From 529f3f316b34db93127f48bea9dfa810282d6676 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 20 Apr 2017 10:28:32 +0200
Subject: [PATCH 01/17] Refactor into SocialRepository

---
 Habitica/res/layout/fragment_chat.xml         |  47 +++
 .../android/habitica/api/ApiService.java      |  25 +-
 .../android/habitica/data/ApiClient.java      |  25 +-
 .../habitica/data/SocialRepository.java       |  51 ++++
 .../android/habitica/data/UserRepository.java |   2 +
 .../data/implementation/ApiClientImpl.java    |   4 +-
 .../implementation/SocialRepositoryImpl.java  | 138 +++++++++
 .../implementation/UserRepositoryImpl.java    |  10 +
 .../data/local/SocialLocalRepository.java     |   4 +
 .../DbFlowSocialLocalRepository.java          |  11 +
 .../commands/SendNewGroupMessageCommand.java  |   8 +-
 .../commands/SendNewInboxMessageCommand.java  |   8 +-
 .../habitica/modules/RepositoryModule.java    |  14 +
 .../social/ChatRecyclerViewAdapter.java       | 273 ++++--------------
 .../ui/fragments/social/ChatListFragment.java |  85 ++----
 .../social/GroupInformationFragment.java      |   2 +-
 .../ui/fragments/social/GuildFragment.java    |  49 ++--
 .../social/GuildsOverviewFragment.java        |  29 +-
 .../ui/fragments/social/InboxFragment.java    |  20 +-
 .../social/InboxMessageListFragment.java      |  38 +--
 .../social/PublicGuildsFragment.java          |  20 +-
 .../ui/fragments/social/TavernFragment.java   |  12 +-
 .../challenges/ChallengeListFragment.java     |   2 +-
 .../ChallengeTasksRecyclerViewFragment.java   |  31 +-
 .../ChallengesOverviewFragment.java           |  12 +-
 .../fragments/social/party/PartyFragment.java |  28 +-
 .../social/party/PartyMemberListFragment.java |   2 +-
 .../android/habitica/ui/helpers/UiUtils.java  |   2 +-
 28 files changed, 538 insertions(+), 414 deletions(-)
 create mode 100644 Habitica/res/layout/fragment_chat.xml
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java

diff --git a/Habitica/res/layout/fragment_chat.xml b/Habitica/res/layout/fragment_chat.xml
new file mode 100644
index 000000000..d43964202
--- /dev/null
+++ b/Habitica/res/layout/fragment_chat.xml
@@ -0,0 +1,47 @@
+<?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">
+    <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="@color/brand_200">
+        <ImageButton
+            android:id="@+id/emoji.toggle.btn"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:src="@drawable/ic_emoticon_grey600_24dp"
+            android:scaleType="center"
+            android:backgroundTint="@color/transparent"
+            android:contentDescription="Toogle Emojis"
+            android:layout_gravity="center"/>
+
+            <net.pherth.android.emoji_library.EmojiEditText
+                android:id="@+id/edit.new.message.text"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:hint="@string/write_message"
+                android:textColor="@android:color/white"
+                android:inputType="textCapSentences|textMultiLine"
+                style="@style/LoginEditTextTheme"/>
+        <Button
+            android:id="@+id/btn.send.message"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:textColor="@color/white"
+            android:text="@string/post"
+            android:drawableTint="@color/white"
+            android:layout_gravity="center"
+            android:background="@color/transparent"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
index e2e6abf35..1540b4948 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
@@ -1,35 +1,34 @@
 package com.habitrpg.android.habitica.api;
 
 import com.habitrpg.android.habitica.models.AchievementResult;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.ContentResult;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
 import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
 import com.habitrpg.android.habitica.models.PurchaseValidationResult;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.habitrpg.android.habitica.models.shops.Shop;
-import com.habitrpg.android.habitica.models.responses.Status;
 import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
 import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.habitrpg.android.habitica.models.auth.UserAuth;
 import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
 import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
+import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.responses.BuyResponse;
 import com.habitrpg.android.habitica.models.responses.FeedResponse;
 import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
 import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.responses.Status;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.habitrpg.android.habitica.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
 import com.habitrpg.android.habitica.models.tasks.ItemData;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -109,7 +108,7 @@ public interface ApiService {
     Observable<HabitResponse<TaskDirectionData>> postTaskDirection(@Path("id") String id, @Path("direction") String direction);
 
     @POST("tasks/{id}/move/to/{position}")
-    Observable<HabitResponse<ArrayList<String>>> postTaskNewPosition(@Path("id") String id, @Path("position") String position);
+    Observable<HabitResponse<List<String>>> postTaskNewPosition(@Path("id") String id, @Path("position") String position);
 
     @POST("tasks/{taskId}/checklist/{itemId}/score")
     Observable<HabitResponse<Task>> scoreChecklistItem(@Path("taskId") String taskId, @Path("itemId") String itemId);
@@ -273,7 +272,7 @@ public interface ApiService {
     /* challenges api */
 
     @GET("challenges/user")
-    Observable<HabitResponse<ArrayList<Challenge>>> getUserChallenges();
+    Observable<HabitResponse<List<Challenge>>> getUserChallenges();
 
     @GET("tasks/challenge/{challengeId}")
     Observable<HabitResponse<TaskList>> getChallengeTasks(@Path("challengeId") String challengeId);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
index 8fcfa3d6d..422e0e15d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
@@ -4,33 +4,32 @@ import android.support.annotation.Nullable;
 
 import com.habitrpg.android.habitica.ErrorResponse;
 import com.habitrpg.android.habitica.models.AchievementResult;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.ContentResult;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
 import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
 import com.habitrpg.android.habitica.models.PurchaseValidationResult;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.habitrpg.android.habitica.models.shops.Shop;
-import com.habitrpg.android.habitica.models.responses.Status;
 import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
 import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
+import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.responses.BuyResponse;
 import com.habitrpg.android.habitica.models.responses.FeedResponse;
 import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
 import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.responses.Status;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.habitrpg.android.habitica.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
 import com.habitrpg.android.habitica.models.tasks.ItemData;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -83,7 +82,7 @@ public interface ApiClient {
 
     Observable<TaskDirectionData> postTaskDirection(String id, String direction);
 
-    Observable<ArrayList<String>> postTaskNewPosition(String id, String position);
+    Observable<List<String>> postTaskNewPosition(String id, String position);
 
     Observable<Task> scoreChecklistItem(String taskId, String itemId);
 
@@ -190,7 +189,7 @@ public interface ApiClient {
 
     /* challenges api */
 
-    Observable<ArrayList<Challenge>> getUserChallenges();
+    Observable<List<Challenge>> getUserChallenges();
 
     Observable<TaskList> getChallengeTasks(String challengeId);
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
new file mode 100644
index 000000000..294e7795f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
@@ -0,0 +1,51 @@
+package com.habitrpg.android.habitica.data;
+
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import rx.Observable;
+
+public interface SocialRepository extends BaseRepository {
+    Observable<List<ChatMessage>> retrieveGroupChat(String groupId);
+    Observable<List<ChatMessage>> getGroupChat(String groupId);
+
+    void markMessagesSeen(String seenGroupId);
+
+    Observable<Void> flagMessage(String groupId, String id);
+
+    Observable<ChatMessage> likeMessage(String groupId, String id);
+
+    Observable<Void> deleteMessage(String groupId, String id);
+
+    Observable<PostChatMessageResult> postGroupChat(String groupId, HashMap<String, String> messageObject);
+    Observable<PostChatMessageResult> postGroupChat(String groupId, String message);
+
+    Observable<Group> retrieveGroup(String id);
+    Observable<Group> getGroup(String id);
+
+    Observable<Void> leaveGroup(String id);
+
+    Observable<Group> joinGroup(String id);
+
+    Observable<Void> updateGroup(Group group);
+
+    Observable<List<Group>> retrieveGroups(String type);
+    Observable<List<Group>> getGroups(String type);
+
+    Observable<PostChatMessageResult> postPrivateMessage(HashMap<String, String> messageObject);
+    Observable<PostChatMessageResult> postPrivateMessage(String recipientId, String message);
+
+
+    Observable<List<HabitRPGUser>> getGroupMembers(String id, boolean includeAllPublicFields);
+
+    Observable<Void> inviteToGroup(String id, Map<String, Object> inviteData);
+
+    Observable<List<Challenge>> getUserChallenges();
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
index 99158deba..b10e78399 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
@@ -19,4 +19,6 @@ public interface UserRepository extends BaseRepository {
     Observable<HabitRPGUser> revive(HabitRPGUser user);
 
     void resetTutorial(@Nullable HabitRPGUser user);
+
+    Observable<HabitRPGUser> sleep(HabitRPGUser user);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index 6c36fb390..e97e200b9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -562,7 +562,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     @Override
-    public Observable<ArrayList<String>> postTaskNewPosition(String id, String position) {
+    public Observable<List<String>> postTaskNewPosition(String id, String position) {
         return apiService.postTaskNewPosition(id, position).compose(configureApiCallObserver());
     }
 
@@ -802,7 +802,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     @Override
-    public Observable<ArrayList<Challenge>> getUserChallenges() {
+    public Observable<List<Challenge>> getUserChallenges() {
         return apiService.getUserChallenges().compose(configureApiCallObserver());
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
new file mode 100644
index 000000000..2cd1abef8
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
@@ -0,0 +1,138 @@
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import rx.Observable;
+import rx.schedulers.Schedulers;
+
+
+public class SocialRepositoryImpl extends BaseRepositoryImpl<SocialLocalRepository> implements SocialRepository {
+
+    public SocialRepositoryImpl(SocialLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<List<ChatMessage>> retrieveGroupChat(String groupId) {
+        return apiClient.listGroupChat(groupId)
+                .flatMap(Observable::from)
+                .map(chatMessage -> {
+                    chatMessage.parsedText = MarkdownParser.parseMarkdown(chatMessage.text);
+                    return chatMessage;
+                })
+                .toList()
+                .subscribeOn(Schedulers.io());
+    }
+
+    @Override
+    public Observable<List<ChatMessage>> getGroupChat(String groupId) {
+        return retrieveGroupChat(groupId);
+    }
+
+    @Override
+    public void markMessagesSeen(String seenGroupId) {
+        apiClient.seenMessages(seenGroupId).subscribe(aVoid -> {}, throwable -> {});
+    }
+
+    @Override
+    public Observable<Void> flagMessage(String groupId, String id) {
+        return apiClient.flagMessage(groupId, id);
+    }
+
+    @Override
+    public Observable<ChatMessage> likeMessage(String groupId, String id) {
+        return apiClient.likeMessage(groupId, id);
+    }
+
+    @Override
+    public Observable<Void> deleteMessage(String groupId, String id) {
+        return apiClient.deleteMessage(groupId, id);
+    }
+
+    @Override
+    public Observable<PostChatMessageResult> postGroupChat(String groupId, HashMap<String, String> messageObject) {
+        return apiClient.postGroupChat(groupId, messageObject);
+    }
+
+    @Override
+    public Observable<PostChatMessageResult> postGroupChat(String groupId, String message) {
+        HashMap<String, String> messageObject = new HashMap<>();
+        messageObject.put("message", message);
+        return postGroupChat(groupId, messageObject);
+    }
+
+    @Override
+    public Observable<Group> retrieveGroup(String id) {
+        return apiClient.getGroup(id);
+    }
+
+    @Override
+    public Observable<Group> getGroup(String id) {
+        return retrieveGroup(id);
+    }
+
+    @Override
+    public Observable<Void> leaveGroup(String id) {
+        return apiClient.leaveGroup(id);
+    }
+
+    @Override
+    public Observable<Group> joinGroup(String id) {
+        return apiClient.joinGroup(id);
+    }
+
+    @Override
+    public Observable<Void> updateGroup(Group group) {
+        return apiClient.updateGroup(group.id, group);
+    }
+
+    @Override
+    public Observable<List<Group>> retrieveGroups(String type) {
+        return apiClient.listGroups(type);
+    }
+
+    @Override
+    public Observable<List<Group>> getGroups(String type) {
+        return retrieveGroups(type);
+    }
+
+    @Override
+    public Observable<PostChatMessageResult> postPrivateMessage(HashMap<String, String> messageObject) {
+        return apiClient.postPrivateMessage(messageObject);
+    }
+
+    @Override
+    public Observable<PostChatMessageResult> postPrivateMessage(String recipientId, String message) {
+        HashMap<String, String> messageObject = new HashMap<>();
+        messageObject.put("message", message);
+        messageObject.put("toUserId", recipientId);
+        return postPrivateMessage(messageObject);
+    }
+
+    @Override
+    public Observable<List<HabitRPGUser>> getGroupMembers(String id, boolean includeAllPublicFields) {
+        return apiClient.getGroupMembers(id, includeAllPublicFields);
+    }
+
+    @Override
+    public Observable<Void> inviteToGroup(String id, Map<String, Object> inviteData) {
+        return apiClient.inviteToGroup(id, inviteData);
+    }
+
+    @Override
+    public Observable<List<Challenge>> getUserChallenges() {
+        return apiClient.getUserChallenges();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index a0499150e..6c79fa4db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -70,6 +70,16 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
                 .subscribe(tutorialSteps -> {}, throwable -> {});
     }
 
+    @Override
+    public Observable<HabitRPGUser> sleep(HabitRPGUser user) {
+        return apiClient.sleep()
+                .map(isSleeping -> {
+                    user.getPreferences().setSleep(isSleeping);
+                    localRepository.saveUser(user);
+                    return user;
+                });
+    }
+
     @Nullable
     private HabitRPGUser mergeUser(@Nullable HabitRPGUser oldUser, HabitRPGUser newUser) {
         if (oldUser == null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java
new file mode 100644
index 000000000..913768b14
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java
@@ -0,0 +1,4 @@
+package com.habitrpg.android.habitica.data.local;
+
+public interface SocialLocalRepository extends BaseLocalRepository {
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
new file mode 100644
index 000000000..1b295fc75
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
@@ -0,0 +1,11 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
+
+
+public class DbFlowSocialLocalRepository implements SocialLocalRepository {
+    @Override
+    public void close() {
+
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
index 30e3d4410..e3369a196 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
@@ -4,11 +4,11 @@ package com.habitrpg.android.habitica.events.commands;
  * Created by Negue on 24.08.2015.
  */
 public class SendNewGroupMessageCommand {
-    public String Message;
-    public String TargetGroupId;
+    public String message;
+    public String targetGroupId;
 
     public SendNewGroupMessageCommand(String targetGroupId, String message) {
-        TargetGroupId = targetGroupId;
-        Message = message;
+        this.targetGroupId = targetGroupId;
+        this.message = message;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewInboxMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewInboxMessageCommand.java
index 2073c3e87..6dc3ad004 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewInboxMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewInboxMessageCommand.java
@@ -4,11 +4,11 @@ package com.habitrpg.android.habitica.events.commands;
  * Created by keithholliday on 6/22/16.
  */
 public class SendNewInboxMessageCommand {
-    public String Message;
-    public String UserToSendTo;
+    public String message;
+    public String userToSendTo;
 
     public SendNewInboxMessageCommand(String userToSendTo, String message) {
-        UserToSendTo = userToSendTo;
-        Message = message;
+        this.userToSendTo = userToSendTo;
+        this.message = message;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
index 0444ddf7a..c7ad53fec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
@@ -2,16 +2,20 @@ package com.habitrpg.android.habitica.modules;
 
 
 import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
+import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.data.TagRepository;
 import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.data.implementation.SetupCustomizationRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.SocialRepositoryImpl;
 import com.habitrpg.android.habitica.data.implementation.TagRepositoryImpl;
 import com.habitrpg.android.habitica.data.implementation.TaskRepositoryImpl;
 import com.habitrpg.android.habitica.data.implementation.UserRepositoryImpl;
+import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
 import com.habitrpg.android.habitica.data.local.TagLocalRepository;
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
 import com.habitrpg.android.habitica.data.local.UserLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowSocialLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.DbFlowTaskLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.DbFlowTagLocalRepository;
 import com.habitrpg.android.habitica.data.ApiClient;
@@ -63,4 +67,14 @@ public class RepositoryModule {
     UserRepository providesUserRepository(UserLocalRepository localRepository, ApiClient apiClient) {
         return new UserRepositoryImpl(localRepository, apiClient);
     }
+
+    @Provides
+    SocialLocalRepository providesSocialLocalRepository() {
+        return new DbFlowSocialLocalRepository();
+    }
+
+    @Provides
+    SocialRepository providesSocialRepository(SocialLocalRepository localRepository, ApiClient apiClient) {
+        return new SocialRepositoryImpl(localRepository, apiClient);
+    }
 }
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 49959771a..495f0a76d 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
@@ -1,28 +1,5 @@
 package com.habitrpg.android.habitica.ui.adapter.social;
 
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.CopyChatAsTodoCommand;
-import com.habitrpg.android.habitica.events.commands.CopyChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
-import com.habitrpg.android.habitica.events.commands.OpenNewPMActivityCommand;
-import com.habitrpg.android.habitica.events.commands.SendNewGroupMessageCommand;
-import com.habitrpg.android.habitica.events.commands.SendNewInboxMessageCommand;
-import com.habitrpg.android.habitica.events.commands.ToggleInnCommand;
-import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.habitrpg.android.habitica.ui.helpers.EmojiKeyboard;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import net.pherth.android.emoji_library.EmojiEditText;
-import net.pherth.android.emoji_library.EmojiTextView;
-
-import org.greenrobot.eventbus.EventBus;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -38,12 +15,27 @@ import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.CopyChatAsTodoCommand;
+import com.habitrpg.android.habitica.events.commands.CopyChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
+import com.habitrpg.android.habitica.events.commands.OpenNewPMActivityCommand;
+import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+
+import net.pherth.android.emoji_library.EmojiTextView;
+
+import org.greenrobot.eventbus.EventBus;
+
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
@@ -52,25 +44,20 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerViewAdapter.ChatRecyclerViewHolder> {
-    private static final int TYPE_DANIEL = 0;
-    private static final int TYPE_NEW_MESSAGE = 1;
-    private static final int TYPE_MESSAGE = 2;
 
     private List<ChatMessage> messages;
     private HabitRPGUser user;
     private String uuid;
     private String groupId;
-    private boolean isTavern;
     private boolean isInboxChat = false;
     private String replyToUserUUID;
     private HabitRPGUser sendingUser;
 
-    public ChatRecyclerViewAdapter(List<ChatMessage> messages, HabitRPGUser user, String groupId, boolean isTavern) {
+    public ChatRecyclerViewAdapter(List<ChatMessage> messages, HabitRPGUser user, String groupId) {
         this.messages = messages;
         this.user = user;
         if (user != null) this.uuid = user.getId();
         this.groupId = groupId;
-        this.isTavern = isTavern;
     }
 
     public void setToInboxChat(String replyToUserUUID) {
@@ -78,7 +65,7 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
         this.isInboxChat = true;
     }
 
-    public void setSendingUser(HabitRPGUser user) {
+    public void setSendingUser(@Nullable HabitRPGUser user) {
         this.sendingUser = user;
     }
 
@@ -87,106 +74,39 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
         this.notifyDataSetChanged();
     }
 
-    @Override
-    public int getItemViewType(int position) {
-        switch (position) {
-            case 0: {
-                return isTavern ? TYPE_DANIEL : TYPE_NEW_MESSAGE;
-            }
-            case 1: {
-                return isTavern ? TYPE_NEW_MESSAGE : TYPE_MESSAGE;
-            }
-            default: {
-                return TYPE_MESSAGE;
-            }
-        }
-    }
-
     @Override
     public ChatRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        int rLayout = R.layout.tavern_chat_item;
-
-        switch (viewType) {
-            case TYPE_DANIEL: {
-                rLayout = R.layout.tavern_daniel_item;
-                break;
-            }
-
-            case TYPE_NEW_MESSAGE: {
-                rLayout = R.layout.tavern_chat_new_entry_item;
-                break;
-            }
-        }
-
         View view = LayoutInflater.from(parent.getContext())
-                .inflate(rLayout, parent, false);
-
+                .inflate(R.layout.tavern_chat_item, parent, false);
         return new ChatRecyclerViewHolder(view, viewType, uuid, groupId);
     }
 
     @Override
     public void onBindViewHolder(ChatRecyclerViewHolder holder, int position) {
-        if (!isTavern && position > 0) {
-            holder.bind(messages.get(position - 1));
-            return;
-        }
-
-        if (position > 1) {
-            holder.bind(messages.get(position - 2));
-        }
+        holder.bind(messages.get(position));
     }
 
     @Override
     public int getItemCount() {
-        int messageCount = messages.size();
-
-        if (isTavern) {
-            // if there are no entries, we just show the toggle inn button
-            messageCount += (messageCount == 0) ? 1 : 2;
-        } else {
-            messageCount += 1;
-        }
-
-        return messageCount;
+        return messages != null ? messages.size() : 0;
     }
 
     public class ChatRecyclerViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, PopupMenu.OnMenuItemClickListener {
 
-        // Toggle Inn State
-        @BindView(R.id.btn_toggle_inn)
-        @Nullable
-        Button btnToggleInn;
-        // New Msg
-        @BindView(R.id.edit_new_message_text)
-        @Nullable
-        EmojiEditText textNewMessage;
-        @BindView(R.id.btn_send_message)
-        @Nullable
-        Button btnSendNewMessage;
         @BindView(R.id.btn_options)
-        @Nullable
         ImageView btnOptions;
         @BindView(R.id.user_background_layout)
-        @Nullable
         LinearLayout userBackground;
         @BindView(R.id.like_background_layout)
-        @Nullable
         LinearLayout likeBackground;
         @BindView(R.id.user_label)
-        @Nullable
         TextView userLabel;
         @BindView(R.id.message_text)
-        @Nullable
         EmojiTextView messageText;
         @BindView(R.id.ago_label)
-        @Nullable
         TextView agoLabel;
         @BindView(R.id.tvLikes)
-        @Nullable
         TextView tvLikes;
-        @BindView(R.id.community_guidelines_view)
-        @Nullable
-        TextView communityGuidelinesView;
 
         Context context;
         Resources res;
@@ -209,102 +129,58 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
 
             res = context.getResources();
 
-            switch (layoutType) {
-                case TYPE_DANIEL: {
-                    if (btnToggleInn != null) {
-                        btnToggleInn.setOnClickListener(this);
-                    }
-
-                    ViewHelper.SetBackgroundTint(btnToggleInn, ContextCompat.getColor(context, R.color.brand));
-                    if (HabiticaApplication.User != null && HabiticaApplication.User.getPreferences().getSleep()) {
-                        btnToggleInn.setText(R.string.tavern_inn_checkOut);
-                    } else {
-                        btnToggleInn.setText(R.string.tavern_inn_rest);
-                    }
-
-                    break;
-                }
-
-                case TYPE_NEW_MESSAGE: {
-                    if (btnSendNewMessage != null) {
-                        btnSendNewMessage.setOnClickListener(this);
-                    }
-                    int color = ContextCompat.getColor(context, R.color.brand);
-
-                    ViewHelper.SetBackgroundTint(btnSendNewMessage, color);
-
-                    // Set up the emoji keyboard
-                    EmojiKeyboard.createKeyboard(itemView, context);
-
-                    break;
-                }
-
-                default: {
-                    if (btnOptions != null) {
-                        btnOptions.setOnClickListener(this);
-                    }
-                    if (tvLikes != null) {
-                        tvLikes.setOnClickListener(this);
-                    }
-                }
+            if (btnOptions != null) {
+                btnOptions.setOnClickListener(this);
             }
-
-            if (communityGuidelinesView != null) {
-                communityGuidelinesView.setPaintFlags(communityGuidelinesView.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-                communityGuidelinesView.setOnClickListener(v -> {
-                    Intent i = new Intent(Intent.ACTION_VIEW);
-                    i.setData(Uri.parse("https://habitica.com/static/community-guidelines"));
-                    context.startActivity(i);
-                });
+            if (tvLikes != null) {
+                tvLikes.setOnClickListener(this);
             }
         }
 
         public void bind(final ChatMessage msg) {
             currentMsg = msg;
 
-            if (layoutType != TYPE_DANIEL && layoutType != TYPE_NEW_MESSAGE) {
-                setLikeProperties(msg);
+            setLikeProperties(msg);
 
-                if (userBackground != null) {
-                    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("")) {
+                msg.user = "system";
+            }
+
+            if (userLabel != null) {
+                if (msg.sent != null && msg.sent.equals("true")) {
+                    userLabel.setText(sendingUser.getProfile().getName());
+                } else {
+                    userLabel.setText(msg.user);
                 }
 
-                if (msg.user == null || msg.user.equals("")) {
-                    msg.user = "system";
+                userLabel.setClickable(true);
+                userLabel.setOnClickListener(view -> {
+                    OpenFullProfileCommand cmd = new OpenFullProfileCommand(msg.uuid);
+
+                    EventBus.getDefault().post(cmd);
+                });
+            }
+
+            DataBindingUtils.setForegroundTintColor(userLabel, msg.getContributorForegroundColor());
+
+            if (messageText != null) {
+                messageText.setText(msg.parsedText);
+                if (msg.parsedText == null) {
+                    messageText.setText(msg.text);
                 }
+                this.messageText.setMovementMethod(LinkMovementMethod.getInstance());
+            }
 
-                if (userLabel != null) {
-                    if (msg.sent != null && msg.sent.equals("true")) {
-                        userLabel.setText(sendingUser.getProfile().getName());
-                    } else {
-                        userLabel.setText(msg.user);
-                    }
-
-                    userLabel.setClickable(true);
-                    userLabel.setOnClickListener(view -> {
-                        OpenFullProfileCommand cmd = new OpenFullProfileCommand(msg.uuid);
-
-                        EventBus.getDefault().post(cmd);
-                    });
-                }
-
-                DataBindingUtils.setForegroundTintColor(userLabel, msg.getContributorForegroundColor());
-
-                if (messageText != null) {
-                    messageText.setText(msg.parsedText);
-                    if (msg.parsedText == null) {
-                        messageText.setText(msg.text);
-                    }
-                    this.messageText.setMovementMethod(LinkMovementMethod.getInstance());
-                }
-
-                if (agoLabel != null) {
-                    agoLabel.setText(msg.getAgoString(res));
-                }
+            if (agoLabel != null) {
+                agoLabel.setText(msg.getAgoString(res));
             }
         }
 
@@ -417,33 +293,6 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
 
                 return;
             }
-
-
-            if (v == btnToggleInn) {
-                EventBus.getDefault().post(new ToggleInnCommand());
-                if (!HabiticaApplication.User.getPreferences().getSleep()) {
-                    if (btnToggleInn != null) {
-                        btnToggleInn.setText(R.string.tavern_inn_checkOut);
-                    }
-                } else {
-                    if (btnToggleInn != null) {
-                        btnToggleInn.setText(R.string.tavern_inn_rest);
-                    }
-                }
-                return;
-            }
-
-            if (textNewMessage != null) {
-                String text = textNewMessage.getText().toString();
-                if (!text.equals("")) {
-                    if (isInboxChat) {
-                        EventBus.getDefault().post(new SendNewInboxMessageCommand(replyToUserUUID, text));
-                    } else {
-                        EventBus.getDefault().post(new SendNewGroupMessageCommand(groupId, text));
-                    }
-                }
-                textNewMessage.setText("");
-            }
         }
 
         private void toggleLike() {
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 2f53778e5..b4284afb9 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,8 +1,9 @@
 package com.habitrpg.android.habitica.ui.fragments.social;
 
-import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
 import com.habitrpg.android.habitica.events.commands.CopyChatMessageCommand;
 import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
@@ -13,7 +14,6 @@ import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.user.HabitRPGUser;
@@ -26,7 +26,6 @@ import org.greenrobot.eventbus.Subscribe;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -38,7 +37,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -51,12 +49,12 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
 
     public String seenGroupId;
     @Inject
-    public ApiClient apiClient;
+    SocialRepository socialRepository;
+    @Inject
+    UserRepository userRepository;
     public boolean isTavern;
     @BindView(R.id.recyclerView)
     RecyclerView mRecyclerView;
-    @BindView(R.id.refresh_layout)
-    SwipeRefreshLayout swipeRefreshLayout;
     LinearLayoutManager layoutManager;
     private String groupId;
     private HabitRPGUser user;
@@ -67,7 +65,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     private boolean navigatedOnceToFragment = false;
     private boolean gotNewMessages = false;
 
-    public void configure(String groupId, HabitRPGUser user, boolean isTavern) {
+    public void configure(String groupId, @Nullable HabitRPGUser user, boolean isTavern) {
         this.groupId = groupId;
         this.user = user;
         if (this.user != null) {
@@ -99,7 +97,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
         }
 
         if (view == null)
-            view = inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false);
+            view = inflater.inflate(R.layout.fragment_chat, container, false);
 
         return view;
     }
@@ -125,7 +123,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
             mRecyclerView.setLayoutManager(layoutManager);
         }
 
-        chatAdapter = new ChatRecyclerViewAdapter(new ArrayList<>(), user, groupId, isTavern);
+        chatAdapter = new ChatRecyclerViewAdapter(new ArrayList<>(), user, groupId);
 
         mRecyclerView.setAdapter(chatAdapter);
 
@@ -136,7 +134,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     public void onRefresh() {
         swipeRefreshLayout.setRefreshing(true);
 
-        apiClient.listGroupChat(groupId)
+        socialRepository.getGroupChat(groupId)
                 .subscribe(this, throwable -> {
                 });
     }
@@ -154,17 +152,14 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
 
             gotNewMessages = false;
 
-            apiClient.seenMessages(seenGroupId)
-                    .subscribe(s -> {
-                    }, throwable -> {
-                    });
+            socialRepository.markMessagesSeen(seenGroupId);
         }
     }
 
     @Subscribe
     public void onEvent(CopyChatMessageCommand cmd) {
         ClipboardManager clipMan = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
-        ClipData chatMessage = ClipData.newPlainText("Chat Message", cmd.chatMessage.text);
+        ClipData chatMessage = ClipData.newPlainText("Chat message", cmd.chatMessage.text);
         clipMan.setPrimaryClip(chatMessage);
         MainActivity activity = (MainActivity) getActivity();
         UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), getString(R.string.chat_message_copied), UiUtils.SnackbarDisplayType.NORMAL);
@@ -175,8 +170,7 @@ 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) -> {
-                    apiClient.flagMessage(cmd.groupId, cmd.chatMessage.id)
-
+                    socialRepository.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);
@@ -190,7 +184,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
 
     @Subscribe
     public void onEvent(final ToggleLikeMessageCommand cmd) {
-        apiClient.likeMessage(cmd.groupId, cmd.chatMessage.id)
+        socialRepository.likeMessage(cmd.groupId, cmd.chatMessage.id)
                 .subscribe(voids -> {
                 }, throwable -> {
                 });
@@ -198,12 +192,10 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
 
     @Subscribe
     public void onEvent(final DeleteChatMessageCommand cmd) {
-        apiClient.deleteMessage(cmd.groupId, cmd.chatMessage.id)
-
+        socialRepository.deleteMessage(cmd.groupId, cmd.chatMessage.id)
                 .subscribe(aVoid -> {
                     if (currentChatMessages != null) {
                         currentChatMessages.remove(cmd.chatMessage);
-
                         ChatListFragment.this.call(currentChatMessages);
                     }
                 }, throwable -> {
@@ -212,14 +204,10 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
 
     @Subscribe
     public void onEvent(SendNewGroupMessageCommand cmd) {
-        HashMap<String, String> messageObject = new HashMap<>();
-        messageObject.put("message", cmd.Message);
-        apiClient.postGroupChat(cmd.TargetGroupId, messageObject)
-
+        socialRepository.postGroupChat(cmd.targetGroupId, cmd.message)
                 .subscribe(postChatMessageResult -> {
                     if (currentChatMessages != null) {
                         currentChatMessages.add(0, postChatMessageResult.message);
-
                         ChatListFragment.this.call(currentChatMessages);
                     }
                 }, throwable -> {
@@ -231,13 +219,10 @@ 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) {
-        apiClient.sleep()
-                .subscribe(aVoid -> {
+        userRepository.sleep(user)
+                .subscribe(habitRPGUser -> {
                     ToggledInnStateEvent innState = new ToggledInnStateEvent();
-                    innState.Inn = !user.getPreferences().getSleep();
-
-                    user.getPreferences().setSleep(innState.Inn);
-
+                    innState.Inn = habitRPGUser.getPreferences().getSleep();
                     EventBus.getDefault().post(innState);
                 }, throwable -> {
                 });
@@ -255,7 +240,6 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     public void call(List<ChatMessage> chatMessages) {
         currentChatMessages = chatMessages;
 
-        //Load unparsed messages first
         if (chatAdapter != null) {
             chatAdapter.setMessages(chatMessages);
         }
@@ -263,41 +247,8 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
         if (swipeRefreshLayout != null) {
             swipeRefreshLayout.setRefreshing(false);
         }
-
-        //Parse chatMessages in AsyncTask
-        ParseMessages parseMessages = new ParseMessages(chatMessages);
-        parseMessages.execute();
         gotNewMessages = true;
 
         markMessagesAsSeen();
     }
-
-    private class ParseMessages extends AsyncTask<Void, Void, Void> {
-        private List<ChatMessage> chatMessages;
-
-        public ParseMessages(List<ChatMessage> chatMessages) {
-            this.chatMessages = chatMessages;
-        }
-
-        @Override
-        protected Void doInBackground(Void... params) {
-
-            for (int i = 0; i < chatMessages.size(); i++) {
-                chatMessages.get(i).parsedText = MarkdownParser.parseMarkdown(chatMessages.get(i).text);
-            }
-
-            return null;
-        }
-
-        protected void onPostExecute(Void result) {
-            if (chatAdapter != null) {
-                chatAdapter.setMessages(chatMessages);
-            }
-
-            if (swipeRefreshLayout != null) {
-                swipeRefreshLayout.setRefreshing(false);
-            }
-        }
-    }
-
 }
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 a323a3fc2..e85481bf1 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
@@ -70,7 +70,7 @@ public class GroupInformationFragment extends BaseFragment {
 
     }
 
-    public static GroupInformationFragment newInstance(@Nullable Group group, HabitRPGUser user) {
+    public static GroupInformationFragment newInstance(@Nullable Group group, @Nullable HabitRPGUser user) {
         Bundle args = new Bundle();
 
         GroupInformationFragment fragment = new GroupInformationFragment();
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 d62538108..e02ca8e63 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
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.social;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.models.social.Group;
@@ -19,10 +20,15 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
+import javax.inject.Inject;
+
 import rx.functions.Action1;
 
 public class GuildFragment extends BaseMainFragment implements Action1<Group> {
 
+    @Inject
+    SocialRepository socialRepository;
+
     public boolean isMember;
     public ViewPager viewPager;
     private Group guild;
@@ -34,8 +40,8 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
         if (this.guildInformationFragment != null) {
             this.guildInformationFragment.setGroup(guild);
         }
-        if (this.guild.chat == null && this.apiClient != null) {
-            apiClient.getGroup(this.guild.id)
+        if (this.guild.chat == null && this.socialRepository != null) {
+            socialRepository.retrieveGroup(this.guild.id)
                     .subscribe(this, throwable -> {
                     });
         }
@@ -65,8 +71,8 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if (this.apiClient != null && this.guild != null) {
-            apiClient.getGroup(this.guild.id)
+        if (this.socialRepository != null && this.guild != null) {
+            socialRepository.retrieveGroup(this.guild.id)
                     .subscribe(this, throwable -> {
                     });
         }
@@ -74,14 +80,16 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (this.isMember) {
-            if (this.user != null && this.user.getId().equals(this.guild.leaderID)) {
-                this.activity.getMenuInflater().inflate(R.menu.guild_admin, menu);
+        if (this.activity != null) {
+            if (this.isMember) {
+                if (this.user != null && this.user.getId().equals(this.guild.leaderID)) {
+                    this.activity.getMenuInflater().inflate(R.menu.guild_admin, menu);
+                } else {
+                    this.activity.getMenuInflater().inflate(R.menu.guild_member, menu);
+                }
             } else {
-                this.activity.getMenuInflater().inflate(R.menu.guild_member, menu);
+                this.activity.getMenuInflater().inflate(R.menu.guild_nonmember, menu);
             }
-        } else {
-            this.activity.getMenuInflater().inflate(R.menu.guild_nonmember, menu);
         }
         super.onCreateOptionsMenu(menu, inflater);
     }
@@ -92,14 +100,18 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
 
         switch (id) {
             case R.id.menu_guild_join:
-                this.apiClient.joinGroup(this.guild.id)
+                this.socialRepository.joinGroup(this.guild.id)
                         .subscribe(this, throwable -> {
                         });
                 this.isMember = true;
                 return true;
             case R.id.menu_guild_leave:
-                this.apiClient.leaveGroup(this.guild.id)
-                        .subscribe(aVoid -> this.activity.supportInvalidateOptionsMenu(), throwable -> {
+                this.socialRepository.leaveGroup(this.guild.id)
+                        .subscribe(aVoid -> {
+                            if (this.activity != null) {
+                                this.activity.supportInvalidateOptionsMenu();
+                            }
+                        }, throwable -> {
                         });
                 this.isMember = false;
                 return true;
@@ -147,9 +159,9 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
             public CharSequence getPageTitle(int position) {
                 switch (position) {
                     case 0:
-                        return activity.getString(R.string.guild);
+                        return getContext().getString(R.string.guild);
                     case 1:
-                        return activity.getString(R.string.chat);
+                        return getContext().getString(R.string.chat);
                 }
                 return "";
             }
@@ -220,8 +232,7 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
                         needsSaving = true;
                     }
                     if (needsSaving) {
-                        this.apiClient.updateGroup(this.guild.id, this.guild)
-
+                        this.socialRepository.updateGroup(this.guild)
                                 .subscribe(aVoid -> {
                                 }, throwable -> {
                                 });
@@ -246,7 +257,9 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
 
             this.guild = group;
         }
-        this.activity.supportInvalidateOptionsMenu();
+        if (this.activity != null) {
+            this.activity.supportInvalidateOptionsMenu();
+        }
     }
 
     @Override
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 556525dff..825624973 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
@@ -1,10 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.social;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.models.social.Group;
-
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
@@ -15,14 +10,25 @@ import android.widget.Button;
 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.data.SocialRepository;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class GuildsOverviewFragment extends BaseMainFragment implements View.OnClickListener, SwipeRefreshLayout.OnRefreshListener {
 
+    @Inject
+    SocialRepository socialRepository;
+
     @BindView(R.id.my_guilds_listview)
     LinearLayout guildsListView;
 
@@ -68,9 +74,8 @@ public class GuildsOverviewFragment extends BaseMainFragment implements View.OnC
     }
 
     private void fetchGuilds() {
-        if (this.apiClient != null && this.apiClient != null) {
-            this.apiClient.listGroups("guilds")
-
+        if (this.socialRepository != null) {
+            this.socialRepository.retrieveGroups("guilds")
                     .subscribe(groups -> {
                         GuildsOverviewFragment.this.guilds = groups;
                         GuildsOverviewFragment.this.setGuildsOnListView();
@@ -100,16 +105,20 @@ public class GuildsOverviewFragment extends BaseMainFragment implements View.OnC
 
     @Override
     public void onClick(View v) {
+        BaseMainFragment fragment;
         if (v == this.publicGuildsButton) {
             PublicGuildsFragment publicGuildsFragment = new PublicGuildsFragment();
             publicGuildsFragment.memberGuildIDs = this.guildIDs;
-            this.activity.displayFragment(publicGuildsFragment);
+            fragment = publicGuildsFragment;
         } else {
             Integer guildIndex = ((ViewGroup) v.getParent()).indexOfChild(v);
             GuildFragment guildFragment = new GuildFragment();
             guildFragment.setGuild(this.guilds.get(guildIndex));
             guildFragment.isMember = true;
-            this.activity.displayFragment(guildFragment);
+            fragment = guildFragment;
+        }
+        if (this.activity != null) {
+            this.activity.displayFragment(fragment);
         }
     }
 
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 a467668e2..0d7d6e2fb 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
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.fragments.social;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -31,12 +32,17 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class InboxFragment extends BaseMainFragment
         implements SwipeRefreshLayout.OnRefreshListener, View.OnClickListener, HabitRPGUserCallback.OnUserReceived {
 
+    @Inject
+    UserRepository userRepository;
+
     @BindView(R.id.inbox_messages)
     LinearLayout inboxMessagesListView;
 
@@ -53,7 +59,6 @@ public class InboxFragment extends BaseMainFragment
         super.onCreateView(inflater, container, savedInstanceState);
 
         this.apiClient.markPrivateMessagesRead()
-
                 .subscribe(aVoid -> {
                 }, throwable -> {
                 });
@@ -75,7 +80,9 @@ public class InboxFragment extends BaseMainFragment
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        this.activity.getMenuInflater().inflate(R.menu.inbox, menu);
+        if (this.activity != null) {
+            this.activity.getMenuInflater().inflate(R.menu.inbox, menu);
+        }
         super.onCreateOptionsMenu(menu, inflater);
     }
 
@@ -92,6 +99,7 @@ public class InboxFragment extends BaseMainFragment
     }
 
     private void openNewMessageDialog() {
+        assert this.activity != null;
         this.chooseRecipientDialogView = this.activity.getLayoutInflater().inflate(R.layout.dialog_choose_message_recipient, null);
 
         Button scaneQRCodeButton = (Button) chooseRecipientDialogView.findViewById(R.id.scanQRCodeButton);
@@ -123,8 +131,8 @@ public class InboxFragment extends BaseMainFragment
     @Override
     public void onRefresh() {
         swipeRefreshLayout.setRefreshing(true);
-        this.apiClient.retrieveUser(true)
-                .subscribe(new HabitRPGUserCallback(this), throwable -> {
+        this.userRepository.retrieveUser(true)
+                .subscribe(this::onUserReceived, throwable -> {
                 });
     }
 
@@ -173,7 +181,9 @@ public class InboxFragment extends BaseMainFragment
     private void openInboxMessages(String userID, String username) {
         InboxMessageListFragment inboxMessageListFragment = new InboxMessageListFragment();
         inboxMessageListFragment.setMessages(this.messages, username, userID);
-        this.activity.displayFragment(inboxMessageListFragment);
+        if (this.activity != null) {
+            this.activity.displayFragment(inboxMessageListFragment);
+        }
     }
 
     @Override
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 a680cda1f..ad0be0bf2 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
@@ -3,6 +3,8 @@ package com.habitrpg.android.habitica.ui.fragments.social;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.events.commands.SendNewInboxMessageCommand;
 import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -26,6 +28,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
@@ -35,6 +39,11 @@ import butterknife.ButterKnife;
 public class InboxMessageListFragment extends BaseMainFragment
         implements SwipeRefreshLayout.OnRefreshListener, HabitRPGUserCallback.OnUserReceived {
 
+    @Inject
+    SocialRepository socialRepository;
+    @Inject
+    UserRepository userRepository;
+
     @BindView(R.id.refresh_layout)
     SwipeRefreshLayout swipeRefreshLayout;
 
@@ -47,7 +56,7 @@ public class InboxMessageListFragment extends BaseMainFragment
     String replyToUserUUID;
 
     public InboxMessageListFragment() {
-        messages = new ArrayList<ChatMessage>();
+        messages = new ArrayList<>();
     }
 
     @Override
@@ -62,7 +71,7 @@ public class InboxMessageListFragment extends BaseMainFragment
         RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this.getActivity());
         chatRecyclerView.setLayoutManager(layoutManager);
 
-        chatAdapter = new ChatRecyclerViewAdapter(messages, user, null, false);
+        chatAdapter = new ChatRecyclerViewAdapter(messages, user, null);
         chatAdapter.setToInboxChat(this.replyToUserUUID);
         chatAdapter.setSendingUser(this.user);
         chatRecyclerView.setAdapter(chatAdapter);
@@ -75,12 +84,11 @@ public class InboxMessageListFragment extends BaseMainFragment
         component.inject(this);
     }
 
-        private void refreshUserInbox () {
-            this.swipeRefreshLayout.setRefreshing(true);
-            this.apiClient.retrieveUser(true)
-
-                    .subscribe(new HabitRPGUserCallback(this), throwable -> {});
-        }
+    private void refreshUserInbox () {
+        this.swipeRefreshLayout.setRefreshing(true);
+        this.userRepository.retrieveUser(true)
+                .subscribe(this::onUserReceived, throwable -> {});
+    }
 
     @Override
     public void onRefresh() {
@@ -118,17 +126,9 @@ public class InboxMessageListFragment extends BaseMainFragment
 
     @Subscribe
     public void onEvent(SendNewInboxMessageCommand cmd) {
-        HashMap<String, String> messageObject = new HashMap<>();
-        messageObject.put("message", cmd.Message);
-        messageObject.put("toUserId", cmd.UserToSendTo);
-
-            apiClient.postPrivateMessage(messageObject)
-
-                    .subscribe(postChatMessageResult -> {
-                        this.refreshUserInbox();
-                    }, throwable -> {
-                    });
-
+        socialRepository.postPrivateMessage(cmd.userToSendTo, cmd.message)
+                .subscribe(postChatMessageResult -> this.refreshUserInbox(), throwable -> {
+                });
         UiUtils.dismissKeyboard(getActivity());
     }
 
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 c20c54b55..50fa3ce17 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
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.social;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.ui.adapter.social.PublicGuildsRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
@@ -23,11 +24,16 @@ import android.view.ViewGroup;
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class PublicGuildsFragment extends BaseMainFragment implements SearchView.OnQueryTextListener {
 
+    @Inject
+    SocialRepository socialRepository;
+
     List<String> memberGuildIDs;
     List<Group> guilds;
 
@@ -36,7 +42,6 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
 
     private View view;
     private PublicGuildsRecyclerViewAdapter viewAdapter;
-    private SearchView guildSearchView;
 
     @Nullable
     @Override
@@ -71,9 +76,8 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
     }
 
     private void fetchGuilds() {
-        if (this.apiClient != null) {
-            this.apiClient.listGroups("publicGuilds")
-
+        if (this.socialRepository != null) {
+            this.socialRepository.getGroups("publicGuilds")
                     .subscribe(groups -> {
                         PublicGuildsFragment.this.guilds = groups;
                         if (PublicGuildsFragment.this.viewAdapter != null) {
@@ -89,9 +93,9 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
         inflater.inflate(R.menu.menu_public_guild, menu);
 
         MenuItem searchItem = menu.findItem(R.id.action_guild_search);
-        guildSearchView = (SearchView) searchItem.getActionView();
+        SearchView guildSearchView = (SearchView) searchItem.getActionView();
         SearchView.SearchAutoComplete theTextArea = (SearchView.SearchAutoComplete) guildSearchView.findViewById(R.id.search_src_text);
-        theTextArea.setHintTextColor(ContextCompat.getColor(this.activity, R.color.white));
+        theTextArea.setHintTextColor(ContextCompat.getColor(getContext(), R.color.white));
         guildSearchView.setQueryHint(getString(R.string.guild_search_hint));
         guildSearchView.setOnQueryTextListener(this);
 
@@ -100,7 +104,9 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
     @Override
     public boolean onQueryTextSubmit(String s) {
         viewAdapter.getFilter().filter(s);
-        UiUtils.dismissKeyboard(this.activity);
+        if (this.activity != null) {
+            UiUtils.dismissKeyboard(this.activity);
+        }
         return true;
     }
 
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 e2a29df19..0a2df97b3 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
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.fragments.social;
 import com.habitrpg.android.habitica.ContentCache;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.models.social.Group;
 
@@ -18,6 +19,9 @@ import javax.inject.Inject;
 
 public class TavernFragment extends BaseMainFragment {
 
+    @Inject
+    SocialRepository socialRepository;
+
     public ViewPager viewPager;
     Group tavern;
 
@@ -53,8 +57,8 @@ public class TavernFragment extends BaseMainFragment {
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if (this.apiClient != null) {
-            apiClient.getGroup("habitrpg")
+        if (this.socialRepository != null) {
+            socialRepository.getGroup("habitrpg")
                     .subscribe(group -> {
                         TavernFragment.this.tavern = group;
                         if (group.quest != null && group.quest.key != null && TavernFragment.this.isAdded()) {
@@ -118,9 +122,9 @@ public class TavernFragment extends BaseMainFragment {
             public CharSequence getPageTitle(int position) {
                 switch (position) {
                     case 0:
-                        return activity.getString(R.string.chat);
+                        return getContext().getString(R.string.chat);
                     case 1:
-                        return activity.getString(R.string.world_quest);
+                        return getContext().getString(R.string.world_quest);
                 }
                 return "";
             }
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 59c927ab5..abba56a50 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
@@ -66,7 +66,7 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
 
     private ChallengeFilterOptions lastFilterOptions;
 
-    public void setObservable(Observable<ArrayList<Challenge>> listObservable) {
+    public void setObservable(Observable<List<Challenge>> listObservable) {
         listObservable
                 .subscribe(challenges -> {
 
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 0cc1fbb4e..6e601f470 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,21 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.social.challenges;
 
 
-import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
 import android.content.Context;
 import android.databinding.ObservableList;
 import android.os.Bundle;
@@ -27,6 +12,20 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -36,8 +35,6 @@ public class ChallengeTasksRecyclerViewFragment extends BaseFragment {
     @Inject
     @Named("UserID")
     String userID;
-    @Inject
-    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 7a1b3747e..979d600fb 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
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.social.challenges;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
 import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
@@ -22,18 +23,24 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Stack;
 
+import javax.inject.Inject;
+
 import rx.subjects.PublishSubject;
 
 public class ChallengesOverviewFragment extends BaseMainFragment {
 
+    @Inject
+    SocialRepository socialRepository;
+
     public ViewPager viewPager;
     public FragmentStatePagerAdapter statePagerAdapter;
     int currentPage;
     private Stack<Integer> pageHistory;
     private boolean saveToHistory;
-    private PublishSubject<ArrayList<Challenge>> getUserChallengesObservable;
+    private PublishSubject<List<Challenge>> getUserChallengesObservable;
     private ChallengeListFragment userChallengesFragment;
     private ChallengeListFragment availableChallengesFragment;
 
@@ -71,8 +78,7 @@ public class ChallengesOverviewFragment extends BaseMainFragment {
     }
 
     private void subscribeGetChallenges() {
-        this.apiClient.getUserChallenges()
-
+        this.socialRepository.getUserChallenges()
                 .subscribe(challenges -> getUserChallengesObservable.onNext(challenges),
                         e -> getUserChallengesObservable.onError(e));
     }
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 c7307dce5..2b38916b9 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
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.fragments.social.party;
 import com.habitrpg.android.habitica.ContentCache;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
 import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -37,6 +38,9 @@ import javax.inject.Inject;
 
 public class PartyFragment extends BaseMainFragment {
 
+    @Inject
+    SocialRepository socialRepository;
+
     public ViewPager viewPager;
     @Inject
     ContentCache contentCache;
@@ -60,7 +64,8 @@ public class PartyFragment extends BaseMainFragment {
 
         // Get the full group data
         if (this.user != null && this.user.getParty() != null && this.user.getParty().id != null) {
-            apiClient.getGroup("party")
+            socialRepository.getGroup("party")
+                    .filter(group1 -> group1 != null)
                     .subscribe(group -> {
                         if (group == null) {
                             return;
@@ -69,8 +74,7 @@ public class PartyFragment extends BaseMainFragment {
 
                         updateGroupUI();
 
-                        apiClient.getGroupMembers(group.id, true)
-
+                        socialRepository.getGroupMembers(group.id, true)
                                 .subscribe(members -> {
                                             PartyFragment.this.group.members = members;
                                             updateGroupUI();
@@ -122,7 +126,9 @@ public class PartyFragment extends BaseMainFragment {
             chatListFragment.seenGroupId = group.id;
         }
 
-        PartyFragment.this.activity.supportInvalidateOptionsMenu();
+        if (this.activity != null) {
+            this.activity.supportInvalidateOptionsMenu();
+        }
 
         if (group != null && group.quest != null && group.quest.key != null && !group.quest.key.isEmpty()) {
             contentCache.getQuestContent(group.quest.key, content -> {
@@ -166,7 +172,7 @@ public class PartyFragment extends BaseMainFragment {
                         .setMessage(viewPager.getContext().getString(R.string.party_leave_confirmation))
                         .setPositiveButton(viewPager.getContext().getString(R.string.yes), (dialog, which) ->  {
                             if (this.group != null){
-                                this.apiClient.leaveGroup(this.group.id)
+                                this.socialRepository.leaveGroup(this.group.id)
                                         .subscribe(group -> getActivity().getSupportFragmentManager().beginTransaction().remove(PartyFragment.this).commit(), throwable -> {
                                         });
                             }
@@ -220,8 +226,7 @@ public class PartyFragment extends BaseMainFragment {
                         needsSaving = true;
                     }
                     if (needsSaving) {
-                        this.apiClient.updateGroup(this.group.id, this.group)
-
+                        this.socialRepository.updateGroup(this.group)
                                 .subscribe(aVoid -> {
                                 }, throwable -> {
                                 });
@@ -251,8 +256,7 @@ public class PartyFragment extends BaseMainFragment {
                         inviteData.put("uuids", invites);
                     }
                     if (this.group != null) {
-                        this.apiClient.inviteToGroup(this.group.id, inviteData)
-
+                        this.socialRepository.inviteToGroup(this.group.id, inviteData)
                                 .subscribe(aVoid -> {
                                 }, throwable -> {
                                 });
@@ -323,11 +327,11 @@ public class PartyFragment extends BaseMainFragment {
             public CharSequence getPageTitle(int position) {
                 switch (position) {
                     case 0:
-                        return activity.getString(R.string.party);
+                        return getContext().getString(R.string.party);
                     case 1:
-                        return activity.getString(R.string.chat);
+                        return getContext().getString(R.string.chat);
                     case 2:
-                        return activity.getString(R.string.members);
+                        return getContext().getString(R.string.members);
                 }
                 return "";
             }
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 78c0457a0..76628b901 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
@@ -31,7 +31,7 @@ public class PartyMemberListFragment extends BaseFragment {
     private PartyMemberRecyclerViewAdapter viewAdapter;
     private View view;
 
-    public void configure(Context ctx, @Nullable List<HabitRPGUser> members) {
+    public void configure(@Nullable Context ctx, @Nullable List<HabitRPGUser> members) {
         this.ctx = ctx;
         this.members = members;
 
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 fb1ab641f..3fa472bbf 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
@@ -48,7 +48,7 @@ public class UiUtils {
      *
      * @param context   Context.
      * @param container Parent view where Snackbar will appear.
-     * @param content   Message.
+     * @param content   message.
      */
     public static void showSnackbar(Context context, View container, String content, SnackbarDisplayType displayType) {
         Snackbar snackbar = Snackbar.make(container, content, Snackbar.LENGTH_LONG);

From 786ba3b449d8fa482e8d53353a22c4b183e68285 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 20 Apr 2017 12:19:36 +0200
Subject: [PATCH 02/17] Move more DB access into repositories

---
 .../habitica/callbacks/SkillCallback.java     |  23 +-
 .../habitica/components/AppComponent.java     |   6 +
 .../android/habitica/data/TagRepository.java  |   2 +-
 .../android/habitica/data/TaskRepository.java |   8 +-
 .../android/habitica/data/UserRepository.java |  11 +
 .../implementation/TagRepositoryImpl.java     |   4 +-
 .../implementation/TaskRepositoryImpl.java    |  21 +-
 .../implementation/UserRepositoryImpl.java    |  37 ++-
 .../data/local/TagLocalRepository.java        |   2 +-
 .../data/local/TaskLocalRepository.java       |   4 +
 .../data/local/UserLocalRepository.java       |   5 +
 .../DbFlowTagLocalRepository.java             |   4 +-
 .../DbFlowTaskLocalRepository.java            |   8 +
 .../DbFlowUserLocalRepository.java            |  53 +++-
 .../android/habitica/modules/AppModule.java   |   4 +-
 .../activities/HabitButtonWidgetActivity.java |  13 +-
 .../ui/activities/PartyInviteActivity.java    |  54 ++--
 .../ui/activities/SkillTasksActivity.java     |  35 +--
 .../ui/activities/TaskFormActivity.java       |  26 +-
 .../SkillTasksRecyclerViewAdapter.java        |  34 +--
 .../ui/fragments/BaseMainFragment.java        |   9 +-
 .../preferences/AccountDetailsFragment.java   |  53 ++--
 .../preferences/PreferencesFragment.java      | 233 +++++++++---------
 .../ui/fragments/skills/SkillsFragment.java   | 119 +++------
 .../ui/fragments/social/ChatListFragment.java |  64 +++--
 .../ChallengeTasksRecyclerViewFragment.java   |   3 +-
 .../tasks/TaskRecyclerViewFragment.java       |   3 +-
 .../widget/AvatarStatsWidgetProvider.java     |  62 ++---
 .../habitica/widget/BaseWidgetProvider.java   |  28 ++-
 .../widget/HabitButtonWidgetProvider.java     |  37 ++-
 .../widget/HabitButtonWidgetService.java      |  49 ++--
 .../habitica/widget/TaskListFactory.java      |  43 ++--
 .../widget/TaskListWidgetProvider.java        |  38 +--
 33 files changed, 566 insertions(+), 529 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
index 94d1c1e9e..7c40655a1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
@@ -1,5 +1,7 @@
 package com.habitrpg.android.habitica.callbacks;
 
+import android.support.annotation.Nullable;
+
 import com.habitrpg.android.habitica.events.SkillUsedEvent;
 import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.habitrpg.android.habitica.models.Skill;
@@ -17,9 +19,10 @@ public class SkillCallback implements Action1<SkillResponse> {
 
     private Skill usedSkill;
     private HabitRPGUser user;
+    @Nullable
     private HabitRPGUserCallback.OnUserReceived callBack;
 
-    public SkillCallback(HabitRPGUserCallback.OnUserReceived callback, HabitRPGUser user, Skill usedSkill) {
+    public SkillCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, @Nullable HabitRPGUser user, Skill usedSkill) {
         this.usedSkill = usedSkill;
         this.user = user;
         this.callBack = callback;
@@ -31,23 +34,9 @@ public class SkillCallback implements Action1<SkillResponse> {
         Double hp = this.user.getStats().getHp();
         Double gold = this.user.getStats().getGp();
 
-        HabitRPGUser user = skillResponse.user;
-        if (user.getItems() != null) {
-            this.user.setItems(user.getItems());
+        if (callBack != null) {
+            callBack.onUserReceived(this.user);
         }
-        if (user.getPreferences() != null) {
-            this.user.setPreferences(user.getPreferences());
-        }
-        if (user.getFlags() != null) {
-            this.user.setFlags(user.getFlags());
-        }
-        if (user.getStats() != null) {
-            this.user.getStats().merge(user.getStats());
-        }
-
-        this.user.async().save();
-
-        callBack.onUserReceived(this.user);
         Stats stats = skillResponse.user.getStats();
         EventBus.getDefault().post(new SkillUsedEvent(this.usedSkill, stats.getMp(), stats.getExp() - xp, stats.getHp() - hp, stats.getGp() - gold));
     }
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 6f5087c1f..4ba15e3e3 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
@@ -4,6 +4,7 @@ import com.habitrpg.android.habitica.helpers.notifications.HabiticaFirebaseInsta
 import com.habitrpg.android.habitica.helpers.notifications.HabiticaFirebaseMessagingService;
 import com.habitrpg.android.habitica.receivers.TaskAlarmBootReceiver;
 import com.habitrpg.android.habitica.receivers.TaskReceiver;
+import com.habitrpg.android.habitica.ui.fragments.preferences.AccountDetailsFragment;
 import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
@@ -77,6 +78,7 @@ import com.habitrpg.android.habitica.ui.fragments.social.party.PartyMemberListFr
 import com.habitrpg.android.habitica.ui.fragments.tasks.TaskRecyclerViewFragment;
 import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment;
 import com.habitrpg.android.habitica.widget.AvatarStatsWidgetProvider;
+import com.habitrpg.android.habitica.widget.BaseWidgetProvider;
 import com.habitrpg.android.habitica.widget.DailiesWidgetProvider;
 import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider;
 import com.habitrpg.android.habitica.widget.HabitButtonWidgetService;
@@ -248,4 +250,8 @@ public interface AppComponent {
     void inject(HabiticaFirebaseInstanceIDService habiticaFirebaseInstanceIDService);
 
     void inject(HabiticaFirebaseMessagingService habiticaFirebaseMessagingService);
+
+    void inject(AccountDetailsFragment accountDetailsFragment);
+
+    void inject(BaseWidgetProvider baseWidgetProvider);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
index c8068e660..0b2a59782 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
@@ -9,7 +9,7 @@ import rx.Observable;
 
 public interface TagRepository extends BaseRepository {
 
-    Observable<List<Tag>> getTags();
+    Observable<List<Tag>> getTags(String userId);
 
     Observable<Tag> createTag(Tag tag);
     Observable<Tag> updateTag(Tag tag);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
index ce81b04df..bf8ef6cee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
@@ -20,9 +20,11 @@ public interface TaskRepository extends BaseRepository  {
     Observable<TaskDirectionData> taskChecked(Task task, boolean up);
     Observable<Task> scoreChecklistItem(String taskId, String itemId);
 
+    Observable<Task> getTask(String taskId);
     Observable<Task> createTask(Task task);
     Observable<Task> updateTask(Task task);
-    Observable<Void> deleteTask(String taskID);
+    Observable<Void> deleteTask(String taskId);
+    void saveTask(Task task);
 
     Observable<List<Task>> createTasks(List<Task> newTasks);
 
@@ -30,4 +32,8 @@ public interface TaskRepository extends BaseRepository  {
     void removeOldChecklists(List<ChecklistItem> onlineChecklistItems);
     void removeOldTaskTags(List<TaskTag> onlineTaskTags);
     void removeOldReminders(List<RemindersItem> onlineReminders);
+
+    Observable<TaskDirectionData> postTaskDirection(String taskId, String direction);
+
+    void markTaskCompleted(String taskId, boolean isCompleted);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
index b10e78399..79778664d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
@@ -2,8 +2,11 @@ package com.habitrpg.android.habitica.data;
 
 import android.support.annotation.Nullable;
 
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
 import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 
+import java.util.List;
 import java.util.Map;
 
 import rx.Observable;
@@ -21,4 +24,12 @@ public interface UserRepository extends BaseRepository {
     void resetTutorial(@Nullable HabitRPGUser user);
 
     Observable<HabitRPGUser> sleep(HabitRPGUser user);
+
+    Observable<List<Skill>> getSkills(HabitRPGUser user);
+
+    Observable<List<Skill>> getSpecialItems(HabitRPGUser user);
+
+    Observable<SkillResponse> useSkill(@Nullable HabitRPGUser user, String key, String target, String taskId);
+
+    Observable<SkillResponse> useSkill(@Nullable HabitRPGUser user, String key, String target);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
index 604d2757c..5be928eb6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
@@ -18,8 +18,8 @@ public class TagRepositoryImpl extends BaseRepositoryImpl<TagLocalRepository> im
     }
 
     @Override
-    public Observable<List<Tag>> getTags() {
-        return localRepository.getTags();
+    public Observable<List<Tag>> getTags(String userId) {
+        return localRepository.getTags(userId);
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
index 03e85cf85..c86c19a92 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -13,7 +13,6 @@ import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
 import com.habitrpg.android.habitica.models.tasks.TaskTag;
 import com.habitrpg.android.habitica.models.tasks.TasksOrder;
-import com.playseeds.android.sdk.inappmessaging.Log;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -64,6 +63,11 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         return apiClient.scoreChecklistItem(taskId, itemId).doOnNext(this.localRepository::saveTask);
     }
 
+    @Override
+    public Observable<Task> getTask(String taskId) {
+        return localRepository.getTask(taskId);
+    }
+
     @Override
     public Observable<Task> createTask(Task task) {
         long now = new Date().getTime();
@@ -98,6 +102,11 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
                 .doOnNext(aVoid -> localRepository.deleteTask(taskID));
     }
 
+    @Override
+    public void saveTask(Task task) {
+        localRepository.saveTask(task);
+    }
+
     @Override
     public Observable<List<Task>> createTasks(List<Task> newTasks) {
         return apiClient.createTasks(newTasks);
@@ -122,4 +131,14 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
     public void removeOldReminders(List<RemindersItem> onlineReminders) {
         localRepository.removeOldReminders(onlineReminders);
     }
+
+    @Override
+    public Observable<TaskDirectionData> postTaskDirection(String taskId, String direction) {
+        return apiClient.postTaskDirection(taskId, direction);
+    }
+
+    @Override
+    public void markTaskCompleted(String taskId, boolean isCompleted) {
+        localRepository.markTaskCompleted(taskId, isCompleted);
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 6c79fa4db..98c65a4ae 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -5,10 +5,13 @@ import android.support.annotation.Nullable;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.data.local.UserLocalRepository;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
 import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.habitrpg.android.habitica.models.TutorialStep;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import rx.Observable;
@@ -80,11 +83,35 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
                 });
     }
 
-    @Nullable
-    private HabitRPGUser mergeUser(@Nullable HabitRPGUser oldUser, HabitRPGUser newUser) {
-        if (oldUser == null) {
-            return null;
-        }
+    @Override
+    public Observable<List<Skill>> getSkills(HabitRPGUser user) {
+        return localRepository.getSkills(user);
+    }
+
+    @Override
+    public Observable<List<Skill>> getSpecialItems(HabitRPGUser user) {
+        return localRepository.getSpecialItems(user);
+    }
+
+    @Override
+    public Observable<SkillResponse> useSkill(HabitRPGUser user, String key, String target, String taskId) {
+        return apiClient.useSkill(key, target, taskId).doOnNext(skillResponse -> {
+            if (user != null) {
+                mergeUser(user, skillResponse.user);
+            }
+        });
+    }
+
+    @Override
+    public Observable<SkillResponse> useSkill(HabitRPGUser user, String key, String target) {
+        return apiClient.useSkill(key, target).doOnNext(skillResponse -> {
+            if (user != null) {
+                mergeUser(user, skillResponse.user);
+            }
+        });
+    }
+
+    private HabitRPGUser mergeUser(HabitRPGUser oldUser, HabitRPGUser newUser) {
         if (newUser.getItems() != null) {
             oldUser.setItems(newUser.getItems());
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
index 67d854ab0..6c1b0d3f3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
@@ -7,7 +7,7 @@ import java.util.List;
 import rx.Observable;
 
 public interface TagLocalRepository extends BaseLocalRepository {
-    Observable<List<Tag>> getTags();
+    Observable<List<Tag>> getTags(String userId);
 
     void removeOldTags(List<Tag> onlineTags);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
index a1ca78476..5f98da8fc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
@@ -25,4 +25,8 @@ public interface TaskLocalRepository extends BaseLocalRepository {
     void removeOldReminders(List<RemindersItem> onlineReminders);
 
     void deleteTask(String taskID);
+
+    Observable<Task> getTask(String taskId);
+
+    void markTaskCompleted(String taskId, boolean isCompleted);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
index 64d5e8fab..3b037c63a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.data.local;
 
+import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.habitrpg.android.habitica.models.TutorialStep;
 
@@ -14,4 +15,8 @@ public interface UserLocalRepository extends BaseLocalRepository {
     void saveUser(HabitRPGUser user);
 
     Observable<List<TutorialStep>> getTutorialSteps();
+
+    Observable<List<Skill>> getSkills(HabitRPGUser user);
+
+    Observable<List<Skill>> getSpecialItems(HabitRPGUser user);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
index 46b4d0b2e..5053b30d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
@@ -7,6 +7,7 @@ import com.habitrpg.android.habitica.data.local.TagLocalRepository;
 import com.habitrpg.android.habitica.models.Tag;
 import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
 import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.From;
 import com.raizlabs.android.dbflow.sql.language.OrderBy;
 import com.raizlabs.android.dbflow.sql.language.Select;
@@ -23,8 +24,9 @@ public class DbFlowTagLocalRepository implements TagLocalRepository {
     }
 
     @Override
-    public Observable<List<Tag>> getTags() {
+    public Observable<List<Tag>> getTags(String userId) {
         return Observable.defer(() -> Observable.just(new Select().from(Tag.class)
+                .where(Condition.column("user_id").eq(userId))
                 .orderBy(OrderBy.columns("position", "dateCreated").descending())
                 .queryList()));
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
index 44b201042..09b222b4a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
@@ -48,6 +48,14 @@ public class DbFlowTaskLocalRepository implements TaskLocalRepository {
                 .querySingle()));
     }
 
+    @Override
+    public void markTaskCompleted(String taskId, boolean isCompleted) {
+        getTask(taskId).subscribe(task -> {
+            task.completed = isCompleted;
+            saveTask(task);
+        }, throwable -> {});
+    }
+
     @Override
     public void saveTasks(TasksOrder tasksOrder, TaskList tasks) {
         sortTasks(tasks, tasksOrder.getHabits());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
index 331e9ae6c..d071db059 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
@@ -1,11 +1,14 @@
 package com.habitrpg.android.habitica.data.local.implementation;
 
 import com.habitrpg.android.habitica.data.local.UserLocalRepository;
+import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.user.SpecialItems;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import rx.Observable;
@@ -19,7 +22,7 @@ public class DbFlowUserLocalRepository implements UserLocalRepository {
     @Override
     public Observable<HabitRPGUser> getUser(String userID) {
         return Observable.defer(() -> Observable.just(new Select()
-        .from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).querySingle()));
+                .from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).querySingle()));
     }
 
     @Override
@@ -30,6 +33,52 @@ public class DbFlowUserLocalRepository implements UserLocalRepository {
     @Override
     public Observable<List<TutorialStep>> getTutorialSteps() {
         return Observable.defer(() -> Observable.just(new Select()
-        .from(TutorialStep.class).queryList()));
+                .from(TutorialStep.class).queryList()));
+    }
+
+    @Override
+    public Observable<List<Skill>> getSkills(HabitRPGUser user) {
+        return Observable.defer(() -> Observable.just(new Select()
+                .from(Skill.class)
+                .where(Condition.column("habitClass").eq(user.getStats().get_class()))
+                .and(Condition.column("lvl").lessThanOrEq(user.getStats().getLvl()))
+                .queryList()));
+    }
+
+    @Override
+    public Observable<List<Skill>> getSpecialItems(HabitRPGUser user) {
+        SpecialItems specialItems = user.getItems().getSpecial();
+        if (specialItems != null) {
+
+            Condition.In specialsWhere = Condition.column("key").in("");
+
+            if (specialItems.getSnowball() > 0) {
+                specialsWhere.and("snowball");
+            }
+
+            if (specialItems.getShinySeed() > 0) {
+                specialsWhere.and("shinySeed");
+            }
+
+            if (specialItems.getSeafoam() > 0) {
+                specialsWhere.and("seafoam");
+            }
+
+            if (specialItems.getSpookySparkles() > 0) {
+                specialsWhere.and("spookySparkles");
+            }
+            return Observable.defer(() -> Observable.from(new Select()
+                    .from(Skill.class)
+                    .where(specialsWhere)
+                    .queryList()))
+                    .map(skill -> {
+                        skill.isSpecialItem = true;
+                        skill.target = "party";
+                        return skill;
+                    })
+                    .toList();
+        } else {
+            return Observable.just(new ArrayList<>());
+        }
     }
 }
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 7a8cc25b9..04c6d18d2 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
@@ -26,6 +26,8 @@ import dagger.Provides;
 
 @Module
 public class AppModule {
+    public static final String NAMED_USER_ID = "userId";
+
 
     private Application application;
 
@@ -46,7 +48,7 @@ public class AppModule {
     }
 
     @Provides
-    @Named("UserID")
+    @Named(NAMED_USER_ID)
     public String providesUserID(SharedPreferences sharedPreferences) {
         return sharedPreferences.getString(application.getString(R.string.SP_userID), "");
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
index 8defc3d1b..a9e846985 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
@@ -2,6 +2,8 @@ package com.habitrpg.android.habitica.ui.activities;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.modules.AppModule;
 import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider;
 import com.habitrpg.android.habitica.models.tasks.Task;
@@ -14,10 +16,19 @@ import android.support.v7.preference.PreferenceManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import butterknife.BindView;
 
 public class HabitButtonWidgetActivity extends BaseActivity implements TaskClickActivity {
 
+    @Inject
+    TaskRepository taskRepository;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
+
     @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
     private int widgetId;
@@ -56,7 +67,7 @@ public class HabitButtonWidgetActivity extends BaseActivity implements TaskClick
             recyclerView.setLayoutManager(layoutManager);
         }
 
-        recyclerView.setAdapter(new SkillTasksRecyclerViewAdapter(Task.TYPE_HABIT, this));
+        recyclerView.setAdapter(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_HABIT, this, userId));
     }
 
     @Override
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 a28b97531..0410e630a 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,18 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
-import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
-import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
@@ -25,12 +12,23 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
+import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import butterknife.BindView;
 
@@ -41,32 +39,18 @@ public class PartyInviteActivity extends BaseActivity {
     public static final String IS_EMAIL_KEY = "isEmail";
     public static final String EMAILS_KEY = "emails";
     @Inject
-    protected HostConfig hostConfig;
+    @Named(AppModule.NAMED_USER_ID)
+    protected String userId;
     @Inject
-    ApiClient apiClient;
+    SocialRepository socialRepository;
+    @Inject
+    UserRepository userRepository;
     @BindView(R.id.tab_layout)
     TabLayout tabLayout;
     @BindView(R.id.view_pager)
     ViewPager viewPager;
     List<PartyInviteFragment> fragments = new ArrayList<>();
-    private HabitRPGUser user;
     private String userIdToInvite;
-    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
-        @Override
-        public void onResultReceived(HabitRPGUser user) {
-            handleUserRecieved(user);
-        }
-
-        @Override
-        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
-            return true;
-        }
-
-        @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser user) {
-            return true;
-        }
-    };
 
     @Override
     protected int getLayoutResId() {
@@ -179,13 +163,11 @@ public class PartyInviteActivity extends BaseActivity {
             }
             userIdToInvite = uri.getPathSegments().get(2);
 
-            //@TODO: Move to user helper/model
-            new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).async().querySingle(userTransactionListener);
+            userRepository.getUser(userId).subscribe(this::handleUserRecieved, throwable -> {});
         }
     }
 
     public void handleUserRecieved(HabitRPGUser user) {
-        this.user = user;
 
         if (this.userIdToInvite == null) {
             return;
@@ -200,7 +182,7 @@ public class PartyInviteActivity extends BaseActivity {
         invites.add(userIdToInvite);
         inviteData.put("uuids", invites);
 
-        this.apiClient.inviteToGroup(this.user.getParty().getId(), inviteData)
+        this.socialRepository.inviteToGroup(user.getParty().getId(), inviteData)
                 .subscribe(aVoid -> {}, throwable -> {});
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
index 896bef5cd..c35612d47 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
@@ -1,12 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,21 +7,35 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.util.SparseArray;
 
-import java.util.HashMap;
-import java.util.Map;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment;
+
+import javax.inject.Inject;
+import javax.inject.Named;
 
 import butterknife.BindView;
 
 public class SkillTasksActivity extends BaseActivity implements TaskClickActivity {
 
+    @Inject
+    TaskRepository taskRepository;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
+
     @BindView(R.id.viewpager)
     public ViewPager viewPager;
 
     @BindView(R.id.tab_layout)
     public TabLayout tabLayout;
-    protected HabitRPGUser user;
-    Map<Integer, SkillTasksRecyclerViewFragment> viewFragmentsDictionary = new HashMap<>();
+    SparseArray<SkillTasksRecyclerViewFragment> viewFragmentsDictionary = new SparseArray<>();
 
     @Override
     protected int getLayoutResId() {
@@ -56,13 +63,13 @@ public class SkillTasksActivity extends BaseActivity implements TaskClickActivit
 
                 switch (position) {
                     case 0:
-                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(Task.TYPE_HABIT, SkillTasksActivity.this), Task.TYPE_HABIT);
+                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_HABIT, SkillTasksActivity.this, userId), Task.TYPE_HABIT);
                         break;
                     case 1:
-                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(Task.TYPE_DAILY, SkillTasksActivity.this), Task.TYPE_DAILY);
+                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_DAILY, SkillTasksActivity.this, userId), Task.TYPE_DAILY);
                         break;
                     default:
-                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(Task.TYPE_TODO, SkillTasksActivity.this), Task.TYPE_TODO);
+                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_TODO, SkillTasksActivity.this, userId), Task.TYPE_TODO);
                 }
 
                 viewFragmentsDictionary.put(position, fragment);
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 3fa63ec30..b6922e5d7 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
@@ -37,6 +37,8 @@ import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.TagRepository;
+import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.events.TaskSaveEvent;
 import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
 import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
@@ -194,6 +196,10 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
 
     @Inject
     TaskFilterHelper taskFilterHelper;
+    @Inject
+    TaskRepository taskRepository;
+    @Inject
+    TagRepository tagRepository;
 
     EmojiPopup popup;
 
@@ -321,13 +327,14 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
         }
 
         if (taskId != null) {
-            Task task = new Select().from(Task.class).byIds(taskId).querySingle();
-            this.task = task;
-            if (task != null) {
-                populate(task);
-            }
+            taskRepository.getTask(taskId).subscribe(task -> {
+                this.task = task;
+                if (task != null) {
+                    populate(task);
+                }
 
-            setTitle(task);
+                setTitle(task);
+            }, throwable -> {});
 
             btnDelete.setEnabled(true);
         } else {
@@ -404,12 +411,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             emojiToggle2.setOnClickListener(new emojiClickListener(newCheckListEditText));
         }
 
-        Observable.defer(() -> Observable.just(new Select().from(Tag.class)
-                .where(Condition.column("user_id").eq(this.userId))
-                .queryList())
-        )
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
+        tagRepository.getTags(userId)
                 .subscribe(
                         loadedTags -> {
                             tags = loadedTags;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
index a56bbf32f..12dc2f185 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.ui.adapter;
 
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding;
 import com.habitrpg.android.habitica.ui.activities.TaskClickActivity;
 import com.habitrpg.android.habitica.models.tasks.Task;
@@ -27,15 +28,19 @@ public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter<SkillTas
 
 
     private static final int TYPE_CELL = 1;
+    private final TaskRepository taskRepository;
     String taskType;
     TaskClickActivity activity;
     private ObservableArrayList<Task> observableContent;
     private RecyclerView.Adapter<ViewHolder> parentAdapter;
+    private String userId;
 
-    public SkillTasksRecyclerViewAdapter(String taskType, TaskClickActivity activity) {
+    public SkillTasksRecyclerViewAdapter(TaskRepository taskRepository, String taskType, TaskClickActivity activity, String userId) {
         this.setHasStableIds(true);
         this.taskType = taskType;
         this.activity = activity;
+        this.taskRepository = taskRepository;
+        this.userId = userId;
 
         this.loadContent();
 
@@ -90,21 +95,20 @@ public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter<SkillTas
         if (this.observableContent == null || forced) {
 
             this.observableContent = new ObservableArrayList<>();
-
-            this.observableContent.addAll(new Select().from(Task.class)
-                    .where(Condition.column("type").eq(this.taskType))
-                    .and(Condition.CombinedCondition
-                            .begin(Condition.column("completed").eq(false))
-                            .or(Condition.column("type").eq("daily"))
-                    )
-                    .orderBy(OrderBy.columns("position", "dateCreated").descending())
-                    .queryList());
-        }
-
-        if (parentAdapter != null) {
-            parentAdapter.notifyDataSetChanged();
+            taskRepository.getTasks(taskType, userId).subscribe(tasks -> {
+                this.observableContent.addAll(tasks);
+                if (parentAdapter != null) {
+                    parentAdapter.notifyDataSetChanged();
+                } else {
+                    notifyDataSetChanged();
+                }
+            }, throwable -> {});
         } else {
-            notifyDataSetChanged();
+            if (parentAdapter != null) {
+                parentAdapter.notifyDataSetChanged();
+            } else {
+                notifyDataSetChanged();
+            }
         }
     }
 
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 91581e4d9..ce2450760 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,5 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.data.ApiClient;
@@ -22,6 +23,8 @@ public abstract class BaseMainFragment extends BaseFragment {
 
     @Inject
     public ApiClient apiClient;
+    @Inject
+    UserRepository userRepository;
     @Nullable
     public MainActivity activity;
     @Nullable
@@ -82,7 +85,9 @@ public abstract class BaseMainFragment extends BaseFragment {
         super.onCreateView(inflater, container, savedInstanceState);
         if (savedInstanceState != null && savedInstanceState.containsKey("userId")) {
             String userId = savedInstanceState.getString("userId");
-            this.user = new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(userId)).querySingle();
+            if (userId != null) {
+                userRepository.getUser(userId).subscribe(habitRPGUser -> user = habitRPGUser, throwable -> {});
+            }
         }
 
         if (tabLayout != null) {
@@ -128,7 +133,7 @@ public abstract class BaseMainFragment extends BaseFragment {
     }
 
     public String customTitle() {
-        return null;
+        return "";
     }
 
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
index 4f35979be..58ecc84d0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
@@ -1,18 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
-import com.habitrpg.android.habitica.helpers.QrCodeManager;
-import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import org.greenrobot.eventbus.EventBus;
-
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -21,38 +8,40 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.Preference;
 import android.widget.Toast;
 
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
+import com.habitrpg.android.habitica.helpers.QrCodeManager;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
+import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView;
+
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 public class AccountDetailsFragment extends BasePreferencesFragment {
 
+    @Inject
+    UserRepository userRepository;
+
     private QrCodeManager qrCodeManager;
     private HabitRPGUser user;
-    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
-        @Override
-        public void onResultReceived(HabitRPGUser user) {
-            AccountDetailsFragment.this.setUser(user);
-        }
-
-        @Override
-        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
-            return true;
-        }
-
-        @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser user) {
-            return true;
-        }
-    };
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        HabiticaBaseApplication.getComponent().inject(this);
+
         String userID = getPreferenceManager().getSharedPreferences().getString(getContext().getString(R.string.SP_userID), null);
         if (userID != null) {
-            new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).async().querySingle(userTransactionListener);
+            userRepository.getUser(userID).subscribe(this::setUser, throwable -> {});
         }
     }
 
@@ -104,9 +93,7 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
         final AlertDialog dialog = new AlertDialog.Builder(getContext())
                 .setView(view)
                 .setTitle(R.string.subscription_status)
-                .setPositiveButton(R.string.close, (dialogInterface, i) -> {
-                    dialogInterface.dismiss();
-                }).create();
+                .setPositiveButton(R.string.close, (dialogInterface, i) -> dialogInterface.dismiss()).create();
         dialog.show();
     }
 }
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 cde3a63e3..aac3f7d3f 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,28 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
-import com.habitrpg.android.habitica.helpers.LanguageHelper;
-import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
-import com.habitrpg.android.habitica.prefs.TimePreference;
-import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Preferences;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import org.greenrobot.eventbus.EventBus;
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -33,6 +10,24 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
 
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
+import com.habitrpg.android.habitica.helpers.LanguageHelper;
+import com.habitrpg.android.habitica.helpers.SoundManager;
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
+import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Preferences;
+import com.habitrpg.android.habitica.prefs.TimePreference;
+import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -56,23 +51,6 @@ public class PreferencesFragment extends BasePreferencesFragment implements
     @Inject
     PushNotificationManager pushNotificationManager;
 
-    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
-        @Override
-        public void onResultReceived(HabitRPGUser user) {
-            PreferencesFragment.this.setUser(user);
-        }
-
-        @Override
-        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
-            return true;
-        }
-
-        @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser user) {
-            return true;
-        }
-    };
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -82,7 +60,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
 
         String userID = getPreferenceManager().getSharedPreferences().getString(context.getString(R.string.SP_userID), null);
         if (userID != null) {
-            new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).async().querySingle(userTransactionListener);
+            userRepository.getUser(userID).subscribe(PreferencesFragment.this::setUser, throwable -> {});
         }
     }
 
@@ -142,12 +120,8 @@ public class PreferencesFragment extends BasePreferencesFragment implements
             if (user.getFlags().getClassSelected() && !user.getPreferences().getDisableClasses()) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
                         .setTitle(getString(R.string.change_class_confirmation))
-                        .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> {
-                            dialog.dismiss();
-                        })
-                        .setPositiveButton(getString(R.string.change_class), (dialog, which) -> {
-                            startActivityForResult(intent, MainActivity.SELECT_CLASS_RESULT);
-                        });
+                        .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> dialog.dismiss())
+                        .setPositiveButton(getString(R.string.change_class), (dialog, which) -> startActivityForResult(intent, MainActivity.SELECT_CLASS_RESULT));
                 AlertDialog alert = builder.create();
                 alert.show();
             } else {
@@ -163,84 +137,99 @@ public class PreferencesFragment extends BasePreferencesFragment implements
 
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        if (key.equals("use_reminder")) {
-            boolean use_reminder = sharedPreferences.getBoolean(key, false);
-            timePreference.setEnabled(use_reminder);
-            if (use_reminder) {
-                TaskAlarmManager.scheduleDailyReminder(context);
-            } else {
+        switch (key) {
+            case "use_reminder":
+                boolean use_reminder = sharedPreferences.getBoolean(key, false);
+                timePreference.setEnabled(use_reminder);
+                if (use_reminder) {
+                    TaskAlarmManager.scheduleDailyReminder(context);
+                } else {
+                    TaskAlarmManager.removeDailyReminder(context);
+                }
+                break;
+            case "reminder_time":
                 TaskAlarmManager.removeDailyReminder(context);
+                TaskAlarmManager.scheduleDailyReminder(context);
+                break;
+            case "usePushNotifications":
+                boolean userPushNotifications = sharedPreferences.getBoolean(key, false);
+                pushNotificationsPreference.setEnabled(userPushNotifications);
+                if (userPushNotifications) {
+                    pushNotificationManager.addPushDeviceUsingStoredToken();
+                } else {
+                    pushNotificationManager.removePushDeviceUsingStoredToken();
+                }
+                break;
+            case "cds_time":
+                String timeval = sharedPreferences.getString("cds_time", "00:00");
+                String[] pieces = timeval.split(":");
+                int hour = Integer.parseInt(pieces[0]);
+                Map<String, Object> updateObject = new HashMap<>();
+                updateObject.put("dayStart", hour);
+                apiClient.changeCustomDayStart(updateObject)
+                        .subscribe(user -> {
+                        }, throwable -> {
+                        });
+                break;
+            case "language": {
+                LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString(key, "en"));
+
+                Locale.setDefault(languageHelper.getLocale());
+                Configuration configuration = new Configuration();
+                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
+                    configuration.locale = languageHelper.getLocale();
+                } else {
+                    configuration.setLocale(languageHelper.getLocale());
+                }
+                getActivity().getResources().updateConfiguration(configuration,
+                        getActivity().getResources().getDisplayMetrics());
+                userRepository.updateUser(user, "preferences.language", languageHelper.getLanguageCode())
+                        .subscribe(habitRPGUser -> {
+                        }, throwable -> {
+                        });
+
+                Preferences preferences = user.getPreferences();
+                preferences.setLanguage(languageHelper.getLanguageCode());
+                apiClient.setLanguageCode(preferences.getLanguage());
+                apiClient.getContent()
+                        .subscribe(contentResult -> {
+                        }, throwable -> {
+                        });
+
+                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
+                    Intent intent = new Intent(getActivity(), MainActivity.class);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                    startActivity(intent);
+                } else {
+                    Intent intent = new Intent(getActivity(), MainActivity.class);
+                    this.startActivity(intent);
+                    getActivity().finishAffinity();
+                }
+                EventBus.getDefault().post(new RefreshUserCommand());
+
+                break;
             }
-        } else if (key.equals("reminder_time")) {
-            TaskAlarmManager.removeDailyReminder(context);
-            TaskAlarmManager.scheduleDailyReminder(context);
-        } else if (key.equals("usePushNotifications")) {
-            boolean userPushNotifications = sharedPreferences.getBoolean(key, false);
-            pushNotificationsPreference.setEnabled(userPushNotifications);
-            if (userPushNotifications) {
-                pushNotificationManager.addPushDeviceUsingStoredToken();
-            } else {
-                pushNotificationManager.removePushDeviceUsingStoredToken();
+            case "audioTheme": {
+                String newAudioTheme = sharedPreferences.getString(key, "off");
+                userRepository.updateUser(user, "preferences.sound", newAudioTheme)
+                        .subscribe(habitRPGUser -> {
+                        }, throwable -> {
+                        });
+
+                Preferences preferences = user.getPreferences();
+                preferences.setSound(newAudioTheme);
+
+                soundManager.setSoundTheme(newAudioTheme);
+
+                soundManager.preloadAllFiles();
+                break;
             }
-        } else if (key.equals("cds_time")) {
-            String timeval = sharedPreferences.getString("cds_time", "00:00");
-            String[] pieces = timeval.split(":");
-            int hour = Integer.parseInt(pieces[0]);
-            Map<String, Object> updateObject = new HashMap<>();
-            updateObject.put("dayStart", hour);
-            apiClient.changeCustomDayStart(updateObject)
-                    .subscribe(user -> {
-                    }, throwable -> {
-                    });
-        } else if (key.equals("language")) {
-            LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString(key, "en"));
-
-            Locale.setDefault(languageHelper.getLocale());
-            Configuration configuration = new Configuration();
-            if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
-                configuration.locale = languageHelper.getLocale();
-            } else {
-                configuration.setLocale(languageHelper.getLocale());
-            }
-            getActivity().getResources().updateConfiguration(configuration,
-                    getActivity().getResources().getDisplayMetrics());
-            userRepository.updateUser(user, "preferences.language", languageHelper.getLanguageCode())
-                    .subscribe(habitRPGUser -> {}, throwable -> {});
-
-            Preferences preferences = user.getPreferences();
-            preferences.setLanguage(languageHelper.getLanguageCode());
-            apiClient.setLanguageCode(preferences.getLanguage());
-            apiClient.getContent()
-                    .subscribe(contentResult -> {
-                    }, throwable -> {
-                    });
-
-            if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
-                Intent intent = new Intent(getActivity(), MainActivity.class);
-                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                startActivity(intent);
-            } else {
-                Intent intent = new Intent(getActivity(), MainActivity.class);
-                this.startActivity(intent);
-                getActivity().finishAffinity();
-            }
-            EventBus.getDefault().post(new RefreshUserCommand());
-
-        } else if (key.equals("audioTheme")) {
-            String newAudioTheme = sharedPreferences.getString(key, "off");
-            userRepository.updateUser(user, "preferences.sound", newAudioTheme)
-                    .subscribe(habitRPGUser -> {}, throwable -> {
-                    });
-
-            Preferences preferences = user.getPreferences();
-            preferences.setSound(newAudioTheme);
-
-            soundManager.setSoundTheme(newAudioTheme);
-
-            soundManager.preloadAllFiles();
-        } else if (key.equals("dailyDueDefaultView")) {
-            userRepository.updateUser(user, "preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
-                    .subscribe(habitRPGUser -> {}, throwable -> {});
+            case "dailyDueDefaultView":
+                userRepository.updateUser(user, "preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
+                        .subscribe(habitRPGUser -> {
+                        }, throwable -> {
+                        });
+                break;
         }
     }
 
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 5b24344ab..5c9f92d77 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
@@ -1,26 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.skills;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
-import com.habitrpg.android.habitica.callbacks.SkillCallback;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.SkillUsedEvent;
-import com.habitrpg.android.habitica.events.commands.UseSkillCommand;
-import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
-import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
-import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.user.SpecialItems;
-import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import org.greenrobot.eventbus.Subscribe;
-
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -32,7 +11,25 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import java.util.List;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.SkillCallback;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.SkillUsedEvent;
+import com.habitrpg.android.habitica.events.commands.UseSkillCommand;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
+import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
+import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
+
+import org.greenrobot.eventbus.Subscribe;
+
+import javax.inject.Inject;
 
 import butterknife.BindView;
 import rx.Observable;
@@ -42,6 +39,9 @@ public class SkillsFragment extends BaseMainFragment {
     private final int TASK_SELECTION_ACTIVITY = 10;
     private final int MEMBER_SELECTION_ACTIVITY = 11;
 
+    @Inject
+    UserRepository userRepository;
+
     @BindView(R.id.recyclerView)
     RecyclerView recyclerView;
     SkillsRecyclerViewAdapter adapter;
@@ -91,48 +91,9 @@ public class SkillsFragment extends BaseMainFragment {
 
         adapter.mana = this.user.getStats().getMp();
 
-        List<Skill> skills = new Select()
-                .from(Skill.class)
-                .where(Condition.column("habitClass").eq(user.getStats().get_class()))
-                .and(Condition.column("lvl").lessThanOrEq(user.getStats().getLvl()))
-                .queryList();
-        adapter.setSkillList(skills);
-
-
-        SpecialItems specialItems = this.user.getItems().getSpecial();
-        if (specialItems != null) {
-            Condition.In specialsWhere = Condition.column("key").in("");
-
-            if (specialItems.getSnowball() > 0) {
-                specialsWhere.and("snowball");
-            }
-
-            if (specialItems.getShinySeed() > 0) {
-                specialsWhere.and("shinySeed");
-            }
-
-            if (specialItems.getSeafoam() > 0) {
-                specialsWhere.and("seafoam");
-            }
-
-            if (specialItems.getSpookySparkles() > 0) {
-                specialsWhere.and("spookySparkles");
-            }
-
-            List<Skill> specials = new Select()
-                    .from(Skill.class)
-                    .where(specialsWhere)
-                    .queryList();
-
-            for (Skill item : specials) {
-                item.isSpecialItem = true;
-                item.target = "party";
-
-                skills.add(item);
-            }
-        }
-
-        adapter.setSkillList(skills);
+        Observable.concat(userRepository.getSkills(user).flatMap(Observable::from), userRepository.getSpecialItems(user).flatMap(Observable::from))
+                .toList()
+                .subscribe(skills -> adapter.setSkillList(skills), throwable -> {});
     }
 
     @Override
@@ -166,9 +127,9 @@ public class SkillsFragment extends BaseMainFragment {
         adapter.setMana(event.newMana);
         StringBuilder message = new StringBuilder();
         if (skill.isSpecialItem) {
-            message.append(activity.getString(R.string.used_skill_without_mana, skill.text));
+            message.append(getContext().getString(R.string.used_skill_without_mana, skill.text));
         } else {
-            message.append(activity.getString(R.string.used_skill, skill.text, skill.mana));
+            message.append(getContext().getString(R.string.used_skill, skill.text, skill.mana));
         }
 
         if (event.xp != 0) {
@@ -180,10 +141,15 @@ public class SkillsFragment extends BaseMainFragment {
         if (event.gold != 0) {
             message.append(" + ").append(round(event.gold, 2)).append(" GP");
         }
-        UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), message.toString(), UiUtils.SnackbarDisplayType.NORMAL);
-        apiClient.getUser()
-
-                .subscribe(new MergeUserCallback(activity, user), throwable -> {
+        if (activity != null) {
+            UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), message.toString(), UiUtils.SnackbarDisplayType.NORMAL);
+        }
+        userRepository.retrieveUser(false)
+                .subscribe(habitRPGUser -> {
+                    if (activity != null) {
+                        activity.onUserReceived(habitRPGUser);
+                    }
+                }, throwable -> {
                 });
     }
 
@@ -210,25 +176,22 @@ public class SkillsFragment extends BaseMainFragment {
         useSkill(skill, null);
     }
 
-    private void useSkill(Skill skill, String taskId) {
+    private void useSkill(Skill skill, @Nullable String taskId) {
         displayProgressDialog();
         Observable<SkillResponse> observable;
         if (taskId != null) {
-            observable = apiClient.useSkill(skill.key, skill.target, taskId);
+            observable = userRepository.useSkill(user, skill.key, skill.target, taskId);
         } else {
-            observable = apiClient.useSkill(skill.key, skill.target);
+            observable = userRepository.useSkill(user, skill.key, skill.target);
         }
-        observable
-                .subscribe(new SkillCallback(activity, user, skill), throwable -> {
-                    removeProgressDialog();
-                });
+        observable.subscribe(new SkillCallback(activity, user, skill), throwable -> removeProgressDialog());
     }
 
     private void displayProgressDialog() {
         if (progressDialog != null) {
             progressDialog.dismiss();
         }
-        progressDialog = ProgressDialog.show(activity, activity.getString(R.string.skill_progress_title), null, true);
+        progressDialog = ProgressDialog.show(activity, getContext().getString(R.string.skill_progress_title), null, true);
     }
 
     private void removeProgressDialog() {
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 b4284afb9..6d9f65cf3 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,28 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.social;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
-import com.habitrpg.android.habitica.events.commands.CopyChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.SendNewGroupMessageCommand;
-import com.habitrpg.android.habitica.events.commands.ToggleInnCommand;
-import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -36,6 +13,27 @@ 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.data.SocialRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
+import com.habitrpg.android.habitica.events.commands.CopyChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.SendNewGroupMessageCommand;
+import com.habitrpg.android.habitica.events.commands.ToggleInnCommand;
+import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -55,6 +53,8 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     public boolean isTavern;
     @BindView(R.id.recyclerView)
     RecyclerView mRecyclerView;
+    @BindView(R.id.refresh_layout)
+    SwipeRefreshLayout swipeRefreshLayout;
     LinearLayoutManager layoutManager;
     private String groupId;
     private HabitRPGUser user;
@@ -90,14 +90,14 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
             if (savedInstanceState.containsKey("userId")) {
                 this.userId = savedInstanceState.getString("userId");
                 if (this.userId != null) {
-                    this.user = new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(userId)).querySingle();
+                    userRepository.getUser(userId).subscribe(habitRPGUser -> this.user = habitRPGUser, throwable -> {});
                 }
             }
 
         }
 
         if (view == null)
-            view = inflater.inflate(R.layout.fragment_chat, container, false);
+            view = inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false);
 
         return view;
     }
@@ -169,14 +169,12 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     public void onEvent(final FlagChatMessageCommand cmd) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setMessage(R.string.chat_flag_confirmation)
-                .setPositiveButton(R.string.flag_confirm, (dialog, id) -> {
-                    socialRepository.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);
-                            }, throwable -> {
-                            });
-                })
+                .setPositiveButton(R.string.flag_confirm, (dialog, id) -> socialRepository.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);
+                        }, throwable -> {
+                        }))
                 .setNegativeButton(R.string.action_cancel, (dialog, id) -> {
                 });
         builder.show();
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 6e601f470..c6975a336 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
@@ -17,6 +17,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.modules.AppModule;
 import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
@@ -33,7 +34,7 @@ public class ChallengeTasksRecyclerViewFragment extends BaseFragment {
     public RecyclerView recyclerView;
     public BaseTasksRecyclerViewAdapter recyclerAdapter;
     @Inject
-    @Named("UserID")
+    @Named(AppModule.NAMED_USER_ID)
     String userID;
 
     ObservableList<Task> tasksOnInitialize;
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 bd997a18c..5ebaf6d17 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
@@ -12,6 +12,7 @@ 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.TaskFilterHelper;
+import com.habitrpg.android.habitica.modules.AppModule;
 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;
@@ -63,7 +64,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     private static final String CLASS_TYPE_KEY = "CLASS_TYPE_KEY";
     public BaseTasksRecyclerViewAdapter recyclerAdapter;
     @Inject
-    @Named("UserID")
+    @Named(AppModule.NAMED_USER_ID)
     String userID;
     @Inject
     ApiClient apiClient;
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 8815e0fbe..4f9fd3e36 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,19 +1,5 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.AvatarView;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Stats;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
@@ -24,28 +10,21 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.RemoteViews;
 
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
 import javax.inject.Inject;
+import javax.inject.Named;
 
 public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
-    private static final String LOG = AvatarStatsWidgetProvider.class.getName();
 
     private AppWidgetManager appWidgetManager;
-    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
-        @Override
-        public void onResultReceived(HabitRPGUser user) {
-            updateData(user);
-        }
-
-        @Override
-        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
-            return true;
-        }
-
-        @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser user) {
-            return true;
-        }
-    };
 
     @Override
     public int layoutResourceId() {
@@ -53,27 +32,24 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
     }
 
     @Inject
-    ApiClient apiClient;
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
     @Inject
-    HostConfig hostConfig;
+    UserRepository userRepository;
 
-    private void setUp(Context context) {
-        if (apiClient == null) {
-            HabiticaBaseApplication application = HabiticaApplication.getInstance(context);
-            application.getComponent().inject(this);
+    private void setUp() {
+        if (userRepository == null) {
+            HabiticaBaseApplication.getComponent().inject(this);
         }
     }
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        this.setUp(context);
+        this.setUp();
         this.appWidgetManager = appWidgetManager;
         this.context = context;
-        ComponentName thisWidget = new ComponentName(context,
-                AvatarStatsWidgetProvider.class);
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
 
-        new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).async().querySingle(userTransactionListener);
+        userRepository.getUser(userId).subscribe(this::updateData, throwable -> {});
     }
 
     @Override
@@ -126,7 +102,7 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
             remoteViews.setTextViewText(R.id.lvl_tv, context.getString(R.string.user_level, user.getStats().getLvl()));
 
             AvatarView avatarView = new AvatarView(context, true, true, true);
-            ;
+
             avatarView.setUser(user);
             RemoteViews finalRemoteViews = remoteViews;
             avatarView.onAvatarImageReady(bitmap -> {
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 6b661e334..3b34eb1bc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java
@@ -1,10 +1,5 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
 import android.annotation.TargetApi;
 import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
@@ -15,12 +10,20 @@ import android.support.v4.util.Pair;
 import android.widget.RemoteViews;
 import android.widget.Toast;
 
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.interactors.NotifyUserUseCase;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 
+import javax.inject.Inject;
+
 
 public abstract class BaseWidgetProvider extends AppWidgetProvider {
 
+    @Inject
+    UserRepository userRepository;
+
     protected Context context;
 
     /**
@@ -69,13 +72,14 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider {
     }
 
     protected void showToastForTaskDirection(Context context, TaskDirectionData data, String userID) {
-        HabitRPGUser user = new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).querySingle();
-
-        Pair<String, UiUtils.SnackbarDisplayType> pair = NotifyUserUseCase.getNotificationAndAddStatsToUser(user, data.exp, data.hp, data.getGp(), data.mp);
-
-        user.save();
-        Toast toast = Toast.makeText(context, pair.first, Toast.LENGTH_LONG);
-        toast.show();
+        if (userRepository == null) {
+            HabiticaApplication.getComponent().inject(this);
+        }
+        userRepository.getUser(userID).subscribe(habitRPGUser -> {
+            Pair<String, UiUtils.SnackbarDisplayType> pair = NotifyUserUseCase.getNotificationAndAddStatsToUser(habitRPGUser, data.exp, data.hp, data.getGp(), data.mp);
+            Toast toast = Toast.makeText(context, pair.first, Toast.LENGTH_LONG);
+            toast.show();
+        }, throwable -> {});
     }
 
     abstract public int layoutResourceId();
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 b84c58561..61328763e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java
@@ -8,11 +8,9 @@ import android.os.Build;
 import android.os.Bundle;
 import android.widget.RemoteViews;
 
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
@@ -25,14 +23,13 @@ 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 ApiClient apiClient;
+    public TaskRepository taskRepository;
     @Inject
-    public HostConfig hostConfig;
+    public String userId;
 
-    private void setUp(Context context) {
-        if (apiClient == null) {
-            HabiticaBaseApplication application = HabiticaApplication.getInstance(context);
-            application.getComponent().inject(this);
+    private void setUp() {
+        if (taskRepository == null) {
+            HabiticaBaseApplication.getComponent().inject(this);
         }
     }
 
@@ -43,12 +40,12 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider {
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        setUp(context);
+        setUp();
         ComponentName thisWidget = new ComponentName(context,
                 HabitButtonWidgetProvider.class);
         int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
 
-        if (Build.VERSION.SDK_INT >= 16) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
             for (int widgetId : allWidgetIds) {
                 Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
                 appWidgetManager.partiallyUpdateAppWidget(widgetId,
@@ -66,7 +63,7 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        setUp(context);
+        setUp();
         if (intent.getAction().equals(HABIT_ACTION)) {
             AppWidgetManager mgr = AppWidgetManager.getInstance(context);
             int appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
@@ -77,17 +74,15 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider {
             int[] ids = {appWidgetId};
 
             if (taskId != null) {
-                apiClient.postTaskDirection(taskId, direction)
-
+                taskRepository.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();
-                            task.save();
-                            showToastForTaskDirection(context, taskDirectionData, hostConfig.getUser());
+                            taskRepository.getTask(taskId).subscribe(task -> {
+                                task.value = task.value + taskDirectionData.getDelta();
+                                taskRepository.saveTask(task);
+                            });
+                            showToastForTaskDirection(context, taskDirectionData, userId);
                             this.onUpdate(context, mgr, ids);
-                        }, throwable -> {
-                            this.onUpdate(context, mgr, ids);
-                        });
+                        }, throwable -> this.onUpdate(context, mgr, ids));
             }
         }
         super.onReceive(context, intent);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
index 6a7472cd1..1a1f109dc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
@@ -1,15 +1,5 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.responses.TaskDirection;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
 import android.app.PendingIntent;
 import android.app.Service;
 import android.appwidget.AppWidgetManager;
@@ -19,55 +9,50 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.IBinder;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.widget.RemoteViews;
 
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.models.responses.TaskDirection;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.modules.AppModule;
+
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 public class HabitButtonWidgetService extends Service {
     @Inject
-    public HostConfig hostConfig;
+    @Named(AppModule.NAMED_USER_ID)
+    public String userId;
     @Inject
     public SharedPreferences sharedPreferences;
     @Inject
     public Resources resources;
     @Inject
     public Context context;
+    @Inject
+    TaskRepository taskRepository;
     private AppWidgetManager appWidgetManager;
 
     private Map<String, Integer> taskMapping;
     private int[] allWidgetIds;
-    private TransactionListener<Task> userTransactionListener = new TransactionListener<Task>() {
-        @Override
-        public void onResultReceived(Task task) {
-            updateData(task);
-        }
-
-        @Override
-        public boolean onReady(BaseTransaction<Task> task) {
-            return true;
-        }
-
-        @Override
-        public boolean hasResult(BaseTransaction<Task> baseTransaction, Task task) {
-            return true;
-        }
-    };
 
     @Override
     public int onStartCommand(final Intent intent, int flags, int startId) {
-        HabiticaApplication application = (HabiticaApplication) getApplication();
-        application.getComponent().inject(this);
+        HabiticaBaseApplication.getComponent().inject(this);
         this.appWidgetManager = AppWidgetManager.getInstance(this);
         ComponentName thisWidget = new ComponentName(this, HabitButtonWidgetProvider.class);
         allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
         makeTaskMapping();
 
         for (String taskid : this.taskMapping.keySet()) {
-            new Select().from(Task.class).where(Condition.column("id").eq(taskid)).async().querySingle(userTransactionListener);
+            taskRepository.getTask(taskid).subscribe(this::updateData, throwable -> {});
         }
 
         stopSelf();
@@ -85,7 +70,7 @@ public class HabitButtonWidgetService extends Service {
                 remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, null);
             } else {
                 remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.VISIBLE);
-                remoteViews.setInt(R.id.btnPlus, "setBackgroundColor", resources.getColor(task.getLightTaskColor()));
+                remoteViews.setInt(R.id.btnPlus, "setBackgroundColor", ContextCompat.getColor(context, task.getLightTaskColor()));
                 remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, getPendingIntent(task.getId(), TaskDirection.up.toString(), taskMapping.get(task.getId())));
             }
             if (!task.getDown()) {
@@ -93,7 +78,7 @@ public class HabitButtonWidgetService extends Service {
                 remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, null);
             } else {
                 remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.VISIBLE);
-                remoteViews.setInt(R.id.btnMinus, "setBackgroundColor", resources.getColor(task.getMediumTaskColor()));
+                remoteViews.setInt(R.id.btnMinus, "setBackgroundColor", ContextCompat.getColor(context, task.getMediumTaskColor()));
                 remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, getPendingIntent(task.getId(), TaskDirection.down.toString(), taskMapping.get(task.getId())));
             }
             appWidgetManager.updateAppWidget(taskMapping.get(task.getId()), remoteViews);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
index 7a7adaf5e..648c622fa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
@@ -1,16 +1,5 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.OrderBy;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import net.pherth.android.emoji_library.EmojiHandler;
-
 import android.appwidget.AppWidgetManager;
 import android.content.Context;
 import android.content.Intent;
@@ -19,6 +8,16 @@ import android.text.style.DynamicDrawableSpan;
 import android.widget.RemoteViews;
 import android.widget.RemoteViewsService;
 
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+
+import net.pherth.android.emoji_library.EmojiHandler;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,8 +31,12 @@ import rx.schedulers.Schedulers;
 public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsFactory {
     private final int widgetId;
     @Inject
-    @Named("UserID")
+    @Named(AppModule.NAMED_USER_ID)
     public String userID;
+    @Inject
+    TaskRepository taskRepository;
+    @Inject
+    UserRepository userRepository;
     private Integer customDayStart;
     private int listItemResId;
     private int listItemTextResId;
@@ -42,7 +45,7 @@ public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsF
     private Context context = null;
     private boolean reloadData;
 
-    public TaskListFactory(Context context, Intent intent, String taskType, int listItemResId, int listItemTextResId) {
+    TaskListFactory(Context context, Intent intent, String taskType, int listItemResId, int listItemTextResId) {
         this.context = context;
         this.widgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0);
         this.listItemResId = listItemResId;
@@ -55,7 +58,7 @@ public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsF
         }
 
         if (customDayStart == null) {
-            Observable.defer(() -> Observable.just(new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).querySingle()))
+            userRepository.getUser(userID)
                     .subscribe(habitRPGUser -> {
                         customDayStart = habitRPGUser.getPreferences().getDayStart();
                         this.loadData();
@@ -67,12 +70,8 @@ public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsF
     }
 
     private void loadData() {
-        Observable.defer(() -> Observable.from(new Select()
-                .from(Task.class)
-                .where(Condition.column("type").eq(taskType))
-                .and(Condition.column("completed").eq(false))
-                .orderBy(OrderBy.columns("position", "dateCreated").descending())
-                .queryList()))
+        taskRepository.getTasks(taskType, userID)
+                .flatMap(Observable::from)
                 .filter(task -> task.type.equals(Task.TYPE_TODO) || task.isDisplayedActive(customDayStart))
                 .toList()
                 .subscribeOn(Schedulers.io())
@@ -81,9 +80,7 @@ public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsF
                     taskList = tasks;
                     this.reloadData = false;
                     AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(widgetId, R.id.list_view);
-                }, throwable -> {
-                    this.reloadData = false;
-                });
+                }, throwable -> this.reloadData = false);
     }
 
 
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 98848a8ee..8bc39e62a 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
@@ -5,6 +5,8 @@ import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.modules.AppModule;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.models.responses.TaskDirection;
 import com.habitrpg.android.habitica.models.tasks.Task;
@@ -22,6 +24,9 @@ import android.os.Bundle;
 import android.widget.RemoteViews;
 
 import javax.inject.Inject;
+import javax.inject.Named;
+
+import static com.habitrpg.android.habitica.BR.task;
 
 public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
     public static final String DAILY_ACTION = "com.habitrpg.android.habitica.DAILY_ACTION";
@@ -30,12 +35,14 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
     @Inject
     ApiClient apiClient;
     @Inject
-    HostConfig hostConfig;
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
+    @Inject
+    TaskRepository taskRepository;
 
     private void setUp(Context context) {
         if (apiClient == null) {
-            HabiticaBaseApplication application = HabiticaApplication.getInstance(context);
-            application.getComponent().inject(this);
+            HabiticaBaseApplication.getComponent().inject(this);
         }
     }
 
@@ -56,17 +63,12 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
             String taskId = intent.getStringExtra(TASK_ID_ITEM);
 
             if (taskId != null) {
-                apiClient.postTaskDirection(taskId, TaskDirection.up.toString())
-
+                taskRepository.postTaskDirection(taskId, TaskDirection.up.toString())
                         .subscribe(taskDirectionData -> {
-                            Task task = new Select().from(Task.class).where(Condition.column("id").eq(taskId)).querySingle();
-                            task.completed = true;
-                            task.save();
-                            showToastForTaskDirection(context, taskDirectionData, hostConfig.getUser());
+                            taskRepository.markTaskCompleted(taskId, true);
+                            showToastForTaskDirection(context, taskDirectionData, userId);
                             AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
-                        }, throwable -> {
-                            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
-                        });
+                        }, throwable -> AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view));
             }
         }
         super.onReceive(context, intent);
@@ -86,12 +88,12 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
             }
         }
 
-        for (int i = 0; i < appWidgetIds.length; ++i) {
+        for (int appWidgetId : appWidgetIds) {
             Intent intent = new Intent(context, getServiceClass());
-            intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetIds[i]);
+            intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
             intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
             RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.widget_task_list);
-            rv.setRemoteAdapter(appWidgetIds[i], R.id.list_view, intent);
+            rv.setRemoteAdapter(appWidgetId, R.id.list_view, intent);
             rv.setEmptyView(R.id.list, R.id.empty_view);
             rv.setTextViewText(R.id.widget_title, context.getString(getTitleResId()));
 
@@ -102,15 +104,15 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
 
             Intent taskIntent = new Intent(context, getProviderClass());
             taskIntent.setAction(DAILY_ACTION);
-            taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetIds[i]);
+            taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
             intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
             PendingIntent toastPendingIntent = PendingIntent.getBroadcast(context, 0, taskIntent,
                     PendingIntent.FLAG_UPDATE_CURRENT);
             rv.setPendingIntentTemplate(R.id.list_view, toastPendingIntent);
 
-            appWidgetManager.updateAppWidget(appWidgetIds[i], rv);
+            appWidgetManager.updateAppWidget(appWidgetId, rv);
 
-            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetIds[i], R.id.list_view);
+            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
         }
 
         super.onUpdate(context, appWidgetManager, appWidgetIds);

From f5ad6488bc9addb92f5b84c1547c615980765b76 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 20 Apr 2017 15:33:33 +0200
Subject: [PATCH 03/17] Move all db access to repositories

---
 Habitica/AndroidManifest.xml                  |  498 ++--
 Habitica/res/anim/fab_slide_in.xml            |    6 +-
 Habitica/res/anim/fab_slide_out.xml           |    6 +-
 .../layout_rounded_bg_lighter_gray.xml        |   10 +-
 Habitica/res/layout/activity_intro.xml        |  108 +-
 Habitica/res/layout/activity_login.xml        |  486 ++--
 Habitica/res/layout/activity_main.xml         |  218 +-
 Habitica/res/layout/avatar_with_bars.xml      |  254 +-
 .../res/layout/dialog_login_incentive.xml     |   72 +-
 Habitica/res/layout/dialog_task_filter.xml    |  222 +-
 Habitica/res/layout/edit_tag_item.xml         |   50 +-
 .../res/layout/equipment_overview_list.xml    |  130 +-
 Habitica/res/layout/floating_menu_tasks.xml   |  172 +-
 .../res/layout/fragment_avatar_overview.xml   |  310 +-
 Habitica/res/layout/fragment_chat.xml         |   92 +-
 .../layout/fragment_equipment_overview.xml    |  152 +-
 Habitica/res/layout/fragment_faq_detail.xml   |   70 +-
 Habitica/res/layout/fragment_group_info.xml   |  768 ++---
 Habitica/res/layout/fragment_setup_avatar.xml |  114 +-
 Habitica/res/layout/fragment_setup_tasks.xml  |  110 +-
 Habitica/res/layout/fragment_skills.xml       |   18 +-
 Habitica/res/layout/fragment_welcome.xml      |  126 +-
 Habitica/res/layout/reward_item_card.xml      |  174 +-
 Habitica/res/layout/skill_task_item_card.xml  |  134 +-
 Habitica/res/values-bg/strings.profile.xml    |   34 +-
 Habitica/res/values-bg/strings.tutorial.xml   |   44 +-
 Habitica/res/values-bg/strings.xml            | 1084 +++----
 Habitica/res/values-de/strings.profile.xml    |   30 +-
 Habitica/res/values-de/strings.tutorial.xml   |   20 +-
 Habitica/res/values-de/strings.xml            | 1040 +++----
 Habitica/res/values-es/strings.profile.xml    |   30 +-
 Habitica/res/values-es/strings.tutorial.xml   |   20 +-
 Habitica/res/values-es/strings.xml            |  932 +++---
 Habitica/res/values-fr/strings.profile.xml    |   30 +-
 Habitica/res/values-fr/strings.tutorial.xml   |   20 +-
 Habitica/res/values-fr/strings.xml            | 1064 +++----
 Habitica/res/values-in/strings.tutorial.xml   |   20 +-
 Habitica/res/values-in/strings.xml            |  804 +++---
 Habitica/res/values-it/strings.profile.xml    |   34 +-
 Habitica/res/values-it/strings.tutorial.xml   |   38 +-
 Habitica/res/values-it/strings.xml            | 1086 +++----
 Habitica/res/values-iw/strings.tutorial.xml   |   20 +-
 Habitica/res/values-iw/strings.xml            |  720 ++---
 Habitica/res/values-ja/strings.profile.xml    |   30 +-
 Habitica/res/values-ja/strings.tutorial.xml   |   20 +-
 Habitica/res/values-ja/strings.xml            |  934 +++---
 Habitica/res/values-ko/strings.profile.xml    |   30 +-
 Habitica/res/values-ko/strings.tutorial.xml   |   20 +-
 Habitica/res/values-ko/strings.xml            |  990 +++----
 Habitica/res/values-lt/strings.tutorial.xml   |   20 +-
 Habitica/res/values-lt/strings.xml            |  784 +++---
 Habitica/res/values-nl/strings.profile.xml    |   34 +-
 Habitica/res/values-nl/strings.tutorial.xml   |   44 +-
 Habitica/res/values-nl/strings.xml            | 1084 +++----
 Habitica/res/values-pl/strings.profile.xml    |   34 +-
 Habitica/res/values-pl/strings.tutorial.xml   |   22 +-
 Habitica/res/values-pl/strings.xml            | 1028 +++----
 Habitica/res/values-ru/strings.profile.xml    |   34 +-
 Habitica/res/values-ru/strings.tutorial.xml   |   40 +-
 Habitica/res/values-ru/strings.xml            | 1032 +++----
 Habitica/res/values-tr/strings.profile.xml    |   34 +-
 Habitica/res/values-tr/strings.tutorial.xml   |   22 +-
 Habitica/res/values-tr/strings.xml            | 1064 +++----
 Habitica/res/values-v19/styles.xml            |   30 +-
 Habitica/res/values-zh/strings.profile.xml    |   34 +-
 Habitica/res/values-zh/strings.tutorial.xml   |   28 +-
 Habitica/res/values-zh/strings.xml            | 1034 +++----
 Habitica/res/values/colors.xml                |  274 +-
 Habitica/res/values/strings.xml               | 1144 ++++----
 Habitica/res/values/styles.xml                |  718 ++---
 Habitica/res/xml/preferences_fragment.xml     |  388 +--
 .../android/habitica/ContentCache.java        |  137 -
 .../android/habitica/ErrorResponse.java       |   46 +-
 .../android/habitica/HabitDatabase.java       |   30 +-
 .../habitica/HabiticaBaseApplication.java     |  700 ++---
 .../habitica/HabiticaPurchaseVerifier.java    |  264 +-
 .../habitica/NotificationPublisher.java       |  192 +-
 .../android/habitica/api/ApiService.java      |  600 ++--
 .../habitica/api/MaintenanceApiService.java   |   34 +-
 .../habitrpg/android/habitica/api/Server.java |   70 +-
 .../callbacks/HabitRPGUserCallback.java       |   68 +-
 .../habitica/callbacks/ItemsCallback.java     |   50 +-
 .../habitica/callbacks/MergeUserCallback.java |   48 +-
 .../habitica/callbacks/SkillCallback.java     |   86 +-
 .../callbacks/TaskScoringCallback.java        |  156 +-
 .../callbacks/TaskUpdateCallback.java         |   42 +-
 .../habitica/callbacks/UnlockCallback.java    |   62 +-
 .../habitica/components/AppComponent.java     |  517 ++--
 .../android/habitica/data/ApiClient.java      |  440 +--
 .../habitica/data/ContentRepository.java      |   10 +
 .../data/CustomizationRepository.java         |   11 +
 .../android/habitica/data/FAQRepository.java  |   12 +
 .../habitica/data/InventoryRepository.java    |   44 +
 .../data/SetupCustomizationRepository.java    |   26 +-
 .../habitica/data/SocialRepository.java       |  109 +-
 .../android/habitica/data/TagRepository.java  |   48 +-
 .../android/habitica/data/TaskRepository.java |   79 +-
 .../habitica/data/TutorialRepository.java     |   14 +
 .../android/habitica/data/UserRepository.java |   70 +-
 .../data/implementation/ApiClientImpl.java    | 1696 +++++------
 .../implementation/BaseRepositoryImpl.java    |    2 +-
 .../implementation/ContentRepositoryImpl.java |   21 +
 .../CustomizationRepositoryImpl.java          |   22 +
 .../implementation/FAQRepositoryImpl.java     |   22 +
 .../InventoryRepositoryImpl.java              |  105 +
 .../SetupCustomizationRepositoryImpl.java     |  364 +--
 .../implementation/SocialRepositoryImpl.java  |  296 +-
 .../implementation/TagRepositoryImpl.java     |  128 +-
 .../implementation/TaskRepositoryImpl.java    |  293 +-
 .../TutorialRepositoryImpl.java               |   27 +
 .../implementation/UserRepositoryImpl.java    |  260 +-
 .../local/CustomizationLocalRepository.java   |   11 +
 .../data/local/FAQLocalRepository.java        |   12 +
 .../data/local/InventoryLocalRepository.java  |   39 +
 .../data/local/SocialLocalRepository.java     |   19 +-
 .../data/local/TagLocalRepository.java        |   26 +-
 .../data/local/TaskLocalRepository.java       |   65 +-
 .../data/local/TutorialLocalRepository.java   |   13 +
 .../data/local/UserLocalRepository.java       |   44 +-
 .../DbFlowCustomizationLocalRepository.java   |   53 +
 .../DbFlowFAQLocalRepository.java             |   21 +
 .../DbFlowInventoryLocalRepository.java       |  238 ++
 .../DbFlowSocialLocalRepository.java          |   48 +-
 .../DbFlowTagLocalRepository.java             |  158 +-
 .../DbFlowTaskLocalRepository.java            |  615 ++--
 .../DbFlowTutorialLocalRepository.java        |   29 +
 .../DbFlowUserLocalRepository.java            |  168 +-
 .../habitica/events/DisplayTutorialEvent.java |   34 +-
 .../habitica/events/HabitScoreEvent.java      |   24 +-
 .../events/OpenedMysteryItemEvent.java        |   20 +-
 .../habitica/events/ReminderDeleteEvent.java  |   20 +-
 .../habitica/events/SkillUsedEvent.java       |   40 +-
 .../habitica/events/TaskCreatedEvent.java     |   28 +-
 .../habitica/events/TaskDeleteEvent.java      |   20 +-
 .../habitica/events/TaskLongPressedEvent.java |   20 +-
 .../habitica/events/TaskSaveEvent.java        |   24 +-
 .../habitica/events/TaskTappedEvent.java      |   16 +-
 .../habitica/events/TaskUpdatedEvent.java     |   28 +-
 .../events/commands/BuyGemItemCommand.java    |   18 +-
 .../events/commands/BuyRewardCommand.java     |   20 +-
 .../commands/ChatMessageCommandBase.java      |   32 +-
 .../commands/ChecklistCheckedCommand.java     |   20 +-
 .../commands/CopyChatAsTodoCommand.java       |   24 +-
 .../commands/CopyChatMessageCommand.java      |   24 +-
 .../commands/DeleteChatMessageCommand.java    |   24 +-
 .../events/commands/DeleteTagCommand.java     |   30 +-
 .../events/commands/EditTagCommand.java       |   28 +-
 .../habitica/events/commands/FeedCommand.java |   22 +-
 .../commands/FlagChatMessageCommand.java      |   26 +-
 .../events/commands/HatchingCommand.java      |   22 +-
 .../events/commands/SellItemCommand.java      |   18 +-
 .../commands/SendNewGroupMessageCommand.java  |   28 +-
 .../commands/SendNewInboxMessageCommand.java  |   28 +-
 .../events/commands/TaskCheckedCommand.java   |   22 +-
 .../commands/ToggleLikeMessageCommand.java    |   24 +-
 .../events/commands/UpdateTagCommand.java     |   32 +-
 .../events/commands/UseSkillCommand.java      |   22 +-
 .../helpers/PopupNotificationsManager.java    |  277 +-
 .../habitica/helpers/QrCodeManager.java       |  332 +--
 .../habitica/helpers/RemindersManager.java    |  284 +-
 .../habitica/helpers/TaskAlarmManager.java    |  462 ++-
 .../habitica/helpers/TaskFilterHelper.java    |  214 +-
 .../habitica/helpers/UserStatComputer.java    |  300 +-
 .../GuildInviteLocalNotification.java         |    6 +-
 .../HabiticaFirebaseInstanceIDService.java    |   48 +-
 .../HabiticaFirebaseMessagingService.java     |   44 +-
 .../HabiticaLocalNotification.java            |    4 +-
 .../PartyInviteLocalNotification.java         |    6 +-
 .../PushNotificationManager.java              |  290 +-
 .../QuestBegunLocalNotification.java          |    4 +-
 .../QuestInviteLocalNotification.java         |    6 +-
 .../ReceivedGemsGiftLocalNotification.java    |    4 +-
 ...ceivedPrivateMessageLocalNotification.java |    4 +-
 ...ivedSubscriptionGiftLocalNotification.java |    4 +-
 .../WonChallengeLocalNotification.java        |    4 +-
 .../interactors/BuyRewardUseCase.java         |   84 +-
 .../CheckClassSelectionUseCase.java           |  156 +-
 .../interactors/ChecklistCheckUseCase.java    |   76 +-
 .../interactors/DailyCheckUseCase.java        |   92 +-
 .../interactors/DisplayItemDropUseCase.java   |  120 +-
 .../interactors/HabitScoreUseCase.java        |   92 +-
 .../habitica/interactors/LevelUpUseCase.java  |  210 +-
 .../interactors/NotifyUserUseCase.java        |  218 +-
 .../interactors/TodoCheckUseCase.java         |   92 +-
 .../android/habitica/models/Achievement.java  |   28 +-
 .../habitica/models/AchievementGroup.java     |   16 +-
 .../habitica/models/AchievementResult.java    |   12 +-
 .../android/habitica/models/ContentGear.java  |   22 +-
 .../habitica/models/ContentResult.java        |   96 +-
 .../android/habitica/models/FAQArticle.java   |   90 +-
 .../habitica/models/HabitRpgClass.java        |   26 +-
 .../habitica/models/LeaveChallengeBody.java   |   22 +-
 .../android/habitica/models/Notification.java |  174 +-
 .../models/PurchaseValidationRequest.java     |   18 +-
 .../models/PurchaseValidationResult.java      |   12 +-
 .../android/habitica/models/PushDevice.java   |   68 +-
 .../habitica/models/SetupCustomization.java   |  222 +-
 .../android/habitica/models/Skill.java        |   48 +-
 .../models/SubscriptionValidationRequest.java |   18 +-
 .../habitrpg/android/habitica/models/Tag.java |  200 +-
 .../android/habitica/models/Transaction.java  |   14 +-
 .../android/habitica/models/TutorialStep.java |  162 +-
 .../models/auth/LocalAuthentication.java      |   80 +-
 .../habitica/models/auth/UserAuth.java        |   86 +-
 .../models/auth/UserAuthResponse.java         |   96 +-
 .../habitica/models/auth/UserAuthSocial.java  |   52 +-
 .../models/auth/UserAuthSocialTokens.java     |   50 +-
 .../habitica/models/inventory/Animal.java     |  202 +-
 .../models/inventory/Customization.java       |  418 +--
 .../models/inventory/CustomizationSet.java    |   26 +-
 .../habitica/models/inventory/Egg.java        |  108 +-
 .../habitica/models/inventory/Food.java       |   86 +-
 .../models/inventory/HatchingPotion.java      |   66 +-
 .../habitica/models/inventory/Item.java       |  126 +-
 .../models/{tasks => inventory}/ItemData.java |  305 +-
 .../habitica/models/inventory/Mount.java      |   40 +-
 .../habitica/models/inventory/Pet.java        |   42 +-
 .../habitica/models/inventory/Quest.java      |  120 +-
 .../habitica/models/inventory/QuestBoss.java  |  156 +-
 .../models/inventory/QuestCollect.java        |   46 +-
 .../models/inventory/QuestContent.java        |  244 +-
 .../models/inventory/QuestProgress.java       |   98 +-
 .../models/inventory/SpecialItem.java         |   60 +-
 .../models/invitations/GuildInvite.java       |  128 +-
 .../models/invitations/Invitations.java       |  123 +-
 .../models/invitations/PartyInvite.java       |  122 +-
 .../notifications/NotificationData.java       |   36 +-
 .../habitica/models/notifications/Reward.java |   18 +-
 .../models/responses/BuyResponse.java         |   32 +-
 .../models/responses/FeedResponse.java        |   14 +-
 .../models/responses/HabitResponse.java       |   76 +-
 .../models/responses/HabiticaError.java       |   14 +-
 .../models/responses/MaintenanceResponse.java |   20 +-
 .../responses/PostChatMessageResult.java      |   20 +-
 .../models/responses/SkillResponse.java       |   28 +-
 .../habitica/models/responses/Status.java     |   32 +-
 .../models/responses/TaskDirection.java       |   38 +-
 .../models/responses/TaskDirectionData.java   |   60 +-
 .../responses/TaskDirectionDataDrop.java      |   90 +-
 .../responses/TaskDirectionDataTemp.java      |   36 +-
 .../models/responses/UnlockResponse.java      |   36 +-
 .../android/habitica/models/shops/Shop.java   |  114 +-
 .../habitica/models/shops/ShopCategory.java   |  106 +-
 .../habitica/models/shops/ShopItem.java       |  283 +-
 .../models/shops/ShopItemUnlockCondition.java |   36 +-
 .../habitica/models/social/Backer.java        |   14 +-
 .../habitica/models/social/Challenge.java     |  193 +-
 .../habitica/models/social/ChatMessage.java   |  190 +-
 .../habitica/models/social/Contributor.java   |   22 +-
 .../android/habitica/models/social/Group.java |  141 +-
 .../habitica/models/social/UserParty.java     |  157 +-
 .../habitica/models/tasks/ChecklistItem.java  |  228 +-
 .../android/habitica/models/tasks/Days.java   |  222 +-
 .../habitica/models/tasks/RemindersItem.java  |  256 +-
 .../android/habitica/models/tasks/Task.java   | 1377 +++++----
 .../habitica/models/tasks/TaskGroupPlan.java  |   46 +-
 .../habitica/models/tasks/TaskList.java       |   18 +-
 .../habitica/models/tasks/TaskTag.java        |  152 +-
 .../habitica/models/tasks/TasksOrder.java     |   86 +-
 .../habitica/models/user/Authentication.java  |   95 +-
 .../habitica/models/user/BasicStats.java      |  143 +-
 .../android/habitica/models/user/Buffs.java   |  176 +-
 .../habitica/models/user/ContributorInfo.java |  211 +-
 .../android/habitica/models/user/Flags.java   |  294 +-
 .../android/habitica/models/user/Gear.java    |  120 +-
 .../habitica/models/user/HabitRPGUser.java    | 1283 +++++----
 .../android/habitica/models/user/Hair.java    |  174 +-
 .../android/habitica/models/user/Inbox.java   |  197 +-
 .../android/habitica/models/user/Items.java   |  350 +--
 .../android/habitica/models/user/Outfit.java  |  203 +-
 .../habitica/models/user/PlayerMinStats.java  |  303 +-
 .../habitica/models/user/Preferences.java     |  492 ++--
 .../android/habitica/models/user/Profile.java |  130 +-
 .../habitica/models/user/Purchases.java       |   96 +-
 .../habitica/models/user/SpecialItems.java    |  130 +-
 .../android/habitica/models/user/Stats.java   |  110 +-
 .../models/user/SubscriptionPlan.java         |  158 +-
 .../user/SubscriptionPlanConsecutive.java     |  126 +-
 .../models/user/SuppressedModals.java         |  110 +-
 .../android/habitica/modules/ApiModule.java   |  119 +-
 .../android/habitica/modules/AppModule.java   |  206 +-
 .../habitica/modules/RepositoryModule.java    |  216 +-
 .../proxy/impl/EmptyCrashlyticsProxy.java     |    4 +-
 .../LocalNotificationActionReceiver.java      |  216 +-
 .../receivers/TaskAlarmBootReceiver.java      |   46 +-
 .../habitica/receivers/TaskReceiver.java      |  130 +-
 .../android/habitica/ui/AvatarView.java       |  962 +++----
 .../habitica/ui/AvatarWithBarsViewModel.java  |  434 +--
 .../habitica/ui/GemPurchaseOptionsView.java   |    4 +-
 .../android/habitica/ui/ItemDetailDialog.java |    8 +-
 .../habitica/ui/MaxHeightLinearLayout.java    |    6 +-
 .../android/habitica/ui/SpeechBubbleView.java |    8 +-
 .../android/habitica/ui/TutorialView.java     |  216 +-
 .../WrapContentRecyclerViewLayoutManager.java |    4 +-
 .../habitica/ui/activities/AboutActivity.java |   12 +-
 .../ui/activities/AddTaskWidgetActivity.java  |  158 +-
 .../habitica/ui/activities/BaseActivity.java  |    8 +-
 .../activities/ChallengeDetailActivity.java   |  832 +++---
 .../ui/activities/ClassSelectionActivity.java |  470 ++--
 .../ui/activities/FullProfileActivity.java    |  999 ++++---
 .../ui/activities/GemPurchaseActivity.java    |   20 +-
 .../ui/activities/GroupFormActivity.java      |   16 +-
 .../activities/HabitButtonWidgetActivity.java |  192 +-
 .../habitica/ui/activities/IntroActivity.java |  332 +--
 .../habitica/ui/activities/LoginActivity.java | 1253 +++++----
 .../habitica/ui/activities/MainActivity.java  | 2498 ++++++++---------
 .../ui/activities/MaintenanceActivity.java    |  194 +-
 .../ui/activities/PartyInviteActivity.java    |  376 +--
 .../habitica/ui/activities/PrefsActivity.java |   16 +-
 .../habitica/ui/activities/SetupActivity.java |  606 ++--
 .../ui/activities/SkillMemberActivity.java    |   18 +-
 .../ui/activities/SkillTasksActivity.java     |  220 +-
 .../ui/activities/TaskFormActivity.java       | 2019 +++++++------
 .../CustomizationRecyclerViewAdapter.java     |  604 ++--
 .../adapter/FAQOverviewRecyclerAdapter.java   |  230 +-
 .../ui/adapter/IReceiveNewEntries.java        |   18 +-
 .../SkillTasksRecyclerViewAdapter.java        |  305 +-
 .../ui/adapter/SkillsRecyclerViewAdapter.java |  246 +-
 .../EquipmentRecyclerViewAdapter.java         |  240 +-
 .../inventory/ItemRecyclerAdapter.java        |  456 +--
 .../inventory/MountDetailRecyclerAdapter.java |  260 +-
 .../inventory/PetDetailRecyclerAdapter.java   |  342 +--
 .../inventory/ShopRecyclerAdapter.java        |  508 ++--
 .../inventory/StableRecyclerAdapter.java      |  280 +-
 .../setup/CustomizationSetupAdapter.java      |  368 +--
 .../ui/adapter/setup/TaskSetupAdapter.java    |  208 +-
 .../ui/adapter/social/AchievementAdapter.java |  308 +-
 .../social/ChallengesListViewAdapter.java     |  420 ++-
 .../social/ChatRecyclerViewAdapter.java       |  695 +++--
 .../PartyMemberRecyclerViewAdapter.java       |  294 +-
 .../PublicGuildsRecyclerViewAdapter.java      |  342 +--
 .../QuestCollectRecyclerViewAdapter.java      |  168 +-
 .../ChallengesFilterRecyclerViewAdapter.java  |  208 +-
 .../tasks/BaseTasksRecyclerViewAdapter.java   |  356 +--
 .../ui/adapter/tasks/CheckListAdapter.java    |  272 +-
 .../tasks/DailiesRecyclerViewHolder.java      |    8 +-
 .../tasks/HabitsRecyclerViewAdapter.java      |    8 +-
 .../ui/adapter/tasks/RemindersAdapter.java    |  280 +-
 .../tasks/RewardsRecyclerViewAdapter.java     |  205 +-
 .../SortableTasksRecyclerViewAdapter.java     |  104 +-
 .../tasks/TodosRecyclerViewAdapter.java       |    8 +-
 .../habitica/ui/fragments/AboutFragment.java  |    4 +-
 .../habitica/ui/fragments/BaseFragment.java   |  262 +-
 .../ui/fragments/BaseMainFragment.java        |  278 +-
 .../ui/fragments/GemsPurchaseFragment.java    |   16 +-
 .../habitica/ui/fragments/NewsFragment.java   |    8 +-
 .../ui/fragments/SubscriptionFragment.java    |  612 ++--
 .../ui/fragments/faq/FAQDetailFragment.java   |  114 +-
 .../ui/fragments/faq/FAQOverviewFragment.java |  141 +-
 .../AvatarCustomizationFragment.java          |  355 ++-
 .../customization/AvatarOverviewFragment.java |  322 +--
 .../equipment/EquipmentDetailFragment.java    |  146 +-
 .../equipment/EquipmentOverviewFragment.java  |  338 ++-
 .../inventory/items/ItemRecyclerFragment.java |  475 ++--
 .../inventory/items/ItemsFragment.java        |   18 +-
 .../inventory/shops/ShopFragment.java         |  286 +-
 .../inventory/shops/ShopsFragment.java        |  212 +-
 .../stable/MountDetailRecyclerFragment.java   |  230 +-
 .../stable/PetDetailRecyclerFragment.java     |  279 +-
 .../inventory/stable/StableFragment.java      |    8 +-
 .../stable/StableRecyclerFragment.java        |  421 ++-
 .../preferences/AccountDetailsFragment.java   |  198 +-
 .../preferences/BasePreferencesFragment.java  |    4 +-
 .../DayStartPreferenceDialogFragment.java     |    6 +-
 .../preferences/PreferencesFragment.java      |  558 ++--
 .../TimePreferenceDialogFragment.java         |    4 +-
 .../fragments/setup/AvatarSetupFragment.java  |  542 ++--
 .../ui/fragments/setup/IntroFragment.java     |    8 +-
 .../ui/fragments/setup/TaskSetupFragment.java |  376 +--
 .../ui/fragments/setup/WelcomeFragment.java   |   76 +-
 .../SkillTasksRecyclerViewFragment.java       |   16 +-
 .../ui/fragments/skills/SkillsFragment.java   |  412 +--
 .../ui/fragments/social/ChatListFragment.java |  504 ++--
 .../social/GroupInformationFragment.java      |  719 ++---
 .../ui/fragments/social/GuildFragment.java    |  538 ++--
 .../social/GuildsOverviewFragment.java        |  260 +-
 .../ui/fragments/social/InboxFragment.java    |  442 +--
 .../social/InboxMessageListFragment.java      |  271 +-
 .../social/PublicGuildsFragment.java          |  246 +-
 .../ui/fragments/social/TavernFragment.java   |  284 +-
 .../ChallengeDetailDialogHolder.java          |  690 ++---
 .../ChallengeFilterDialogHolder.java          |  284 +-
 .../challenges/ChallengeFilterOptions.java    |   22 +-
 .../challenges/ChallengeListFragment.java     |  441 +--
 .../ChallengeTasksRecyclerViewFragment.java   |  460 +--
 .../ChallengesOverviewFragment.java           |  385 ++-
 .../fragments/social/party/PartyFragment.java |  754 ++---
 .../social/party/PartyInviteFragment.java     |   10 +-
 .../social/party/PartyMemberListFragment.java |  146 +-
 .../tasks/TaskRecyclerViewFragment.java       |  759 ++---
 .../ui/fragments/tasks/TasksFragment.java     |  991 ++++---
 .../habitica/ui/helpers/DataBindingUtils.java |   12 +-
 .../habitica/ui/helpers/EmojiKeyboard.java    |   10 +-
 .../helpers/FloatingActionMenuBehavior.java   |  306 +-
 .../habitica/ui/helpers/MarginDecoration.java |    4 +-
 .../habitica/ui/helpers/MarkdownParser.java   |  100 +-
 .../ui/helpers/RecyclerViewEmptySupport.java  |    1 -
 .../android/habitica/ui/helpers/UiUtils.java  |  156 +-
 .../habitica/ui/helpers/ViewHelper.java       |    1 -
 .../habitica/ui/menu/BottomSheetMenu.java     |    4 +-
 .../habitica/ui/menu/BottomSheetMenuItem.java |    4 +-
 .../habitica/ui/menu/MainDrawerBuilder.java   |   10 +-
 .../ui/menu/SectionIconDrawerItem.java        |   14 +-
 .../ui/viewHolders/SectionViewHolder.java     |    4 +-
 .../viewHolders/tasks/BaseTaskViewHolder.java |  426 +--
 .../tasks/ChecklistedViewHolder.java          |  350 +--
 .../ui/viewHolders/tasks/DailyViewHolder.java |  116 +-
 .../ui/viewHolders/tasks/HabitViewHolder.java |  194 +-
 .../viewHolders/tasks/RewardViewHolder.java   |  196 +-
 .../ui/viewHolders/tasks/TodoViewHolder.java  |   90 +-
 .../habitica/ui/views/FadingViewPager.java    |    1 -
 .../ui/views/login/LoginBackgroundView.java   |  296 +-
 .../habitica/ui/views/login/StarView.java     |    5 +-
 .../ui/views/setup/AvatarCategoryView.java    |    4 +-
 .../setup/AvatarCustomizationDrawer.java      |    4 +-
 .../SubscriptionDetailsView.java              |  266 +-
 .../subscriptions/SubscriptionOptionView.java |    4 +-
 .../ui/views/tasks/TaskFilterDialog.java      |  852 +++---
 .../habitica/utils/BooleanAsIntAdapter.java   |   76 +-
 .../habitica/utils/ChallengeDeserializer.java |  175 +-
 .../utils/ChatMessageDeserializer.java        |  137 +-
 .../utils/ChecklistItemSerializer.java        |   49 +-
 .../habitica/utils/ContentDeserializer.java   |  390 +--
 .../utils/CustomizationDeserializer.java      |  301 +-
 .../habitica/utils/DateDeserializer.java      |  128 +-
 .../habitica/utils/DateSerializer.java        |   38 +-
 .../android/habitica/utils/DaysUtils.java     |   70 +-
 .../habitica/utils/EggListDeserializer.java   |  135 +-
 .../utils/FAQArticleListDeserilializer.java   |   81 +-
 .../utils/FeedResponseDeserializer.java       |   37 +-
 .../habitica/utils/FoodListDeserializer.java  |  137 +-
 .../habitica/utils/GroupSerialization.java    |  181 +-
 .../utils/HatchingPotionListDeserializer.java |  135 +-
 .../utils/ItemDataListDeserializer.java       |    3 +-
 .../habitica/utils/MountListDeserializer.java |   55 +-
 .../habitica/utils/PetListDeserializer.java   |   55 +-
 .../habitica/utils/PurchasedDeserializer.java |  191 +-
 .../habitica/utils/QuestListDeserializer.java |  151 +-
 .../utils/RemindersItemSerializer.java        |   55 +-
 .../habitica/utils/SkillDeserializer.java     |  107 +-
 .../utils/TaskGroupPlanDeserializer.java      |   51 +-
 .../habitica/utils/TaskListDeserializer.java  |   63 +-
 .../habitica/utils/TaskSerializer.java        |  117 +-
 .../habitica/utils/TaskTagDeserializer.java   |  119 +-
 .../utils/TutorialStepListDeserializer.java   |   77 +-
 .../widget/AddTaskWidgetProvider.java         |  142 +-
 .../widget/AvatarStatsWidgetProvider.java     |  254 +-
 .../habitica/widget/BaseWidgetProvider.java   |  176 +-
 .../habitica/widget/DailiesListFactory.java   |   26 +-
 .../widget/DailiesWidgetProvider.java         |    6 +-
 .../widget/HabitButtonWidgetProvider.java     |  190 +-
 .../widget/HabitButtonWidgetService.java      |  232 +-
 .../habitica/widget/TaskListFactory.java      |  304 +-
 .../widget/TaskListWidgetProvider.java        |  253 +-
 .../habitica/widget/TodoListFactory.java      |   26 +-
 .../android/habitica/api/BaseAPITests.java    |  150 +-
 .../android/habitica/api/SocialAPITests.java  |  182 +-
 .../PopupNotificationsManagerTest.java        |  302 +-
 .../helpers/TaskAlarmManagerTest.java         |  720 ++---
 .../helpers/UserStatComputerTest.java         |  234 +-
 .../habitica/models/SubscriptionPlanTest.java |   98 +-
 .../android/habitica/models/UserTest.java     |  128 +-
 .../AvatarCustomizationFragmentTest.java      |   44 +-
 .../EquipmentOverviewFragmentTest.java        |   50 +-
 .../MountDetailRecyclerFragmentTest.java      |   40 +-
 .../stable/PetDetailRecyclerFragmentTest.java |   40 +-
 .../habitica/utils/DateDeserializerTest.java  |  174 +-
 store_strings.xml                             |   20 +-
 translations/store_strings-bg.xml             |   18 +-
 translations/store_strings-ca.xml             |    8 +-
 translations/store_strings-cmn.xml            |    8 +-
 translations/store_strings-cs.xml             |    8 +-
 translations/store_strings-de.xml             |    8 +-
 translations/store_strings-en-rGB.xml         |    8 +-
 translations/store_strings-es.xml             |    8 +-
 translations/store_strings-es_419.xml         |    8 +-
 translations/store_strings-fi.xml             |    8 +-
 translations/store_strings-fil.xml            |    8 +-
 translations/store_strings-fr.xml             |    8 +-
 translations/store_strings-he.xml             |    8 +-
 translations/store_strings-hr_HR.xml          |    8 +-
 translations/store_strings-id.xml             |    8 +-
 translations/store_strings-it.xml             |   22 +-
 translations/store_strings-ja.xml             |    8 +-
 translations/store_strings-ko.xml             |    8 +-
 translations/store_strings-lt.xml             |    8 +-
 translations/store_strings-nl.xml             |   18 +-
 translations/store_strings-no.xml             |    8 +-
 translations/store_strings-pl.xml             |    8 +-
 translations/store_strings-pt-rBR.xml         |    8 +-
 translations/store_strings-pt_PT.xml          |    8 +-
 translations/store_strings-ru.xml             |    8 +-
 translations/store_strings-tr.xml             |    8 +-
 translations/store_strings-zh-Hans.xml        |    8 +-
 translations/store_strings-zh-rTW.xml         |    8 +-
 495 files changed, 47459 insertions(+), 47087 deletions(-)
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTutorialLocalRepository.java
 rename Habitica/src/main/java/com/habitrpg/android/habitica/models/{tasks => inventory}/ItemData.java (92%)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index fbc0841a3..0af1f6fd4 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -1,249 +1,249 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.habitrpg.android.habitica"
-    android:versionCode="180"
-    android:versionName="1.0.1"
-    android:screenOrientation="portrait"
-    android:installLocation="auto" >
-
-    <uses-sdk
-        android:minSdkVersion="15"
-        android:targetSdkVersion="25" />
-
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <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" />
-
-    <application
-        android:name=".HabiticaApplication"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-            tools:replace="android:name">
-        <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>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name=".ui.activities.PrefsActivity"
-            android:parentActivityName=".ui.activities.MainActivity"
-            android:label="@string/PS_settings_title"
-            android:screenOrientation="portrait"
-            tools:ignore="UnusedAttribute">
-        </activity>
-        <activity
-            android:name=".ui.activities.LoginActivity"
-            android:label="@string/LoginActivityName"
-            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>
-        <activity
-            android:name=".ui.activities.SetupActivity"
-            android:windowSoftInputMode="adjustResize"
-            android:screenOrientation="portrait">
-        </activity>
-        <activity
-            android:name=".ui.activities.SkillTasksActivity"
-            android:label="@string/app_name"
-            android:screenOrientation="portrait">
-        </activity>
-        <activity
-            android:name=".ui.activities.SkillMemberActivity"
-            android:label="@string/app_name"
-            android:screenOrientation="portrait">
-        </activity>
-
-        <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
-        <meta-data
-                android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
-                android:value="false"/>
-        <activity
-            android:name=".ui.activities.AboutActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".ui.activities.TaskFormActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"
-            android:parentActivityName=".ui.activities.MainActivity"
-            android:screenOrientation="portrait"
-            tools:ignore="UnusedAttribute">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ui.activities.MainActivity" />
-        </activity>
-        <activity
-            android:name=".ui.activities.GroupFormActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"
-            android:parentActivityName=".ui.activities.MainActivity"
-            android:screenOrientation="portrait"
-            tools:ignore="UnusedAttribute">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ui.activities.MainActivity" />
-        </activity>
-        <activity
-            android:name=".ui.activities.ClassSelectionActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"
-            android:parentActivityName=".ui.activities.MainActivity"
-            android:screenOrientation="portrait"
-            tools:ignore="UnusedAttribute"
-            android:label="@string/select_class">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ui.activities.MainActivity" />
-        </activity>
-        <activity
-            android:name=".ui.activities.PartyInviteActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"
-            android:screenOrientation="portrait"
-            tools:ignore="UnusedAttribute"
-            android:label="@string/invite_users">
-        </activity>
-        <activity
-            android:name=".ui.activities.FullProfileActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText"
-            android:parentActivityName=".ui.activities.MainActivity"
-            android:screenOrientation="portrait"
-            tools:ignore="UnusedAttribute">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ui.activities.MainActivity" />
-        </activity>
-        <activity
-            android:name=".ui.activities.ChallengeDetailActivity"
-            android:parentActivityName=".ui.activities.MainActivity"
-            android:screenOrientation="portrait"
-            android:launchMode="singleTask"
-            tools:ignore="UnusedAttribute">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value=".ui.activities.MainActivity" />
-        </activity>
-        <activity android:name="com.facebook.FacebookActivity"
-            android:configChanges=
-                "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:screenOrientation="portrait"
-            android:label="@string/app_name" />
-        <activity android:name=".ui.activities.MaintenanceActivity"
-                  android:screenOrientation="portrait"
-                  android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
-        <activity android:name=".ui.activities.GemPurchaseActivity"
-                  android:screenOrientation="portrait" />
-        <receiver  android:process=":remote" android:name=".NotificationPublisher" />
-
-        <receiver
-                android:process=":remote"
-                android:name=".receivers.TaskReceiver"/>
-
-        <receiver android:name=".receivers.LocalNotificationActionReceiver">
-            <intent-filter>
-                <action android:name="ACCEPT_PARTY_INVITE"/>
-                <action android:name="REJECT_PARTY_INVITE"/>
-                <action android:name="ACCEPT_QUEST_INVITE"/>
-                <action android:name="REJECT_QUEST_INVITE"/>
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".receivers.TaskAlarmBootReceiver" android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
-            </intent-filter>
-        </receiver>
-
-        <activity android:name=".ui.activities.AddTaskWidgetActivity">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
-            </intent-filter>
-        </activity>
-        <activity android:name=".ui.activities.HabitButtonWidgetActivity">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
-            </intent-filter>
-        </activity>
-        <service
-            android:name=".helpers.notifications.HabiticaFirebaseMessagingService">
-            <intent-filter>
-                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
-            </intent-filter>
-        </service>
-        <service
-            android:name=".helpers.notifications.HabiticaFirebaseInstanceIDService">
-            <intent-filter>
-                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
-            </intent-filter>
-        </service>
-
-        <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="@string/content_provider"
-            android:grantUriPermissions="true"
-            android:exported="false">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/filepaths" />
-        </provider>
-
-        <receiver android:name=".widget.AvatarStatsWidgetProvider"
-            android:label="@string/stats_widget_label">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data android:name="android.appwidget.provider"
-                       android:resource="@xml/avatar_widget_info" />
-        </receiver>
-        <receiver android:name=".widget.DailiesWidgetProvider"
-            android:label="@string/widget_dailies">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data android:name="android.appwidget.provider"
-                android:resource="@xml/task_list_widget_info" />
-        </receiver>
-        <receiver android:name=".widget.TodoListWidgetProvider"
-            android:label="@string/widget_todo_list">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data android:name="android.appwidget.provider"
-                android:resource="@xml/task_list_widget_info" />
-        </receiver>
-        <receiver android:name=".widget.HabitButtonWidgetProvider"
-            android:label="@string/widget_habit_button">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data android:name="android.appwidget.provider"
-                android:resource="@xml/habit_button_widget_info" />
-        </receiver>
-
-        <service
-            android:name=".widget.DailiesWidgetService"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-        <service
-            android:name=".widget.TodosWidgetService"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-        <service android:name=".widget.HabitButtonWidgetService"/>
-    </application>
-
-</manifest>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.habitrpg.android.habitica"
+    android:versionCode="180"
+    android:versionName="1.0.1"
+    android:screenOrientation="portrait"
+    android:installLocation="auto" >
+
+    <uses-sdk
+        android:minSdkVersion="15"
+        android:targetSdkVersion="25" />
+
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <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" />
+
+    <application
+        android:name=".HabiticaApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme"
+            tools:replace="android:name">
+        <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>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name=".ui.activities.PrefsActivity"
+            android:parentActivityName=".ui.activities.MainActivity"
+            android:label="@string/PS_settings_title"
+            android:screenOrientation="portrait"
+            tools:ignore="UnusedAttribute">
+        </activity>
+        <activity
+            android:name=".ui.activities.LoginActivity"
+            android:label="@string/LoginActivityName"
+            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>
+        <activity
+            android:name=".ui.activities.SetupActivity"
+            android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait">
+        </activity>
+        <activity
+            android:name=".ui.activities.SkillTasksActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait">
+        </activity>
+        <activity
+            android:name=".ui.activities.SkillMemberActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait">
+        </activity>
+
+        <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
+        <meta-data
+                android:name="com.facebook.sdk.AutoLogAppEventsEnabled"
+                android:value="false"/>
+        <activity
+            android:name=".ui.activities.AboutActivity"
+            android:theme="@style/AppThemeWithActionBarBlackText"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ui.activities.TaskFormActivity"
+            android:theme="@style/AppThemeWithActionBarBlackText"
+            android:parentActivityName=".ui.activities.MainActivity"
+            android:screenOrientation="portrait"
+            tools:ignore="UnusedAttribute">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.activities.MainActivity" />
+        </activity>
+        <activity
+            android:name=".ui.activities.GroupFormActivity"
+            android:theme="@style/AppThemeWithActionBarBlackText"
+            android:parentActivityName=".ui.activities.MainActivity"
+            android:screenOrientation="portrait"
+            tools:ignore="UnusedAttribute">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.activities.MainActivity" />
+        </activity>
+        <activity
+            android:name=".ui.activities.ClassSelectionActivity"
+            android:theme="@style/AppThemeWithActionBarBlackText"
+            android:parentActivityName=".ui.activities.MainActivity"
+            android:screenOrientation="portrait"
+            tools:ignore="UnusedAttribute"
+            android:label="@string/select_class">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.activities.MainActivity" />
+        </activity>
+        <activity
+            android:name=".ui.activities.PartyInviteActivity"
+            android:theme="@style/AppThemeWithActionBarBlackText"
+            android:screenOrientation="portrait"
+            tools:ignore="UnusedAttribute"
+            android:label="@string/invite_users">
+        </activity>
+        <activity
+            android:name=".ui.activities.FullProfileActivity"
+            android:theme="@style/AppThemeWithActionBarBlackText"
+            android:parentActivityName=".ui.activities.MainActivity"
+            android:screenOrientation="portrait"
+            tools:ignore="UnusedAttribute">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.activities.MainActivity" />
+        </activity>
+        <activity
+            android:name=".ui.activities.ChallengeDetailActivity"
+            android:parentActivityName=".ui.activities.MainActivity"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask"
+            tools:ignore="UnusedAttribute">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".ui.activities.MainActivity" />
+        </activity>
+        <activity android:name="com.facebook.FacebookActivity"
+            android:configChanges=
+                "keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+            android:screenOrientation="portrait"
+            android:label="@string/app_name" />
+        <activity android:name=".ui.activities.MaintenanceActivity"
+                  android:screenOrientation="portrait"
+                  android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+        <activity android:name=".ui.activities.GemPurchaseActivity"
+                  android:screenOrientation="portrait" />
+        <receiver  android:process=":remote" android:name=".NotificationPublisher" />
+
+        <receiver
+                android:process=":remote"
+                android:name=".receivers.TaskReceiver"/>
+
+        <receiver android:name=".receivers.LocalNotificationActionReceiver">
+            <intent-filter>
+                <action android:name="ACCEPT_PARTY_INVITE"/>
+                <action android:name="REJECT_PARTY_INVITE"/>
+                <action android:name="ACCEPT_QUEST_INVITE"/>
+                <action android:name="REJECT_QUEST_INVITE"/>
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".receivers.TaskAlarmBootReceiver" android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            </intent-filter>
+        </receiver>
+
+        <activity android:name=".ui.activities.AddTaskWidgetActivity">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
+            </intent-filter>
+        </activity>
+        <activity android:name=".ui.activities.HabitButtonWidgetActivity">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
+            </intent-filter>
+        </activity>
+        <service
+            android:name=".helpers.notifications.HabiticaFirebaseMessagingService">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+        <service
+            android:name=".helpers.notifications.HabiticaFirebaseInstanceIDService">
+            <intent-filter>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+            </intent-filter>
+        </service>
+
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="@string/content_provider"
+            android:grantUriPermissions="true"
+            android:exported="false">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/filepaths" />
+        </provider>
+
+        <receiver android:name=".widget.AvatarStatsWidgetProvider"
+            android:label="@string/stats_widget_label">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                       android:resource="@xml/avatar_widget_info" />
+        </receiver>
+        <receiver android:name=".widget.DailiesWidgetProvider"
+            android:label="@string/widget_dailies">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                android:resource="@xml/task_list_widget_info" />
+        </receiver>
+        <receiver android:name=".widget.TodoListWidgetProvider"
+            android:label="@string/widget_todo_list">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                android:resource="@xml/task_list_widget_info" />
+        </receiver>
+        <receiver android:name=".widget.HabitButtonWidgetProvider"
+            android:label="@string/widget_habit_button">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data android:name="android.appwidget.provider"
+                android:resource="@xml/habit_button_widget_info" />
+        </receiver>
+
+        <service
+            android:name=".widget.DailiesWidgetService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <service
+            android:name=".widget.TodosWidgetService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <service android:name=".widget.HabitButtonWidgetService"/>
+    </application>
+
+</manifest>
diff --git a/Habitica/res/anim/fab_slide_in.xml b/Habitica/res/anim/fab_slide_in.xml
index 1675a9ae1..3a33f3217 100644
--- a/Habitica/res/anim/fab_slide_in.xml
+++ b/Habitica/res/anim/fab_slide_in.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromYDelta="100%" android:toYDelta="0%"/>
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+	<translate android:fromYDelta="100%" android:toYDelta="0%"/>
 </set>
\ No newline at end of file
diff --git a/Habitica/res/anim/fab_slide_out.xml b/Habitica/res/anim/fab_slide_out.xml
index b82f4d744..6b2339511 100644
--- a/Habitica/res/anim/fab_slide_out.xml
+++ b/Habitica/res/anim/fab_slide_out.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-	<translate android:fromYDelta="0%" android:toYDelta="100%"/>
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+	<translate android:fromYDelta="0%" android:toYDelta="100%"/>
 </set>
\ No newline at end of file
diff --git a/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml b/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml
index 5603a1da1..bf14a76f4 100644
--- a/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml
+++ b/Habitica/res/drawable/layout_rounded_bg_lighter_gray.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/black_10_alpha" />
-    <corners android:radius="@dimen/bar_radius"/>
-    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/black_10_alpha" />
+    <corners android:radius="@dimen/bar_radius"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index dfcf91aef..7afc11e19 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_height="match_parent"
-    android:layout_width="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:background="@color/brand">
-    <android.support.v4.view.ViewPager
-        android:id="@+id/view_pager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    <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/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:textSize="16sp"
-            android:visibility="gone"
-            tools:visibility="visible"/>
-    </RelativeLayout>
-</FrameLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:background="@color/brand">
+    <android.support.v4.view.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+    <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/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:textSize="16sp"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+    </RelativeLayout>
+</FrameLayout>
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index bfdee9750..356dfed6d 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -1,244 +1,244 @@
-<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">
-
-    <com.habitrpg.android.habitica.ui.views.login.LockableScrollView
-        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:layout_marginRight="-2dp"
-            >
-            <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" />
-            <Space android:id="@+id/cloud_anchor"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_centerHorizontal="true"
-                android:visibility="invisible"
-                android:layout_above="@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_alignParentBottom="true"
-                android:scaleType="centerCrop"
-                android:paddingBottom="460dp"
-                />
-            <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_alignParentBottom="true"
-                android:scaleType="centerCrop"
-                android:paddingBottom="400dp"
-                />
-
-
-        </com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView>
-
-    </com.habitrpg.android.habitica.ui.views.login.LockableScrollView>
-
-
-    <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:paddingTop="@dimen/spacing_large"
-            android:paddingLeft="@dimen/spacing_large"
-            android:paddingRight="@dimen/spacing_large"
-            android:id="@+id/login_intro_view"
-            android:orientation="vertical"
-            android:background="@color/transparent"
-            android:fitsSystemWindows="true"
-            >
-
-            <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:contentDescription="@string/brand_name" />
-
-            <Button
-                android:id="@+id/new_game_button"
-                android:layout_width="@dimen/login_intro_button_size"
-                android:layout_height="@dimen/login_intro_button_size"
-                android:text="@string/register_btn"
-                android:layout_gravity="center_vertical|center_horizontal"
-                android:textColor="@color/white"
-                android:layout_marginTop="@dimen/spacing_large"
-                android:background="@drawable/login_begin_button"/>
-
-            <Button
-                android:id="@+id/show_login_button"
-                android:layout_width="@dimen/login_intro_button_size"
-                android:layout_height="@dimen/login_intro_button_size"
-                android:text="@string/login_btn"
-                android:layout_gravity="center_vertical|center_horizontal"
-                android:textColor="@color/white"
-                android:layout_marginTop="@dimen/spacing_large"
-                android:background="@drawable/login_begin_button"/>
-
-            <ScrollView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/transparent"
-                android:visibility="invisible"
-                android:id="@+id/login_scrollview"
-                android:scrollIndicators="none"
-                tools:visibility="visible"
-                android:padding="0dp"
-                >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="@dimen/spacing_large"
-                    android:id="@+id/login.linear.layout"
-                    android:orientation="vertical"
-                    android:background="@color/transparent">
-
-                    <EditText
-                        android:id="@+id/username"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:drawableEnd="@drawable/ic_username"
-                        android:drawableRight="@drawable/ic_username"
-                        android:imeOptions="actionNext"
-                        android:inputType="textPersonName"
-                        android:nextFocusDown="@+id/email"
-                        android:hint="@string/username"
-                        android:theme="@style/LoginEditTextTheme"
-                        android:textColor="@color/white_75_alpha"
-                        android:textColorHighlight="@color/white"/>
-
-                    <EditText
-                        android:id="@+id/email"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textEmailAddress"
-                        android:imeOptions="actionNext"
-                        android:drawableRight="@drawable/ic_email"
-                        android:nextFocusDown="@+id/password"
-                        android:drawableEnd="@drawable/ic_email"
-                        android:hint="@string/emailAddress"
-                        android:textColor="@color/white_75_alpha"
-                        android:theme="@style/LoginEditTextTheme"
-                        />
-
-                    <EditText
-                        android:id="@+id/password"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textPassword"
-                        android:imeOptions="actionNext"
-                        android:nextFocusDown="@+id/confirm_password"
-                        android:drawableRight="@drawable/ic_password"
-                        android:drawableEnd="@drawable/ic_password"
-                        android:hint="@string/password"
-                        android:textColor="@color/white_75_alpha"
-                        android:theme="@style/LoginEditTextTheme"/>
-
-                    <EditText
-                        android:id="@+id/confirm_password"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:inputType="textPassword"
-                        android:drawableRight="@drawable/ic_password"
-                        android:drawableEnd="@drawable/ic_password"
-                        android:imeOptions="actionDone"
-                        android:hint="@string/confirmpassword"
-                        android:textColor="@color/white_75_alpha"
-                        android:theme="@style/LoginEditTextTheme"/>
-
-                    <ProgressBar
-                        android:id="@+id/PB_AsyncTask"
-                        android:indeterminate="true"
-                        android:visibility="gone"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"/>
-
-                    <Button
-                        android:id="@+id/login_btn"
-                        android:layout_width="match_parent"
-                        android:layout_height="42dp"
-                        android:text="@string/register_btn"
-                        android:layout_marginTop="@dimen/spacing_xlarge"
-                        style="@style/LoginButton"/>
-
-                    <Button
-                        android:id="@+id/fb_login_button"
-                        android:layout_width="match_parent"
-                        android:layout_marginTop="@dimen/spacing_xlarge"
-                        android:layout_height="@dimen/diamond_button_height"
-                        android:text="@string/login_btn_fb"
-                        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"/>
-
-                    <TextView
-                        android:id="@+id/forgot_pw_tv"
-                        android:layout_width="match_parent"
-                        android:layout_marginTop="@dimen/spacing_xlarge"
-                        android:gravity="center_horizontal"
-                        android:layout_height="wrap_content"
-                        android:text="@string/forgot_pw_tv"
-                        android:layout_gravity="center_horizontal"
-                        android:textColor="@color/white_50_alpha"/>
-
-                </LinearLayout>
-
-            </ScrollView>
-
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/back_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_arrow_back_white_36dp"
-            android:background="@color/transparent"
-            android:paddingLeft="12dp"
-            android:alpha="0" />
-    </FrameLayout>
-
+<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">
+
+    <com.habitrpg.android.habitica.ui.views.login.LockableScrollView
+        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:layout_marginRight="-2dp"
+            >
+            <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" />
+            <Space android:id="@+id/cloud_anchor"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_centerHorizontal="true"
+                android:visibility="invisible"
+                android:layout_above="@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_alignParentBottom="true"
+                android:scaleType="centerCrop"
+                android:paddingBottom="460dp"
+                />
+            <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_alignParentBottom="true"
+                android:scaleType="centerCrop"
+                android:paddingBottom="400dp"
+                />
+
+
+        </com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView>
+
+    </com.habitrpg.android.habitica.ui.views.login.LockableScrollView>
+
+
+    <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:paddingTop="@dimen/spacing_large"
+            android:paddingLeft="@dimen/spacing_large"
+            android:paddingRight="@dimen/spacing_large"
+            android:id="@+id/login_intro_view"
+            android:orientation="vertical"
+            android:background="@color/transparent"
+            android:fitsSystemWindows="true"
+            >
+
+            <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:contentDescription="@string/brand_name" />
+
+            <Button
+                android:id="@+id/new_game_button"
+                android:layout_width="@dimen/login_intro_button_size"
+                android:layout_height="@dimen/login_intro_button_size"
+                android:text="@string/register_btn"
+                android:layout_gravity="center_vertical|center_horizontal"
+                android:textColor="@color/white"
+                android:layout_marginTop="@dimen/spacing_large"
+                android:background="@drawable/login_begin_button"/>
+
+            <Button
+                android:id="@+id/show_login_button"
+                android:layout_width="@dimen/login_intro_button_size"
+                android:layout_height="@dimen/login_intro_button_size"
+                android:text="@string/login_btn"
+                android:layout_gravity="center_vertical|center_horizontal"
+                android:textColor="@color/white"
+                android:layout_marginTop="@dimen/spacing_large"
+                android:background="@drawable/login_begin_button"/>
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/transparent"
+                android:visibility="invisible"
+                android:id="@+id/login_scrollview"
+                android:scrollIndicators="none"
+                tools:visibility="visible"
+                android:padding="0dp"
+                >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/spacing_large"
+                    android:id="@+id/login.linear.layout"
+                    android:orientation="vertical"
+                    android:background="@color/transparent">
+
+                    <EditText
+                        android:id="@+id/username"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:drawableEnd="@drawable/ic_username"
+                        android:drawableRight="@drawable/ic_username"
+                        android:imeOptions="actionNext"
+                        android:inputType="textPersonName"
+                        android:nextFocusDown="@+id/email"
+                        android:hint="@string/username"
+                        android:theme="@style/LoginEditTextTheme"
+                        android:textColor="@color/white_75_alpha"
+                        android:textColorHighlight="@color/white"/>
+
+                    <EditText
+                        android:id="@+id/email"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textEmailAddress"
+                        android:imeOptions="actionNext"
+                        android:drawableRight="@drawable/ic_email"
+                        android:nextFocusDown="@+id/password"
+                        android:drawableEnd="@drawable/ic_email"
+                        android:hint="@string/emailAddress"
+                        android:textColor="@color/white_75_alpha"
+                        android:theme="@style/LoginEditTextTheme"
+                        />
+
+                    <EditText
+                        android:id="@+id/password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textPassword"
+                        android:imeOptions="actionNext"
+                        android:nextFocusDown="@+id/confirm_password"
+                        android:drawableRight="@drawable/ic_password"
+                        android:drawableEnd="@drawable/ic_password"
+                        android:hint="@string/password"
+                        android:textColor="@color/white_75_alpha"
+                        android:theme="@style/LoginEditTextTheme"/>
+
+                    <EditText
+                        android:id="@+id/confirm_password"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:inputType="textPassword"
+                        android:drawableRight="@drawable/ic_password"
+                        android:drawableEnd="@drawable/ic_password"
+                        android:imeOptions="actionDone"
+                        android:hint="@string/confirmpassword"
+                        android:textColor="@color/white_75_alpha"
+                        android:theme="@style/LoginEditTextTheme"/>
+
+                    <ProgressBar
+                        android:id="@+id/PB_AsyncTask"
+                        android:indeterminate="true"
+                        android:visibility="gone"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"/>
+
+                    <Button
+                        android:id="@+id/login_btn"
+                        android:layout_width="match_parent"
+                        android:layout_height="42dp"
+                        android:text="@string/register_btn"
+                        android:layout_marginTop="@dimen/spacing_xlarge"
+                        style="@style/LoginButton"/>
+
+                    <Button
+                        android:id="@+id/fb_login_button"
+                        android:layout_width="match_parent"
+                        android:layout_marginTop="@dimen/spacing_xlarge"
+                        android:layout_height="@dimen/diamond_button_height"
+                        android:text="@string/login_btn_fb"
+                        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"/>
+
+                    <TextView
+                        android:id="@+id/forgot_pw_tv"
+                        android:layout_width="match_parent"
+                        android:layout_marginTop="@dimen/spacing_xlarge"
+                        android:gravity="center_horizontal"
+                        android:layout_height="wrap_content"
+                        android:text="@string/forgot_pw_tv"
+                        android:layout_gravity="center_horizontal"
+                        android:textColor="@color/white_50_alpha"/>
+
+                </LinearLayout>
+
+            </ScrollView>
+
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/back_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableLeft="@drawable/ic_arrow_back_white_36dp"
+            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 6342c53bc..f57567cfc 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -1,110 +1,110 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/coordinatorLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".ui.activities.MainActivity"
-        android:fitsSystemWindows="false">
-
-        <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.CollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:titleEnabled="false"
-                app:contentScrim="?attr/colorPrimary"
-                app:expandedTitleMarginEnd="?attr/actionBarSize"
-                app:expandedTitleMarginStart="0dp"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <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: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"
-
-                app:layout_collapseMode="pin"
-                app:tabGravity="fill"
-                app:tabIndicatorColor="@android:color/white"
-                app:tabMode="fixed" />
-        </android.support.design.widget.AppBarLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_gravity="bottom|center_horizontal"
-            android:layout_alignParentBottom="true"
-            app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
-            android:padding="0dp">
-            <android.support.design.widget.CoordinatorLayout
-                android:id="@+id/floating_menu_wrapper"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom|right"
-                android:layout_marginBottom="-5dp"
-                />
-            <com.roughike.bottombar.BottomBar
-                android:id="@+id/bottom_navigation"
-                android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:background="@color/brand_100"
-                app:bb_tabXmlResource="@xml/main_menu_tasks"
-                app:bb_inActiveTabColor="@color/brand_500"
-                app:bb_activeTabColor="@color/white"
-                app:bb_behavior="underNavbar"
-                app:bb_badgesHideWhenActive="true"
-                app:bb_badgeBackgroundColor="@color/brand_400"
-                android:layout_gravity="bottom"
-                android:layout_margin="0dp"
-                />
-
-        </LinearLayout>
-    </android.support.design.widget.CoordinatorLayout>
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/overlayFrameLayout"
-        android:clickable="false"
-        android:fitsSystemWindows="true"
-        />
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.activities.MainActivity"
+        android:fitsSystemWindows="false">
+
+        <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.CollapsingToolbarLayout
+                android:id="@+id/collapsing_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:titleEnabled="false"
+                app:contentScrim="?attr/colorPrimary"
+                app:expandedTitleMarginEnd="?attr/actionBarSize"
+                app:expandedTitleMarginStart="0dp"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+                <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: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"
+
+                app:layout_collapseMode="pin"
+                app:tabGravity="fill"
+                app:tabIndicatorColor="@android:color/white"
+                app:tabMode="fixed" />
+        </android.support.design.widget.AppBarLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_gravity="bottom|center_horizontal"
+            android:layout_alignParentBottom="true"
+            app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+            android:padding="0dp">
+            <android.support.design.widget.CoordinatorLayout
+                android:id="@+id/floating_menu_wrapper"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|right"
+                android:layout_marginBottom="-5dp"
+                />
+            <com.roughike.bottombar.BottomBar
+                android:id="@+id/bottom_navigation"
+                android:layout_width="match_parent"
+                android:layout_height="60dp"
+                android:background="@color/brand_100"
+                app:bb_tabXmlResource="@xml/main_menu_tasks"
+                app:bb_inActiveTabColor="@color/brand_500"
+                app:bb_activeTabColor="@color/white"
+                app:bb_behavior="underNavbar"
+                app:bb_badgesHideWhenActive="true"
+                app:bb_badgeBackgroundColor="@color/brand_400"
+                android:layout_gravity="bottom"
+                android:layout_margin="0dp"
+                />
+
+        </LinearLayout>
+    </android.support.design.widget.CoordinatorLayout>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/overlayFrameLayout"
+        android:clickable="false"
+        android:fitsSystemWindows="true"
+        />
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index 1cdb57f5b..399ca57d6 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -1,128 +1,128 @@
-<?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:id="@+id/avatar_with_bars_layout"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_centerHorizontal="true"
-              android:adjustViewBounds="true"
-              android:focusable="true"
-              android:focusableInTouchMode="true"
-              android:orientation="vertical"
-              android:background="@color/brand"
-              android:paddingLeft="16dp"
-              android:paddingRight="16dp"
-              android:paddingStart="16dp"
-              android:paddingEnd="16dp">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <com.habitrpg.android.habitica.ui.AvatarView
-            android:id="@+id/avatarView"
-            android:layout_width="@dimen/avatar_header_width"
-            android:layout_height="@dimen/avatar_header_height"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="32dp"
-            android:layout_marginRight="32dp"
-            app:showBackground="true"
-            app:showMount="true"
-            app:showPet="true" />
-
-        <LinearLayout
-            android:id="@+id/LL_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <include
-                android:id="@+id/hpBar"
-                layout="@layout/value_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/header_bar_spacing" />
-
-            <include
-                android:id="@+id/xpBar"
-                layout="@layout/value_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/header_bar_spacing"  />
-
-            <include
-                android:id="@+id/mpBar"
-                layout="@layout/value_bar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-
-        </LinearLayout>
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="6dp"
-        android:paddingBottom="6dp">
-    <TextView
-        android:id="@+id/lvl_tv"
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:drawableLeft="@drawable/ic_header_warrior"
-        android:drawableStart="@drawable/ic_header_warrior"
-        android:drawablePadding="6dp"
-        android:gravity="center"
-        android:textSize="14sp"
-        android:textColor="@color/textColorSecondaryDark"
-        tools:text="Lvl 12 Warrior" />
-        <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_weight="1" />
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:gravity="center_vertical">
-
-        <TextView
-            android:id="@+id/gems_tv"
-            android:drawableLeft="@drawable/ic_header_gem"
-            android:drawableStart="@drawable/ic_header_gem"
-            android:layout_width="wrap_content"
-            android:gravity="center"
-            android:drawablePadding="8dp"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textColor="@color/textColorSecondaryDark"
-            android:layout_marginLeft="16dp"
-            android:layout_marginStart="16dp"
-            />
-
-        <TextView
-            android:id="@+id/gold_tv"
-            android:drawableLeft="@drawable/ic_header_gold"
-            android:drawableStart="@drawable/ic_header_gold"
-            android:layout_width="wrap_content"
-            android:gravity="center"
-            android:drawablePadding="6dp"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textColor="@color/textColorSecondaryDark"
-            android:layout_marginLeft="16dp"
-            android:layout_marginStart="16dp"
-            />
-        <TextView
-            android:id="@+id/silver_tv"
-            android:drawableLeft="@drawable/ic_header_silver"
-            android:drawableStart="@drawable/ic_header_silver"
-            android:layout_width="wrap_content"
-            android:gravity="center"
-            android:drawablePadding="6dp"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textColor="@color/textColorSecondaryDark"
-            android:layout_marginLeft="16dp"
-            android:layout_marginStart="16dp"
-            />
-    </LinearLayout>
-    </LinearLayout>
+<?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:id="@+id/avatar_with_bars_layout"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_centerHorizontal="true"
+              android:adjustViewBounds="true"
+              android:focusable="true"
+              android:focusableInTouchMode="true"
+              android:orientation="vertical"
+              android:background="@color/brand"
+              android:paddingLeft="16dp"
+              android:paddingRight="16dp"
+              android:paddingStart="16dp"
+              android:paddingEnd="16dp">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <com.habitrpg.android.habitica.ui.AvatarView
+            android:id="@+id/avatarView"
+            android:layout_width="@dimen/avatar_header_width"
+            android:layout_height="@dimen/avatar_header_height"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="32dp"
+            android:layout_marginRight="32dp"
+            app:showBackground="true"
+            app:showMount="true"
+            app:showPet="true" />
+
+        <LinearLayout
+            android:id="@+id/LL_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <include
+                android:id="@+id/hpBar"
+                layout="@layout/value_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/header_bar_spacing" />
+
+            <include
+                android:id="@+id/xpBar"
+                layout="@layout/value_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/header_bar_spacing"  />
+
+            <include
+                android:id="@+id/mpBar"
+                layout="@layout/value_bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+        </LinearLayout>
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="6dp"
+        android:paddingBottom="6dp">
+    <TextView
+        android:id="@+id/lvl_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:drawableLeft="@drawable/ic_header_warrior"
+        android:drawableStart="@drawable/ic_header_warrior"
+        android:drawablePadding="6dp"
+        android:gravity="center"
+        android:textSize="14sp"
+        android:textColor="@color/textColorSecondaryDark"
+        tools:text="Lvl 12 Warrior" />
+        <View
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:gravity="center_vertical">
+
+        <TextView
+            android:id="@+id/gems_tv"
+            android:drawableLeft="@drawable/ic_header_gem"
+            android:drawableStart="@drawable/ic_header_gem"
+            android:layout_width="wrap_content"
+            android:gravity="center"
+            android:drawablePadding="8dp"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:textColor="@color/textColorSecondaryDark"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            />
+
+        <TextView
+            android:id="@+id/gold_tv"
+            android:drawableLeft="@drawable/ic_header_gold"
+            android:drawableStart="@drawable/ic_header_gold"
+            android:layout_width="wrap_content"
+            android:gravity="center"
+            android:drawablePadding="6dp"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:textColor="@color/textColorSecondaryDark"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            />
+        <TextView
+            android:id="@+id/silver_tv"
+            android:drawableLeft="@drawable/ic_header_silver"
+            android:drawableStart="@drawable/ic_header_silver"
+            android:layout_width="wrap_content"
+            android:gravity="center"
+            android:drawablePadding="6dp"
+            android:layout_height="wrap_content"
+            android:textSize="14sp"
+            android:textColor="@color/textColorSecondaryDark"
+            android:layout_marginLeft="16dp"
+            android:layout_marginStart="16dp"
+            />
+    </LinearLayout>
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_login_incentive.xml b/Habitica/res/layout/dialog_login_incentive.xml
index 11cbd48cd..b6e86f72f 100644
--- a/Habitica/res/layout/dialog_login_incentive.xml
+++ b/Habitica/res/layout/dialog_login_incentive.xml
@@ -1,37 +1,37 @@
-<?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"
-    android:gravity="center_horizontal">
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:id="@+id/imageView" />
-
-    <TextView
-        android:text=""
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:layout_marginLeft="25dp"
-        android:layout_marginRight="25dp"
-        android:id="@+id/you_earned_message" />
-
-    <TextView
-        android:text=""
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:id="@+id/next_unlock_message" />
-
-    <Button
-        android:text="@string/see_you_tomorrow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="50dp"
-        android:id="@+id/confirm_button"
-        style="@style/Widget.AppCompat.Button.Borderless.Colored" />
-
+<?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"
+    android:gravity="center_horizontal">
+
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:id="@+id/imageView" />
+
+    <TextView
+        android:text=""
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:layout_marginLeft="25dp"
+        android:layout_marginRight="25dp"
+        android:id="@+id/you_earned_message" />
+
+    <TextView
+        android:text=""
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:id="@+id/next_unlock_message" />
+
+    <Button
+        android:text="@string/see_you_tomorrow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:id="@+id/confirm_button"
+        style="@style/Widget.AppCompat.Button.Borderless.Colored" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 74e8591e1..4c70410a9 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -1,112 +1,112 @@
-<?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"
-        android:layout_marginTop="16dp"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
-        android:layout_marginBottom="16dp"
-        android:orientation="vertical">
-        <TextView
-            android:id="@+id/task_type_title"
-            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"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp">
-
-            <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"
-                    android:gravity="right|center_vertical"
-                    android:paddingRight="0dp"/>
-        </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" />
+<?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"
+        android:layout_marginTop="16dp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginBottom="16dp"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/task_type_title"
+            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"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
+
+            <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"
+                    android:gravity="right|center_vertical"
+                    android:paddingRight="0dp"/>
+        </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
index d4acbd4d3..406269da6 100644
--- a/Habitica/res/layout/edit_tag_item.xml
+++ b/Habitica/res/layout/edit_tag_item.xml
@@ -1,26 +1,26 @@
-<?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="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_vertical">
-    <Button
-        android:id="@+id/delete_button"
-        android:layout_width="45dp"
-        android:layout_height="wrap_content"
-        android:padding="0dp"
-        android:drawableLeft="@drawable/ic_close_purple_300_36dp"
-        style="@style/Base.Widget.AppCompat.Button.Borderless"/>
-    <EditText
-        android:id="@+id/edit_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_marginLeft="8dp"
-        android:drawableRight="@drawable/ic_create_grey_400_18dp"
-        tools:text="hello"
-        style="@style/TagEditTextTheme"
-        android:paddingBottom="14dp"
-        />
+<?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="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical">
+    <Button
+        android:id="@+id/delete_button"
+        android:layout_width="45dp"
+        android:layout_height="wrap_content"
+        android:padding="0dp"
+        android:drawableLeft="@drawable/ic_close_purple_300_36dp"
+        style="@style/Base.Widget.AppCompat.Button.Borderless"/>
+    <EditText
+        android:id="@+id/edit_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginLeft="8dp"
+        android:drawableRight="@drawable/ic_create_grey_400_18dp"
+        tools:text="hello"
+        style="@style/TagEditTextTheme"
+        android:paddingBottom="14dp"
+        />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/equipment_overview_list.xml b/Habitica/res/layout/equipment_overview_list.xml
index 803b597c3..8fd56b78d 100644
--- a/Habitica/res/layout/equipment_overview_list.xml
+++ b/Habitica/res/layout/equipment_overview_list.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-    <data>
-        <import type="java.util.Map"/>
-        <import type="com.habitrpg.android.habitica.models.user.Outfit" />
-        <variable name="categorytitle" type="String"/>
-        <variable name="outfit" type="Outfit"/>
-        <variable
-            name="equipmentNames"
-            type="Map&lt;String, String>" />
-    </data>
-        <android.support.v7.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/CardView.Default">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:divider="?android:listDivider"
-                android:showDividers="middle">
-                <include layout="@layout/item_image_row"
-                    android:id="@+id/outfit_head"
-                    bind:title="@{@string/outfit_head}"
-                    bind:value="@{equipmentNames.get(outfit.getHead)}"
-                    bind:imageNamed='@{"shop_"+outfit.getHead}'/>
-                <include layout="@layout/item_image_row"
-                    android:id="@+id/outfit_head_accessory"
-                    bind:title="@{@string/outfit_headAccessory}"
-                    bind:value="@{equipmentNames.get(outfit.getHeadAccessory)}"
-                    bind:imageNamed='@{"shop_"+outfit.getHeadAccessory}'/>
-                <include layout="@layout/item_image_row"
-                    android:id="@+id/outfit_Eyewear"
-                    bind:title="@{@string/outfit_eyewear}"
-                    bind:value="@{equipmentNames.get(outfit.getEyeWear)}"
-                    bind:imageNamed='@{"shop_"+outfit.getEyeWear}'/>
-                <include layout="@layout/item_image_row"
-                    android:id="@+id/outfit_Armor"
-                    bind:title="@{@string/outfit_armor}"
-                    bind:value='@{equipmentNames.get(outfit.getArmor)}'
-                    bind:imageNamed='@{"shop_"+outfit.getArmor}'/>
-                <include layout="@layout/item_image_row"
-                    android:id="@+id/outfit_back"
-                    bind:title="@{@string/outfit_back}"
-                    bind:value="@{equipmentNames.get(outfit.getBack)}"
-                    bind:imageNamed='@{"shop_"+outfit.getBack}'/>
-                <include layout="@layout/item_image_row"
-                    android:id="@+id/outfit_Body"
-                    bind:title="@{@string/outfit_body}"
-                    bind:value="@{equipmentNames.get(outfit.getBody)}"
-                    bind:imageNamed='@{"shop_"+outfit.getBody}'/>
-                <include layout="@layout/item_image_row"
-                    android:id="@+id/outfit_weapon"
-                    bind:title="@{@string/outfit_weapon}"
-                    bind:value="@{equipmentNames.get(outfit.getWeapon)}"
-                    bind:imageNamed='@{"shop_"+outfit.getWeapon}'/>
-                <include layout="@layout/item_image_row"
-                    android:id="@+id/outfit_shield"
-                    bind:title="@{@string/outfit_shield}"
-                    bind:value="@{equipmentNames.get(outfit.getShield)}"
-                    bind:imageNamed='@{"shop_"+outfit.getShield}'/>
-            </LinearLayout>
-        </android.support.v7.widget.CardView>
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bind="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <data>
+        <import type="java.util.Map"/>
+        <import type="com.habitrpg.android.habitica.models.user.Outfit" />
+        <variable name="categorytitle" type="String"/>
+        <variable name="outfit" type="Outfit"/>
+        <variable
+            name="equipmentNames"
+            type="Map&lt;String, String>" />
+    </data>
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/CardView.Default">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:divider="?android:listDivider"
+                android:showDividers="middle">
+                <include layout="@layout/item_image_row"
+                    android:id="@+id/outfit_head"
+                    bind:title="@{@string/outfit_head}"
+                    bind:value="@{equipmentNames.get(outfit.getHead)}"
+                    bind:imageNamed='@{"shop_"+outfit.getHead}'/>
+                <include layout="@layout/item_image_row"
+                    android:id="@+id/outfit_head_accessory"
+                    bind:title="@{@string/outfit_headAccessory}"
+                    bind:value="@{equipmentNames.get(outfit.getHeadAccessory)}"
+                    bind:imageNamed='@{"shop_"+outfit.getHeadAccessory}'/>
+                <include layout="@layout/item_image_row"
+                    android:id="@+id/outfit_Eyewear"
+                    bind:title="@{@string/outfit_eyewear}"
+                    bind:value="@{equipmentNames.get(outfit.getEyeWear)}"
+                    bind:imageNamed='@{"shop_"+outfit.getEyeWear}'/>
+                <include layout="@layout/item_image_row"
+                    android:id="@+id/outfit_Armor"
+                    bind:title="@{@string/outfit_armor}"
+                    bind:value='@{equipmentNames.get(outfit.getArmor)}'
+                    bind:imageNamed='@{"shop_"+outfit.getArmor}'/>
+                <include layout="@layout/item_image_row"
+                    android:id="@+id/outfit_back"
+                    bind:title="@{@string/outfit_back}"
+                    bind:value="@{equipmentNames.get(outfit.getBack)}"
+                    bind:imageNamed='@{"shop_"+outfit.getBack}'/>
+                <include layout="@layout/item_image_row"
+                    android:id="@+id/outfit_Body"
+                    bind:title="@{@string/outfit_body}"
+                    bind:value="@{equipmentNames.get(outfit.getBody)}"
+                    bind:imageNamed='@{"shop_"+outfit.getBody}'/>
+                <include layout="@layout/item_image_row"
+                    android:id="@+id/outfit_weapon"
+                    bind:title="@{@string/outfit_weapon}"
+                    bind:value="@{equipmentNames.get(outfit.getWeapon)}"
+                    bind:imageNamed='@{"shop_"+outfit.getWeapon}'/>
+                <include layout="@layout/item_image_row"
+                    android:id="@+id/outfit_shield"
+                    bind:title="@{@string/outfit_shield}"
+                    bind:value="@{equipmentNames.get(outfit.getShield)}"
+                    bind:imageNamed='@{"shop_"+outfit.getShield}'/>
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
 </layout>
\ No newline at end of file
diff --git a/Habitica/res/layout/floating_menu_tasks.xml b/Habitica/res/layout/floating_menu_tasks.xml
index c237864d0..068766a8a 100644
--- a/Habitica/res/layout/floating_menu_tasks.xml
+++ b/Habitica/res/layout/floating_menu_tasks.xml
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:fab="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/fab.menu"
-    app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom|right"
-    android:layout_alignParentBottom="true"
-    android:layout_alignParentRight="true"
-    android:layout_marginBottom="16dp"
-    android:layout_marginRight="8dp"
-    fab:menu_fab_size="normal"
-    fab:menu_colorNormal="@color/brand_400"
-    fab:menu_colorPressed="@color/brand_500"
-    fab:menu_colorRipple="#FFFFFF"
-    fab:menu_animationDelayPerItem="50"
-    fab:menu_icon="@drawable/fab_add"
-    fab:menu_buttonSpacing="2dp"
-    fab:menu_labels_margin="4dp">
-
-    <com.github.clans.fab.FloatingActionButton
-        android:id="@+id/fab.new.habit"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-
-        fab:fab_colorNormal="@color/white"
-        fab:fab_colorPressed="@color/brand_500"
-        fab:fab_colorRipple="#FFFFFF"
-
-        fab:fab_shadowColor="#000"
-        fab:fab_elevationCompat="4dp"
-        android:src="@drawable/add_habit"
-        fab:fab_size="mini"
-        fab:fab_label="@string/new_habit" />
-
-    <com.github.clans.fab.FloatingActionButton
-        android:id="@+id/fab.new.daily"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-
-        fab:fab_colorNormal="@color/white"
-        fab:fab_colorPressed="@color/brand_500"
-        fab:fab_colorRipple="#FFFFFF"
-
-        fab:fab_shadowColor="#000"
-        fab:fab_elevationCompat="4dp"
-
-        android:src="@drawable/add_daily"
-        fab:fab_size="mini"
-        fab:fab_label="@string/new_daily" />
-
-    <com.github.clans.fab.FloatingActionButton
-        android:id="@+id/fab.new.todo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-
-        fab:fab_colorNormal="@color/white"
-        fab:fab_colorPressed="@color/brand_500"
-        fab:fab_colorRipple="#FFFFFF"
-
-        fab:fab_shadowColor="#000"
-        fab:fab_elevationCompat="4dp"
-
-        android:src="@drawable/add_todo"
-        fab:fab_size="mini"
-        fab:fab_label="@string/new_todo" />
-
-    <com.github.clans.fab.FloatingActionButton
-        android:id="@+id/fab.new.reward"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-
-        fab:fab_colorNormal="@color/white"
-        fab:fab_colorPressed="@color/brand_500"
-        fab:fab_colorRipple="#FFFFFF"
-
-        fab:fab_shadowColor="#000"
-        fab:fab_elevationCompat="4dp"
-
-        android:src="@drawable/add_rewards"
-        fab:fab_size="mini"
-        fab:fab_label="@string/new_reward" />
-
-</com.github.clans.fab.FloatingActionMenu>
+<?xml version="1.0" encoding="utf-8"?>
+<com.github.clans.fab.FloatingActionMenu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/fab.menu"
+    app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom|right"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentRight="true"
+    android:layout_marginBottom="16dp"
+    android:layout_marginRight="8dp"
+    fab:menu_fab_size="normal"
+    fab:menu_colorNormal="@color/brand_400"
+    fab:menu_colorPressed="@color/brand_500"
+    fab:menu_colorRipple="#FFFFFF"
+    fab:menu_animationDelayPerItem="50"
+    fab:menu_icon="@drawable/fab_add"
+    fab:menu_buttonSpacing="2dp"
+    fab:menu_labels_margin="4dp">
+
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.habit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
+
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
+        android:src="@drawable/add_habit"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_habit" />
+
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.daily"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
+
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
+
+        android:src="@drawable/add_daily"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_daily" />
+
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.todo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
+
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
+
+        android:src="@drawable/add_todo"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_todo" />
+
+    <com.github.clans.fab.FloatingActionButton
+        android:id="@+id/fab.new.reward"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+
+        fab:fab_colorNormal="@color/white"
+        fab:fab_colorPressed="@color/brand_500"
+        fab:fab_colorRipple="#FFFFFF"
+
+        fab:fab_shadowColor="#000"
+        fab:fab_elevationCompat="4dp"
+
+        android:src="@drawable/add_rewards"
+        fab:fab_size="mini"
+        fab:fab_label="@string/new_reward" />
+
+</com.github.clans.fab.FloatingActionMenu>
diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index f429af959..b1450d9e9 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -1,156 +1,156 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="com.habitrpg.android.habitica.models.user.Preferences" />
-        <import type="android.view.View" />
-
-        <variable
-            name="preferences"
-            type="Preferences" />
-    </data>
-
-    <android.support.v4.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbarSize="3dp"
-        android:scrollbarThumbVertical="@color/md_grey_500"
-        android:scrollbars="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:paddingBottom="?attr/actionBarSize">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/SectionTitle"
-                android:text="@string/avatar_body"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <android.support.v7.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/CardView.Default">
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:divider="?android:listDivider"
-                    android:showDividers="middle">
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="match_parent"
-                        android:layout_height="50dp">
-
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:id="@+id/textView3"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginEnd="8dp"
-                            android:layout_marginRight="8dp"
-                            android:text="@string/avatar_size"
-                            android:gravity="center_vertical"
-                            android:textStyle="bold" />
-
-                        <Spinner
-                            android:layout_width="wrap_content"
-                            android:layout_height="match_parent"
-                            android:id="@+id/avatar_size_spinner"
-                            android:spinnerMode="dropdown"
-                            android:layout_marginRight="8dp"
-                            android:layout_marginEnd="8dp"
-                            android:entries="@array/avatar_sizes"/>
-                    </LinearLayout>
-                    <include layout="@layout/item_image_row"
-                        android:id="@+id/avatar_shirt"
-                        bind:title="@{@string/avatar_shirt}"
-                        bind:value="@{preferences.getShirt}"
-                        bind:imageNamed='@{preferences.getSize + "_shirt_" + preferences.getShirt}'/>
-                    <include layout="@layout/item_image_row"
-                        android:id="@+id/avatar_skin"
-                        bind:title="@{@string/avatar_skin}"
-                        bind:value="@{preferences.getSkin}"
-                        bind:imageNamed='@{"skin_" + preferences.getSkin}' />
-                </LinearLayout>
-            </android.support.v7.widget.CardView>
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/avatar_hair"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                style="@style/SectionTitle"/>
-
-            <android.support.v7.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/CardView.Default">
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:divider="?android:listDivider"
-                    android:showDividers="middle">
-                    <include layout="@layout/item_image_row"
-                        android:id="@+id/avatar_hair_color"
-                        bind:title="@{@string/avatar_color}"
-                        bind:value="@{preferences.getHair.getColor}"
-                        bind:imageNamed='@{"hair_bangs_1_" + preferences.getHair.getColor}' />
-                    <include layout="@layout/item_image_row"
-                        android:id="@+id/avatar_hair_base"
-                        bind:title="@{@string/avatar_base}"
-                        bind:valueInt="@{preferences.getHair.getBase}"
-                        bind:imageNamed='@{preferences.getHair.getBase == 0 ? null : "hair_base_" + preferences.getHair.getBase + "_" + preferences.getHair.getColor}' />
-                    <include layout="@layout/item_image_row"
-                        android:id="@+id/avatar_hair_bangs"
-                        bind:title="@{@string/avatar_bangs}"
-                        bind:valueInt="@{preferences.getHair.getBangs}"
-                        bind:imageNamed='@{preferences.getHair.getBangs == 0 ? null : "hair_bangs_" + preferences.getHair.getBangs + "_" + preferences.getHair.getColor}' />
-                    <include layout="@layout/item_image_row"
-                        android:id="@+id/avatar_hair_flower"
-                        bind:title="@{@string/avatar_flower}"
-                        bind:valueInt="@{preferences.getHair.getFlower}"
-                        bind:imageNamed='@{preferences.getHair.getFlower == 0 ? null : "hair_flower_" + preferences.getHair.getFlower}' />
-                    <include layout="@layout/item_image_row"
-                        android:id="@+id/avatar_hair_beard"
-                        bind:title="@{@string/avatar_beard}"
-                        bind:valueInt="@{preferences.getHair.getBeard}"
-                        bind:imageNamed='@{preferences.getHair.getBeard == 0 ? null : "hair_beard_" + preferences.getHair.getBeard + "_" + preferences.getHair.getColor}' />
-                    <include layout="@layout/item_image_row"
-                        android:id="@+id/avatar_hair_mustache"
-                        bind:title="@{@string/avatar_mustache}"
-                        bind:valueInt="@{preferences.getHair.getMustache}"
-                        bind:imageNamed='@{preferences.getHair.getMustache == 0 ? null : "hair_mustache_" + preferences.getHair.getMustache + "_" + preferences.getHair.getColor}' />
-                </LinearLayout>
-        </android.support.v7.widget.CardView>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/avatar_background"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            style="@style/SectionTitle"/>
-
-        <android.support.v7.widget.CardView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/CardView.Default">
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-                <include layout="@layout/avatar_background_overview_card"
-                    android:id="@+id/avatar_background"
-                    bind:text="@{preferences.getBackground}"
-                    bind:imageNamed='@{"background_" + preferences.getBackground}' />
-            </LinearLayout>
-        </android.support.v7.widget.CardView>
-    </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+        <import type="com.habitrpg.android.habitica.models.user.Preferences" />
+        <import type="android.view.View" />
+
+        <variable
+            name="preferences"
+            type="Preferences" />
+    </data>
+
+    <android.support.v4.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbarSize="3dp"
+        android:scrollbarThumbVertical="@color/md_grey_500"
+        android:scrollbars="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="?attr/actionBarSize">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/SectionTitle"
+                android:text="@string/avatar_body"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:divider="?android:listDivider"
+                    android:showDividers="middle">
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="50dp">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:id="@+id/textView3"
+                            android:layout_marginStart="8dp"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginEnd="8dp"
+                            android:layout_marginRight="8dp"
+                            android:text="@string/avatar_size"
+                            android:gravity="center_vertical"
+                            android:textStyle="bold" />
+
+                        <Spinner
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:id="@+id/avatar_size_spinner"
+                            android:spinnerMode="dropdown"
+                            android:layout_marginRight="8dp"
+                            android:layout_marginEnd="8dp"
+                            android:entries="@array/avatar_sizes"/>
+                    </LinearLayout>
+                    <include layout="@layout/item_image_row"
+                        android:id="@+id/avatar_shirt"
+                        bind:title="@{@string/avatar_shirt}"
+                        bind:value="@{preferences.getShirt}"
+                        bind:imageNamed='@{preferences.getSize + "_shirt_" + preferences.getShirt}'/>
+                    <include layout="@layout/item_image_row"
+                        android:id="@+id/avatar_skin"
+                        bind:title="@{@string/avatar_skin}"
+                        bind:value="@{preferences.getSkin}"
+                        bind:imageNamed='@{"skin_" + preferences.getSkin}' />
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/avatar_hair"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                style="@style/SectionTitle"/>
+
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:divider="?android:listDivider"
+                    android:showDividers="middle">
+                    <include layout="@layout/item_image_row"
+                        android:id="@+id/avatar_hair_color"
+                        bind:title="@{@string/avatar_color}"
+                        bind:value="@{preferences.getHair.getColor}"
+                        bind:imageNamed='@{"hair_bangs_1_" + preferences.getHair.getColor}' />
+                    <include layout="@layout/item_image_row"
+                        android:id="@+id/avatar_hair_base"
+                        bind:title="@{@string/avatar_base}"
+                        bind:valueInt="@{preferences.getHair.getBase}"
+                        bind:imageNamed='@{preferences.getHair.getBase == 0 ? null : "hair_base_" + preferences.getHair.getBase + "_" + preferences.getHair.getColor}' />
+                    <include layout="@layout/item_image_row"
+                        android:id="@+id/avatar_hair_bangs"
+                        bind:title="@{@string/avatar_bangs}"
+                        bind:valueInt="@{preferences.getHair.getBangs}"
+                        bind:imageNamed='@{preferences.getHair.getBangs == 0 ? null : "hair_bangs_" + preferences.getHair.getBangs + "_" + preferences.getHair.getColor}' />
+                    <include layout="@layout/item_image_row"
+                        android:id="@+id/avatar_hair_flower"
+                        bind:title="@{@string/avatar_flower}"
+                        bind:valueInt="@{preferences.getHair.getFlower}"
+                        bind:imageNamed='@{preferences.getHair.getFlower == 0 ? null : "hair_flower_" + preferences.getHair.getFlower}' />
+                    <include layout="@layout/item_image_row"
+                        android:id="@+id/avatar_hair_beard"
+                        bind:title="@{@string/avatar_beard}"
+                        bind:valueInt="@{preferences.getHair.getBeard}"
+                        bind:imageNamed='@{preferences.getHair.getBeard == 0 ? null : "hair_beard_" + preferences.getHair.getBeard + "_" + preferences.getHair.getColor}' />
+                    <include layout="@layout/item_image_row"
+                        android:id="@+id/avatar_hair_mustache"
+                        bind:title="@{@string/avatar_mustache}"
+                        bind:valueInt="@{preferences.getHair.getMustache}"
+                        bind:imageNamed='@{preferences.getHair.getMustache == 0 ? null : "hair_mustache_" + preferences.getHair.getMustache + "_" + preferences.getHair.getColor}' />
+                </LinearLayout>
+        </android.support.v7.widget.CardView>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/avatar_background"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            style="@style/SectionTitle"/>
+
+        <android.support.v7.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/CardView.Default">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <include layout="@layout/avatar_background_overview_card"
+                    android:id="@+id/avatar_background"
+                    bind:text="@{preferences.getBackground}"
+                    bind:imageNamed='@{"background_" + preferences.getBackground}' />
+            </LinearLayout>
+        </android.support.v7.widget.CardView>
+    </LinearLayout>
+    </android.support.v4.widget.NestedScrollView>
 </layout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_chat.xml b/Habitica/res/layout/fragment_chat.xml
index d43964202..17ff86f5b 100644
--- a/Habitica/res/layout/fragment_chat.xml
+++ b/Habitica/res/layout/fragment_chat.xml
@@ -1,47 +1,47 @@
-<?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">
-    <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:background="@color/brand_200">
-        <ImageButton
-            android:id="@+id/emoji.toggle.btn"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:src="@drawable/ic_emoticon_grey600_24dp"
-            android:scaleType="center"
-            android:backgroundTint="@color/transparent"
-            android:contentDescription="Toogle Emojis"
-            android:layout_gravity="center"/>
-
-            <net.pherth.android.emoji_library.EmojiEditText
-                android:id="@+id/edit.new.message.text"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:hint="@string/write_message"
-                android:textColor="@android:color/white"
-                android:inputType="textCapSentences|textMultiLine"
-                style="@style/LoginEditTextTheme"/>
-        <Button
-            android:id="@+id/btn.send.message"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:textColor="@color/white"
-            android:text="@string/post"
-            android:drawableTint="@color/white"
-            android:layout_gravity="center"
-            android:background="@color/transparent"/>
-    </LinearLayout>
+<?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">
+    <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="@color/brand_200">
+        <ImageButton
+            android:id="@+id/emoji.toggle.btn"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:src="@drawable/ic_emoticon_grey600_24dp"
+            android:scaleType="center"
+            android:backgroundTint="@color/transparent"
+            android:contentDescription="Toogle Emojis"
+            android:layout_gravity="center"/>
+
+            <net.pherth.android.emoji_library.EmojiEditText
+                android:id="@+id/edit.new.message.text"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:hint="@string/write_message"
+                android:textColor="@android:color/white"
+                android:inputType="textCapSentences|textMultiLine"
+                style="@style/LoginEditTextTheme"/>
+        <Button
+            android:id="@+id/btn.send.message"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:textColor="@color/white"
+            android:text="@string/post"
+            android:drawableTint="@color/white"
+            android:layout_gravity="center"
+            android:background="@color/transparent"/>
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_equipment_overview.xml b/Habitica/res/layout/fragment_equipment_overview.xml
index c4e4038dd..6fb40cd70 100644
--- a/Habitica/res/layout/fragment_equipment_overview.xml
+++ b/Habitica/res/layout/fragment_equipment_overview.xml
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="java.util.Map"/>
-        <import type="com.habitrpg.android.habitica.models.user.Outfit" />
-        <import type="android.view.View" />
-
-        <variable
-            name="currentBattleGear"
-            type="Outfit" />
-        <variable
-            name="currentCostume"
-            type="Outfit" />
-        <variable
-            name="usingCostume"
-            type="Boolean" />
-        <variable
-            name="equipmentNames"
-            type="Map&lt;String, String>" />
-    </data>
-
-
-    <android.support.v4.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbarSize="3dp"
-        android:scrollbarThumbVertical="@color/md_grey_500"
-        android:scrollbars="vertical"
-        android:paddingTop="@dimen/row_padding"
-        android:paddingBottom="?attr/actionBarSize">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/SectionTitle"
-                android:text="@string/battle_gear"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-            <include layout="@layout/equipment_overview_list"
-                android:id="@+id/battle_gear_group"
-                bind:outfit="@{currentBattleGear}"
-                bind:equipmentNames="@{equipmentNames}" />
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/SectionTitle"
-                android:text="@string/costume"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/row_padding">
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="@string/wear_costume"/>
-
-                <Switch
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/costume_switch"
-                    android:checked="@{usingCostume}"/>
-
-            </LinearLayout>
-            <include layout="@layout/equipment_overview_list"
-                android:id="@+id/costume_group"
-                bind:outfit="@{currentCostume}"
-                bind:equipmentNames="@{equipmentNames}" />
-        </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+        <import type="java.util.Map"/>
+        <import type="com.habitrpg.android.habitica.models.user.Outfit" />
+        <import type="android.view.View" />
+
+        <variable
+            name="currentBattleGear"
+            type="Outfit" />
+        <variable
+            name="currentCostume"
+            type="Outfit" />
+        <variable
+            name="usingCostume"
+            type="Boolean" />
+        <variable
+            name="equipmentNames"
+            type="Map&lt;String, String>" />
+    </data>
+
+
+    <android.support.v4.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbarSize="3dp"
+        android:scrollbarThumbVertical="@color/md_grey_500"
+        android:scrollbars="vertical"
+        android:paddingTop="@dimen/row_padding"
+        android:paddingBottom="?attr/actionBarSize">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/SectionTitle"
+                android:text="@string/battle_gear"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+            <include layout="@layout/equipment_overview_list"
+                android:id="@+id/battle_gear_group"
+                bind:outfit="@{currentBattleGear}"
+                bind:equipmentNames="@{equipmentNames}" />
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/SectionTitle"
+                android:text="@string/costume"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="@dimen/row_padding">
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/wear_costume"/>
+
+                <Switch
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/costume_switch"
+                    android:checked="@{usingCostume}"/>
+
+            </LinearLayout>
+            <include layout="@layout/equipment_overview_list"
+                android:id="@+id/costume_group"
+                bind:outfit="@{currentCostume}"
+                bind:equipmentNames="@{equipmentNames}" />
+        </LinearLayout>
+    </android.support.v4.widget.NestedScrollView>
 </layout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_faq_detail.xml b/Habitica/res/layout/fragment_faq_detail.xml
index a28337e37..81c311255 100644
--- a/Habitica/res/layout/fragment_faq_detail.xml
+++ b/Habitica/res/layout/fragment_faq_detail.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scrollbarSize="3dp"
-    android:scrollbarThumbVertical="@color/md_grey_500"
-    android:scrollbars="vertical">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="?attr/actionBarSize">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:id="@+id/questionTextView"
-            android:layout_gravity="center_horizontal"
-            android:padding="@dimen/card_padding"/>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/answerTextView"
-            android:layout_gravity="center_horizontal"
-            android:paddingLeft="@dimen/card_padding"
-            android:paddingStart="@dimen/card_padding"
-            android:paddingEnd="@dimen/card_padding"
-            android:paddingRight="@dimen/card_padding"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            />
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.NestedScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbarSize="3dp"
+    android:scrollbarThumbVertical="@color/md_grey_500"
+    android:scrollbars="vertical">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="?attr/actionBarSize">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:id="@+id/questionTextView"
+            android:layout_gravity="center_horizontal"
+            android:padding="@dimen/card_padding"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/answerTextView"
+            android:layout_gravity="center_horizontal"
+            android:paddingLeft="@dimen/card_padding"
+            android:paddingStart="@dimen/card_padding"
+            android:paddingEnd="@dimen/card_padding"
+            android:paddingRight="@dimen/card_padding"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            />
+    </LinearLayout>
 </android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index 9ab0222f7..9eada270f 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -1,385 +1,385 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<layout xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <data>
-        <import type="com.habitrpg.android.habitica.models.social.Group" />
-        <import type="com.habitrpg.android.habitica.models.inventory.QuestContent" />
-        <import type="com.habitrpg.android.habitica.models.invitations.PartyInvite" />
-        <import type="com.habitrpg.android.habitica.models.user.HabitRPGUser" />
-        <import type="android.view.View" />
-        <import type="android.text.Html"/>
-
-        <variable
-            name="group"
-            type="Group" />
-
-        <variable
-            name="quest"
-            type="QuestContent" />
-
-        <variable
-            name="user"
-            type="HabitRPGUser" />
-
-        <variable
-            name="hideParticipantCard"
-            type="Boolean" />
-
-        <variable
-            name="invitation"
-            type="PartyInvite" />
-
-    </data>
-
-
-    <android.support.v4.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbarSize="3dp"
-        android:scrollbarThumbVertical="@color/md_grey_500"
-        android:scrollbars="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <android.support.v7.widget.CardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/CardView.Default"
-                    android:id="@+id/invitationWrapper"
-                    android:visibility="@{invitation == null ? View.GONE : View.VISIBLE}"
-                    >
-
-                <LinearLayout
-                        android:orientation="vertical"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        style="@style/CardContent">
-                <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/invited_to_party" />
-                <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:layout_gravity="right">
-
-                    <Button
-                            android:id="@+id/btnPartyInviteAccept"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/quest.accept"
-                            android:textColor="@color/btn_success"
-                            style="?android:buttonBarButtonStyle" />
-
-                    <Button
-                            android:id="@+id/btnPartyInviteReject"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/quest.reject"
-                            android:textColor="@color/btn_danger"
-                            style="?android:buttonBarButtonStyle" />
-                    </LinearLayout>
-                </LinearLayout>
-            </android.support.v7.widget.CardView>
-
-            <android.support.v7.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/CardView.Default"
-                android:id="@+id/qrWrapper"
-                android:visibility="@{group == null ? View.VISIBLE : View.GONE}"
-                >
-
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    style="@style/CardContent">
-
-                    <include layout="@layout/qr_code" />
-                </LinearLayout>
-            </android.support.v7.widget.CardView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@{group.name}"
-                style="@style/SectionTitle"
-                android:visibility="@{group.description.length() == 0 &amp;&amp; group.balance == 0 ? View.GONE : View.VISIBLE}"/>
-
-            <android.support.v7.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/CardView.Default"
-                android:visibility="@{group.description.length() == 0 &amp;&amp; group.leaderMessage.length() == 0 &amp;&amp; group.balance == 0 ? View.GONE : View.VISIBLE}">
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/CardContent"
-                    android:divider="?android:listDivider"
-                    android:showDividers="middle"
-                    android:orientation="vertical">
-                    <net.pherth.android.emoji_library.EmojiTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        bind:parsemarkdown="@{group.description}" />
-                    <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:visibility="@{group.leaderName.length() == 0 ? View.GONE : View.VISIBLE}">
-                        <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="@{@string/leaderName(group.leaderName)}" />
-                    </LinearLayout>
-                    <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:visibility="@{group.leaderMessage.length() == 0 ? View.GONE : View.VISIBLE}">
-                        <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="@{@string/leaderMessage(group.leaderName)}" />
-                        <net.pherth.android.emoji_library.EmojiTextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                bind:parsemarkdown="@{group.leaderMessage}"/>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:visibility='@{group.type.equals("guild") ? View.VISIBLE : View.GONE}' >
-                        <TextView
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text="@string/gems"/>
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@{String.valueOf(group.balance * 4)}"/>
-                    </LinearLayout>
-                </LinearLayout>
-
-            </android.support.v7.widget.CardView>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/quest"
-                style="@style/SectionTitle"
-                android:visibility="@{quest != null ? View.VISIBLE : View.GONE}" />
-
-            <android.support.v7.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/CardView.Default"
-                android:visibility="@{quest != null &amp;&amp; !group.quest.active ? View.VISIBLE : View.GONE}">
-
-                <LinearLayout
-                    android:orientation="vertical"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    style="@style/CardContent">
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/quest.invitation"
-                        style="@style/CardTitle" />
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/quest.invitation.text"
-                        style="@style/CardText"
-                        android:visibility="@{user.getParty().getQuest().RSVPNeeded? View.VISIBLE : View.GONE}"/>
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        android:layout_gravity="right">
-
-                        <Button
-                            android:id="@+id/btnQuestAccept"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/quest.accept"
-                            android:textColor="@color/btn_success"
-                            style="?android:buttonBarButtonStyle"
-                            android:visibility="@{user.getParty().getQuest().RSVPNeeded? View.VISIBLE : View.GONE}" />
-
-                        <Button
-                            android:id="@+id/btnQuestReject"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/quest.reject"
-                            android:textColor="@color/btn_danger"
-                            style="?android:buttonBarButtonStyle"
-                            android:visibility="@{user.getParty().getQuest().RSVPNeeded? View.VISIBLE : View.GONE}" />
-
-                        <Button
-                            android:id="@+id/btnQuestBegin"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/quest.begin"
-                            android:textColor="@color/btn_warning"
-                            style="?android:buttonBarButtonStyle"
-                            android:visibility="@{user.getId().equals(group.quest.leader) ? View.VISIBLE : View.GONE}" />
-
-                        <Button
-                            android:id="@+id/btnQuestCancel"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/quest.cancel"
-                            android:textColor="@color/btn_danger"
-                            style="?android:buttonBarButtonStyle"
-                            android:visibility="@{user.getId().equals(group.quest.leader) ? View.VISIBLE : View.GONE}" />
-
-                    </LinearLayout>
-
-                </LinearLayout>
-            </android.support.v7.widget.CardView>
-
-            <android.support.v7.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/CardView.Default"
-                android:visibility="@{quest != null ? View.VISIBLE : View.GONE}">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    style="@style/CardContent">
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:text="@{quest.text}"
-                        style="@style/CardTitle"
-                        />
-
-                    <com.facebook.drawee.view.SimpleDraweeView
-                        android:layout_width="@dimen/quest_image_width"
-                        android:layout_height="@dimen/quest_image_height"
-                        android:layout_marginBottom="8dp"
-                        bind:questImageName='@{"quest_"+ quest.key}'
-                        />
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        style="?android:buttonBarStyle"
-                        android:visibility="@{group.quest.active? View.VISIBLE : View.GONE}">
-
-                        <include
-                            android:id="@+id/bossHpBar"
-                            layout="@layout/value_bar"
-                            bind:barForegroundColor="@{@color/hpColor}"
-                            bind:description='@{String.format("%.0f",Math.ceil(group.quest.getProgress().hp))+" / "+String.format("%.0f",Math.ceil(quest.boss.hp))}'
-                            bind:icon="@drawable/ic_header_heart"
-                            bind:partyMembers="@{true}"
-                            bind:text='@{"Boss Health"}'
-                            bind:weightToShow="@{(float)(group.quest.getProgress().hp / quest.boss.hp)}" />
-
-                        <include
-                            android:id="@+id/bossRageBar"
-                            layout="@layout/value_bar"
-                            bind:barForegroundColor="@{@color/mpColor}"
-                            bind:description='@{String.format("%.0f",Math.ceil(group.quest.getProgress().rage))+" / "+String.format("%.0f",Math.ceil(quest.boss.rage_value))}'
-                            bind:icon="@drawable/ic_header_magic"
-                            bind:partyMembers="@{true}"
-                            bind:text='@{"Rage"}'
-                            bind:weightToShow="@{(float)(group.quest.getProgress().rage / quest.boss.rage_value)}" />
-
-                        <android.support.v7.widget.RecyclerView
-                            android:id="@+id/collectionStats"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:layout_margin="@dimen/row_padding"/>
-
-                    </LinearLayout>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@{quest.notes != null ? Html.fromHtml(quest.notes) : null}"
-                        style="@style/CardText"
-                        />
-
-                </LinearLayout>
-
-            </android.support.v7.widget.CardView>
-
-            <android.support.v7.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/CardView.Default"
-                android:visibility="@{quest != null &amp;&amp; !hideParticipantCard ? View.VISIBLE : View.GONE}">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    style="@style/CardContent">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/quest.participants"
-                        android:id="@+id/textView12"
-                        style="@style/CardTitle" />
-
-                    <LinearLayout
-                        android:id="@+id/questMemberView"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:divider="?android:listDivider"
-                        android:showDividers="middle"
-                        style="@style/CardContent"/>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal"
-                        style="?android:buttonBarStyle"
-                        android:visibility="@{group.quest.active? View.VISIBLE : View.GONE}"
-                        android:layout_gravity="right">
-
-                        <Button
-                            android:id="@+id/btnQuestAbort"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/quest.abort"
-                            android:textColor="@color/btn_danger"
-                            style="?android:buttonBarButtonStyle"
-                            android:visibility="@{(group.quest != null &amp;&amp; user.getId().equals(group.quest.leader))? View.VISIBLE : View.GONE}" />
-
-                        <Button
-                            android:id="@+id/btnQuestLeave"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/quest.leave"
-                            android:textColor="@color/btn_warning"
-                            style="?android:buttonBarButtonStyle"
-                            android:visibility="@{(!user.getId().equals(group.quest.leader) &amp;&amp; group.quest.members.containsKey(user.getId()))? View.VISIBLE : View.GONE}" />
-
-                    </LinearLayout>
-                </LinearLayout>
-
-            </android.support.v7.widget.CardView>
-        </LinearLayout>
-    </android.support.v4.widget.NestedScrollView>
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout xmlns:bind="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+        <import type="com.habitrpg.android.habitica.models.social.Group" />
+        <import type="com.habitrpg.android.habitica.models.inventory.QuestContent" />
+        <import type="com.habitrpg.android.habitica.models.invitations.PartyInvite" />
+        <import type="com.habitrpg.android.habitica.models.user.HabitRPGUser" />
+        <import type="android.view.View" />
+        <import type="android.text.Html"/>
+
+        <variable
+            name="group"
+            type="Group" />
+
+        <variable
+            name="quest"
+            type="QuestContent" />
+
+        <variable
+            name="user"
+            type="HabitRPGUser" />
+
+        <variable
+            name="hideParticipantCard"
+            type="Boolean" />
+
+        <variable
+            name="invitation"
+            type="PartyInvite" />
+
+    </data>
+
+
+    <android.support.v4.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbarSize="3dp"
+        android:scrollbarThumbVertical="@color/md_grey_500"
+        android:scrollbars="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <android.support.v7.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/CardView.Default"
+                    android:id="@+id/invitationWrapper"
+                    android:visibility="@{invitation == null ? View.GONE : View.VISIBLE}"
+                    >
+
+                <LinearLayout
+                        android:orientation="vertical"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        style="@style/CardContent">
+                <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/invited_to_party" />
+                <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_gravity="right">
+
+                    <Button
+                            android:id="@+id/btnPartyInviteAccept"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/quest.accept"
+                            android:textColor="@color/btn_success"
+                            style="?android:buttonBarButtonStyle" />
+
+                    <Button
+                            android:id="@+id/btnPartyInviteReject"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/quest.reject"
+                            android:textColor="@color/btn_danger"
+                            style="?android:buttonBarButtonStyle" />
+                    </LinearLayout>
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default"
+                android:id="@+id/qrWrapper"
+                android:visibility="@{group == null ? View.VISIBLE : View.GONE}"
+                >
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    style="@style/CardContent">
+
+                    <include layout="@layout/qr_code" />
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@{group.name}"
+                style="@style/SectionTitle"
+                android:visibility="@{group.description.length() == 0 &amp;&amp; group.balance == 0 ? View.GONE : View.VISIBLE}"/>
+
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default"
+                android:visibility="@{group.description.length() == 0 &amp;&amp; group.leaderMessage.length() == 0 &amp;&amp; group.balance == 0 ? View.GONE : View.VISIBLE}">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/CardContent"
+                    android:divider="?android:listDivider"
+                    android:showDividers="middle"
+                    android:orientation="vertical">
+                    <net.pherth.android.emoji_library.EmojiTextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        bind:parsemarkdown="@{group.description}" />
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:visibility="@{group.leaderName.length() == 0 ? View.GONE : View.VISIBLE}">
+                        <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="@{@string/leaderName(group.leaderName)}" />
+                    </LinearLayout>
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:visibility="@{group.leaderMessage.length() == 0 ? View.GONE : View.VISIBLE}">
+                        <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:text="@{@string/leaderMessage(group.leaderName)}" />
+                        <net.pherth.android.emoji_library.EmojiTextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                bind:parsemarkdown="@{group.leaderMessage}"/>
+                    </LinearLayout>
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:visibility='@{group.type.equals("guild") ? View.VISIBLE : View.GONE}' >
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:text="@string/gems"/>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{String.valueOf(group.balance * 4)}"/>
+                    </LinearLayout>
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/quest"
+                style="@style/SectionTitle"
+                android:visibility="@{quest != null ? View.VISIBLE : View.GONE}" />
+
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default"
+                android:visibility="@{quest != null &amp;&amp; !group.quest.active ? View.VISIBLE : View.GONE}">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    style="@style/CardContent">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/quest.invitation"
+                        style="@style/CardTitle" />
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/quest.invitation.text"
+                        style="@style/CardText"
+                        android:visibility="@{user.getParty().getQuest().RSVPNeeded? View.VISIBLE : View.GONE}"/>
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        android:layout_gravity="right">
+
+                        <Button
+                            android:id="@+id/btnQuestAccept"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/quest.accept"
+                            android:textColor="@color/btn_success"
+                            style="?android:buttonBarButtonStyle"
+                            android:visibility="@{user.getParty().getQuest().RSVPNeeded? View.VISIBLE : View.GONE}" />
+
+                        <Button
+                            android:id="@+id/btnQuestReject"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/quest.reject"
+                            android:textColor="@color/btn_danger"
+                            style="?android:buttonBarButtonStyle"
+                            android:visibility="@{user.getParty().getQuest().RSVPNeeded? View.VISIBLE : View.GONE}" />
+
+                        <Button
+                            android:id="@+id/btnQuestBegin"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/quest.begin"
+                            android:textColor="@color/btn_warning"
+                            style="?android:buttonBarButtonStyle"
+                            android:visibility="@{user.getId().equals(group.quest.leader) ? View.VISIBLE : View.GONE}" />
+
+                        <Button
+                            android:id="@+id/btnQuestCancel"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/quest.cancel"
+                            android:textColor="@color/btn_danger"
+                            style="?android:buttonBarButtonStyle"
+                            android:visibility="@{user.getId().equals(group.quest.leader) ? View.VISIBLE : View.GONE}" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default"
+                android:visibility="@{quest != null ? View.VISIBLE : View.GONE}">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    style="@style/CardContent">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="8dp"
+                        android:text="@{quest.text}"
+                        style="@style/CardTitle"
+                        />
+
+                    <com.facebook.drawee.view.SimpleDraweeView
+                        android:layout_width="@dimen/quest_image_width"
+                        android:layout_height="@dimen/quest_image_height"
+                        android:layout_marginBottom="8dp"
+                        bind:questImageName='@{"quest_"+ quest.key}'
+                        />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        style="?android:buttonBarStyle"
+                        android:visibility="@{group.quest.active? View.VISIBLE : View.GONE}">
+
+                        <include
+                            android:id="@+id/bossHpBar"
+                            layout="@layout/value_bar"
+                            bind:barForegroundColor="@{@color/hpColor}"
+                            bind:description='@{String.format("%.0f",Math.ceil(group.quest.getProgress().hp))+" / "+String.format("%.0f",Math.ceil(quest.boss.hp))}'
+                            bind:icon="@drawable/ic_header_heart"
+                            bind:partyMembers="@{true}"
+                            bind:text='@{"Boss Health"}'
+                            bind:weightToShow="@{(float)(group.quest.getProgress().hp / quest.boss.hp)}" />
+
+                        <include
+                            android:id="@+id/bossRageBar"
+                            layout="@layout/value_bar"
+                            bind:barForegroundColor="@{@color/mpColor}"
+                            bind:description='@{String.format("%.0f",Math.ceil(group.quest.getProgress().rage))+" / "+String.format("%.0f",Math.ceil(quest.boss.rage_value))}'
+                            bind:icon="@drawable/ic_header_magic"
+                            bind:partyMembers="@{true}"
+                            bind:text='@{"Rage"}'
+                            bind:weightToShow="@{(float)(group.quest.getProgress().rage / quest.boss.rage_value)}" />
+
+                        <android.support.v7.widget.RecyclerView
+                            android:id="@+id/collectionStats"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_margin="@dimen/row_padding"/>
+
+                    </LinearLayout>
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{quest.notes != null ? Html.fromHtml(quest.notes) : null}"
+                        style="@style/CardText"
+                        />
+
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
+
+            <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/CardView.Default"
+                android:visibility="@{quest != null &amp;&amp; !hideParticipantCard ? View.VISIBLE : View.GONE}">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    style="@style/CardContent">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/quest.participants"
+                        android:id="@+id/textView12"
+                        style="@style/CardTitle" />
+
+                    <LinearLayout
+                        android:id="@+id/questMemberView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:divider="?android:listDivider"
+                        android:showDividers="middle"
+                        style="@style/CardContent"/>
+
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        style="?android:buttonBarStyle"
+                        android:visibility="@{group.quest.active? View.VISIBLE : View.GONE}"
+                        android:layout_gravity="right">
+
+                        <Button
+                            android:id="@+id/btnQuestAbort"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/quest.abort"
+                            android:textColor="@color/btn_danger"
+                            style="?android:buttonBarButtonStyle"
+                            android:visibility="@{(group.quest != null &amp;&amp; user.getId().equals(group.quest.leader))? View.VISIBLE : View.GONE}" />
+
+                        <Button
+                            android:id="@+id/btnQuestLeave"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/quest.leave"
+                            android:textColor="@color/btn_warning"
+                            style="?android:buttonBarButtonStyle"
+                            android:visibility="@{(!user.getId().equals(group.quest.leader) &amp;&amp; group.quest.members.containsKey(user.getId()))? View.VISIBLE : View.GONE}" />
+
+                    </LinearLayout>
+                </LinearLayout>
+
+            </android.support.v7.widget.CardView>
+        </LinearLayout>
+    </android.support.v4.widget.NestedScrollView>
 </layout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_setup_avatar.xml b/Habitica/res/layout/fragment_setup_avatar.xml
index d7438ea6e..470ff5bbb 100644
--- a/Habitica/res/layout/fragment_setup_avatar.xml
+++ b/Habitica/res/layout/fragment_setup_avatar.xml
@@ -1,58 +1,58 @@
-<?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="match_parent"
-                android:background="@color/light_gray_bg"
-                android:gravity="center_horizontal">
-
-    <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"/>
-
-    <ImageView
-            android:id="@+id/avatar_background"
-            android:layout_marginTop="@dimen/setup_vertical_spacing"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/randomize_button"
-            android:src="@drawable/creator_hills_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"
-            app:showSleeping="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:id="@+id/speech_bubble"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:namePlate="Justin"
-            app:npcDrawable="@drawable/justin_textbox"
-            android:layout_marginLeft="@dimen/content_inset"
-            android:layout_marginRight="@dimen/content_inset"
-            android:layout_above="@id/customization_drawer"
-            android:layout_marginBottom="12dp"/>
-
+<?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="match_parent"
+                android:background="@color/light_gray_bg"
+                android:gravity="center_horizontal">
+
+    <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"/>
+
+    <ImageView
+            android:id="@+id/avatar_background"
+            android:layout_marginTop="@dimen/setup_vertical_spacing"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/randomize_button"
+            android:src="@drawable/creator_hills_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"
+            app:showSleeping="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:id="@+id/speech_bubble"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:namePlate="Justin"
+            app:npcDrawable="@drawable/justin_textbox"
+            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 ad2aeb780..929f78ef0 100644
--- a/Habitica/res/layout/fragment_setup_tasks.xml
+++ b/Habitica/res/layout/fragment_setup_tasks.xml
@@ -1,56 +1,56 @@
-<?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="match_parent"
-                android:background="@color/light_gray_bg"
-                android:gravity="center_horizontal">
-
-    <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"/>
-
-    <ImageView
-            android:id="@+id/avatar_background"
-            android:layout_marginTop="@dimen/setup_vertical_spacing"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            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"
-            app:showSleeping="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="230dp"
-            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:id="@+id/speech_bubble"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:namePlate="Justin"
-            app:npcDrawable="@drawable/justin_textbox"
-            android:layout_marginLeft="@dimen/content_inset"
-            android:layout_marginRight="@dimen/content_inset"
-            android:layout_above="@id/recyclerView"
-            android:layout_marginBottom="12dp"/>
-
+<?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="match_parent"
+                android:background="@color/light_gray_bg"
+                android:gravity="center_horizontal">
+
+    <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"/>
+
+    <ImageView
+            android:id="@+id/avatar_background"
+            android:layout_marginTop="@dimen/setup_vertical_spacing"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            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"
+            app:showSleeping="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="230dp"
+            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:id="@+id/speech_bubble"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:namePlate="Justin"
+            app:npcDrawable="@drawable/justin_textbox"
+            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_skills.xml b/Habitica/res/layout/fragment_skills.xml
index 462cf2a07..992878ff5 100644
--- a/Habitica/res/layout/fragment_skills.xml
+++ b/Habitica/res/layout/fragment_skills.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    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" />
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.RecyclerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    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" />
diff --git a/Habitica/res/layout/fragment_welcome.xml b/Habitica/res/layout/fragment_welcome.xml
index 327b0827f..ef600484a 100644
--- a/Habitica/res/layout/fragment_welcome.xml
+++ b/Habitica/res/layout/fragment_welcome.xml
@@ -1,64 +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:background="@color/light_gray_bg"
-    android:gravity="center_vertical">
-    <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-        <ImageView
-                android:id="@+id/exp_icon"
-                android:src="@drawable/ic_header_exp"
-                android:layout_centerHorizontal="true"
-                style="@style/welcome_floating_icon"
-                />
-        <ImageView
-                android:id="@+id/heart_icon"
-                style="@style/welcome_floating_icon"
-                android:layout_toLeftOf="@id/exp_icon"
-                android:src="@drawable/ic_header_heart"
-                android:layout_marginTop="35dp"
-                android:layout_marginRight="8dp"/>
-        <ImageView
-                android:id="@+id/magic_icon"
-                style="@style/welcome_floating_icon"
-                android:layout_toRightOf="@id/exp_icon"
-                android:src="@drawable/ic_header_magic"
-                android:layout_marginTop="35dp"
-                android:layout_marginLeft="8dp"/>
-        <ImageView
-                style="@style/welcome_floating_icon"
-                android:src="@drawable/ic_header_gold"
-                android:layout_below="@id/heart_icon"
-                android:layout_toLeftOf="@id/exp_icon"
-                android:layout_marginRight="33dp"
-                android:layout_marginTop="8dp"
-                />
-        <ImageView
-                style="@style/welcome_floating_icon"
-                android:src="@drawable/ic_header_gem"
-                android:layout_below="@id/magic_icon"
-                android:layout_toRightOf="@id/exp_icon"
-                android:layout_marginLeft="33dp"
-                android:layout_marginTop="8dp"
-                />
-        <ImageView
-                android:layout_width="80dp"
-                android:layout_height="105dp"
-                android:layout_centerHorizontal="true"
-                android:layout_below="@id/exp_icon"
-                android:src="@drawable/npc_justin_only"
-                android:layout_marginTop="18dp"/>
-    </RelativeLayout>
-    <com.habitrpg.android.habitica.ui.SpeechBubbleView
-        android:id="@+id/speech_bubble"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:namePlate="Justin"
-            android:layout_marginLeft="@dimen/content_inset"
-            android:layout_marginRight="@dimen/content_inset"/>
+<?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:background="@color/light_gray_bg"
+    android:gravity="center_vertical">
+    <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        <ImageView
+                android:id="@+id/exp_icon"
+                android:src="@drawable/ic_header_exp"
+                android:layout_centerHorizontal="true"
+                style="@style/welcome_floating_icon"
+                />
+        <ImageView
+                android:id="@+id/heart_icon"
+                style="@style/welcome_floating_icon"
+                android:layout_toLeftOf="@id/exp_icon"
+                android:src="@drawable/ic_header_heart"
+                android:layout_marginTop="35dp"
+                android:layout_marginRight="8dp"/>
+        <ImageView
+                android:id="@+id/magic_icon"
+                style="@style/welcome_floating_icon"
+                android:layout_toRightOf="@id/exp_icon"
+                android:src="@drawable/ic_header_magic"
+                android:layout_marginTop="35dp"
+                android:layout_marginLeft="8dp"/>
+        <ImageView
+                style="@style/welcome_floating_icon"
+                android:src="@drawable/ic_header_gold"
+                android:layout_below="@id/heart_icon"
+                android:layout_toLeftOf="@id/exp_icon"
+                android:layout_marginRight="33dp"
+                android:layout_marginTop="8dp"
+                />
+        <ImageView
+                style="@style/welcome_floating_icon"
+                android:src="@drawable/ic_header_gem"
+                android:layout_below="@id/magic_icon"
+                android:layout_toRightOf="@id/exp_icon"
+                android:layout_marginLeft="33dp"
+                android:layout_marginTop="8dp"
+                />
+        <ImageView
+                android:layout_width="80dp"
+                android:layout_height="105dp"
+                android:layout_centerHorizontal="true"
+                android:layout_below="@id/exp_icon"
+                android:src="@drawable/npc_justin_only"
+                android:layout_marginTop="18dp"/>
+    </RelativeLayout>
+    <com.habitrpg.android.habitica.ui.SpeechBubbleView
+        android:id="@+id/speech_bubble"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:namePlate="Justin"
+            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/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index 416951cf3..13a733b17 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/white">
-
-    <LinearLayout
-        android:id="@+id/gearElementsLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clickable="false"
-        android:orientation="horizontal">
-
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/rewardImageView"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_gravity="center_vertical"
-            android:layout_margin="12dp"
-            android:scaleType="center"
-            tools:src="@drawable/custom_reward"/>
-
-        <LinearLayout
-            android:id="@+id/textReward"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:orientation="vertical"
-            android:paddingBottom="@dimen/task_top_bottom_padding"
-            android:paddingEnd="@dimen/reward_spacing"
-            android:paddingRight="@dimen/reward_spacing"
-            android:paddingTop="@dimen/task_top_bottom_padding">
-
-            <net.pherth.android.emoji_library.EmojiTextView
-                android:id="@+id/checkedTextView"
-                style="@style/Subheader3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="#000"
-                tools:text="Title" />
-
-            <net.pherth.android.emoji_library.EmojiTextView
-                android:id="@+id/notesTextView"
-                style="@style/Caption2.Regular"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                tools:text="Notes"/>
-
-            <TextView
-                    android:id="@+id/approvalRequiredTextField"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/Caption4"
-                    android:text="@string/pending_approval"
-                    />
-
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/btnReward"
-            android:layout_width="wrap_content"
-            android:layout_height="32dp"
-            android:minWidth="64dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:gravity="left|center_vertical"
-            android:drawablePadding="5dp"
-            android:background="@drawable/rounded_purple_square"
-            android:drawableLeft="@drawable/ic_header_gold"
-            android:drawableStart="@drawable/ic_header_gold"
-            android:paddingLeft="12dp"
-            android:paddingStart="12dp"
-            android:paddingRight="12dp"
-            android:paddingEnd="12dp"
-            android:textColor="@color/white"
-            tools:text="150"
-            android:textSize="15sp" />
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_gravity="bottom"
-        android:background="@color/task_border_gray" />
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white">
+
+    <LinearLayout
+        android:id="@+id/gearElementsLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="false"
+        android:orientation="horizontal">
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/rewardImageView"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="12dp"
+            android:scaleType="center"
+            tools:src="@drawable/custom_reward"/>
+
+        <LinearLayout
+            android:id="@+id/textReward"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingBottom="@dimen/task_top_bottom_padding"
+            android:paddingEnd="@dimen/reward_spacing"
+            android:paddingRight="@dimen/reward_spacing"
+            android:paddingTop="@dimen/task_top_bottom_padding">
+
+            <net.pherth.android.emoji_library.EmojiTextView
+                android:id="@+id/checkedTextView"
+                style="@style/Subheader3"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textColor="#000"
+                tools:text="Title" />
+
+            <net.pherth.android.emoji_library.EmojiTextView
+                android:id="@+id/notesTextView"
+                style="@style/Caption2.Regular"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:text="Notes"/>
+
+            <TextView
+                    android:id="@+id/approvalRequiredTextField"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/Caption4"
+                    android:text="@string/pending_approval"
+                    />
+
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/btnReward"
+            android:layout_width="wrap_content"
+            android:layout_height="32dp"
+            android:minWidth="64dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:gravity="left|center_vertical"
+            android:drawablePadding="5dp"
+            android:background="@drawable/rounded_purple_square"
+            android:drawableLeft="@drawable/ic_header_gold"
+            android:drawableStart="@drawable/ic_header_gold"
+            android:paddingLeft="12dp"
+            android:paddingStart="12dp"
+            android:paddingRight="12dp"
+            android:paddingEnd="12dp"
+            android:textColor="@color/white"
+            tools:text="150"
+            android:textSize="15sp" />
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_gravity="bottom"
+        android:background="@color/task_border_gray" />
 </FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index 51049bd77..5a7ee1df8 100644
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="com.habitrpg.android.habitica.models.tasks.Task" />
-        <import type="android.view.View"/>
-
-        <variable
-            name="task"
-            type="Task" />
-    </data>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:background="@color/white">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_centerVertical="true"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
-                    android:paddingEnd="16dp"
-                    android:paddingBottom="20dp"
-                    android:paddingTop="20dp">
-                    <TextView
-                        android:id="@+id/checkedTextView"
-                        style="@style/CardTitle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@{task.text}" />
-
-                    <TextView
-                        android:id="@+id/notesTextView"
-                        style="@style/CardText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@{task.notes}"
-                        android:visibility="@{task.notes != null ? View.VISIBLE : View.GONE}"/>
-                </LinearLayout>
-                <View
-                    android:id="@+id/rightBorderView"
-                    android:layout_width="5dp"
-                    android:layout_height="match_parent"
-                    app:backgroundColor="@{task.getLightTaskColor}"
-                    android:gravity="center"
-                    android:layout_alignParentTop="true"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true" />
-            </RelativeLayout>
-        </LinearLayout>
-        <View
-            android:id="@+id/bottomBorderView"
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:background="@color/cell_separator"/>
-    </LinearLayout>
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="com.habitrpg.android.habitica.models.tasks.Task" />
+        <import type="android.view.View"/>
+
+        <variable
+            name="task"
+            type="Task" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@color/white">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:layout_centerVertical="true"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="20dp"
+                    android:paddingTop="20dp">
+                    <TextView
+                        android:id="@+id/checkedTextView"
+                        style="@style/CardTitle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{task.text}" />
+
+                    <TextView
+                        android:id="@+id/notesTextView"
+                        style="@style/CardText"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@{task.notes}"
+                        android:visibility="@{task.notes != null ? View.VISIBLE : View.GONE}"/>
+                </LinearLayout>
+                <View
+                    android:id="@+id/rightBorderView"
+                    android:layout_width="5dp"
+                    android:layout_height="match_parent"
+                    app:backgroundColor="@{task.getLightTaskColor}"
+                    android:gravity="center"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_alignParentEnd="true" />
+            </RelativeLayout>
+        </LinearLayout>
+        <View
+            android:id="@+id/bottomBorderView"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:background="@color/cell_separator"/>
+    </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/Habitica/res/values-bg/strings.profile.xml b/Habitica/res/values-bg/strings.profile.xml
index 8103de203..7f30d8a75 100644
--- a/Habitica/res/values-bg/strings.profile.xml
+++ b/Habitica/res/values-bg/strings.profile.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">Любимци и превози</string>
-    <string name="profile_pets_found">Открити любимци</string>
-    <string name="profile_mounts_tamed">Опитомени превози</string>
-    <string name="profile_loading_data">зареждане на данните за членовете.</string>
-    <string name="profile_send_message_to">Изпращане на съобщение до %s</string>
-    <string name="profile_message_sent_to">Съобщението е изпратено до %s</string>
-    <string name="profile_level">Ниво:</string>
-    <string name="profile_class_bonus">Класов бонус:</string>
-    <string name="profile_allocated">Разпределени:</string>
-    <string name="profile_boosts">Подсилки:</string>
-    <string name="profile_private_message">Лично съобщение</string>
-    <string name="profile_achievements">Постижения</string>
-    <string name="profile_achievement_ok">Добре</string>
-    <string name="profile_qrcode_close">Затваряне</string>
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Любимци и превози</string>
+    <string name="profile_pets_found">Открити любимци</string>
+    <string name="profile_mounts_tamed">Опитомени превози</string>
+    <string name="profile_loading_data">зареждане на данните за членовете.</string>
+    <string name="profile_send_message_to">Изпращане на съобщение до %s</string>
+    <string name="profile_message_sent_to">Съобщението е изпратено до %s</string>
+    <string name="profile_level">Ниво:</string>
+    <string name="profile_class_bonus">Класов бонус:</string>
+    <string name="profile_allocated">Разпределени:</string>
+    <string name="profile_boosts">Подсилки:</string>
+    <string name="profile_private_message">Лично съобщение</string>
+    <string name="profile_achievements">Постижения</string>
+    <string name="profile_achievement_ok">Добре</string>
+    <string name="profile_qrcode_close">Затваряне</string>
+
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-bg/strings.tutorial.xml b/Habitica/res/values-bg/strings.tutorial.xml
index 67565cd13..cab578b08 100644
--- a/Habitica/res/values-bg/strings.tutorial.xml
+++ b/Habitica/res/values-bg/strings.tutorial.xml
@@ -1,22 +1,22 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_overview">Готово! Въведох няколко задачи, според интересите Ви. Опитайте да добавите още няколко, ако искате. Можете да редактирате всяка задача като докоснете заглавието ѝ.</string>
-  <string name="tutorial_habits_1">Първо, навиците. Те могат да са положителни — тоест такива, каквито искате да си създадете или затвърдите, и отрицателни — от които искате да се откажете.</string>
-  <string name="tutorial_habits_2">Всеки път, когато извършите нещо, което е положителен навик, докоснете знака +, за да получите опит и злато!</string>
-  <string name="tutorial_habits_3">Ако се отпуснете и направите нещо, което е лош навик, докоснете знака - и героят Ви ще загуби малко здраве — това ще Ви държи отговорни за действията си.</string>
-  <string name="tutorial_habits_4">Опитайте! Можете да разгледате и другите видове задачи чрез бутоните отдолу.</string>
-  <string name="tutorial_dailies_1">Създайте ежедневни задачи за онези неща, които трябва да се правят редовно или по график.</string>
-  <string name="tutorial_dailies_2">Внимавайте! Ако пропуснете някоя ежедневна задача, героят Ви ще загуби здраве в края на деня. Не пропускайте да ги отмятайте и ако сте постоянен/а, ще получите страхотни награди!</string>
-  <string name="tutorial_todos_1">Използвайте задачите за изпълнение, за да следите онези неща, които трябва да извършите само веднъж.</string>
-  <string name="tutorial_todos_2">Ако дадена задача трябва да бъде изпълнена навреме, задайте ѝ краен срок. Изглежда можете да отметнете една още сега. Направете го!</string>
-  <string name="tutorial_rewards_1">Купувайте екипировка за героя си със златото, което печелите!</string>
-  <string name="tutorial_rewards_2">Можете и да си създадете реални персонализирани награди, в зависимост от това какво Ви мотивира.</string>
-  <string name="tutorial_tasks_complete">Това е всичко засега. Ако искате да си припомните нещо, погледнете раздела с ЧЗВ.</string>
-  <string name="tutorial_equipment">Когато купувате екипировка, тя се появява тук. Бойното снаряжение променя показателите Ви, а костюмът (ако е включен) променя вида на героя Ви.</string>
-  <string name="tutorial_items">Печелете предмети като изпълнявате задачи и качвате нива. Докоснете предмет, за да го използвате!</string>
-  <string name="tutorial_pets">Когато изпълнявате задачите си в истинския живот, имате шанс на случаен принцип да Ви се паднат яйца и отвари. Комбинирайте ги, за да излюпите любимци.</string>
-  <string name="tutorial_skills">Уменията са специални способности, които имат мощни ефекти! Докоснете умение, за да го използвате. Това ще Ви струва мана (синята лента), която се възстановява при влизане в играта всеки ден, както и кагато изпълнявате задачите от истинския си живот. Прегледайте ЧЗВ в менюто за повече информация!</string>
-  <string name="tutorial_party">Тук е мястото, където заедно с приятелите си можете взаимно да се държите отговорни за изпълнението на целите си, както и да се биете срещу чудовища със задачите си!</string>
-  <string name="tutorial_tavern">Добре дошли в кръчмата — обществено място за разговори, достъпно за хора от всички възрасти! Тук можете да разговаряте за продуктивността си и да задавате въпроси. Приятно прекарване!</string>
-  <string name="tutorial_classes">Изберете дали да бъдете воин, магьосник, лечител или мошеник! Всеки клас има уникална екипировка и умения. Докоснете (?), за да научите повече!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_overview">Готово! Въведох няколко задачи, според интересите Ви. Опитайте да добавите още няколко, ако искате. Можете да редактирате всяка задача като докоснете заглавието ѝ.</string>
+  <string name="tutorial_habits_1">Първо, навиците. Те могат да са положителни — тоест такива, каквито искате да си създадете или затвърдите, и отрицателни — от които искате да се откажете.</string>
+  <string name="tutorial_habits_2">Всеки път, когато извършите нещо, което е положителен навик, докоснете знака +, за да получите опит и злато!</string>
+  <string name="tutorial_habits_3">Ако се отпуснете и направите нещо, което е лош навик, докоснете знака - и героят Ви ще загуби малко здраве — това ще Ви държи отговорни за действията си.</string>
+  <string name="tutorial_habits_4">Опитайте! Можете да разгледате и другите видове задачи чрез бутоните отдолу.</string>
+  <string name="tutorial_dailies_1">Създайте ежедневни задачи за онези неща, които трябва да се правят редовно или по график.</string>
+  <string name="tutorial_dailies_2">Внимавайте! Ако пропуснете някоя ежедневна задача, героят Ви ще загуби здраве в края на деня. Не пропускайте да ги отмятайте и ако сте постоянен/а, ще получите страхотни награди!</string>
+  <string name="tutorial_todos_1">Използвайте задачите за изпълнение, за да следите онези неща, които трябва да извършите само веднъж.</string>
+  <string name="tutorial_todos_2">Ако дадена задача трябва да бъде изпълнена навреме, задайте ѝ краен срок. Изглежда можете да отметнете една още сега. Направете го!</string>
+  <string name="tutorial_rewards_1">Купувайте екипировка за героя си със златото, което печелите!</string>
+  <string name="tutorial_rewards_2">Можете и да си създадете реални персонализирани награди, в зависимост от това какво Ви мотивира.</string>
+  <string name="tutorial_tasks_complete">Това е всичко засега. Ако искате да си припомните нещо, погледнете раздела с ЧЗВ.</string>
+  <string name="tutorial_equipment">Когато купувате екипировка, тя се появява тук. Бойното снаряжение променя показателите Ви, а костюмът (ако е включен) променя вида на героя Ви.</string>
+  <string name="tutorial_items">Печелете предмети като изпълнявате задачи и качвате нива. Докоснете предмет, за да го използвате!</string>
+  <string name="tutorial_pets">Когато изпълнявате задачите си в истинския живот, имате шанс на случаен принцип да Ви се паднат яйца и отвари. Комбинирайте ги, за да излюпите любимци.</string>
+  <string name="tutorial_skills">Уменията са специални способности, които имат мощни ефекти! Докоснете умение, за да го използвате. Това ще Ви струва мана (синята лента), която се възстановява при влизане в играта всеки ден, както и кагато изпълнявате задачите от истинския си живот. Прегледайте ЧЗВ в менюто за повече информация!</string>
+  <string name="tutorial_party">Тук е мястото, където заедно с приятелите си можете взаимно да се държите отговорни за изпълнението на целите си, както и да се биете срещу чудовища със задачите си!</string>
+  <string name="tutorial_tavern">Добре дошли в кръчмата — обществено място за разговори, достъпно за хора от всички възрасти! Тук можете да разговаряте за продуктивността си и да задавате въпроси. Приятно прекарване!</string>
+  <string name="tutorial_classes">Изберете дали да бъдете воин, магьосник, лечител или мошеник! Всеки клас има уникална екипировка и умения. Докоснете (?), за да научите повече!</string>
+</resources>
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 244baf855..742b5091a 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -1,542 +1,542 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Опресняване</string>
-  <string name="XP_default">Опит</string>
-  <string name="HP_default">Здраве</string>
-  <string name="MP_default">Мана</string>
-  <string name="ERR_pb_barcode">Настройките не могат да бъдат заредени от кода</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Настройки</string>
-  <string name="SP_address_hint">Вашият персонализиран сървър</string>
-  <string name="SP_userID_title">Потребителски идентификатор</string>
-  <string name="SP_userID_summary">Вашият потребителски идентификатор</string>
-  <string name="SP_APIToken_title">Жетон за ППИ</string>
-  <string name="SP_APIToken_summary">Вашият жетон за ППИ</string>
-  <string name="Language_title">Език</string>
-  <string name="Language_summary">Промяна на езика на Хабитика</string>
-  <string name="SP_user_qr_code">Вашият QR-код</string>
-  <string name="PS_contact_title">Свържете се с мен</string>
-  <string name="unknown_error">Възникна грешка…</string>
-  <string name="pref_account_header">Профил</string>
-  <string name="pref_first_day_of_the_week_title">Начален ден на седмицата</string>
-  <string name="pref_first_day_of_the_week_summary">Първият ден от седмицата във всички календари</string>
-  <string name="pref_reminder_header">Ежедневно напомняне</string>
-  <string name="pref_reminder_checkbox">Включване на напомнянето</string>
-  <string name="pref_reminder_picker">Задаване на времето за напомняне</string>
-  <string name="pref_cds_header">Персонализирано начало на деня</string>
-  <string name="pref_cds_picker">Задаване на персонализирано начало на деня</string>
-  <string name="pref_push_notifications_checkbox">Потребителски известия</string>
-  <string name="push_notifications">Известия</string>
-  <string name="push_notifications_sum">Настройте известията си</string>
-  <string name="preference_push_you_won_challenge">Спечелихте предизвикателство</string>
-  <string name="preference_push_received_a_private_message">Получихте лично съобщение</string>
-  <string name="preference_push_gifted_gems">Подарени диаманти</string>
-  <string name="preference_push_gifted_subscription">Подарен абонамент</string>
-  <string name="preference_push_invited_to_party">Получихте покана за група</string>
-  <string name="preference_push_invited_to_guild">Получихте покана за гилдия</string>
-  <string name="preference_push_your_quest_has_begun">Мисията Ви започна</string>
-  <string name="preference_push_invited_to_quest">Получихте покана за мисия</string>
-  <!--Adding tasks-->
-  <string name="task_value">Стойност</string>
-  <string name="new_todo">Нова задача</string>
-  <string name="new_reward">Нова награда</string>
-  <string name="new_daily">Нова ежедневна</string>
-  <string name="new_habit">Нов навик</string>
-  <string name="action_edit">Редактиране</string>
-  <string name="action_delete">Изтриване</string>
-  <string name="action_cancel">Отказ</string>
-  <string name="login_btn">Вход</string>
-  <string name="register_btn">Регистрация</string>
-  <string name="username">Потребителско име</string>
-  <string name="email_username">Е-поща или потребителско име</string>
-  <string name="password">Парола</string>
-  <string name="emailAddress">Е-поща</string>
-  <string name="confirmpassword">Потвърдете паролата</string>
-  <string name="logout">Изход</string>
-  <string name="logout_description">Излизане от Вашия профил</string>
-  <string name="account_details_sum">Вижте подробностите за профила си</string>
-  <string name="account_details">Подробности за профила</string>
-  <string name="LoginActivityName">Добре дошли</string>
-  <string name="string_revive">Съживяване</string>
-  <string name="please_connect">Моля, свържете се чрез приложението, преди да използвате джаджа</string>
-  <string name="about.title">Относно</string>
-  <string name="about.libraries">Библиотеки</string>
-  <string name="about.versionhistory">История на версиите</string>
-  <string name="about.habitica_open_source">Хабитика е софтуер с отворен код, който е наличен в Github</string>
-  <string name="about.rate_our_app">Оценете приложението</string>
-  <string name="about.give_us_feedback">Изпратете ни отзивите си!</string>
-  <string name="about.bugreport">Докладване на проблем</string>
-  <string name="about.source_code">Изходен код</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Грешка при свързване</string>
-  <string name="network_error_no_network_body">Нямате връзка с Интернет.</string>
-  <string name="internal_error_api">Изглежда има проблем със сървъра. Опитайте отново по-късно.</string>
-  <string name="authentication_error_title">Грешка при удостоверяване</string>
-  <string name="authentication_error_body">Потребителското име и/или паролата е грешна.</string>
-  <string name="login_validation_error_title">Грешка при проверяването</string>
-  <string name="login_validation_error_fieldsmissing">Трябва да попълните всички полета.</string>
-  <string name="save_changes">Запазване</string>
-  <string name="copy">Копиране</string>
-  <string name="notes">Бележки</string>
-  <string name="text">Текст</string>
-  <string name="difficulty">Трудност</string>
-  <string name="tags">Етикети</string>
-  <string name="trivial">Елементарно</string>
-  <string name="easy">Лесно</string>
-  <string name="medium">Средно</string>
-  <string name="hard">Трудно</string>
-  <string name="start_date">Начална дата</string>
-  <string name="positive_habit_form">Положителен ( + )</string>
-  <string name="negative_habit_form">Отрицателен ( - )</string>
-  <string name="checklist">Подзадачи</string>
-  <string name="reminders">Напомняния</string>
-  <string name="actions">Действия</string>
-  <string name="attributes">Показатели</string>
-  <string name="physical">Физическа</string>
-  <string name="mental">Умствена</string>
-  <string name="social">Обществена</string>
-  <string name="other">Други</string>
-  <string name="frequency">Честота</string>
-  <string name="frequency_weekly">В определени дни от седмицата</string>
-  <string name="frequency_daily">На всеки Х дни</string>
-  <string name="monday">Понеделник</string>
-  <string name="tuesday">Вторник</string>
-  <string name="wednesday">Сряда</string>
-  <string name="thursday">Четвъртък</string>
-  <string name="friday">Петък</string>
-  <string name="saturday">Събота</string>
-  <string name="sunday">Неделя</string>
-  <string name="levelup_header">Вдигнахте ниво!</string>
-  <string name="levelup_detail">Изпълнявайки целите си в истинския живот, Вие достигнахте ниво %1$d!</string>
-  <string name="levelup_health">Вие бяхте излекуван(а) напълно!</string>
-  <string name="levelup_button">Ура!</string>
-  <string name="faint_subtitle">Не се отчайвайте!</string>
-  <string name="faint_penalty_body">Изгубихте ниво, всичкото си злато и един предмет от екипировката си, но можете да си ги върнете с усърдна работа! Късмет — ще се справите.</string>
-  <string name="faint_header">Здравето Ви свърши!</string>
-  <string name="faint_button">Възстановете здравето си и опитайте отново</string>
-  <string name="filter">Филтър</string>
-  <string name="profile_image">Профилно изображение</string>
-  <string name="mana_price_button">%d МТ</string>
-  <string name="used_skill">Използвахте %1$s за %2$d точки мана.</string>
-  <string name="used_skill_without_mana">Вие използвахте %1$s.</string>
-  <string name="new_checklist_item">нова подзадача</string>
-  <string name="add_checklist_item">Добавяне</string>
-  <string name="reminder_title">Не забравяйте да изпълнявате ежедневните си задачи!</string>
-  <string name="skill_progress_title">Използване на умение</string>
-  <string name="coming_soon">Очаквайте скоро</string>
-  <string name="chat_flag_confirmation">Наистина ли искате да докладвате това съобщение за нарушение?</string>
-  <string name="flag_confirm">Докладване на съобщението</string>
-  <string name="unlock_lvl_11">Оключва се на ниво 11</string>
-  <string name="no_party_message">Вие не участвате в група. За да се присъедините към група, моля, посетете уеб сайта.</string>
-  <string name="forgot_pw_btn">Забравена парола</string>
-  <string name="forgot_pw_tv">Забравена парола? Моля, използвайте мобилния уеб сайт.</string>
-  <string name="tavern.inn.checkOut">Включете отново ежедневните си задачи</string>
-  <string name="tavern.inn.rest">Пауза на ежедн.</string>
-  <string name="reward.dialog.buy">Купуване</string>
-  <string name="reward.dialog.dismiss">Премахване</string>
-  <string name="party">Група</string>
-  <string name="chat">Чат</string>
-  <string name="members">Членове</string>
-  <string name="habits">Навици</string>
-  <string name="dailies">Ежедн.</string>
-  <string name="todos">Задачи</string>
-  <string name="rewards">Награди</string>
-  <string name="taskform.delete.title">Сигурен/на ли сте?</string>
-  <string name="taskform.delete.message">Наистина ли искате да изтриете това?</string>
-  <string name="yes">Да</string>
-  <string name="no">Не</string>
-  <string name="quest">Мисия</string>
-  <string name="avatar_body">Тяло</string>
-  <string name="avatar_hair">Коса</string>
-  <string name="avatar_shirt">Риза</string>
-  <string name="avatar_skin">Кожа</string>
-  <string name="avatar_ears">Животински уши</string>
-  <string name="avatar_base">Основа</string>
-  <string name="avatar_color">Цвят</string>
-  <string name="avatar_beard">Брада</string>
-  <string name="avatar_mustache">Мустаци</string>
-  <string name="avatar_flower">Цвете</string>
-  <string name="avatar_bangs">Бретон</string>
-  <string name="avatar_nothing">Няма нищо</string>
-  <string name="avatar_size">Размер</string>
-  <string name="avatar_size_slim">Слаб</string>
-  <string name="avatar_size_broad">Широк</string>
-  <string name="avatar_background">Фон</string>
-  <string name="purchase_customization">Купуване на персонализация</string>
-  <string name="purchase_set_button">Отключване на комплекта за %d диамант(а)</string>
-  <string name="purchase_button">Купуване</string>
-  <string name="purchase_set_title">Купуване на комплекта %s</string>
-  <string name="due_date">Крайна дата</string>
-  <string name="quest.accept">Приемане</string>
-  <string name="quest.reject">Отказване</string>
-  <string name="quest.begin">Започване на мисия</string>
-  <string name="quest.cancel">Отказване на поканата</string>
-  <string name="quest.abort">Прекратяване на мисията</string>
-  <string name="quest.leave">Напускане на мисията</string>
-  <string name="quest.pending">В очакване</string>
-  <string name="quest.accepted">Приета</string>
-  <string name="quest.rejected">Отказана</string>
-  <string name="quest.participants">Участници</string>
-  <string name="version_info">Версия %1$s (%2$d)</string>
-  <string name="sidebar_help">Помощ и ЧЗВ</string>
-  <string name="complete_tutorial">Разбрано!</string>
-  <string name="dismiss_tutorial">Напомнете ми отново</string>
-  <string name="intro_1_subtitle">Добре дошли в</string>
-  <string name="intro_1_title">Хабитика</string>
-  <string name="intro_1_description">Време е да започнете да се забавлявате, докато вършите задачите си. Над %s вече подобряват живота си, с малки стъпки.</string>
-  <string name="intro_2_subtitle">Напредък в играта</string>
-  <string name="intro_2_title">Напредък в живота</string>
-  <string name="intro_2_description">Отключвайте функционалности в играта като отбелязвате завършените задачи в истинския си живот. За изпълнението на целите си ще получавате екипировка, любимци и най-различни други награди.</string>
-  <string name="intro_3_subtitle">Бийте се с чудовища</string>
-  <string name="intro_3_title">Общувайте</string>
-  <string name="intro_3_description">Приятелите Ви могат да Ви помогнат да постигнете целите си. Подкрепяйте се взаимно в живота и битките, за да израснете заедно!</string>
-  <string name="intro_finish_button">Да започваме!</string>
-  <string name="previous_button">Назад</string>
-  <string name="next_button">Напред</string>
-  <string name="skip_button">Пропускане</string>
-  <string name="setup_welcome_description">Добре дошли в Хабитика, където напредването в играта ще подобри истинския Ви живот! Докато изпълнявате реалните си цели, ще отключвате екипировка, любимци, мисии и още.</string>
-  <string name="setup_welcome_title">Добре дошли</string>
-  <string name="avatar_setup_description">Е, как искате да изглеждате? Не се притеснявайте, по-късно ще можете да промените това.</string>
-  <string name="task_setup_description">Страхотно! И така, върху какво искате да поработите по време на това пътешествие?</string>
-  <string name="setup_group_work">Работа</string>
-  <string name="setup_group_exercise">Упражнения</string>
-  <string name="setup_group_health">Здраве</string>
-  <string name="setup_group_school">Училище</string>
-  <string name="setup_group_teams">Екипи</string>
-  <string name="setup_group_chores">Домакинска работа</string>
-  <string name="setup_group_creativity">Изобретателност</string>
-  <string name="setup_task_work_1">Обработка на е-поща</string>
-  <string name="setup_task_work_2">Най-важната задача</string>
-  <string name="setup_task_work_3">Работен проект</string>
-  <string name="setup_task_exercise_1">10 мин аеробни упражнения</string>
-  <string name="setup_task_exercise_2">Разтягане</string>
-  <string name="setup_task_exercise_3">Да организирам тренировките си</string>
-  <string name="setup_task_healthWellness_1">Да ям полезна/вредна храна</string>
-  <string name="setup_task_healthWellness_2">Да изчистя зъбите си с конец</string>
-  <string name="setup_task_healthWellness_3">Да се запиша за преглед</string>
-  <string name="setup_task_school_1">Учене/отлагане</string>
-  <string name="setup_task_school_2">Да напиша домашното си</string>
-  <string name="setup_task_school_3">Да завърша проекта за училище</string>
-  <string name="setup_task_teams_1">Да проверя какво прави екипът</string>
-  <string name="setup_task_teams_2">Да уведомя екипа за напредъка си</string>
-  <string name="setup_task_teams_3">Да завърша екипния проект</string>
-  <string name="setup_task_chores_1">10 минути чистене</string>
-  <string name="setup_task_chores_2">Да измия чиниите</string>
-  <string name="setup_task_chores_3">Да подредя килера</string>
-  <string name="setup_task_creativity_1">Да се уча от майстор в занаята</string>
-  <string name="setup_task_creativity_2">Да работя по проекта си</string>
-  <string name="setup_task_creativity_3">Да завърша проекта си</string>
-  <string name="gem.purchase.support">Искате ли да помогнете на Хабитика да продължи да съществува? Можете да подкрепите разработчиците като купите диаманти!\n\nС диамантите можете да си купувате забавни неща за профила си, като: \n\n — Интересни костюми за героя си;\n — Страхотни фонове;\n — Забавни мисии, от които ще получите яйца за любимци;\n — Възможността да променяте класа си преди да достигнете ниво 100.\n\nБлагодарим Ви за това, че помагате на Хабитика да се развива. Подкрепата Ви означава много за нас!</string>
-  <string name="my_guilds">Моите гилдии</string>
-  <string name="public_guilds">Обществени гилдии</string>
-  <string name="guild">Гилдия</string>
-  <string name="leave">Напускане</string>
-  <string name="join">Присъединяване</string>
-  <string name="leader">Водач</string>
-  <string name="gems">Диаманти</string>
-  <string name="copy_as_todo">Копиране като задача</string>
-  <string name="send_pm">Изпращане на ЛС</string>
-  <string name="flag">Докладване</string>
-  <string name="delete">Изтриване</string>
-  <string name="name">Име</string>
-  <string name="description">Описание</string>
-  <string name="add_tag">Добавяне на нов етикет</string>
-  <string name="privacy">Поверителност</string>
-  <string name="write_message">Напишете съобщение</string>
-  <string name="post">Изпр.</string>
-  <string name="guild_search_hint">Търсене на гилдии</string>
-  <string name="todo_due">Срок: %s</string>
-  <string name="daily_streak">текуща серия: %d</string>
-  <string name="todo_has_duedate">Задачата има краен срок</string>
-  <string name="battle_gear">Бойно снаряжение</string>
-  <string name="costume">Костюм</string>
-  <string name="outfit_head">Глава</string>
-  <string name="outfit_headAccessory">Аксесоар за глава</string>
-  <string name="outfit_eyewear">Предмет за очи</string>
-  <string name="outfit_armor">Броня</string>
-  <string name="outfit_back">Гръб</string>
-  <string name="outfit_body">Тяло</string>
-  <string name="outfit_shield">Щит</string>
-  <string name="outfit_weapon">Оръжие</string>
-  <string name="wear_costume">Костюм</string>
-  <string name="equipped">Екипирано</string>
-  <string name="quest_cancel_message">Наистина ли искате да прекратите мисията? Всички приети покани ще бъдат загубени. Притежателят на мисията ще си запази свитъка ѝ.</string>
-  <string name="quest.invitation">Покана за мисия</string>
-  <string name="quest_begin_message">Наистина ли искате да започнете мисията? След като мисията започне, никой повече няма да може да се присъедини към нея.</string>
-  <string name="quest.invitation.text">Получихте покана за участие в мисия!</string>
-  <string name="ago_1day">Преди 1 ден</string>
-  <string name="ago_days">Преди %d дни</string>
-  <string name="ago_1Minute">Преди 1 минута</string>
-  <string name="ago_minutes">Преди %d минути</string>
-  <string name="ago_hours">Преди %d часа</string>
-  <string name="ago_1hour">Преди 1 час</string>
-  <string name="today">Днес</string>
-  <string name="sidebar_items">Предмети</string>
-  <string name="eggs">Яйца</string>
-  <string name="hatching_potions">Излюпващи отвари</string>
-  <string name="food">Храна</string>
-  <string name="quests">Мисии</string>
-  <string name="pets">Любимци</string>
-  <string name="mounts">Превози</string>
-  <string name="armoireEquipment">Намерихте рядък предмет в гардероба: %s! Страхотно!</string>
-  <string name="armoireFood">Тършувате из гардероба и намирате %1$s %2$s. Какво ли прави това там?</string>
-  <string name="armoireExp">Сборвате се с гардероба и получавате опит. Така му се пада!</string>
-  <string name="armoireNotesFull">Отворете гардероба, за да получите специална екипировка, опит или храна! Оставащи предмети: %d</string>
-  <string name="armoireLastItem">Намерихте последния рядък предмет за екипиране в омагьосания гардероб.</string>
-  <string name="armoireNotesEmpty">В гардероба ще се появяват нови предмети през първата седмица на всеки месец. До тогава продължавайте да щракате за опит и храна!</string>
-  <string name="sell">Продаване (%d злато)</string>
-  <string name="hatch_with_potion">Излюпване с отвара</string>
-  <string name="feed_to_pet">Даване на любимец</string>
-  <string name="hatch_egg">Излюпване с яйце</string>
-  <string name="invite_party">Поканване на групата</string>
-  <string name="dialog_feeding">Хранене на %1$s %2$s с:</string>
-  <string name="use_animal">Използване</string>
-  <string name="feed">Хранене</string>
-  <string name="hatch_with">Излюпване на любимец с %s</string>
-  <string name="hatched_pet_title">Вие излюпихте %1$s %2$s!</string>
-  <string name="close">Затваряне</string>
-  <string name="share">Споделяне</string>
-  <string name="notification_pet_fed">Вие нахранихте своя(та/то) %1$s %2$s!</string>
-  <string name="notification_purchase">%s беше закупен(а/о)</string>
-  <string name="sectionpets">Обикновени любимци</string>
-  <string name="sectionpremiumPets">Любимци от магически отвари</string>
-  <string name="sectionquestPets">Любимци от мисии</string>
-  <string name="sectionspecialPets">Редки любимци</string>
-  <string name="sectionmounts">Обикновени превози</string>
-  <string name="sectionpremiumMounts">Превози от магически отвари</string>
-  <string name="sectionquestMounts">Превози от мисии</string>
-  <string name="sectionspecialMounts">Редки превози</string>
-  <string name="world_quest">Световна мисия</string>
-  <string name="inn_description">Починете в странноприемницата, за да не Ви наранят неизпълнените ежедневни задачи! (Забележка: това не Ви защитава от получаването на щети от главатари.)</string>
-  <string name="empty_items">Нямате %s</string>
-  <string name="user_level">Ниво %d</string>
-  <string name="user_level_with_class">Ниво %1$d %2$s</string>
-  <string name="warrior">Воин</string>
-  <string name="rogue">Мошеник</string>
-  <string name="mage">Магьосник</string>
-  <string name="healer">Лечител</string>
-  <string name="warrior_description">Воините нанасят повече и по-силни „критични удари“, които на случаен принцип дават злато, опит и шанс за падане на предмет при изпълнение на задача. Те също така нанасят сериозни щети на чудовищата-главатари. Играйте като воин, ако Ви мотивират изненадващите награди, или ако искате да раздавате правосъдие в мисиите с главатари.</string>
-  <string name="mage_description">Магьосниците се учат лесно, тъй като придобиват опит и нива по-бързо от останалите класове. Те имат много мана за специалните си умения. Играйте като магьосник, ако обичате тактическите страни на навиците, или ако се мотивирате от вдигане на нива и отключване на специални функционалности!</string>
-  <string name="rogue_description">Мошениците обичат да трупат богатства, печелят злато повече от останалите и са майстори в намирането на случайни предмети. Отличителното им умение „Невидимост“ позволява да избегнат последствията от пропуснати ежедневни задачи. Играйте като мошеник, ако Ви мотивират наградите и постиженията, и обичате плячката и значките!</string>
-  <string name="healer_description">Лечителите трудно могат да бъдат наранени и разпростират защитата си върху останалите. Пропуснатите ежедневни задачи и лошите навици не ги смущават толкова много; те винаги могат да възстановят здравето си след провал. Играйте като лечител, ако обичате да помагате на останалите в групата си или ако искате да изиграете смъртта чрез усърдна работа!</string>
-  <string name="select_class">Изберете клас</string>
-  <string name="opt_out_class">Отказване</string>
-  <string name="opt_out_description">Не Ви се занимава с класове? Искате да изберете по-късно? Откажете се от тях — ще бъдете воин без специални умения. Можете да прочетете относно класовата система по-късно в уикито, както и да включите класовете когато пожелаете.</string>
-  <string name="class_confirmation">Наистина ли искате да бъдете %s?</string>
-  <string name="class_changed">Вие вече сте %s!</string>
-  <string name="class_changed_description">Вече имате ново бойно снаряжение по подразбиране, което можете да намерите в „Екипировка“!</string>
-  <string name="choose_class">Избиране на класа</string>
-  <string name="dialog_go_back">Назад</string>
-  <string name="opt_out_confirmation">Наистина ли искате да се откажете?</string>
-  <string name="change_class">Промяна на класа</string>
-  <string name="change_class_description">Променете класа си и възстановете показателните си точки за 3 диаманта. Можете да разпределите показателните си точки през уеб сайта</string>
-  <string name="enable_class">Включване на класовата система</string>
-  <string name="changing_class_progress">Промяна на класа</string>
-  <string name="by_email">По е-поща</string>
-  <string name="invite_existing_users">Поканете съществуващи потребители</string>
-  <string name="send">Изпращане</string>
-  <string name="invite">Поканете приятели</string>
-  <string name="invite_id_description">Ако имате приятели, които вече използват Хабитика, поканете ги чрез потребителски идентификатор тук.</string>
-  <string name="invite_email_description">Ако приятел се присъедини към Хабитика през Вашето е-писмо, той автоматично ще бъде поканен в групата Ви!</string>
-  <string name="add_invites">Добавяне на покани</string>
-  <string name="user_id">Потребителски ид.</string>
-  <string name="email">Е-поща</string>
-  <string name="invite_users">Поканване в групата</string>
-  <string name="share_using">Споделяне чрез</string>
-  <string name="share_levelup">Достигнах ниво %d в Хабитика, като подобрявам навиците си в истинския живот!</string>
-  <string name="share_hatched">Току-що излюпих любимец — %1$s %2$s в Хабитика, като изпълнявах задачите си в истинския живот!</string>
-  <string name="share_raised">Току-що се сдобих с превоз — %1$s %2$s в Хабитика като изпълнявах задачите си в истинския живот!</string>
-  <string name="open_in_store">Отваряне в магазина</string>
-  <string name="change_class_confirmation">Наистина ли искате да промените класа си? Това ще Ви струва 3 диаманта.</string>
-  <string name="change_class_equipment_warning">Внимание: Повече няма да можете да купувате екипировка за класа „%s“.</string>
-  <string name="leaderMessage">Съобщение от %1$s</string>
-  <string name="leaderName">Водач: %1$s</string>
-  <string name="confirm">Потвърждаване</string>
-  <string name="market">Пазар</string>
-  <string name="timeTravelers">Пътешественици във времето</string>
-  <string name="seasonalShop">Сезонен магазин</string>
-  <string name="empty_inbox">Нямате входящи съобщения. Можете да изпратите ново съобщение на потребител от екрана с неговите публични съобщения в чата!</string>
-  <string name="party_invite">Отключете като поканите приятели</string>
-  <string name="no_gold">Нямате достатъчно злато</string>
-  <string name="no_potion">Няма нужда да купувате лековита отвара</string>
-  <string name="successful_purchase">Закупено успешно: %1$s</string>
-  <string name="purchase_confirmation_title">Потвърждаване на покупката</string>
-  <string name="confirm_purchase_text">Купуване на %1$s за %2$s %3$s</string>
-  <string name="gem">диамант</string>
-  <string name="hourglass">пясъчен часовник</string>
-  <string name="hourglasses">пясъчни часовници</string>
-  <string name="gold_singular">злато</string>
-  <string name="gold_plural">злато</string>
-  <string name="chat_message_copied">Съобщението е копирано</string>
-  <string name="copy_chat_message">Копиране</string>
-  <string name="edit_tag_title">Редактиране на етикет</string>
-  <string name="edit_tag_btn_edit">Редактиране</string>
-  <string name="edit_tag_btn_done">Готово</string>
-  <string name="edit_tag_btn_delete">Изтриване</string>
-  <string name="confirm_delete_tag_title">Сигурен/на ли сте?</string>
-  <string name="confirm_delete_tag_message">Наистина ли искате да изтриете това?</string>
-  <string name="filter_drawer_edit_tags">Редактиране на етикети</string>
-  <string name="filter_drawer_filter_tags">Филтриране по етикет</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">С този QR-код можете да бъдете поканен(а) от някого</string>
-  <string name="qr_save_message">QR-кодът е запазен в</string>
-  <string name="qr_dialogue_title">Вашият QR-код</string>
-  <string name="download">Сваляне</string>
-  <string name="send_new_message">Изпр. на ново съобщение</string>
-  <string name="choose_recipient_title">Изберете получател</string>
-  <string name="action_continue">Продължаване</string>
-  <string name="scan_qr_code">Сканиране на QR-код</string>
-  <string name="enter_recipient_uuid">Въведете потр. ид. на получателя</string>
-  <string name="invited_to_party">Получихте покана за присъединяване към група!</string>
-  <string name="stats_widget_label">Статистика на Хабитика</string>
-  <string name="add_task">Добавяне на задача</string>
-  <string name="add_habit">Добавяне на навик</string>
-  <string name="add_daily">Добавяне на ежедневна</string>
-  <string name="add_todo">Добавяне на задача</string>
-  <string name="add_reward">Добавяне на награда</string>
-  <string name="all_dailies_completed">Изпълнихте всичките си ежедневни задачи. Добра работа!</string>
-  <string name="widget_habit_button">Извършване на навик в Хабитика</string>
-  <string name="widget_dailies">Ежедневни задачи в Хабитика</string>
-  <string name="widget_todo_list">Списък за изпълнение в Хабитика</string>
-  <string name="widget_add_task">Добавяне на задача в Хабитика</string>
-  <string name="google_services_missing">Услугите за „Google play“ не могат да бъдат намерени.</string>
-  <string name="gem.purchase.toolbartitle">Купуване</string>
-  <string name="gem.purchase.title">Купуването на диаманти подкрепя разработчиците и помага на Хабитика да продължи да съществува</string>
-  <string name="gem.purchase.subtitle">Диамантите Ви позволяват да закупувате забавни екстри за профила си като:</string>
-  <string name="gem.purchase.listitem1">Страхотни костюми за героя Ви</string>
-  <string name="gem.purchase.listitem2">Невероятни фонови изображения</string>
-  <string name="gem.purchase.listitem3">Мисии, които Ви награждават с яйца за любимци</string>
-  <string name="gem.purchase.listitem4">Възможността да промените класа си преди ниво 100</string>
-  <string name="support_habitica">Подкрепете Хабитика</string>
-  <string name="skill_transformation_use">използване</string>
-  <string name="hatching_market_info">Не Ви се падат предметите, които искате? Прегледайте пазара!</string>
-  <string name="feeding_market_info">Нуждаете се от друга храна? Купете още от пазара!</string>
-  <string name="open_market">Отваряне на пазара</string>
-  <string name="cds_description">Ежедневните Ви задачи ще се подновят при първия път, когато използвате Хабитика след %1$s. Уверете се, че сте изпълнили ежедневните си задачи преди това време!</string>
-  <string name="AudioTheme_title">Звукова тема</string>
-  <string name="AudioTheme_summary">Промяна на звуковата тема на Хабитика</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">До утре!</string>
-  <string name="belongs_to_challenge">Принадлежи на предизвикателство</string>
-  <string name="has_reminder">Има напомняне</string>
-  <string name="has_tag">Има етикет</string>
-  <string name="subscribe.title">Абонирането подкрепя разработчиците и помага на Хабитика да продължи да съществува</string>
-  <string name="subscribe_prompt">Абонирайте се и ще получите следните полезни неща:</string>
-  <string name="subscribe.listitem1">Купуване на диаманти със злато</string>
-  <string name="subscribe.listitem2">Изключителни ежемесечни предмети</string>
-  <string name="subscribe.listitem3">Запазване на повече записи в историята</string>
-  <string name="subscribe.listitem4">Два пъти по-висока граница на ежедневните падания на предмети</string>
-  <string name="subscriptions">Абонаменти</string>
-  <string name="subscription_duration">Повтаря се всеки %s</string>
-  <string name="subscribe">Абониране</string>
-  <string name="subscribe.listitem1.description">Александър Търговеца вече ще Ви продава диаманти на цената от 20 злато за диамант.\n\nМесечните му доставки отначало ще бъдат ограничени до 25 диаманта на месец, но може да се увеличат в зависимост от продължителността на абонамента Ви.\n\nОграничението се вдига с по 5 диаманта след всеки три месеца непрекъснат абонамент, докато не достигне 50 диаманта на месец!</string>
-  <string name="subscribe.listitem2.description">Всеки месец ще получавате уникален козметичен предмет за героя си!\n\nОсвен това, за всеки три месеца непрекъснат абонамент, тайнствените пътешественици във времето ще Ви дават достъп до исторически козметични предмети (както и такива от бъдещето).</string>
-  <string name="subscribe.listitem3.description">Прави завършените задачи и историята на задачите налични за по-дълго време.</string>
-  <string name="subscribe.listitem4.description">С двойно увеличеното ограничение на паданията ще получавате повече предмети от завършените си задачи всеки ден, което ще Ви помогне да завършите конюшнята си по-бързо!</string>
-  <string name="subscribe1month.gemcap">Ограничението на диамантите започва от 25</string>
-  <string name="subscribe3month.gemcap">Ограничението на диамантите е вдигнато на 30</string>
-  <string name="subscribe6month.gemcap">Ограничението на диамантите е вдигнато на 35</string>
-  <string name="subscribe12month.gemcap">Ограничението на диамантите е вдигнато на 45</string>
-  <string name="subscription_hourglasses">+%d Тайнствен пясъчен часовник</string>
-  <string name="payment_method">Разплащателен метод</string>
-  <string name="subscription">Абонамент</string>
-  <string name="active">Активен</string>
-  <string name="cancel_subscription">Прекратяване на абонамента</string>
-  <string name="cancel_subscription_google.description">Не искате вече да бъдете абонат? Можете да прекратите абонамента си от раздела „Моите приложения“ в магазина „Google Play“.</string>
-  <string name="cancel_subscription_notgoogle.description">Искате да прекратите абонамента си? Заради избрания от Вас разплащателен метод, можете да направите това само от уеб сайта. Натиснете бутона по-долу, за да отворите уеб сайта в браузъра си!</string>
-  <string name="visit_habitica_website">Към уеб сайта на Хабитика</string>
-  <string name="current_bonuses">Текущи бонуси</string>
-  <string name="months_subscribed">Месечни абонаменти</string>
-  <string name="current_hourclasses">Текущи тайнствени пясъчни часовници</string>
-  <string name="monthly_gem_cap">Месечно ограничение на диамантите</string>
-  <string name="inactive">Неактивен</string>
-  <string name="one_month">1 месец</string>
-  <string name="months">%d месеца</string>
-  <string name="month">месец</string>
-  <string name="three_months">3 месеца</string>
-  <string name="six_months">6 месеца</string>
-  <string name="twelve_months">12 месеца</string>
-  <string name="subscribe_prompt_thanks">За абонирането си получавате следните полезни неща:</string>
-  <string name="subscription_status">Състояние на абонамента</string>
-  <string name="byLeader">от %s</string>
-  <string name="challenge_details">Подробности за предизвикателството</string>
-  <string name="challenge_leave_title">Напускане на предизвикателството</string>
-  <string name="challenge_leave_text">Наистина ли искате да напуснете предизвикателството „%s“?</string>
-  <string name="challenge_remove_tasks_title">Премахване на задачите</string>
-  <string name="challenge_remove_tasks_text">Искате ли да премахнете задачите?</string>
-  <string name="remove_tasks">Премахване</string>
-  <string name="keep_tasks">Задържане</string>
-  <string name="my_challenges">Моите предизвикателства</string>
-  <string name="public_challenges">Обществени</string>
-  <string name="challenges">Предизвикателства</string>
-  <string name="daily">Ежедневно</string>
-  <string name="habit">Навик</string>
-  <string name="reward">Награда</string>
-  <string name="todo">Задача</string>
-  <string name="official">Официално</string>
-  <string name="participating">Участващи</string>
-  <string name="challenge">Предизвикателство</string>
-  <string name="go_to_challenge">Към предизвикателството</string>
-  <string name="not_part_of_a_challenge">В момента не участвате в предизвикателство!</string>
-  <string name="join_a_challenge">Включете се в предизвикателство, така ще добавите списък от подбрани задачи към списъка си. След това се състезавайте с останалите хабитиканци, за да печелите постижения и дори диаманти!</string>
-  <string name="check_the_public_challenge_tab">Докоснете раздела „Обществени“, там ще откриете предизвикателствата, създадени от потребителите и ще можете да изберете най-подходящото за себе си!</string>
-  <string name="add_reminder">Добавяне на напомняне</string>
-  <string name="warning">Внимание</string>
-  <string name="open_settings">Отваряне на настройките</string>
-  <string name="dont_keep_activities_warning">Изглежда сте включили опцията за разработчици „Да не се пазят дейностите“. В момента тя предизвиква проблеми с приложението на Хабитика, така че е препоръчително да я изключите.</string>
-  <string name="inbox">Входящи</string>
-  <string name="FAQ">Често задавани въпроси</string>
-  <string name="special">Специален</string>
-  <string name="gem_for_gold_description">Тъй като имате абонамент за Хабитика, можете всеки месец да купувате определен брой диаманти срещу злато.</string>
-  <string name="limited_count">Остават %d</string>
-  <string name="gem_shop">Диамант</string>
-  <string name="mystery_item">Тайнствен предмет</string>
-  <string name="myster_item_notes">Всеки месец абонатите получават един тайнствен предмет. Това обикновено става една седмица преди края на месеца.</string>
-  <string name="open">Отваряне</string>
-  <string name="notification_mystery_item">Вие отворихте кутията и намерихте %s!</string>
-  <string name="checkInRewardEarned">Спечелихте %1$s като награда за усърдието си в подобряването на живота си.</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Следващата Ви награда ще се отключи след %1$d отчитания</string>
-  <string name="pending_approval">изчакване за одобрение</string>
-  <string name="filters">Филтри</string>
-  <string name="done">Готово</string>
-  <string name="group_tasks_edit_description">Груповите задачи не могат да бъдат редактирани.</string>
-  <string name="group_tasks_edit_title">Тази задача не може да се редактира</string>
-  <string name="groups">Групи</string>
-  <string name="all">Всички</string>
-  <string name="none">Нищо</string>
-  <string name="owned">Притежавани</string>
-  <string name="not_owned">Непритежавани</string>
-  <string name="new_game">Нова\nигра</string>
-  <string name="login_btn_fb">Влизане с Фейсбук</string>
-  <string name="login_btn_google">Влизане с Гугъл</string>
-  <string name="action_back">Назад</string>
-  <string name="welcome_text">О, сигурно сте нов тук. Аз съм Джъстин и ще бъда Вашият съветник в Хабитика.\n\nЗа да започнете, ще трябва да си създадете герой.</string>
-  <string name="randomize">Разбъркване</string>
-  <string name="avatar_extras">Екстри</string>
-  <string name="avatar_skin_color">Цвят на кожата</string>
-  <string name="avatar_hair_color">Цвят на косата</string>
-  <string name="avatar_hair_bangs">Бретон</string>
-  <string name="avatar_hair_ponytail">Опашка</string>
-  <string name="avatar_glasses">Очила</string>
-  <string name="avatar_wheelchair">Инвалидна количка</string>
-  <string name="weak">Слаби</string>
-  <string name="strong">Силни</string>
-  <string name="gray">Изпълнени</string>
-  <string name="dated">С дата</string>
-  <string name="completed">Завършени</string>
-  <string name="setuP_group_other">Други</string>
-  <string name="clear">Изчистване</string>
-  <string name="empty_title_habits">Нямате навици</string>
-  <string name="empty_description_habits">Навиците са задачи, които не се влияят от времето. Можете да ги отмятате много пъти през деня или пък да ги пропуснете.</string>
-  <string name="empty_title_dailies">Нямате ежедневни задачи</string>
-  <string name="empty_description_dailies">Ежедневните задачи са такива, които се повтарят през определено време. Изберете кога трябва де ги изпълнявате.</string>
-  <string name="empty_title_todos">Нямате задачи за изпълнение</string>
-  <string name="empty_description_todos">Задачите за изпълнение трябва да бъдат изпълнение само веднъж. Към тях можете да добавите подзадачи, като така ще увеличите стойността им.</string>
-  <string name="empty_title_rewards">Нямате награди</string>
-  <string name="reset_walkthrough">Нулиране на съветите на Джъстин</string>
-  <string name="read_community_guidelines">Моля, прочетете Обществените правила, преди да публикувате</string>
-  <string name="maintenance">Профилактика</string>
-  <string name="reload_content">Презареждане на съдържанието</string>
-  <string name="dailyDueDefaultView">Ежедневните по подразбиране да са неизпълнени</string>
-  <string name="dailyDueDefaultViewDescription">Ако това е избрано, ежедневните задачи по подразбиране ще се появяват в раздела с неизпълнени, вместо в този с всички задачи</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Опресняване</string>
+  <string name="XP_default">Опит</string>
+  <string name="HP_default">Здраве</string>
+  <string name="MP_default">Мана</string>
+  <string name="ERR_pb_barcode">Настройките не могат да бъдат заредени от кода</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Настройки</string>
+  <string name="SP_address_hint">Вашият персонализиран сървър</string>
+  <string name="SP_userID_title">Потребителски идентификатор</string>
+  <string name="SP_userID_summary">Вашият потребителски идентификатор</string>
+  <string name="SP_APIToken_title">Жетон за ППИ</string>
+  <string name="SP_APIToken_summary">Вашият жетон за ППИ</string>
+  <string name="Language_title">Език</string>
+  <string name="Language_summary">Промяна на езика на Хабитика</string>
+  <string name="SP_user_qr_code">Вашият QR-код</string>
+  <string name="PS_contact_title">Свържете се с мен</string>
+  <string name="unknown_error">Възникна грешка…</string>
+  <string name="pref_account_header">Профил</string>
+  <string name="pref_first_day_of_the_week_title">Начален ден на седмицата</string>
+  <string name="pref_first_day_of_the_week_summary">Първият ден от седмицата във всички календари</string>
+  <string name="pref_reminder_header">Ежедневно напомняне</string>
+  <string name="pref_reminder_checkbox">Включване на напомнянето</string>
+  <string name="pref_reminder_picker">Задаване на времето за напомняне</string>
+  <string name="pref_cds_header">Персонализирано начало на деня</string>
+  <string name="pref_cds_picker">Задаване на персонализирано начало на деня</string>
+  <string name="pref_push_notifications_checkbox">Потребителски известия</string>
+  <string name="push_notifications">Известия</string>
+  <string name="push_notifications_sum">Настройте известията си</string>
+  <string name="preference_push_you_won_challenge">Спечелихте предизвикателство</string>
+  <string name="preference_push_received_a_private_message">Получихте лично съобщение</string>
+  <string name="preference_push_gifted_gems">Подарени диаманти</string>
+  <string name="preference_push_gifted_subscription">Подарен абонамент</string>
+  <string name="preference_push_invited_to_party">Получихте покана за група</string>
+  <string name="preference_push_invited_to_guild">Получихте покана за гилдия</string>
+  <string name="preference_push_your_quest_has_begun">Мисията Ви започна</string>
+  <string name="preference_push_invited_to_quest">Получихте покана за мисия</string>
+  <!--Adding tasks-->
+  <string name="task_value">Стойност</string>
+  <string name="new_todo">Нова задача</string>
+  <string name="new_reward">Нова награда</string>
+  <string name="new_daily">Нова ежедневна</string>
+  <string name="new_habit">Нов навик</string>
+  <string name="action_edit">Редактиране</string>
+  <string name="action_delete">Изтриване</string>
+  <string name="action_cancel">Отказ</string>
+  <string name="login_btn">Вход</string>
+  <string name="register_btn">Регистрация</string>
+  <string name="username">Потребителско име</string>
+  <string name="email_username">Е-поща или потребителско име</string>
+  <string name="password">Парола</string>
+  <string name="emailAddress">Е-поща</string>
+  <string name="confirmpassword">Потвърдете паролата</string>
+  <string name="logout">Изход</string>
+  <string name="logout_description">Излизане от Вашия профил</string>
+  <string name="account_details_sum">Вижте подробностите за профила си</string>
+  <string name="account_details">Подробности за профила</string>
+  <string name="LoginActivityName">Добре дошли</string>
+  <string name="string_revive">Съживяване</string>
+  <string name="please_connect">Моля, свържете се чрез приложението, преди да използвате джаджа</string>
+  <string name="about.title">Относно</string>
+  <string name="about.libraries">Библиотеки</string>
+  <string name="about.versionhistory">История на версиите</string>
+  <string name="about.habitica_open_source">Хабитика е софтуер с отворен код, който е наличен в Github</string>
+  <string name="about.rate_our_app">Оценете приложението</string>
+  <string name="about.give_us_feedback">Изпратете ни отзивите си!</string>
+  <string name="about.bugreport">Докладване на проблем</string>
+  <string name="about.source_code">Изходен код</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Грешка при свързване</string>
+  <string name="network_error_no_network_body">Нямате връзка с Интернет.</string>
+  <string name="internal_error_api">Изглежда има проблем със сървъра. Опитайте отново по-късно.</string>
+  <string name="authentication_error_title">Грешка при удостоверяване</string>
+  <string name="authentication_error_body">Потребителското име и/или паролата е грешна.</string>
+  <string name="login_validation_error_title">Грешка при проверяването</string>
+  <string name="login_validation_error_fieldsmissing">Трябва да попълните всички полета.</string>
+  <string name="save_changes">Запазване</string>
+  <string name="copy">Копиране</string>
+  <string name="notes">Бележки</string>
+  <string name="text">Текст</string>
+  <string name="difficulty">Трудност</string>
+  <string name="tags">Етикети</string>
+  <string name="trivial">Елементарно</string>
+  <string name="easy">Лесно</string>
+  <string name="medium">Средно</string>
+  <string name="hard">Трудно</string>
+  <string name="start_date">Начална дата</string>
+  <string name="positive_habit_form">Положителен ( + )</string>
+  <string name="negative_habit_form">Отрицателен ( - )</string>
+  <string name="checklist">Подзадачи</string>
+  <string name="reminders">Напомняния</string>
+  <string name="actions">Действия</string>
+  <string name="attributes">Показатели</string>
+  <string name="physical">Физическа</string>
+  <string name="mental">Умствена</string>
+  <string name="social">Обществена</string>
+  <string name="other">Други</string>
+  <string name="frequency">Честота</string>
+  <string name="frequency_weekly">В определени дни от седмицата</string>
+  <string name="frequency_daily">На всеки Х дни</string>
+  <string name="monday">Понеделник</string>
+  <string name="tuesday">Вторник</string>
+  <string name="wednesday">Сряда</string>
+  <string name="thursday">Четвъртък</string>
+  <string name="friday">Петък</string>
+  <string name="saturday">Събота</string>
+  <string name="sunday">Неделя</string>
+  <string name="levelup_header">Вдигнахте ниво!</string>
+  <string name="levelup_detail">Изпълнявайки целите си в истинския живот, Вие достигнахте ниво %1$d!</string>
+  <string name="levelup_health">Вие бяхте излекуван(а) напълно!</string>
+  <string name="levelup_button">Ура!</string>
+  <string name="faint_subtitle">Не се отчайвайте!</string>
+  <string name="faint_penalty_body">Изгубихте ниво, всичкото си злато и един предмет от екипировката си, но можете да си ги върнете с усърдна работа! Късмет — ще се справите.</string>
+  <string name="faint_header">Здравето Ви свърши!</string>
+  <string name="faint_button">Възстановете здравето си и опитайте отново</string>
+  <string name="filter">Филтър</string>
+  <string name="profile_image">Профилно изображение</string>
+  <string name="mana_price_button">%d МТ</string>
+  <string name="used_skill">Използвахте %1$s за %2$d точки мана.</string>
+  <string name="used_skill_without_mana">Вие използвахте %1$s.</string>
+  <string name="new_checklist_item">нова подзадача</string>
+  <string name="add_checklist_item">Добавяне</string>
+  <string name="reminder_title">Не забравяйте да изпълнявате ежедневните си задачи!</string>
+  <string name="skill_progress_title">Използване на умение</string>
+  <string name="coming_soon">Очаквайте скоро</string>
+  <string name="chat_flag_confirmation">Наистина ли искате да докладвате това съобщение за нарушение?</string>
+  <string name="flag_confirm">Докладване на съобщението</string>
+  <string name="unlock_lvl_11">Оключва се на ниво 11</string>
+  <string name="no_party_message">Вие не участвате в група. За да се присъедините към група, моля, посетете уеб сайта.</string>
+  <string name="forgot_pw_btn">Забравена парола</string>
+  <string name="forgot_pw_tv">Забравена парола? Моля, използвайте мобилния уеб сайт.</string>
+  <string name="tavern.inn.checkOut">Включете отново ежедневните си задачи</string>
+  <string name="tavern.inn.rest">Пауза на ежедн.</string>
+  <string name="reward.dialog.buy">Купуване</string>
+  <string name="reward.dialog.dismiss">Премахване</string>
+  <string name="party">Група</string>
+  <string name="chat">Чат</string>
+  <string name="members">Членове</string>
+  <string name="habits">Навици</string>
+  <string name="dailies">Ежедн.</string>
+  <string name="todos">Задачи</string>
+  <string name="rewards">Награди</string>
+  <string name="taskform.delete.title">Сигурен/на ли сте?</string>
+  <string name="taskform.delete.message">Наистина ли искате да изтриете това?</string>
+  <string name="yes">Да</string>
+  <string name="no">Не</string>
+  <string name="quest">Мисия</string>
+  <string name="avatar_body">Тяло</string>
+  <string name="avatar_hair">Коса</string>
+  <string name="avatar_shirt">Риза</string>
+  <string name="avatar_skin">Кожа</string>
+  <string name="avatar_ears">Животински уши</string>
+  <string name="avatar_base">Основа</string>
+  <string name="avatar_color">Цвят</string>
+  <string name="avatar_beard">Брада</string>
+  <string name="avatar_mustache">Мустаци</string>
+  <string name="avatar_flower">Цвете</string>
+  <string name="avatar_bangs">Бретон</string>
+  <string name="avatar_nothing">Няма нищо</string>
+  <string name="avatar_size">Размер</string>
+  <string name="avatar_size_slim">Слаб</string>
+  <string name="avatar_size_broad">Широк</string>
+  <string name="avatar_background">Фон</string>
+  <string name="purchase_customization">Купуване на персонализация</string>
+  <string name="purchase_set_button">Отключване на комплекта за %d диамант(а)</string>
+  <string name="purchase_button">Купуване</string>
+  <string name="purchase_set_title">Купуване на комплекта %s</string>
+  <string name="due_date">Крайна дата</string>
+  <string name="quest.accept">Приемане</string>
+  <string name="quest.reject">Отказване</string>
+  <string name="quest.begin">Започване на мисия</string>
+  <string name="quest.cancel">Отказване на поканата</string>
+  <string name="quest.abort">Прекратяване на мисията</string>
+  <string name="quest.leave">Напускане на мисията</string>
+  <string name="quest.pending">В очакване</string>
+  <string name="quest.accepted">Приета</string>
+  <string name="quest.rejected">Отказана</string>
+  <string name="quest.participants">Участници</string>
+  <string name="version_info">Версия %1$s (%2$d)</string>
+  <string name="sidebar_help">Помощ и ЧЗВ</string>
+  <string name="complete_tutorial">Разбрано!</string>
+  <string name="dismiss_tutorial">Напомнете ми отново</string>
+  <string name="intro_1_subtitle">Добре дошли в</string>
+  <string name="intro_1_title">Хабитика</string>
+  <string name="intro_1_description">Време е да започнете да се забавлявате, докато вършите задачите си. Над %s вече подобряват живота си, с малки стъпки.</string>
+  <string name="intro_2_subtitle">Напредък в играта</string>
+  <string name="intro_2_title">Напредък в живота</string>
+  <string name="intro_2_description">Отключвайте функционалности в играта като отбелязвате завършените задачи в истинския си живот. За изпълнението на целите си ще получавате екипировка, любимци и най-различни други награди.</string>
+  <string name="intro_3_subtitle">Бийте се с чудовища</string>
+  <string name="intro_3_title">Общувайте</string>
+  <string name="intro_3_description">Приятелите Ви могат да Ви помогнат да постигнете целите си. Подкрепяйте се взаимно в живота и битките, за да израснете заедно!</string>
+  <string name="intro_finish_button">Да започваме!</string>
+  <string name="previous_button">Назад</string>
+  <string name="next_button">Напред</string>
+  <string name="skip_button">Пропускане</string>
+  <string name="setup_welcome_description">Добре дошли в Хабитика, където напредването в играта ще подобри истинския Ви живот! Докато изпълнявате реалните си цели, ще отключвате екипировка, любимци, мисии и още.</string>
+  <string name="setup_welcome_title">Добре дошли</string>
+  <string name="avatar_setup_description">Е, как искате да изглеждате? Не се притеснявайте, по-късно ще можете да промените това.</string>
+  <string name="task_setup_description">Страхотно! И така, върху какво искате да поработите по време на това пътешествие?</string>
+  <string name="setup_group_work">Работа</string>
+  <string name="setup_group_exercise">Упражнения</string>
+  <string name="setup_group_health">Здраве</string>
+  <string name="setup_group_school">Училище</string>
+  <string name="setup_group_teams">Екипи</string>
+  <string name="setup_group_chores">Домакинска работа</string>
+  <string name="setup_group_creativity">Изобретателност</string>
+  <string name="setup_task_work_1">Обработка на е-поща</string>
+  <string name="setup_task_work_2">Най-важната задача</string>
+  <string name="setup_task_work_3">Работен проект</string>
+  <string name="setup_task_exercise_1">10 мин аеробни упражнения</string>
+  <string name="setup_task_exercise_2">Разтягане</string>
+  <string name="setup_task_exercise_3">Да организирам тренировките си</string>
+  <string name="setup_task_healthWellness_1">Да ям полезна/вредна храна</string>
+  <string name="setup_task_healthWellness_2">Да изчистя зъбите си с конец</string>
+  <string name="setup_task_healthWellness_3">Да се запиша за преглед</string>
+  <string name="setup_task_school_1">Учене/отлагане</string>
+  <string name="setup_task_school_2">Да напиша домашното си</string>
+  <string name="setup_task_school_3">Да завърша проекта за училище</string>
+  <string name="setup_task_teams_1">Да проверя какво прави екипът</string>
+  <string name="setup_task_teams_2">Да уведомя екипа за напредъка си</string>
+  <string name="setup_task_teams_3">Да завърша екипния проект</string>
+  <string name="setup_task_chores_1">10 минути чистене</string>
+  <string name="setup_task_chores_2">Да измия чиниите</string>
+  <string name="setup_task_chores_3">Да подредя килера</string>
+  <string name="setup_task_creativity_1">Да се уча от майстор в занаята</string>
+  <string name="setup_task_creativity_2">Да работя по проекта си</string>
+  <string name="setup_task_creativity_3">Да завърша проекта си</string>
+  <string name="gem.purchase.support">Искате ли да помогнете на Хабитика да продължи да съществува? Можете да подкрепите разработчиците като купите диаманти!\n\nС диамантите можете да си купувате забавни неща за профила си, като: \n\n — Интересни костюми за героя си;\n — Страхотни фонове;\n — Забавни мисии, от които ще получите яйца за любимци;\n — Възможността да променяте класа си преди да достигнете ниво 100.\n\nБлагодарим Ви за това, че помагате на Хабитика да се развива. Подкрепата Ви означава много за нас!</string>
+  <string name="my_guilds">Моите гилдии</string>
+  <string name="public_guilds">Обществени гилдии</string>
+  <string name="guild">Гилдия</string>
+  <string name="leave">Напускане</string>
+  <string name="join">Присъединяване</string>
+  <string name="leader">Водач</string>
+  <string name="gems">Диаманти</string>
+  <string name="copy_as_todo">Копиране като задача</string>
+  <string name="send_pm">Изпращане на ЛС</string>
+  <string name="flag">Докладване</string>
+  <string name="delete">Изтриване</string>
+  <string name="name">Име</string>
+  <string name="description">Описание</string>
+  <string name="add_tag">Добавяне на нов етикет</string>
+  <string name="privacy">Поверителност</string>
+  <string name="write_message">Напишете съобщение</string>
+  <string name="post">Изпр.</string>
+  <string name="guild_search_hint">Търсене на гилдии</string>
+  <string name="todo_due">Срок: %s</string>
+  <string name="daily_streak">текуща серия: %d</string>
+  <string name="todo_has_duedate">Задачата има краен срок</string>
+  <string name="battle_gear">Бойно снаряжение</string>
+  <string name="costume">Костюм</string>
+  <string name="outfit_head">Глава</string>
+  <string name="outfit_headAccessory">Аксесоар за глава</string>
+  <string name="outfit_eyewear">Предмет за очи</string>
+  <string name="outfit_armor">Броня</string>
+  <string name="outfit_back">Гръб</string>
+  <string name="outfit_body">Тяло</string>
+  <string name="outfit_shield">Щит</string>
+  <string name="outfit_weapon">Оръжие</string>
+  <string name="wear_costume">Костюм</string>
+  <string name="equipped">Екипирано</string>
+  <string name="quest_cancel_message">Наистина ли искате да прекратите мисията? Всички приети покани ще бъдат загубени. Притежателят на мисията ще си запази свитъка ѝ.</string>
+  <string name="quest.invitation">Покана за мисия</string>
+  <string name="quest_begin_message">Наистина ли искате да започнете мисията? След като мисията започне, никой повече няма да може да се присъедини към нея.</string>
+  <string name="quest.invitation.text">Получихте покана за участие в мисия!</string>
+  <string name="ago_1day">Преди 1 ден</string>
+  <string name="ago_days">Преди %d дни</string>
+  <string name="ago_1Minute">Преди 1 минута</string>
+  <string name="ago_minutes">Преди %d минути</string>
+  <string name="ago_hours">Преди %d часа</string>
+  <string name="ago_1hour">Преди 1 час</string>
+  <string name="today">Днес</string>
+  <string name="sidebar_items">Предмети</string>
+  <string name="eggs">Яйца</string>
+  <string name="hatching_potions">Излюпващи отвари</string>
+  <string name="food">Храна</string>
+  <string name="quests">Мисии</string>
+  <string name="pets">Любимци</string>
+  <string name="mounts">Превози</string>
+  <string name="armoireEquipment">Намерихте рядък предмет в гардероба: %s! Страхотно!</string>
+  <string name="armoireFood">Тършувате из гардероба и намирате %1$s %2$s. Какво ли прави това там?</string>
+  <string name="armoireExp">Сборвате се с гардероба и получавате опит. Така му се пада!</string>
+  <string name="armoireNotesFull">Отворете гардероба, за да получите специална екипировка, опит или храна! Оставащи предмети: %d</string>
+  <string name="armoireLastItem">Намерихте последния рядък предмет за екипиране в омагьосания гардероб.</string>
+  <string name="armoireNotesEmpty">В гардероба ще се появяват нови предмети през първата седмица на всеки месец. До тогава продължавайте да щракате за опит и храна!</string>
+  <string name="sell">Продаване (%d злато)</string>
+  <string name="hatch_with_potion">Излюпване с отвара</string>
+  <string name="feed_to_pet">Даване на любимец</string>
+  <string name="hatch_egg">Излюпване с яйце</string>
+  <string name="invite_party">Поканване на групата</string>
+  <string name="dialog_feeding">Хранене на %1$s %2$s с:</string>
+  <string name="use_animal">Използване</string>
+  <string name="feed">Хранене</string>
+  <string name="hatch_with">Излюпване на любимец с %s</string>
+  <string name="hatched_pet_title">Вие излюпихте %1$s %2$s!</string>
+  <string name="close">Затваряне</string>
+  <string name="share">Споделяне</string>
+  <string name="notification_pet_fed">Вие нахранихте своя(та/то) %1$s %2$s!</string>
+  <string name="notification_purchase">%s беше закупен(а/о)</string>
+  <string name="sectionpets">Обикновени любимци</string>
+  <string name="sectionpremiumPets">Любимци от магически отвари</string>
+  <string name="sectionquestPets">Любимци от мисии</string>
+  <string name="sectionspecialPets">Редки любимци</string>
+  <string name="sectionmounts">Обикновени превози</string>
+  <string name="sectionpremiumMounts">Превози от магически отвари</string>
+  <string name="sectionquestMounts">Превози от мисии</string>
+  <string name="sectionspecialMounts">Редки превози</string>
+  <string name="world_quest">Световна мисия</string>
+  <string name="inn_description">Починете в странноприемницата, за да не Ви наранят неизпълнените ежедневни задачи! (Забележка: това не Ви защитава от получаването на щети от главатари.)</string>
+  <string name="empty_items">Нямате %s</string>
+  <string name="user_level">Ниво %d</string>
+  <string name="user_level_with_class">Ниво %1$d %2$s</string>
+  <string name="warrior">Воин</string>
+  <string name="rogue">Мошеник</string>
+  <string name="mage">Магьосник</string>
+  <string name="healer">Лечител</string>
+  <string name="warrior_description">Воините нанасят повече и по-силни „критични удари“, които на случаен принцип дават злато, опит и шанс за падане на предмет при изпълнение на задача. Те също така нанасят сериозни щети на чудовищата-главатари. Играйте като воин, ако Ви мотивират изненадващите награди, или ако искате да раздавате правосъдие в мисиите с главатари.</string>
+  <string name="mage_description">Магьосниците се учат лесно, тъй като придобиват опит и нива по-бързо от останалите класове. Те имат много мана за специалните си умения. Играйте като магьосник, ако обичате тактическите страни на навиците, или ако се мотивирате от вдигане на нива и отключване на специални функционалности!</string>
+  <string name="rogue_description">Мошениците обичат да трупат богатства, печелят злато повече от останалите и са майстори в намирането на случайни предмети. Отличителното им умение „Невидимост“ позволява да избегнат последствията от пропуснати ежедневни задачи. Играйте като мошеник, ако Ви мотивират наградите и постиженията, и обичате плячката и значките!</string>
+  <string name="healer_description">Лечителите трудно могат да бъдат наранени и разпростират защитата си върху останалите. Пропуснатите ежедневни задачи и лошите навици не ги смущават толкова много; те винаги могат да възстановят здравето си след провал. Играйте като лечител, ако обичате да помагате на останалите в групата си или ако искате да изиграете смъртта чрез усърдна работа!</string>
+  <string name="select_class">Изберете клас</string>
+  <string name="opt_out_class">Отказване</string>
+  <string name="opt_out_description">Не Ви се занимава с класове? Искате да изберете по-късно? Откажете се от тях — ще бъдете воин без специални умения. Можете да прочетете относно класовата система по-късно в уикито, както и да включите класовете когато пожелаете.</string>
+  <string name="class_confirmation">Наистина ли искате да бъдете %s?</string>
+  <string name="class_changed">Вие вече сте %s!</string>
+  <string name="class_changed_description">Вече имате ново бойно снаряжение по подразбиране, което можете да намерите в „Екипировка“!</string>
+  <string name="choose_class">Избиране на класа</string>
+  <string name="dialog_go_back">Назад</string>
+  <string name="opt_out_confirmation">Наистина ли искате да се откажете?</string>
+  <string name="change_class">Промяна на класа</string>
+  <string name="change_class_description">Променете класа си и възстановете показателните си точки за 3 диаманта. Можете да разпределите показателните си точки през уеб сайта</string>
+  <string name="enable_class">Включване на класовата система</string>
+  <string name="changing_class_progress">Промяна на класа</string>
+  <string name="by_email">По е-поща</string>
+  <string name="invite_existing_users">Поканете съществуващи потребители</string>
+  <string name="send">Изпращане</string>
+  <string name="invite">Поканете приятели</string>
+  <string name="invite_id_description">Ако имате приятели, които вече използват Хабитика, поканете ги чрез потребителски идентификатор тук.</string>
+  <string name="invite_email_description">Ако приятел се присъедини към Хабитика през Вашето е-писмо, той автоматично ще бъде поканен в групата Ви!</string>
+  <string name="add_invites">Добавяне на покани</string>
+  <string name="user_id">Потребителски ид.</string>
+  <string name="email">Е-поща</string>
+  <string name="invite_users">Поканване в групата</string>
+  <string name="share_using">Споделяне чрез</string>
+  <string name="share_levelup">Достигнах ниво %d в Хабитика, като подобрявам навиците си в истинския живот!</string>
+  <string name="share_hatched">Току-що излюпих любимец — %1$s %2$s в Хабитика, като изпълнявах задачите си в истинския живот!</string>
+  <string name="share_raised">Току-що се сдобих с превоз — %1$s %2$s в Хабитика като изпълнявах задачите си в истинския живот!</string>
+  <string name="open_in_store">Отваряне в магазина</string>
+  <string name="change_class_confirmation">Наистина ли искате да промените класа си? Това ще Ви струва 3 диаманта.</string>
+  <string name="change_class_equipment_warning">Внимание: Повече няма да можете да купувате екипировка за класа „%s“.</string>
+  <string name="leaderMessage">Съобщение от %1$s</string>
+  <string name="leaderName">Водач: %1$s</string>
+  <string name="confirm">Потвърждаване</string>
+  <string name="market">Пазар</string>
+  <string name="timeTravelers">Пътешественици във времето</string>
+  <string name="seasonalShop">Сезонен магазин</string>
+  <string name="empty_inbox">Нямате входящи съобщения. Можете да изпратите ново съобщение на потребител от екрана с неговите публични съобщения в чата!</string>
+  <string name="party_invite">Отключете като поканите приятели</string>
+  <string name="no_gold">Нямате достатъчно злато</string>
+  <string name="no_potion">Няма нужда да купувате лековита отвара</string>
+  <string name="successful_purchase">Закупено успешно: %1$s</string>
+  <string name="purchase_confirmation_title">Потвърждаване на покупката</string>
+  <string name="confirm_purchase_text">Купуване на %1$s за %2$s %3$s</string>
+  <string name="gem">диамант</string>
+  <string name="hourglass">пясъчен часовник</string>
+  <string name="hourglasses">пясъчни часовници</string>
+  <string name="gold_singular">злато</string>
+  <string name="gold_plural">злато</string>
+  <string name="chat_message_copied">Съобщението е копирано</string>
+  <string name="copy_chat_message">Копиране</string>
+  <string name="edit_tag_title">Редактиране на етикет</string>
+  <string name="edit_tag_btn_edit">Редактиране</string>
+  <string name="edit_tag_btn_done">Готово</string>
+  <string name="edit_tag_btn_delete">Изтриване</string>
+  <string name="confirm_delete_tag_title">Сигурен/на ли сте?</string>
+  <string name="confirm_delete_tag_message">Наистина ли искате да изтриете това?</string>
+  <string name="filter_drawer_edit_tags">Редактиране на етикети</string>
+  <string name="filter_drawer_filter_tags">Филтриране по етикет</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">С този QR-код можете да бъдете поканен(а) от някого</string>
+  <string name="qr_save_message">QR-кодът е запазен в</string>
+  <string name="qr_dialogue_title">Вашият QR-код</string>
+  <string name="download">Сваляне</string>
+  <string name="send_new_message">Изпр. на ново съобщение</string>
+  <string name="choose_recipient_title">Изберете получател</string>
+  <string name="action_continue">Продължаване</string>
+  <string name="scan_qr_code">Сканиране на QR-код</string>
+  <string name="enter_recipient_uuid">Въведете потр. ид. на получателя</string>
+  <string name="invited_to_party">Получихте покана за присъединяване към група!</string>
+  <string name="stats_widget_label">Статистика на Хабитика</string>
+  <string name="add_task">Добавяне на задача</string>
+  <string name="add_habit">Добавяне на навик</string>
+  <string name="add_daily">Добавяне на ежедневна</string>
+  <string name="add_todo">Добавяне на задача</string>
+  <string name="add_reward">Добавяне на награда</string>
+  <string name="all_dailies_completed">Изпълнихте всичките си ежедневни задачи. Добра работа!</string>
+  <string name="widget_habit_button">Извършване на навик в Хабитика</string>
+  <string name="widget_dailies">Ежедневни задачи в Хабитика</string>
+  <string name="widget_todo_list">Списък за изпълнение в Хабитика</string>
+  <string name="widget_add_task">Добавяне на задача в Хабитика</string>
+  <string name="google_services_missing">Услугите за „Google play“ не могат да бъдат намерени.</string>
+  <string name="gem.purchase.toolbartitle">Купуване</string>
+  <string name="gem.purchase.title">Купуването на диаманти подкрепя разработчиците и помага на Хабитика да продължи да съществува</string>
+  <string name="gem.purchase.subtitle">Диамантите Ви позволяват да закупувате забавни екстри за профила си като:</string>
+  <string name="gem.purchase.listitem1">Страхотни костюми за героя Ви</string>
+  <string name="gem.purchase.listitem2">Невероятни фонови изображения</string>
+  <string name="gem.purchase.listitem3">Мисии, които Ви награждават с яйца за любимци</string>
+  <string name="gem.purchase.listitem4">Възможността да промените класа си преди ниво 100</string>
+  <string name="support_habitica">Подкрепете Хабитика</string>
+  <string name="skill_transformation_use">използване</string>
+  <string name="hatching_market_info">Не Ви се падат предметите, които искате? Прегледайте пазара!</string>
+  <string name="feeding_market_info">Нуждаете се от друга храна? Купете още от пазара!</string>
+  <string name="open_market">Отваряне на пазара</string>
+  <string name="cds_description">Ежедневните Ви задачи ще се подновят при първия път, когато използвате Хабитика след %1$s. Уверете се, че сте изпълнили ежедневните си задачи преди това време!</string>
+  <string name="AudioTheme_title">Звукова тема</string>
+  <string name="AudioTheme_summary">Промяна на звуковата тема на Хабитика</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">До утре!</string>
+  <string name="belongs_to_challenge">Принадлежи на предизвикателство</string>
+  <string name="has_reminder">Има напомняне</string>
+  <string name="has_tag">Има етикет</string>
+  <string name="subscribe.title">Абонирането подкрепя разработчиците и помага на Хабитика да продължи да съществува</string>
+  <string name="subscribe_prompt">Абонирайте се и ще получите следните полезни неща:</string>
+  <string name="subscribe.listitem1">Купуване на диаманти със злато</string>
+  <string name="subscribe.listitem2">Изключителни ежемесечни предмети</string>
+  <string name="subscribe.listitem3">Запазване на повече записи в историята</string>
+  <string name="subscribe.listitem4">Два пъти по-висока граница на ежедневните падания на предмети</string>
+  <string name="subscriptions">Абонаменти</string>
+  <string name="subscription_duration">Повтаря се всеки %s</string>
+  <string name="subscribe">Абониране</string>
+  <string name="subscribe.listitem1.description">Александър Търговеца вече ще Ви продава диаманти на цената от 20 злато за диамант.\n\nМесечните му доставки отначало ще бъдат ограничени до 25 диаманта на месец, но може да се увеличат в зависимост от продължителността на абонамента Ви.\n\nОграничението се вдига с по 5 диаманта след всеки три месеца непрекъснат абонамент, докато не достигне 50 диаманта на месец!</string>
+  <string name="subscribe.listitem2.description">Всеки месец ще получавате уникален козметичен предмет за героя си!\n\nОсвен това, за всеки три месеца непрекъснат абонамент, тайнствените пътешественици във времето ще Ви дават достъп до исторически козметични предмети (както и такива от бъдещето).</string>
+  <string name="subscribe.listitem3.description">Прави завършените задачи и историята на задачите налични за по-дълго време.</string>
+  <string name="subscribe.listitem4.description">С двойно увеличеното ограничение на паданията ще получавате повече предмети от завършените си задачи всеки ден, което ще Ви помогне да завършите конюшнята си по-бързо!</string>
+  <string name="subscribe1month.gemcap">Ограничението на диамантите започва от 25</string>
+  <string name="subscribe3month.gemcap">Ограничението на диамантите е вдигнато на 30</string>
+  <string name="subscribe6month.gemcap">Ограничението на диамантите е вдигнато на 35</string>
+  <string name="subscribe12month.gemcap">Ограничението на диамантите е вдигнато на 45</string>
+  <string name="subscription_hourglasses">+%d Тайнствен пясъчен часовник</string>
+  <string name="payment_method">Разплащателен метод</string>
+  <string name="subscription">Абонамент</string>
+  <string name="active">Активен</string>
+  <string name="cancel_subscription">Прекратяване на абонамента</string>
+  <string name="cancel_subscription_google.description">Не искате вече да бъдете абонат? Можете да прекратите абонамента си от раздела „Моите приложения“ в магазина „Google Play“.</string>
+  <string name="cancel_subscription_notgoogle.description">Искате да прекратите абонамента си? Заради избрания от Вас разплащателен метод, можете да направите това само от уеб сайта. Натиснете бутона по-долу, за да отворите уеб сайта в браузъра си!</string>
+  <string name="visit_habitica_website">Към уеб сайта на Хабитика</string>
+  <string name="current_bonuses">Текущи бонуси</string>
+  <string name="months_subscribed">Месечни абонаменти</string>
+  <string name="current_hourclasses">Текущи тайнствени пясъчни часовници</string>
+  <string name="monthly_gem_cap">Месечно ограничение на диамантите</string>
+  <string name="inactive">Неактивен</string>
+  <string name="one_month">1 месец</string>
+  <string name="months">%d месеца</string>
+  <string name="month">месец</string>
+  <string name="three_months">3 месеца</string>
+  <string name="six_months">6 месеца</string>
+  <string name="twelve_months">12 месеца</string>
+  <string name="subscribe_prompt_thanks">За абонирането си получавате следните полезни неща:</string>
+  <string name="subscription_status">Състояние на абонамента</string>
+  <string name="byLeader">от %s</string>
+  <string name="challenge_details">Подробности за предизвикателството</string>
+  <string name="challenge_leave_title">Напускане на предизвикателството</string>
+  <string name="challenge_leave_text">Наистина ли искате да напуснете предизвикателството „%s“?</string>
+  <string name="challenge_remove_tasks_title">Премахване на задачите</string>
+  <string name="challenge_remove_tasks_text">Искате ли да премахнете задачите?</string>
+  <string name="remove_tasks">Премахване</string>
+  <string name="keep_tasks">Задържане</string>
+  <string name="my_challenges">Моите предизвикателства</string>
+  <string name="public_challenges">Обществени</string>
+  <string name="challenges">Предизвикателства</string>
+  <string name="daily">Ежедневно</string>
+  <string name="habit">Навик</string>
+  <string name="reward">Награда</string>
+  <string name="todo">Задача</string>
+  <string name="official">Официално</string>
+  <string name="participating">Участващи</string>
+  <string name="challenge">Предизвикателство</string>
+  <string name="go_to_challenge">Към предизвикателството</string>
+  <string name="not_part_of_a_challenge">В момента не участвате в предизвикателство!</string>
+  <string name="join_a_challenge">Включете се в предизвикателство, така ще добавите списък от подбрани задачи към списъка си. След това се състезавайте с останалите хабитиканци, за да печелите постижения и дори диаманти!</string>
+  <string name="check_the_public_challenge_tab">Докоснете раздела „Обществени“, там ще откриете предизвикателствата, създадени от потребителите и ще можете да изберете най-подходящото за себе си!</string>
+  <string name="add_reminder">Добавяне на напомняне</string>
+  <string name="warning">Внимание</string>
+  <string name="open_settings">Отваряне на настройките</string>
+  <string name="dont_keep_activities_warning">Изглежда сте включили опцията за разработчици „Да не се пазят дейностите“. В момента тя предизвиква проблеми с приложението на Хабитика, така че е препоръчително да я изключите.</string>
+  <string name="inbox">Входящи</string>
+  <string name="FAQ">Често задавани въпроси</string>
+  <string name="special">Специален</string>
+  <string name="gem_for_gold_description">Тъй като имате абонамент за Хабитика, можете всеки месец да купувате определен брой диаманти срещу злато.</string>
+  <string name="limited_count">Остават %d</string>
+  <string name="gem_shop">Диамант</string>
+  <string name="mystery_item">Тайнствен предмет</string>
+  <string name="myster_item_notes">Всеки месец абонатите получават един тайнствен предмет. Това обикновено става една седмица преди края на месеца.</string>
+  <string name="open">Отваряне</string>
+  <string name="notification_mystery_item">Вие отворихте кутията и намерихте %s!</string>
+  <string name="checkInRewardEarned">Спечелихте %1$s като награда за усърдието си в подобряването на живота си.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Следващата Ви награда ще се отключи след %1$d отчитания</string>
+  <string name="pending_approval">изчакване за одобрение</string>
+  <string name="filters">Филтри</string>
+  <string name="done">Готово</string>
+  <string name="group_tasks_edit_description">Груповите задачи не могат да бъдат редактирани.</string>
+  <string name="group_tasks_edit_title">Тази задача не може да се редактира</string>
+  <string name="groups">Групи</string>
+  <string name="all">Всички</string>
+  <string name="none">Нищо</string>
+  <string name="owned">Притежавани</string>
+  <string name="not_owned">Непритежавани</string>
+  <string name="new_game">Нова\nигра</string>
+  <string name="login_btn_fb">Влизане с Фейсбук</string>
+  <string name="login_btn_google">Влизане с Гугъл</string>
+  <string name="action_back">Назад</string>
+  <string name="welcome_text">О, сигурно сте нов тук. Аз съм Джъстин и ще бъда Вашият съветник в Хабитика.\n\nЗа да започнете, ще трябва да си създадете герой.</string>
+  <string name="randomize">Разбъркване</string>
+  <string name="avatar_extras">Екстри</string>
+  <string name="avatar_skin_color">Цвят на кожата</string>
+  <string name="avatar_hair_color">Цвят на косата</string>
+  <string name="avatar_hair_bangs">Бретон</string>
+  <string name="avatar_hair_ponytail">Опашка</string>
+  <string name="avatar_glasses">Очила</string>
+  <string name="avatar_wheelchair">Инвалидна количка</string>
+  <string name="weak">Слаби</string>
+  <string name="strong">Силни</string>
+  <string name="gray">Изпълнени</string>
+  <string name="dated">С дата</string>
+  <string name="completed">Завършени</string>
+  <string name="setuP_group_other">Други</string>
+  <string name="clear">Изчистване</string>
+  <string name="empty_title_habits">Нямате навици</string>
+  <string name="empty_description_habits">Навиците са задачи, които не се влияят от времето. Можете да ги отмятате много пъти през деня или пък да ги пропуснете.</string>
+  <string name="empty_title_dailies">Нямате ежедневни задачи</string>
+  <string name="empty_description_dailies">Ежедневните задачи са такива, които се повтарят през определено време. Изберете кога трябва де ги изпълнявате.</string>
+  <string name="empty_title_todos">Нямате задачи за изпълнение</string>
+  <string name="empty_description_todos">Задачите за изпълнение трябва да бъдат изпълнение само веднъж. Към тях можете да добавите подзадачи, като така ще увеличите стойността им.</string>
+  <string name="empty_title_rewards">Нямате награди</string>
+  <string name="reset_walkthrough">Нулиране на съветите на Джъстин</string>
+  <string name="read_community_guidelines">Моля, прочетете Обществените правила, преди да публикувате</string>
+  <string name="maintenance">Профилактика</string>
+  <string name="reload_content">Презареждане на съдържанието</string>
+  <string name="dailyDueDefaultView">Ежедневните по подразбиране да са неизпълнени</string>
+  <string name="dailyDueDefaultViewDescription">Ако това е избрано, ежедневните задачи по подразбиране ще се появяват в раздела с неизпълнени, вместо в този с всички задачи</string>
+</resources>
diff --git a/Habitica/res/values-de/strings.profile.xml b/Habitica/res/values-de/strings.profile.xml
index 676127686..62e05115c 100644
--- a/Habitica/res/values-de/strings.profile.xml
+++ b/Habitica/res/values-de/strings.profile.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">Haustiere &amp; Reittiere</string>
-    <string name="profile_pets_found">Gefundene Haustiere</string>
-    <string name="profile_mounts_tamed">Gezähmte Reittiere</string>
-    <string name="profile_loading_data">Lade Mitgliederdaten.</string>
-    <string name="profile_send_message_to">Nachricht an %s schicken</string>
-    <string name="profile_message_sent_to">Nachricht an %s gesendet</string>
-    <string name="profile_level">Level:</string>
-    <string name="profile_class_bonus">Klassen-Bonus:</string>
-    <string name="profile_allocated">Verteilt:</string>
-    <string name="profile_boosts">Verstärkung:</string>
-    <string name="profile_private_message">Private Nachricht</string>
-    <string name="profile_achievements">Erfolge</string>
-    <string name="profile_achievement_ok">Okay</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Haustiere &amp; Reittiere</string>
+    <string name="profile_pets_found">Gefundene Haustiere</string>
+    <string name="profile_mounts_tamed">Gezähmte Reittiere</string>
+    <string name="profile_loading_data">Lade Mitgliederdaten.</string>
+    <string name="profile_send_message_to">Nachricht an %s schicken</string>
+    <string name="profile_message_sent_to">Nachricht an %s gesendet</string>
+    <string name="profile_level">Level:</string>
+    <string name="profile_class_bonus">Klassen-Bonus:</string>
+    <string name="profile_allocated">Verteilt:</string>
+    <string name="profile_boosts">Verstärkung:</string>
+    <string name="profile_private_message">Private Nachricht</string>
+    <string name="profile_achievements">Erfolge</string>
+    <string name="profile_achievement_ok">Okay</string>
     </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-de/strings.tutorial.xml b/Habitica/res/values-de/strings.tutorial.xml
index 4d58435a8..0ee2bf64a 100644
--- a/Habitica/res/values-de/strings.tutorial.xml
+++ b/Habitica/res/values-de/strings.tutorial.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_equipment">Wenn Du Ausrüstung kaufst, taucht diese hier auf. Deine Kampfausrüstung beeinflusst Deine Spielerstatistiken und Dein Kostüm (falls aktiviert) beeinflusst Dein Aussehen.</string>
-  <string name="tutorial_items">Verdiene Gegenstände indem Du Aufgaben erledigst und Stufen aufsteigst. Tippe auf einen Gegenstand um ihn zu benutzen!</string>
-  <string name="tutorial_pets">Wenn du Aufgaben abschließt, hast Du eine Chance, Eier und Tränke zu finden. Kombiniere sie, um Haustiere auszubrüten.</string>
-  <string name="tutorial_skills">Fähigkeiten erlauben es Dir, mächtige Effekte auszulösen. Tippe auf eine Fähigkeit, um sie zu benutzen. Das kostet Mana (der blaue Balken), das Du verdienst, indem Du Dich jeden Tag einloggst und reale Aufgaben abschließt. Für mehr Infos schaue im Menü in die FAQ!</string>
-  <string name="tutorial_party">Hier können Du und Deine Freunde Euch gegenseitig motivieren und mit Euren Aufgaben Monster bekämpfen!</string>
-  <string name="tutorial_tavern">Willkommen im Gasthaus, einem öffentlichen und für alle Altersklassen geeigneten Chat! Hier kannst Du über Produktivität diskutieren und Fragen stellen. Viel Spaß!</string>
-  <string name="tutorial_classes">Wähle aus, ob Du ein Krieger, Magier, Heiler oder Schurke werden möchtest. Jede Klasse hat einzigartige Ausrüstungsgegenstände und Fähigkeiten. Tippe auf (?) um mehr zu erfahren!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_equipment">Wenn Du Ausrüstung kaufst, taucht diese hier auf. Deine Kampfausrüstung beeinflusst Deine Spielerstatistiken und Dein Kostüm (falls aktiviert) beeinflusst Dein Aussehen.</string>
+  <string name="tutorial_items">Verdiene Gegenstände indem Du Aufgaben erledigst und Stufen aufsteigst. Tippe auf einen Gegenstand um ihn zu benutzen!</string>
+  <string name="tutorial_pets">Wenn du Aufgaben abschließt, hast Du eine Chance, Eier und Tränke zu finden. Kombiniere sie, um Haustiere auszubrüten.</string>
+  <string name="tutorial_skills">Fähigkeiten erlauben es Dir, mächtige Effekte auszulösen. Tippe auf eine Fähigkeit, um sie zu benutzen. Das kostet Mana (der blaue Balken), das Du verdienst, indem Du Dich jeden Tag einloggst und reale Aufgaben abschließt. Für mehr Infos schaue im Menü in die FAQ!</string>
+  <string name="tutorial_party">Hier können Du und Deine Freunde Euch gegenseitig motivieren und mit Euren Aufgaben Monster bekämpfen!</string>
+  <string name="tutorial_tavern">Willkommen im Gasthaus, einem öffentlichen und für alle Altersklassen geeigneten Chat! Hier kannst Du über Produktivität diskutieren und Fragen stellen. Viel Spaß!</string>
+  <string name="tutorial_classes">Wähle aus, ob Du ein Krieger, Magier, Heiler oder Schurke werden möchtest. Jede Klasse hat einzigartige Ausrüstungsgegenstände und Fähigkeiten. Tippe auf (?) um mehr zu erfahren!</string>
+</resources>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index fb315826c..cb9a1bc23 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -1,520 +1,520 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Aktualisieren</string>
-  <string name="XP_default">Erfahrung</string>
-  <string name="HP_default">Gesundheit</string>
-  <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Einstellungen konnten nicht vom Barcode geladen werden</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Einstellungen</string>
-  <string name="SP_address_hint">Dein benutzerdefinierter Server</string>
-  <string name="SP_userID_title">Benutzer-ID</string>
-  <string name="SP_userID_summary">Deine Benutzer-ID</string>
-  <string name="SP_APIToken_title">API-Token</string>
-  <string name="SP_APIToken_summary">Dein API-Token</string>
-  <string name="Language_title">Sprache</string>
-  <string name="Language_summary">Habiticas Sprache ändern</string>
-  <string name="SP_user_qr_code">Dein QR Code</string>
-  <string name="PS_contact_title">Kontaktiere mich</string>
-  <string name="pref_account_header">Konto</string>
-  <string name="pref_first_day_of_the_week_title">Erster Tag der Woche</string>
-  <string name="pref_first_day_of_the_week_summary">Erster Tag der Woche in allen Kalendern</string>
-  <string name="pref_reminder_header">Tägliche Erinnerung</string>
-  <string name="pref_reminder_checkbox">Erinnerung aktivieren</string>
-  <string name="pref_reminder_picker">Erinnerungszeit einstellen</string>
-  <string name="pref_cds_header">Persönlicher Tagesstart</string>
-  <string name="pref_cds_picker">Persönlichen Tagesstart einstellen</string>
-  <string name="pref_push_notifications_checkbox">Push-Benachrichtigungen des Benutzers</string>
-  <string name="push_notifications">Push-Benachrichtigungen</string>
-  <string name="push_notifications_sum">Stelle deine Push-Benachrichtigungen ein</string>
-  <string name="preference_push_you_won_challenge">Du hast einen Wettbewerb gewonnen!</string>
-  <string name="preference_push_received_a_private_message">Private Nachricht erhalten</string>
-  <string name="preference_push_gifted_gems">Geschenkte Edelsteine</string>
-  <string name="preference_push_gifted_subscription">Geschenkte Abonnements</string>
-  <string name="preference_push_invited_to_party">Zur Gruppe eingeladen</string>
-  <string name="preference_push_invited_to_guild">Zur Gilde eingeladen</string>
-  <string name="preference_push_your_quest_has_begun">Deine Quest hat begonnen</string>
-  <string name="preference_push_invited_to_quest">Zur Quest eingeladen</string>
-  <!--Adding tasks-->
-  <string name="task_value">Wert</string>
-  <string name="action_edit">Bearbeiten</string>
-  <string name="action_delete">Löschen</string>
-  <string name="action_cancel">Abbrechen</string>
-  <string name="login_btn">Login</string>
-  <string name="register_btn">Registrieren</string>
-  <string name="username">Benutzername</string>
-  <string name="email_username">E-Mail oder Benutzername</string>
-  <string name="password">Passwort</string>
-  <string name="emailAddress">E-Mail-Adresse</string>
-  <string name="confirmpassword">Passwort bestätigen</string>
-  <string name="logout">Ausloggen</string>
-  <string name="logout_description">Logge Dich aus</string>
-  <string name="account_details_sum">Prüfe deine Kontodetails</string>
-  <string name="account_details">Kontodetails</string>
-  <string name="LoginActivityName">Willkommen</string>
-  <string name="string_revive">Wiederbeleben</string>
-  <string name="please_connect">Baue eine Verbindung mit Hilfe der App auf, bevor Du ein Widget benutzt</string>
-  <string name="about.title">Über</string>
-  <string name="about.libraries">Bibliotheken</string>
-  <string name="about.versionhistory">Versionsverlauf</string>
-  <string name="about.habitica_open_source">Habitica ist als Open-Source-Software auf GitHub verfügbar</string>
-  <string name="about.rate_our_app">Bewerte unsere App</string>
-  <string name="about.give_us_feedback">Feedback senden!</string>
-  <string name="about.bugreport">Melde einen Fehler</string>
-  <string name="about.source_code">Quellcode</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Verbindungsfehler</string>
-  <string name="network_error_no_network_body">Keine Internetverbindung.</string>
-  <string name="internal_error_api">Es scheint ein Problem mit dem Server zu geben. Versuche es später noch mal.</string>
-  <string name="authentication_error_title">Authentifikationsfehler</string>
-  <string name="authentication_error_body">Ungültiger Benutzername und/oder Passwort</string>
-  <string name="login_validation_error_title">Validierungsfehler</string>
-  <string name="login_validation_error_fieldsmissing">Bitte fülle alle Felder aus.</string>
-  <string name="save_changes">Speichern</string>
-  <string name="copy">Kopieren</string>
-  <string name="notes">Notizen</string>
-  <string name="text">Text</string>
-  <string name="difficulty">Schwierigkeit</string>
-  <string name="tags">Tags</string>
-  <string name="trivial">Trivial</string>
-  <string name="easy">Einfach</string>
-  <string name="medium">Mittel</string>
-  <string name="hard">Schwer</string>
-  <string name="start_date">Starttermin</string>
-  <string name="positive_habit_form">Positiv ( + )</string>
-  <string name="negative_habit_form">Negativ ( - )</string>
-  <string name="checklist">Checkliste</string>
-  <string name="reminders">Erinnerungen</string>
-  <string name="actions">Aktionen</string>
-  <string name="attributes">Attribute</string>
-  <string name="physical">Körperlich</string>
-  <string name="mental">Mental</string>
-  <string name="social">Sozial</string>
-  <string name="other">Anderes</string>
-  <string name="frequency">Häufigkeit</string>
-  <string name="frequency_weekly">An bestimmten Tagen der Woche</string>
-  <string name="frequency_daily">Alle X Tage</string>
-  <string name="monday">Montag</string>
-  <string name="tuesday">Dienstag</string>
-  <string name="wednesday">Mittwoch</string>
-  <string name="thursday">Donnerstag</string>
-  <string name="friday">Freitag</string>
-  <string name="saturday">Samstag</string>
-  <string name="sunday">Sonntag</string>
-  <string name="levelup_header">Du bist ein Level aufgestiegen!</string>
-  <string name="levelup_detail">Das Erfüllen Deiner Lebensziele hat Dich auf Level %1$d steigen lassen!</string>
-  <string name="levelup_health">Du wurdest vollständig geheilt!</string>
-  <string name="levelup_button">Hurra!</string>
-  <string name="faint_subtitle">Nicht verzweifeln!</string>
-  <string name="faint_penalty_body">Du hast einen Level, Dein Gold und einen Teil Deiner Ausrüstung verloren, aber Du kannst alles durch harte Arbeit wieder zurückbekommen! Viel Glück -- Du schaffst das.</string>
-  <string name="faint_header">Du hast alle Deine Lebenspunkte verloren!</string>
-  <string name="faint_button">Lebenspunkte auffüllen &amp; Nochmal versuchen</string>
-  <string name="filter">Filtern</string>
-  <string name="profile_image">Profilbild</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Du hast %1$s für %2$d Mana benutzt.</string>
-  <string name="used_skill_without_mana">Du hast %1$s benutzt.</string>
-  <string name="new_checklist_item">Neue Unteraufgabe</string>
-  <string name="add_checklist_item">Hinzufügen</string>
-  <string name="reminder_title">Denke daran Deine täglichen Aufgaben abzuhaken!</string>
-  <string name="skill_progress_title">Fertigkeiten benutzen</string>
-  <string name="coming_soon">demnächst verfügbar</string>
-  <string name="chat_flag_confirmation">Möchtest Du diesen Beitrag wirklich melden?</string>
-  <string name="flag_confirm">Verletzung der Community-Richtlinien melden</string>
-  <string name="unlock_lvl_11">Freigeschaltet ab Lvl 11</string>
-  <string name="no_party_message">Du bist nicht in einer Gruppe. Besuche die Website, um einer Gruppe beizutreten.</string>
-  <string name="forgot_pw_btn">Passwort vergessen</string>
-  <string name="forgot_pw_tv">Passwort vergessen? Bitte die mobile Website benutzen.</string>
-  <string name="tavern.inn.checkOut">Reaktiviere Deine täglichen Aufgaben</string>
-  <string name="tavern.inn.rest">Pausiere Deine täglichen Aufgaben</string>
-  <string name="reward.dialog.buy">Kaufen</string>
-  <string name="reward.dialog.dismiss">Als gelesen markieren</string>
-  <string name="party">Gruppe</string>
-  <string name="chat">Chat</string>
-  <string name="members">Mitglieder</string>
-  <string name="habits">Gewohnheiten</string>
-  <string name="dailies">Tägliche Aufgaben</string>
-  <string name="todos">To-Dos</string>
-  <string name="rewards">Belohnungen</string>
-  <string name="taskform.delete.title">Bist Du sicher?</string>
-  <string name="taskform.delete.message">Wirklich löschen?</string>
-  <string name="yes">Ja</string>
-  <string name="no">Nein</string>
-  <string name="quest">Quest</string>
-  <string name="avatar_body">Körper</string>
-  <string name="avatar_hair">Haar</string>
-  <string name="avatar_shirt">Shirt</string>
-  <string name="avatar_skin">Haut</string>
-  <string name="avatar_ears">Tierohren</string>
-  <string name="avatar_base">hinten</string>
-  <string name="avatar_color">Farbe</string>
-  <string name="avatar_beard">Bart</string>
-  <string name="avatar_mustache">Schnurrbart</string>
-  <string name="avatar_flower">Blume</string>
-  <string name="avatar_bangs">Frisur vorne</string>
-  <string name="avatar_nothing">Nichts gesetzt</string>
-  <string name="avatar_size">Größe</string>
-  <string name="avatar_size_slim">Dünn</string>
-  <string name="avatar_size_broad">Kräftig</string>
-  <string name="avatar_background">Hintergrund</string>
-  <string name="purchase_customization">Kaufe Anpassung</string>
-  <string name="purchase_set_button">Set für %d Edelsteine freischalten</string>
-  <string name="purchase_button">Kaufen</string>
-  <string name="purchase_set_title">Set %s kaufen</string>
-  <string name="due_date">Frist</string>
-  <string name="quest.accept">Annehmen</string>
-  <string name="quest.reject">Ablehnen</string>
-  <string name="quest.begin">Quest starten</string>
-  <string name="quest.cancel">Einladung abbrechen</string>
-  <string name="quest.abort">Quest abbrechen</string>
-  <string name="quest.leave">Quest verlassen</string>
-  <string name="quest.pending">Ausstehend</string>
-  <string name="quest.accepted">Angenommen</string>
-  <string name="quest.rejected">Abgelehnt</string>
-  <string name="quest.participants">Teilnehmer</string>
-  <string name="version_info">Version %1$s (%2$d)</string>
-  <string name="sidebar_help">Hilfe &amp; FAQ</string>
-  <string name="complete_tutorial">Verstanden!</string>
-  <string name="dismiss_tutorial">Erinnere mich noch einmal</string>
-  <string name="intro_1_subtitle">Willkommen bei</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Es ist an der Zeit für Spaß, während du deine Aufgaben machst. Tritt einer Gemeinschaft von %s anderen Menschen bei, die ihr Leben Aufgabe für Aufgabe verbessern möchten.</string>
-  <string name="intro_2_subtitle">Fortschritt im Spiel</string>
-  <string name="intro_2_title">Fortschritt im Leben</string>
-  <string name="intro_2_description">Schalte Spielinhalte durch das Erledigen und Abhaken deiner realen Aufgaben frei. Bekomme Rüstungen, Tiere und vieles mehr als Belohnungen für das Erfüllen deiner Ziele.</string>
-  <string name="intro_3_description">Behalte Deine Ziele im Auge mit Hilfe Deiner Freunde. Unterstützt Euch gegenseitig im Leben und im Kampf, während Ihr Euch gemeinsam verbessert!</string>
-  <string name="intro_finish_button">Fangen wir an!</string>
-  <string name="previous_button">Zurück</string>
-  <string name="next_button">Weiter</string>
-  <string name="skip_button">Überspringen</string>
-  <string name="setup_welcome_description">Willkommen zu Habitica! Hier bedeutet Fortschritt im Spiel gleichzeitig Fortschritt im echten Leben! Während Du Ziele im echten Leben erreichst, wirst Du Ausrüstung, Haustiere, Quests und vieles mehr freischalten.</string>
-  <string name="setup_welcome_title">Willkommen</string>
-  <string name="avatar_setup_description">Also, wie möchtest Du aussehen? Keine Sorge, Du kannst das jederzeit ändern.</string>
-  <string name="setup_group_work">Arbeit</string>
-  <string name="setup_group_exercise">Bewegung</string>
-  <string name="setup_group_health">Gesundheit</string>
-  <string name="setup_group_school">Schule</string>
-  <string name="setup_group_teams">Teams</string>
-  <string name="setup_group_chores">Hausarbeit</string>
-  <string name="setup_group_creativity">Kreativität</string>
-  <string name="setup_task_work_1">Verarbeite E-Mail</string>
-  <string name="setup_task_work_2">Wichtigste Aufgabe</string>
-  <string name="setup_task_work_3">Arbeitsprojekt</string>
-  <string name="setup_task_exercise_1">10 Min. Ausdauer</string>
-  <string name="setup_task_exercise_2">Dehnübungen</string>
-  <string name="setup_task_exercise_3">Trainingsplan erstellen</string>
-  <string name="setup_task_healthWellness_1">Gesund ernähren / Junkfood essen</string>
-  <string name="setup_task_healthWellness_2">Zahnseide benutzen</string>
-  <string name="setup_task_healthWellness_3">Check-up ausmachen</string>
-  <string name="setup_task_school_1">Lernen / Aufschieben</string>
-  <string name="setup_task_school_2">Hausaufgaben machen</string>
-  <string name="setup_task_school_3">Aufgabe für die Schule fertigstellen</string>
-  <string name="setup_task_teams_1">Status des Teams abfragen</string>
-  <string name="setup_task_teams_2">Team auf dem Laufenden halten</string>
-  <string name="setup_task_teams_3">Team-Projekt abschließen</string>
-  <string name="setup_task_chores_1">10 Minuten aufräumen</string>
-  <string name="setup_task_chores_2">Geschirr abwaschen</string>
-  <string name="setup_task_chores_3">Schrank aufräumen</string>
-  <string name="setup_task_creativity_1">Lerne ein Handwerk</string>
-  <string name="setup_task_creativity_2">An einem kreativem Projekt arbeiten</string>
-  <string name="setup_task_creativity_3">Kreatives Projekt fertigstellen</string>
-  <string name="gem.purchase.support">Du möchtest helfen, Habitica am Laufen zu halten? Unterstütze die Entwickler, indem Du Edelsteine kaufst!\n\nMit Edelsteinen kannst Du lustige Extras kaufen, zum Beispiel:\n\n - Coole Kostüme für Deinen Avatar\n - Hübsche Hintergründe\n - Spannende Quests, um Haustiere freizuschalten\n - Die Möglichkeit, Deine Klasse schon vor Level 100 zu wechseln\n\nVielen, vielen Dank, dass Du hilfst, Habitica großartig zu machen. Deine Unterstützung bedeutet uns sehr viel!</string>
-  <string name="my_guilds">Meine Gilden</string>
-  <string name="public_guilds">Öffentliche Gilden</string>
-  <string name="guild">Gilde</string>
-  <string name="leave">Verlassen</string>
-  <string name="join">Beitreten</string>
-  <string name="leader">Anführer</string>
-  <string name="gems">Edelsteine</string>
-  <string name="send_pm">PN senden</string>
-  <string name="flag">Melden</string>
-  <string name="delete">Löschen</string>
-  <string name="name">Name</string>
-  <string name="description">Beschreibung</string>
-  <string name="privacy">Privatsphäre</string>
-  <string name="write_message">Nachricht schreiben</string>
-  <string name="post">posten</string>
-  <string name="guild_search_hint">Nach Gilden suchen</string>
-  <string name="todo_due">Bis: %s</string>
-  <string name="daily_streak">Aktuelle Serie: %d</string>
-  <string name="todo_has_duedate">Diese Aufgabe hat eine Frist.</string>
-  <string name="battle_gear">Kampfausrüstung</string>
-  <string name="costume">Kostüm</string>
-  <string name="outfit_head">Kopf</string>
-  <string name="outfit_headAccessory">Kopfschmuck</string>
-  <string name="outfit_eyewear">Brillen</string>
-  <string name="outfit_armor">Rüstung</string>
-  <string name="outfit_back">Rücken</string>
-  <string name="outfit_body">Körper</string>
-  <string name="outfit_shield">Schild</string>
-  <string name="outfit_weapon">Waffe</string>
-  <string name="wear_costume">Kostüm tragen</string>
-  <string name="equipped">Ausgerüstet</string>
-  <string name="quest_cancel_message">Bist Du sicher, dass Du diese Quest abbrechen willst? Alle angenommenen Einladungen gehen verloren. Der Questbesitzer erhält die Questschriftrolle zurück.</string>
-  <string name="quest.invitation">Questeinladung</string>
-  <string name="quest_begin_message">Bist Du sicher, dass Du die Quest beginnen willst? Sobald sie aktiv ist, können keine zusätzlichen Gruppenmitglieder beitreten.</string>
-  <string name="quest.invitation.text">Du wurdest eingeladen, an einer Quest teilzunehmen!</string>
-  <string name="ago_1day">Vor einem Tag</string>
-  <string name="ago_days">Vor %d Tagen</string>
-  <string name="ago_1Minute">Vor einer Minute</string>
-  <string name="ago_minutes">Vor %d Minuten</string>
-  <string name="ago_hours">Vor %d Stunden</string>
-  <string name="ago_1hour">Vor einer Stunde</string>
-  <string name="today">Heute</string>
-  <string name="sidebar_items">Gegenstände</string>
-  <string name="eggs">Eier</string>
-  <string name="hatching_potions">Schlüpftränke</string>
-  <string name="food">Futter</string>
-  <string name="quests">Quests</string>
-  <string name="pets">Haustiere</string>
-  <string name="mounts">Reittiere</string>
-  <string name="armoireEquipment">Du hast einen seltenen Ausrüstungsgegenstand im Schrank gefunden: %s! Großartig!</string>
-  <string name="armoireFood">Du wühlst im Schrank herum und findest %1$s %2$s. Was macht das denn hier?</string>
-  <string name="armoireExp">Du ringst mit dem verzauberten Schrank und gewinnst Erfahrung. Nimm das!</string>
-  <string name="armoireNotesFull">Öffne den Schrank um zufällig spezielle Gegenstände, Erfahrung oder Nahrung zu erhalten! Verbleibende Ausrüstungsgegenstände: %d</string>
-  <string name="armoireLastItem">Du hast das letzte Stück der seltenen Ausrüstung im verzauberten Schrank gefunden.</string>
-  <string name="armoireNotesEmpty">Der Schrank wird jeden Monat neue Ausrüstung beinhalten. Bis dahin kannst Du weiterklicken um Erfahrung und Nahrung zu erhalten.</string>
-  <string name="sell">Verkaufen (%d Gold)</string>
-  <string name="hatch_with_potion">Mit Trank ausbrüten</string>
-  <string name="feed_to_pet">An Haustier verfüttern</string>
-  <string name="hatch_egg">Mit Ei ausbrüten</string>
-  <string name="invite_party">Gruppe einladen</string>
-  <string name="dialog_feeding">Füttere %1$s %2$s mit:</string>
-  <string name="use_animal">Nutzen</string>
-  <string name="feed">Füttern</string>
-  <string name="hatch_with">Haustier mit %s ausbrüten</string>
-  <string name="hatched_pet_title">Du hast ein %1$s %2$s ausgebrütet!</string>
-  <string name="close">Schließen</string>
-  <string name="share">Teilen</string>
-  <string name="notification_pet_fed">Du hast Dein/e/n %1$s %2$s gefüttert!</string>
-  <string name="notification_purchase">%s gekauft</string>
-  <string name="sectionpets">Normale Haustiere</string>
-  <string name="sectionpremiumPets">Magische Haustiere</string>
-  <string name="sectionquestPets">Quest-Haustiere</string>
-  <string name="sectionspecialPets">Seltene Haustiere</string>
-  <string name="sectionmounts">Normale Reittiere</string>
-  <string name="sectionpremiumMounts">Magische Reittiere</string>
-  <string name="sectionquestMounts">Quest-Reittiere</string>
-  <string name="sectionspecialMounts">Seltene Reittiere</string>
-  <string name="world_quest">Weltenquest</string>
-  <string name="inn_description">Ruhe Dich im Gasthaus aus damit Deine täglichen Aufgaben Dich über Nacht nicht verletzen! (Beachte: verhindert nicht den Schaden durch einen Boss.)</string>
-  <string name="empty_items">Du hast kein/e %s</string>
-  <string name="user_level">Lvl %d</string>
-  <string name="user_level_with_class">Lvl %1$d %2$s</string>
-  <string name="warrior">Krieger</string>
-  <string name="rogue">Schurke</string>
-  <string name="mage">Magier</string>
-  <string name="healer">Heiler</string>
-  <string name="warrior_description">Krieger verursachen mehr und stärkere \"kritische Treffer\", die zufällige Boni auf Gold, Erfahrung und Beute beim Erfüllen einer Aufgabe geben. Sie sind auch sehr stark gegen Bossmonster. Spiele einen Krieger, wenn Dich die Chance auf Belohnungen im Lottogewinn-Stil besonders reizt und Du besonders effektiv gegen Bossmonster sein willst.</string>
-  <string name="mage_description">Magier lernen rasch und erhalten schneller Erfahrung und Level als andere Klassen. Sie bekommen zudem eine große Menge Mana, um ihre Spezialfähigkeiten einzusetzen. Spiele einen Magier, wenn Dir die taktischen Aspekte des Spiels Spaß bereiten, oder wenn Du motiviert wirst durch schnellen Level-Aufstieg und das Freischalten fortgeschrittener Funktionen.</string>
-  <string name="rogue_description">Schurken lieben es Reichtümer anzuhäufen, indem sie mehr Gold als andere verdienen und geschickt darin sind, neue Gegenstände zu finden. Ihre typische Fähigkeit sich im verborgenen zu bewegen erlaubt Dir gelegentlich, die Folgen verpasster täglicher Aufgaben zu vermeiden. Spiele einen Schurken, wenn Dich Spielbelohnungen und Erfolge besonders reizen und Du nach Beute und Abzeichen trachtest!</string>
-  <string name="healer_description">Heiler stehen Schaden unbeeindruckt gegenüber und erweitern diesen Schutz auf andere. Verpasste tägliche Aufgaben und schlechte Angewohnheiten schaden ihnen nicht viel und sie haben Mittel und Wege Lebenspunkte wiederherzustellen. Spiele einen Heiler, wenn Du gerne Anderen in Deiner Gruppe hilfst, oder wenn es Dich besonders reizt, dem Tod durch harte Arbeit zu entkommen!</string>
-  <string name="select_class">Klasse wählen</string>
-  <string name="opt_out_class">Später entscheiden</string>
-  <string name="opt_out_description">Du willst keine Klasse oder möchtest Dich später entscheiden? Entscheide Dich später und werde zunächst ein Krieger ohne Spezialfähigkeiten. Du kannst später im Wiki etwas über das Klassensystem lesen und Deine Klasse jederzeit aktivieren.</string>
-  <string name="class_confirmation">Bist Du sicher, dass Du %s werden willst?</string>
-  <string name="class_changed">Du bist jetzt ein/eine %s!</string>
-  <string name="class_changed_description">Du hast neue Basis-Kampfausrüstung, die Du im Ausrüstungsreiter wechseln kannst!</string>
-  <string name="choose_class">Klasse wählen</string>
-  <string name="dialog_go_back">Zurück</string>
-  <string name="opt_out_confirmation">Bist Du sicher, dass Du Dich noch nicht entscheiden willst?</string>
-  <string name="change_class">Deine Klasse ändern</string>
-  <string name="change_class_description">Ändere Deine Klasse und erhalte Deine Attributpunkte für 3 Edelsteine zurück. Du kannst die Punkte über die Webseite zuweisen</string>
-  <string name="enable_class">Klassensystem freischalten</string>
-  <string name="changing_class_progress">Klasse ändern</string>
-  <string name="by_email">Per E-Mail</string>
-  <string name="invite_existing_users">Nutzer einladen</string>
-  <string name="send">Senden</string>
-  <string name="invite">Freunde einladen</string>
-  <string name="invite_id_description">Wenn Deine Freunde bereits Habitica verwenden, lade sie hier mit Hilfe ihrer Benutzer-ID ein.</string>
-  <string name="invite_email_description">Wenn Freunde Habitica mit Hilfe Deiner E-Mail beitreten, werden sie automatisch zu Deiner Gruppe eingeladen!</string>
-  <string name="add_invites">Einladungen hinzufügen</string>
-  <string name="user_id">Benutzer-ID</string>
-  <string name="email">E-Mail</string>
-  <string name="invite_users">Zur Gruppe einladen</string>
-  <string name="share_using">Teilen via</string>
-  <string name="share_levelup">Ich habe durch das Verbessern meiner realen Lebensgewohnheiten Level %d in Habitica erreicht!</string>
-  <string name="share_hatched">Durch das Erfüllen meiner Real-Life-Aufgaben habe ich ein %1$s %2$s Haustier in Habitica ausgebrütet!</string>
-  <string name="share_raised">Durch das Erfüllen meiner Real-Life-Aufgaben habe ich ein %1$s %2$s Reittier in Habitica erhalten!</string>
-  <string name="open_in_store">Im Play Store öffnen</string>
-  <string name="change_class_confirmation">Bist Du sicher, dass Du Deine Klasse ändern willst? Es kostet 3 Edelsteine.</string>
-  <string name="change_class_equipment_warning">Warnung: Du wirst nicht mehr Ausrüstung für die %s Klasse kaufen können.</string>
-  <string name="leaderMessage">Nachricht von %1$s</string>
-  <string name="leaderName">Führender: %1$s</string>
-  <string name="confirm">Bestätigen</string>
-  <string name="market">Marktplatz</string>
-  <string name="timeTravelers">Mysteriöse Zeitreisende</string>
-  <string name="seasonalShop">Jahreszeitenmarkt</string>
-  <string name="empty_inbox">Du hast keine Nachrichten in Deinem Posteingang. Du kannst einem anderen Benutzer eine neue Nachricht von deren öffentlichen Chatnachrichten aus senden!</string>
-  <string name="party_invite">Durch Einladen von Freunden freischalten</string>
-  <string name="no_gold">Nicht genügend Gold</string>
-  <string name="no_potion">Du musst keinen Heiltrank kaufen</string>
-  <string name="successful_purchase">%1$s gekauft</string>
-  <string name="purchase_confirmation_title">Kauf bestätigen</string>
-  <string name="confirm_purchase_text">%1$s für %2$s %3$s kaufen</string>
-  <string name="gem">Edelstein</string>
-  <string name="hourglass">Sanduhr</string>
-  <string name="hourglasses">Sanduhren</string>
-  <string name="gold_singular">Gold</string>
-  <string name="gold_plural">Gold</string>
-  <string name="chat_message_copied">Nachricht in Zwischenablage kopiert</string>
-  <string name="copy_chat_message">In Zwischenablage kopieren</string>
-  <string name="edit_tag_title">Tag bearbeiten</string>
-  <string name="edit_tag_btn_edit">Bearbeiten</string>
-  <string name="edit_tag_btn_done">Fertig</string>
-  <string name="edit_tag_btn_delete">Löschen</string>
-  <string name="confirm_delete_tag_title">Bist Du sicher?</string>
-  <string name="confirm_delete_tag_message">Wirklich löschen?</string>
-  <string name="filter_drawer_edit_tags">Tags bearbeiten</string>
-  <string name="filter_drawer_filter_tags">Nach Tags filtern</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Lass Dich durch diesen QR Code von jemandem einladen</string>
-  <string name="qr_save_message">QR code gespeichert: </string>
-  <string name="qr_dialogue_title">Dein QR Code</string>
-  <string name="download">Download</string>
-  <string name="send_new_message">Neue Nachricht schicken</string>
-  <string name="choose_recipient_title">Nachrichtenempfänger auswählen</string>
-  <string name="action_continue">Weiter</string>
-  <string name="scan_qr_code">QR Code scannen</string>
-  <string name="enter_recipient_uuid">ID des Empfängers eingeben</string>
-  <string name="invited_to_party">Du wurdest in eine Gruppe eingeladen!</string>
-  <string name="stats_widget_label">Habitica: Avatar</string>
-  <string name="add_task">Neue Aufgabe hinzufügen</string>
-  <string name="add_habit">Neue Gewohnheit hinzufügen</string>
-  <string name="add_daily">Neue Tägliche Aufgabe hinzufügen</string>
-  <string name="add_todo">Neue To-Do hinzufügen</string>
-  <string name="add_reward">Neue Belohnung hinzufügen</string>
-  <string name="all_dailies_completed">Du hast alle deine täglichen Aufgaben erledigt. Gut gemacht!</string>
-  <string name="widget_habit_button">Habitica: Gewohnheit</string>
-  <string name="widget_dailies">Habitica: Tägliche Aufgaben</string>
-  <string name="widget_add_task">Habitica: Neue Aufgabe</string>
-  <string name="google_services_missing">Google Play Dienste konnten nicht gefunden werden</string>
-  <string name="gem.purchase.toolbartitle">Kaufen</string>
-  <string name="gem.purchase.title">Das Erwerben von Edelsteinen unterstützt die Entwickler und hilft Habitica am Laufen zu halten</string>
-  <string name="gem.purchase.subtitle">Edelsteine erlaubes es Dir spaßige Extras für Deinen Account zu erwerben, inklusive:</string>
-  <string name="gem.purchase.listitem1">Coole Kostüme für Deinen Avatar</string>
-  <string name="gem.purchase.listitem2">Fantastische Hintergründe</string>
-  <string name="gem.purchase.listitem3">Quest, welche Dich mit Haustiereiern belohnt</string>
-  <string name="gem.purchase.listitem4">Die Fähigkeit Deine Klasse vor dem Erreichen von Level 100 zu ändern</string>
-  <string name="support_habitica">Unterstütze Habitica</string>
-  <string name="skill_transformation_use">benutzen</string>
-  <string name="hatching_market_info">Kriegst Du nicht die richtige Beute? Besuche den Marktplatz!</string>
-  <string name="feeding_market_info">Brauchst Du anderes Futter? Kaufe mehr auf dem Marktplatz!</string>
-  <string name="open_market">Marktplatz öffnen</string>
-  <string name="cds_description">Deine Täglichen Aufgaben werden zurückgesetzt, wenn Du Dich nach %1$s einloggst. Stelle sicher, dass Du vorher alle Deine Täglichen Aufgaben erledigt hast!</string>
-  <string name="AudioTheme_title">Hintergrundmusik</string>
-  <string name="AudioTheme_summary">Ändere Habiticas Hintergrundmusik</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">Bis morgen!</string>
-  <string name="belongs_to_challenge">Gehört zum Wettbewerb</string>
-  <string name="has_reminder">Hat eine Benachrichtigung</string>
-  <string name="has_tag">Hat einen Tag</string>
-  <string name="subscribe.title">Mit einem Abonnement unterstützt Du die Entwickler und den Betrieb von Habitica</string>
-  <string name="subscribe_prompt">Werde Abonnent und du bekommst diese nützlichen Vorteile: </string>
-  <string name="subscribe.listitem1">Kaufe Edelsteine mit Gold</string>
-  <string name="subscribe.listitem2">Exklusive monatliche Gegenstände</string>
-  <string name="subscribe.listitem3">Zusätzliche Verlaufseinträge sichern</string>
-  <string name="subscribe.listitem4">Tägliches Beute-Limit verdoppelt</string>
-  <string name="subscriptions">Abonnements</string>
-  <string name="subscription_duration">Alle %s wiederholen</string>
-  <string name="subscribe">Abonnieren</string>
-  <string name="subscribe.listitem1.description">Alexander der Händler wird Dir nun Edelsteine für jeweils 20 Goldmünzen pro Stück verkaufen.\n\nSeine monatlichen Lieferungen sind zunächst auf 25 Edelsteine pro Monat beschränkt, welche jedoch durch die Dauer Deines Abonnements erhöht werden.\n\nDas Limit steigt um 5 Edelsteine für jeweils drei durchgehend abonnierte Monate, bis zu einem Maximum von 50 Edelsteinen pro Monat!</string>
-  <string name="subscribe.listitem2.description">Jeden Monat wirst Du einen einzigartigen optischen Gegenstand für Deinen Avatar erhalten.\n\nAußerdem gewährt Dir der Mysteriöse Zeitreisende für jeweils drei durchgehend abonnierte Monate Zugang zu historischen (und futuristischen!) optischen Gegenständen.</string>
-  <string name="subscribe.listitem3.description">Verlängert die Historie erledigter To-Dos und Aufgaben.</string>
-  <string name="subscribe.listitem4.description">Verdoppelte Beute-Limits ermöglichen es Dir, täglich von erledigten Aufgaben mehr Gegenstände zu finden und deinen Stall schneller zu vervollständigen!</string>
-  <string name="subscribe1month.gemcap">Edelsteinobergrenze startet bei 25 Edelsteinen</string>
-  <string name="subscribe3month.gemcap">Edelsteinobergrenze auf 30 Edelsteine erhöht</string>
-  <string name="subscribe6month.gemcap">Edelsteinobergrenze auf 35 Edelsteine erhöht</string>
-  <string name="subscribe12month.gemcap">Edelsteinobergrenze auf 45 Edelsteine erhöht</string>
-  <string name="subscription_hourglasses">+%d Mystische Sanduhr</string>
-  <string name="payment_method">Zahlungsmethode</string>
-  <string name="subscription">Abonnement</string>
-  <string name="active">Aktiv</string>
-  <string name="cancel_subscription">Abonnement kündigen</string>
-  <string name="cancel_subscription_google.description">Du willst nicht länger Abonnent sein? Du findest die Option zum Kündigen im Google Play Store unter \"Meine Apps und Spiele\".</string>
-  <string name="cancel_subscription_notgoogle.description">Du möchtest Dein Abonnement beenden? Aufgrund Deiner Zahlungsmethode kannst Du Dein Abonnement nur über die Webseite beenden. Benutze die Schaltfläche unten, um die Seite in Deinem Browser zu öffnen!</string>
-  <string name="visit_habitica_website">Habitica-Internetseite besuchen</string>
-  <string name="current_bonuses">Aktuelle Boni</string>
-  <string name="months_subscribed">Abonnierte Monate</string>
-  <string name="current_hourclasses">Aktuelle mystische Sanduhren</string>
-  <string name="monthly_gem_cap">Monatliche Edelsteinobergrenze</string>
-  <string name="inactive">Inaktiv</string>
-  <string name="one_month">1 Monat</string>
-  <string name="months">%d Monate</string>
-  <string name="month">Monat</string>
-  <string name="three_months">3 Monate</string>
-  <string name="six_months">6 Monate</string>
-  <string name="twelve_months">12 Monate</string>
-  <string name="subscribe_prompt_thanks">Für das Abonnieren bekommst Du diese nützlichen Vorteile: </string>
-  <string name="subscription_status">Abonnement Status</string>
-  <string name="byLeader">von %s</string>
-  <string name="challenge_details">Wettbewerbdetails</string>
-  <string name="challenge_leave_title">Wettbewerb verlassen</string>
-  <string name="challenge_leave_text">Bist Du Dir sicher, dass du den Wettbewerb \"%s\" verlassen willst?</string>
-  <string name="challenge_remove_tasks_title">Aufgaben entfernen</string>
-  <string name="challenge_remove_tasks_text">Willst du deine Aufgaben wirklich entfernen?</string>
-  <string name="remove_tasks">Entfernen</string>
-  <string name="keep_tasks">Behalten</string>
-  <string name="my_challenges">Meine Wettbewerbe</string>
-  <string name="public_challenges">Öffentlich</string>
-  <string name="challenges">Wettbewerbe</string>
-  <string name="daily">Tägliche Aufgabe</string>
-  <string name="habit">Gewohnheit</string>
-  <string name="reward">Belohnung</string>
-  <string name="todo">To-Do</string>
-  <string name="official">Offiziell</string>
-  <string name="participating">Beigetreten</string>
-  <string name="challenge">Wettbewerb</string>
-  <string name="go_to_challenge">Gehe zum Wettbewerb</string>
-  <string name="not_part_of_a_challenge">Du nimmst im Moment an keinen Wettbewerben teil!</string>
-  <string name="join_a_challenge">Trete einem Wettbewerb bei, um ein ausgewähltes Set von Aufgaben zu deiner Liste hinzuzufügen. Trete dann gegen andere Habitica-Mitglieder an, um Erfolge und sogar Edelsteine zu gewinnen!</string>
-  <string name="check_the_public_challenge_tab">Drücke auf den \"Öffentlich\"-Tab, um die von Mitgliedern erstellten Wettbewerbe zu finden, die am besten zu Dir passen!</string>
-  <string name="add_reminder">Erinnerung hinzufügen</string>
-  <string name="warning">Warnung</string>
-  <string name="open_settings">Einstellungen öffnen</string>
-  <string name="dont_keep_activities_warning">Es sieht so aus, als wäre die Entwickleroption \\"Aktivitäten nicht behalten\\" aktiviert. Momentan können dadurch Probleme in der Habitica App entstehen, deshalb empfehlen wir Dir, die Option zu deaktivieren.</string>
-  <string name="inbox">Posteingang</string>
-  <string name="FAQ">Häufig gestellte Fragen</string>
-  <string name="special">Spezial</string>
-  <string name="gem_for_gold_description">Weil Du Habitica abonnierst, kannst Du jeden Monat eine Anzahl von Edelsteinen mit Gold kaufen. </string>
-  <string name="limited_count">%d übrig</string>
-  <string name="gem_shop">Edelstein</string>
-  <string name="mystery_item">Überraschungsgegenstand</string>
-  <string name="myster_item_notes">Jeden Monat bekommen Abonnenten einen Überraschungsgegenstand. Dieser wird üblicherweise circa eine Woche vor Ende des Monats veröffentlicht.</string>
-  <string name="open">Öffnen</string>
-  <string name="notification_mystery_item">Du öffnest die Kiste und findest %s!</string>
-  <string name="checkInRewardEarned">Du hast ein %1$s als Belohnung für Deine Hingabe, dein Leben zu verbessern, erhalten.</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Deine nächste Belohnung wird nach %1$d Log-Ins freigeschalten </string>
-  <string name="pending_approval">Zustimmung ausstehend</string>
-  <string name="filters">Filter</string>
-  <string name="done">Fertig</string>
-  <string name="group_tasks_edit_description">Gruppenaufgaben können nicht bearbeitet werden.</string>
-  <string name="group_tasks_edit_title">Aufgabe kann nicht bearbeitet werden</string>
-  <string name="groups">Gruppen</string>
-  <string name="all">Alles</string>
-  <string name="none">Nichts</string>
-  <string name="owned">Im Besitz</string>
-  <string name="not_owned">Nicht im Besitz</string>
-  <string name="login_btn_fb">Mit Facebook-Konto einloggen</string>
-  <string name="login_btn_google">Mit Google-Konto einloggen</string>
-  <string name="welcome_text">Oh, Du musst neu hier sein. Ich bin Justin, der Stadtführer von Habitica.\n\nAls erstes erstellen wir Dir einen Avatar.</string>
-  <string name="avatar_extras">Extras</string>
-  <string name="avatar_skin_color">Hautfarbe</string>
-  <string name="avatar_hair_color">Haarfarbe</string>
-  <string name="avatar_hair_bangs">Pony</string>
-  <string name="avatar_hair_ponytail">Zopf</string>
-  <string name="avatar_glasses">Brille</string>
-  <string name="avatar_wheelchair">Rollstuhl</string>
-  <string name="weak">Schwach</string>
-  <string name="strong">Stark</string>
-  <string name="completed">Vervollständigt</string>
-  <string name="setuP_group_other">Anderes</string>
-  <string name="clear">löschen</string>
-  <string name="empty_title_habits">Du hast keine Gewohnheiten</string>
-  <string name="empty_description_habits">Gewohnheiten sind Aufgaben ohne festen Zeitplan. Du kannst sie mehrmals am Tag oder gar nicht abhaken.</string>
-  <string name="empty_title_dailies">Du hast keine täglichen Aufgaben</string>
-  <string name="empty_description_dailies">Tägliche Aufgaben sind sich regelmäßig wiederholende Aufgaben. Such Dir den Zeitplan aus, der Dir am besten passt!</string>
-  <string name="empty_title_todos">Du hast keine To-Dos</string>
-  <string name="empty_description_todos">To-Dos sind Aufgaben, die nur einmal abgehakt werden. Füge Unteraufgaben zu To-Dos hinzu, um deren Wert zu steigern.</string>
-  <string name="empty_title_rewards">Du hast keine Belohnungen</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Aktualisieren</string>
+  <string name="XP_default">Erfahrung</string>
+  <string name="HP_default">Gesundheit</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Einstellungen konnten nicht vom Barcode geladen werden</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Einstellungen</string>
+  <string name="SP_address_hint">Dein benutzerdefinierter Server</string>
+  <string name="SP_userID_title">Benutzer-ID</string>
+  <string name="SP_userID_summary">Deine Benutzer-ID</string>
+  <string name="SP_APIToken_title">API-Token</string>
+  <string name="SP_APIToken_summary">Dein API-Token</string>
+  <string name="Language_title">Sprache</string>
+  <string name="Language_summary">Habiticas Sprache ändern</string>
+  <string name="SP_user_qr_code">Dein QR Code</string>
+  <string name="PS_contact_title">Kontaktiere mich</string>
+  <string name="pref_account_header">Konto</string>
+  <string name="pref_first_day_of_the_week_title">Erster Tag der Woche</string>
+  <string name="pref_first_day_of_the_week_summary">Erster Tag der Woche in allen Kalendern</string>
+  <string name="pref_reminder_header">Tägliche Erinnerung</string>
+  <string name="pref_reminder_checkbox">Erinnerung aktivieren</string>
+  <string name="pref_reminder_picker">Erinnerungszeit einstellen</string>
+  <string name="pref_cds_header">Persönlicher Tagesstart</string>
+  <string name="pref_cds_picker">Persönlichen Tagesstart einstellen</string>
+  <string name="pref_push_notifications_checkbox">Push-Benachrichtigungen des Benutzers</string>
+  <string name="push_notifications">Push-Benachrichtigungen</string>
+  <string name="push_notifications_sum">Stelle deine Push-Benachrichtigungen ein</string>
+  <string name="preference_push_you_won_challenge">Du hast einen Wettbewerb gewonnen!</string>
+  <string name="preference_push_received_a_private_message">Private Nachricht erhalten</string>
+  <string name="preference_push_gifted_gems">Geschenkte Edelsteine</string>
+  <string name="preference_push_gifted_subscription">Geschenkte Abonnements</string>
+  <string name="preference_push_invited_to_party">Zur Gruppe eingeladen</string>
+  <string name="preference_push_invited_to_guild">Zur Gilde eingeladen</string>
+  <string name="preference_push_your_quest_has_begun">Deine Quest hat begonnen</string>
+  <string name="preference_push_invited_to_quest">Zur Quest eingeladen</string>
+  <!--Adding tasks-->
+  <string name="task_value">Wert</string>
+  <string name="action_edit">Bearbeiten</string>
+  <string name="action_delete">Löschen</string>
+  <string name="action_cancel">Abbrechen</string>
+  <string name="login_btn">Login</string>
+  <string name="register_btn">Registrieren</string>
+  <string name="username">Benutzername</string>
+  <string name="email_username">E-Mail oder Benutzername</string>
+  <string name="password">Passwort</string>
+  <string name="emailAddress">E-Mail-Adresse</string>
+  <string name="confirmpassword">Passwort bestätigen</string>
+  <string name="logout">Ausloggen</string>
+  <string name="logout_description">Logge Dich aus</string>
+  <string name="account_details_sum">Prüfe deine Kontodetails</string>
+  <string name="account_details">Kontodetails</string>
+  <string name="LoginActivityName">Willkommen</string>
+  <string name="string_revive">Wiederbeleben</string>
+  <string name="please_connect">Baue eine Verbindung mit Hilfe der App auf, bevor Du ein Widget benutzt</string>
+  <string name="about.title">Über</string>
+  <string name="about.libraries">Bibliotheken</string>
+  <string name="about.versionhistory">Versionsverlauf</string>
+  <string name="about.habitica_open_source">Habitica ist als Open-Source-Software auf GitHub verfügbar</string>
+  <string name="about.rate_our_app">Bewerte unsere App</string>
+  <string name="about.give_us_feedback">Feedback senden!</string>
+  <string name="about.bugreport">Melde einen Fehler</string>
+  <string name="about.source_code">Quellcode</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Verbindungsfehler</string>
+  <string name="network_error_no_network_body">Keine Internetverbindung.</string>
+  <string name="internal_error_api">Es scheint ein Problem mit dem Server zu geben. Versuche es später noch mal.</string>
+  <string name="authentication_error_title">Authentifikationsfehler</string>
+  <string name="authentication_error_body">Ungültiger Benutzername und/oder Passwort</string>
+  <string name="login_validation_error_title">Validierungsfehler</string>
+  <string name="login_validation_error_fieldsmissing">Bitte fülle alle Felder aus.</string>
+  <string name="save_changes">Speichern</string>
+  <string name="copy">Kopieren</string>
+  <string name="notes">Notizen</string>
+  <string name="text">Text</string>
+  <string name="difficulty">Schwierigkeit</string>
+  <string name="tags">Tags</string>
+  <string name="trivial">Trivial</string>
+  <string name="easy">Einfach</string>
+  <string name="medium">Mittel</string>
+  <string name="hard">Schwer</string>
+  <string name="start_date">Starttermin</string>
+  <string name="positive_habit_form">Positiv ( + )</string>
+  <string name="negative_habit_form">Negativ ( - )</string>
+  <string name="checklist">Checkliste</string>
+  <string name="reminders">Erinnerungen</string>
+  <string name="actions">Aktionen</string>
+  <string name="attributes">Attribute</string>
+  <string name="physical">Körperlich</string>
+  <string name="mental">Mental</string>
+  <string name="social">Sozial</string>
+  <string name="other">Anderes</string>
+  <string name="frequency">Häufigkeit</string>
+  <string name="frequency_weekly">An bestimmten Tagen der Woche</string>
+  <string name="frequency_daily">Alle X Tage</string>
+  <string name="monday">Montag</string>
+  <string name="tuesday">Dienstag</string>
+  <string name="wednesday">Mittwoch</string>
+  <string name="thursday">Donnerstag</string>
+  <string name="friday">Freitag</string>
+  <string name="saturday">Samstag</string>
+  <string name="sunday">Sonntag</string>
+  <string name="levelup_header">Du bist ein Level aufgestiegen!</string>
+  <string name="levelup_detail">Das Erfüllen Deiner Lebensziele hat Dich auf Level %1$d steigen lassen!</string>
+  <string name="levelup_health">Du wurdest vollständig geheilt!</string>
+  <string name="levelup_button">Hurra!</string>
+  <string name="faint_subtitle">Nicht verzweifeln!</string>
+  <string name="faint_penalty_body">Du hast einen Level, Dein Gold und einen Teil Deiner Ausrüstung verloren, aber Du kannst alles durch harte Arbeit wieder zurückbekommen! Viel Glück -- Du schaffst das.</string>
+  <string name="faint_header">Du hast alle Deine Lebenspunkte verloren!</string>
+  <string name="faint_button">Lebenspunkte auffüllen &amp; Nochmal versuchen</string>
+  <string name="filter">Filtern</string>
+  <string name="profile_image">Profilbild</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Du hast %1$s für %2$d Mana benutzt.</string>
+  <string name="used_skill_without_mana">Du hast %1$s benutzt.</string>
+  <string name="new_checklist_item">Neue Unteraufgabe</string>
+  <string name="add_checklist_item">Hinzufügen</string>
+  <string name="reminder_title">Denke daran Deine täglichen Aufgaben abzuhaken!</string>
+  <string name="skill_progress_title">Fertigkeiten benutzen</string>
+  <string name="coming_soon">demnächst verfügbar</string>
+  <string name="chat_flag_confirmation">Möchtest Du diesen Beitrag wirklich melden?</string>
+  <string name="flag_confirm">Verletzung der Community-Richtlinien melden</string>
+  <string name="unlock_lvl_11">Freigeschaltet ab Lvl 11</string>
+  <string name="no_party_message">Du bist nicht in einer Gruppe. Besuche die Website, um einer Gruppe beizutreten.</string>
+  <string name="forgot_pw_btn">Passwort vergessen</string>
+  <string name="forgot_pw_tv">Passwort vergessen? Bitte die mobile Website benutzen.</string>
+  <string name="tavern.inn.checkOut">Reaktiviere Deine täglichen Aufgaben</string>
+  <string name="tavern.inn.rest">Pausiere Deine täglichen Aufgaben</string>
+  <string name="reward.dialog.buy">Kaufen</string>
+  <string name="reward.dialog.dismiss">Als gelesen markieren</string>
+  <string name="party">Gruppe</string>
+  <string name="chat">Chat</string>
+  <string name="members">Mitglieder</string>
+  <string name="habits">Gewohnheiten</string>
+  <string name="dailies">Tägliche Aufgaben</string>
+  <string name="todos">To-Dos</string>
+  <string name="rewards">Belohnungen</string>
+  <string name="taskform.delete.title">Bist Du sicher?</string>
+  <string name="taskform.delete.message">Wirklich löschen?</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nein</string>
+  <string name="quest">Quest</string>
+  <string name="avatar_body">Körper</string>
+  <string name="avatar_hair">Haar</string>
+  <string name="avatar_shirt">Shirt</string>
+  <string name="avatar_skin">Haut</string>
+  <string name="avatar_ears">Tierohren</string>
+  <string name="avatar_base">hinten</string>
+  <string name="avatar_color">Farbe</string>
+  <string name="avatar_beard">Bart</string>
+  <string name="avatar_mustache">Schnurrbart</string>
+  <string name="avatar_flower">Blume</string>
+  <string name="avatar_bangs">Frisur vorne</string>
+  <string name="avatar_nothing">Nichts gesetzt</string>
+  <string name="avatar_size">Größe</string>
+  <string name="avatar_size_slim">Dünn</string>
+  <string name="avatar_size_broad">Kräftig</string>
+  <string name="avatar_background">Hintergrund</string>
+  <string name="purchase_customization">Kaufe Anpassung</string>
+  <string name="purchase_set_button">Set für %d Edelsteine freischalten</string>
+  <string name="purchase_button">Kaufen</string>
+  <string name="purchase_set_title">Set %s kaufen</string>
+  <string name="due_date">Frist</string>
+  <string name="quest.accept">Annehmen</string>
+  <string name="quest.reject">Ablehnen</string>
+  <string name="quest.begin">Quest starten</string>
+  <string name="quest.cancel">Einladung abbrechen</string>
+  <string name="quest.abort">Quest abbrechen</string>
+  <string name="quest.leave">Quest verlassen</string>
+  <string name="quest.pending">Ausstehend</string>
+  <string name="quest.accepted">Angenommen</string>
+  <string name="quest.rejected">Abgelehnt</string>
+  <string name="quest.participants">Teilnehmer</string>
+  <string name="version_info">Version %1$s (%2$d)</string>
+  <string name="sidebar_help">Hilfe &amp; FAQ</string>
+  <string name="complete_tutorial">Verstanden!</string>
+  <string name="dismiss_tutorial">Erinnere mich noch einmal</string>
+  <string name="intro_1_subtitle">Willkommen bei</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Es ist an der Zeit für Spaß, während du deine Aufgaben machst. Tritt einer Gemeinschaft von %s anderen Menschen bei, die ihr Leben Aufgabe für Aufgabe verbessern möchten.</string>
+  <string name="intro_2_subtitle">Fortschritt im Spiel</string>
+  <string name="intro_2_title">Fortschritt im Leben</string>
+  <string name="intro_2_description">Schalte Spielinhalte durch das Erledigen und Abhaken deiner realen Aufgaben frei. Bekomme Rüstungen, Tiere und vieles mehr als Belohnungen für das Erfüllen deiner Ziele.</string>
+  <string name="intro_3_description">Behalte Deine Ziele im Auge mit Hilfe Deiner Freunde. Unterstützt Euch gegenseitig im Leben und im Kampf, während Ihr Euch gemeinsam verbessert!</string>
+  <string name="intro_finish_button">Fangen wir an!</string>
+  <string name="previous_button">Zurück</string>
+  <string name="next_button">Weiter</string>
+  <string name="skip_button">Überspringen</string>
+  <string name="setup_welcome_description">Willkommen zu Habitica! Hier bedeutet Fortschritt im Spiel gleichzeitig Fortschritt im echten Leben! Während Du Ziele im echten Leben erreichst, wirst Du Ausrüstung, Haustiere, Quests und vieles mehr freischalten.</string>
+  <string name="setup_welcome_title">Willkommen</string>
+  <string name="avatar_setup_description">Also, wie möchtest Du aussehen? Keine Sorge, Du kannst das jederzeit ändern.</string>
+  <string name="setup_group_work">Arbeit</string>
+  <string name="setup_group_exercise">Bewegung</string>
+  <string name="setup_group_health">Gesundheit</string>
+  <string name="setup_group_school">Schule</string>
+  <string name="setup_group_teams">Teams</string>
+  <string name="setup_group_chores">Hausarbeit</string>
+  <string name="setup_group_creativity">Kreativität</string>
+  <string name="setup_task_work_1">Verarbeite E-Mail</string>
+  <string name="setup_task_work_2">Wichtigste Aufgabe</string>
+  <string name="setup_task_work_3">Arbeitsprojekt</string>
+  <string name="setup_task_exercise_1">10 Min. Ausdauer</string>
+  <string name="setup_task_exercise_2">Dehnübungen</string>
+  <string name="setup_task_exercise_3">Trainingsplan erstellen</string>
+  <string name="setup_task_healthWellness_1">Gesund ernähren / Junkfood essen</string>
+  <string name="setup_task_healthWellness_2">Zahnseide benutzen</string>
+  <string name="setup_task_healthWellness_3">Check-up ausmachen</string>
+  <string name="setup_task_school_1">Lernen / Aufschieben</string>
+  <string name="setup_task_school_2">Hausaufgaben machen</string>
+  <string name="setup_task_school_3">Aufgabe für die Schule fertigstellen</string>
+  <string name="setup_task_teams_1">Status des Teams abfragen</string>
+  <string name="setup_task_teams_2">Team auf dem Laufenden halten</string>
+  <string name="setup_task_teams_3">Team-Projekt abschließen</string>
+  <string name="setup_task_chores_1">10 Minuten aufräumen</string>
+  <string name="setup_task_chores_2">Geschirr abwaschen</string>
+  <string name="setup_task_chores_3">Schrank aufräumen</string>
+  <string name="setup_task_creativity_1">Lerne ein Handwerk</string>
+  <string name="setup_task_creativity_2">An einem kreativem Projekt arbeiten</string>
+  <string name="setup_task_creativity_3">Kreatives Projekt fertigstellen</string>
+  <string name="gem.purchase.support">Du möchtest helfen, Habitica am Laufen zu halten? Unterstütze die Entwickler, indem Du Edelsteine kaufst!\n\nMit Edelsteinen kannst Du lustige Extras kaufen, zum Beispiel:\n\n - Coole Kostüme für Deinen Avatar\n - Hübsche Hintergründe\n - Spannende Quests, um Haustiere freizuschalten\n - Die Möglichkeit, Deine Klasse schon vor Level 100 zu wechseln\n\nVielen, vielen Dank, dass Du hilfst, Habitica großartig zu machen. Deine Unterstützung bedeutet uns sehr viel!</string>
+  <string name="my_guilds">Meine Gilden</string>
+  <string name="public_guilds">Öffentliche Gilden</string>
+  <string name="guild">Gilde</string>
+  <string name="leave">Verlassen</string>
+  <string name="join">Beitreten</string>
+  <string name="leader">Anführer</string>
+  <string name="gems">Edelsteine</string>
+  <string name="send_pm">PN senden</string>
+  <string name="flag">Melden</string>
+  <string name="delete">Löschen</string>
+  <string name="name">Name</string>
+  <string name="description">Beschreibung</string>
+  <string name="privacy">Privatsphäre</string>
+  <string name="write_message">Nachricht schreiben</string>
+  <string name="post">posten</string>
+  <string name="guild_search_hint">Nach Gilden suchen</string>
+  <string name="todo_due">Bis: %s</string>
+  <string name="daily_streak">Aktuelle Serie: %d</string>
+  <string name="todo_has_duedate">Diese Aufgabe hat eine Frist.</string>
+  <string name="battle_gear">Kampfausrüstung</string>
+  <string name="costume">Kostüm</string>
+  <string name="outfit_head">Kopf</string>
+  <string name="outfit_headAccessory">Kopfschmuck</string>
+  <string name="outfit_eyewear">Brillen</string>
+  <string name="outfit_armor">Rüstung</string>
+  <string name="outfit_back">Rücken</string>
+  <string name="outfit_body">Körper</string>
+  <string name="outfit_shield">Schild</string>
+  <string name="outfit_weapon">Waffe</string>
+  <string name="wear_costume">Kostüm tragen</string>
+  <string name="equipped">Ausgerüstet</string>
+  <string name="quest_cancel_message">Bist Du sicher, dass Du diese Quest abbrechen willst? Alle angenommenen Einladungen gehen verloren. Der Questbesitzer erhält die Questschriftrolle zurück.</string>
+  <string name="quest.invitation">Questeinladung</string>
+  <string name="quest_begin_message">Bist Du sicher, dass Du die Quest beginnen willst? Sobald sie aktiv ist, können keine zusätzlichen Gruppenmitglieder beitreten.</string>
+  <string name="quest.invitation.text">Du wurdest eingeladen, an einer Quest teilzunehmen!</string>
+  <string name="ago_1day">Vor einem Tag</string>
+  <string name="ago_days">Vor %d Tagen</string>
+  <string name="ago_1Minute">Vor einer Minute</string>
+  <string name="ago_minutes">Vor %d Minuten</string>
+  <string name="ago_hours">Vor %d Stunden</string>
+  <string name="ago_1hour">Vor einer Stunde</string>
+  <string name="today">Heute</string>
+  <string name="sidebar_items">Gegenstände</string>
+  <string name="eggs">Eier</string>
+  <string name="hatching_potions">Schlüpftränke</string>
+  <string name="food">Futter</string>
+  <string name="quests">Quests</string>
+  <string name="pets">Haustiere</string>
+  <string name="mounts">Reittiere</string>
+  <string name="armoireEquipment">Du hast einen seltenen Ausrüstungsgegenstand im Schrank gefunden: %s! Großartig!</string>
+  <string name="armoireFood">Du wühlst im Schrank herum und findest %1$s %2$s. Was macht das denn hier?</string>
+  <string name="armoireExp">Du ringst mit dem verzauberten Schrank und gewinnst Erfahrung. Nimm das!</string>
+  <string name="armoireNotesFull">Öffne den Schrank um zufällig spezielle Gegenstände, Erfahrung oder Nahrung zu erhalten! Verbleibende Ausrüstungsgegenstände: %d</string>
+  <string name="armoireLastItem">Du hast das letzte Stück der seltenen Ausrüstung im verzauberten Schrank gefunden.</string>
+  <string name="armoireNotesEmpty">Der Schrank wird jeden Monat neue Ausrüstung beinhalten. Bis dahin kannst Du weiterklicken um Erfahrung und Nahrung zu erhalten.</string>
+  <string name="sell">Verkaufen (%d Gold)</string>
+  <string name="hatch_with_potion">Mit Trank ausbrüten</string>
+  <string name="feed_to_pet">An Haustier verfüttern</string>
+  <string name="hatch_egg">Mit Ei ausbrüten</string>
+  <string name="invite_party">Gruppe einladen</string>
+  <string name="dialog_feeding">Füttere %1$s %2$s mit:</string>
+  <string name="use_animal">Nutzen</string>
+  <string name="feed">Füttern</string>
+  <string name="hatch_with">Haustier mit %s ausbrüten</string>
+  <string name="hatched_pet_title">Du hast ein %1$s %2$s ausgebrütet!</string>
+  <string name="close">Schließen</string>
+  <string name="share">Teilen</string>
+  <string name="notification_pet_fed">Du hast Dein/e/n %1$s %2$s gefüttert!</string>
+  <string name="notification_purchase">%s gekauft</string>
+  <string name="sectionpets">Normale Haustiere</string>
+  <string name="sectionpremiumPets">Magische Haustiere</string>
+  <string name="sectionquestPets">Quest-Haustiere</string>
+  <string name="sectionspecialPets">Seltene Haustiere</string>
+  <string name="sectionmounts">Normale Reittiere</string>
+  <string name="sectionpremiumMounts">Magische Reittiere</string>
+  <string name="sectionquestMounts">Quest-Reittiere</string>
+  <string name="sectionspecialMounts">Seltene Reittiere</string>
+  <string name="world_quest">Weltenquest</string>
+  <string name="inn_description">Ruhe Dich im Gasthaus aus damit Deine täglichen Aufgaben Dich über Nacht nicht verletzen! (Beachte: verhindert nicht den Schaden durch einen Boss.)</string>
+  <string name="empty_items">Du hast kein/e %s</string>
+  <string name="user_level">Lvl %d</string>
+  <string name="user_level_with_class">Lvl %1$d %2$s</string>
+  <string name="warrior">Krieger</string>
+  <string name="rogue">Schurke</string>
+  <string name="mage">Magier</string>
+  <string name="healer">Heiler</string>
+  <string name="warrior_description">Krieger verursachen mehr und stärkere \"kritische Treffer\", die zufällige Boni auf Gold, Erfahrung und Beute beim Erfüllen einer Aufgabe geben. Sie sind auch sehr stark gegen Bossmonster. Spiele einen Krieger, wenn Dich die Chance auf Belohnungen im Lottogewinn-Stil besonders reizt und Du besonders effektiv gegen Bossmonster sein willst.</string>
+  <string name="mage_description">Magier lernen rasch und erhalten schneller Erfahrung und Level als andere Klassen. Sie bekommen zudem eine große Menge Mana, um ihre Spezialfähigkeiten einzusetzen. Spiele einen Magier, wenn Dir die taktischen Aspekte des Spiels Spaß bereiten, oder wenn Du motiviert wirst durch schnellen Level-Aufstieg und das Freischalten fortgeschrittener Funktionen.</string>
+  <string name="rogue_description">Schurken lieben es Reichtümer anzuhäufen, indem sie mehr Gold als andere verdienen und geschickt darin sind, neue Gegenstände zu finden. Ihre typische Fähigkeit sich im verborgenen zu bewegen erlaubt Dir gelegentlich, die Folgen verpasster täglicher Aufgaben zu vermeiden. Spiele einen Schurken, wenn Dich Spielbelohnungen und Erfolge besonders reizen und Du nach Beute und Abzeichen trachtest!</string>
+  <string name="healer_description">Heiler stehen Schaden unbeeindruckt gegenüber und erweitern diesen Schutz auf andere. Verpasste tägliche Aufgaben und schlechte Angewohnheiten schaden ihnen nicht viel und sie haben Mittel und Wege Lebenspunkte wiederherzustellen. Spiele einen Heiler, wenn Du gerne Anderen in Deiner Gruppe hilfst, oder wenn es Dich besonders reizt, dem Tod durch harte Arbeit zu entkommen!</string>
+  <string name="select_class">Klasse wählen</string>
+  <string name="opt_out_class">Später entscheiden</string>
+  <string name="opt_out_description">Du willst keine Klasse oder möchtest Dich später entscheiden? Entscheide Dich später und werde zunächst ein Krieger ohne Spezialfähigkeiten. Du kannst später im Wiki etwas über das Klassensystem lesen und Deine Klasse jederzeit aktivieren.</string>
+  <string name="class_confirmation">Bist Du sicher, dass Du %s werden willst?</string>
+  <string name="class_changed">Du bist jetzt ein/eine %s!</string>
+  <string name="class_changed_description">Du hast neue Basis-Kampfausrüstung, die Du im Ausrüstungsreiter wechseln kannst!</string>
+  <string name="choose_class">Klasse wählen</string>
+  <string name="dialog_go_back">Zurück</string>
+  <string name="opt_out_confirmation">Bist Du sicher, dass Du Dich noch nicht entscheiden willst?</string>
+  <string name="change_class">Deine Klasse ändern</string>
+  <string name="change_class_description">Ändere Deine Klasse und erhalte Deine Attributpunkte für 3 Edelsteine zurück. Du kannst die Punkte über die Webseite zuweisen</string>
+  <string name="enable_class">Klassensystem freischalten</string>
+  <string name="changing_class_progress">Klasse ändern</string>
+  <string name="by_email">Per E-Mail</string>
+  <string name="invite_existing_users">Nutzer einladen</string>
+  <string name="send">Senden</string>
+  <string name="invite">Freunde einladen</string>
+  <string name="invite_id_description">Wenn Deine Freunde bereits Habitica verwenden, lade sie hier mit Hilfe ihrer Benutzer-ID ein.</string>
+  <string name="invite_email_description">Wenn Freunde Habitica mit Hilfe Deiner E-Mail beitreten, werden sie automatisch zu Deiner Gruppe eingeladen!</string>
+  <string name="add_invites">Einladungen hinzufügen</string>
+  <string name="user_id">Benutzer-ID</string>
+  <string name="email">E-Mail</string>
+  <string name="invite_users">Zur Gruppe einladen</string>
+  <string name="share_using">Teilen via</string>
+  <string name="share_levelup">Ich habe durch das Verbessern meiner realen Lebensgewohnheiten Level %d in Habitica erreicht!</string>
+  <string name="share_hatched">Durch das Erfüllen meiner Real-Life-Aufgaben habe ich ein %1$s %2$s Haustier in Habitica ausgebrütet!</string>
+  <string name="share_raised">Durch das Erfüllen meiner Real-Life-Aufgaben habe ich ein %1$s %2$s Reittier in Habitica erhalten!</string>
+  <string name="open_in_store">Im Play Store öffnen</string>
+  <string name="change_class_confirmation">Bist Du sicher, dass Du Deine Klasse ändern willst? Es kostet 3 Edelsteine.</string>
+  <string name="change_class_equipment_warning">Warnung: Du wirst nicht mehr Ausrüstung für die %s Klasse kaufen können.</string>
+  <string name="leaderMessage">Nachricht von %1$s</string>
+  <string name="leaderName">Führender: %1$s</string>
+  <string name="confirm">Bestätigen</string>
+  <string name="market">Marktplatz</string>
+  <string name="timeTravelers">Mysteriöse Zeitreisende</string>
+  <string name="seasonalShop">Jahreszeitenmarkt</string>
+  <string name="empty_inbox">Du hast keine Nachrichten in Deinem Posteingang. Du kannst einem anderen Benutzer eine neue Nachricht von deren öffentlichen Chatnachrichten aus senden!</string>
+  <string name="party_invite">Durch Einladen von Freunden freischalten</string>
+  <string name="no_gold">Nicht genügend Gold</string>
+  <string name="no_potion">Du musst keinen Heiltrank kaufen</string>
+  <string name="successful_purchase">%1$s gekauft</string>
+  <string name="purchase_confirmation_title">Kauf bestätigen</string>
+  <string name="confirm_purchase_text">%1$s für %2$s %3$s kaufen</string>
+  <string name="gem">Edelstein</string>
+  <string name="hourglass">Sanduhr</string>
+  <string name="hourglasses">Sanduhren</string>
+  <string name="gold_singular">Gold</string>
+  <string name="gold_plural">Gold</string>
+  <string name="chat_message_copied">Nachricht in Zwischenablage kopiert</string>
+  <string name="copy_chat_message">In Zwischenablage kopieren</string>
+  <string name="edit_tag_title">Tag bearbeiten</string>
+  <string name="edit_tag_btn_edit">Bearbeiten</string>
+  <string name="edit_tag_btn_done">Fertig</string>
+  <string name="edit_tag_btn_delete">Löschen</string>
+  <string name="confirm_delete_tag_title">Bist Du sicher?</string>
+  <string name="confirm_delete_tag_message">Wirklich löschen?</string>
+  <string name="filter_drawer_edit_tags">Tags bearbeiten</string>
+  <string name="filter_drawer_filter_tags">Nach Tags filtern</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Lass Dich durch diesen QR Code von jemandem einladen</string>
+  <string name="qr_save_message">QR code gespeichert: </string>
+  <string name="qr_dialogue_title">Dein QR Code</string>
+  <string name="download">Download</string>
+  <string name="send_new_message">Neue Nachricht schicken</string>
+  <string name="choose_recipient_title">Nachrichtenempfänger auswählen</string>
+  <string name="action_continue">Weiter</string>
+  <string name="scan_qr_code">QR Code scannen</string>
+  <string name="enter_recipient_uuid">ID des Empfängers eingeben</string>
+  <string name="invited_to_party">Du wurdest in eine Gruppe eingeladen!</string>
+  <string name="stats_widget_label">Habitica: Avatar</string>
+  <string name="add_task">Neue Aufgabe hinzufügen</string>
+  <string name="add_habit">Neue Gewohnheit hinzufügen</string>
+  <string name="add_daily">Neue Tägliche Aufgabe hinzufügen</string>
+  <string name="add_todo">Neue To-Do hinzufügen</string>
+  <string name="add_reward">Neue Belohnung hinzufügen</string>
+  <string name="all_dailies_completed">Du hast alle deine täglichen Aufgaben erledigt. Gut gemacht!</string>
+  <string name="widget_habit_button">Habitica: Gewohnheit</string>
+  <string name="widget_dailies">Habitica: Tägliche Aufgaben</string>
+  <string name="widget_add_task">Habitica: Neue Aufgabe</string>
+  <string name="google_services_missing">Google Play Dienste konnten nicht gefunden werden</string>
+  <string name="gem.purchase.toolbartitle">Kaufen</string>
+  <string name="gem.purchase.title">Das Erwerben von Edelsteinen unterstützt die Entwickler und hilft Habitica am Laufen zu halten</string>
+  <string name="gem.purchase.subtitle">Edelsteine erlaubes es Dir spaßige Extras für Deinen Account zu erwerben, inklusive:</string>
+  <string name="gem.purchase.listitem1">Coole Kostüme für Deinen Avatar</string>
+  <string name="gem.purchase.listitem2">Fantastische Hintergründe</string>
+  <string name="gem.purchase.listitem3">Quest, welche Dich mit Haustiereiern belohnt</string>
+  <string name="gem.purchase.listitem4">Die Fähigkeit Deine Klasse vor dem Erreichen von Level 100 zu ändern</string>
+  <string name="support_habitica">Unterstütze Habitica</string>
+  <string name="skill_transformation_use">benutzen</string>
+  <string name="hatching_market_info">Kriegst Du nicht die richtige Beute? Besuche den Marktplatz!</string>
+  <string name="feeding_market_info">Brauchst Du anderes Futter? Kaufe mehr auf dem Marktplatz!</string>
+  <string name="open_market">Marktplatz öffnen</string>
+  <string name="cds_description">Deine Täglichen Aufgaben werden zurückgesetzt, wenn Du Dich nach %1$s einloggst. Stelle sicher, dass Du vorher alle Deine Täglichen Aufgaben erledigt hast!</string>
+  <string name="AudioTheme_title">Hintergrundmusik</string>
+  <string name="AudioTheme_summary">Ändere Habiticas Hintergrundmusik</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Bis morgen!</string>
+  <string name="belongs_to_challenge">Gehört zum Wettbewerb</string>
+  <string name="has_reminder">Hat eine Benachrichtigung</string>
+  <string name="has_tag">Hat einen Tag</string>
+  <string name="subscribe.title">Mit einem Abonnement unterstützt Du die Entwickler und den Betrieb von Habitica</string>
+  <string name="subscribe_prompt">Werde Abonnent und du bekommst diese nützlichen Vorteile: </string>
+  <string name="subscribe.listitem1">Kaufe Edelsteine mit Gold</string>
+  <string name="subscribe.listitem2">Exklusive monatliche Gegenstände</string>
+  <string name="subscribe.listitem3">Zusätzliche Verlaufseinträge sichern</string>
+  <string name="subscribe.listitem4">Tägliches Beute-Limit verdoppelt</string>
+  <string name="subscriptions">Abonnements</string>
+  <string name="subscription_duration">Alle %s wiederholen</string>
+  <string name="subscribe">Abonnieren</string>
+  <string name="subscribe.listitem1.description">Alexander der Händler wird Dir nun Edelsteine für jeweils 20 Goldmünzen pro Stück verkaufen.\n\nSeine monatlichen Lieferungen sind zunächst auf 25 Edelsteine pro Monat beschränkt, welche jedoch durch die Dauer Deines Abonnements erhöht werden.\n\nDas Limit steigt um 5 Edelsteine für jeweils drei durchgehend abonnierte Monate, bis zu einem Maximum von 50 Edelsteinen pro Monat!</string>
+  <string name="subscribe.listitem2.description">Jeden Monat wirst Du einen einzigartigen optischen Gegenstand für Deinen Avatar erhalten.\n\nAußerdem gewährt Dir der Mysteriöse Zeitreisende für jeweils drei durchgehend abonnierte Monate Zugang zu historischen (und futuristischen!) optischen Gegenständen.</string>
+  <string name="subscribe.listitem3.description">Verlängert die Historie erledigter To-Dos und Aufgaben.</string>
+  <string name="subscribe.listitem4.description">Verdoppelte Beute-Limits ermöglichen es Dir, täglich von erledigten Aufgaben mehr Gegenstände zu finden und deinen Stall schneller zu vervollständigen!</string>
+  <string name="subscribe1month.gemcap">Edelsteinobergrenze startet bei 25 Edelsteinen</string>
+  <string name="subscribe3month.gemcap">Edelsteinobergrenze auf 30 Edelsteine erhöht</string>
+  <string name="subscribe6month.gemcap">Edelsteinobergrenze auf 35 Edelsteine erhöht</string>
+  <string name="subscribe12month.gemcap">Edelsteinobergrenze auf 45 Edelsteine erhöht</string>
+  <string name="subscription_hourglasses">+%d Mystische Sanduhr</string>
+  <string name="payment_method">Zahlungsmethode</string>
+  <string name="subscription">Abonnement</string>
+  <string name="active">Aktiv</string>
+  <string name="cancel_subscription">Abonnement kündigen</string>
+  <string name="cancel_subscription_google.description">Du willst nicht länger Abonnent sein? Du findest die Option zum Kündigen im Google Play Store unter \"Meine Apps und Spiele\".</string>
+  <string name="cancel_subscription_notgoogle.description">Du möchtest Dein Abonnement beenden? Aufgrund Deiner Zahlungsmethode kannst Du Dein Abonnement nur über die Webseite beenden. Benutze die Schaltfläche unten, um die Seite in Deinem Browser zu öffnen!</string>
+  <string name="visit_habitica_website">Habitica-Internetseite besuchen</string>
+  <string name="current_bonuses">Aktuelle Boni</string>
+  <string name="months_subscribed">Abonnierte Monate</string>
+  <string name="current_hourclasses">Aktuelle mystische Sanduhren</string>
+  <string name="monthly_gem_cap">Monatliche Edelsteinobergrenze</string>
+  <string name="inactive">Inaktiv</string>
+  <string name="one_month">1 Monat</string>
+  <string name="months">%d Monate</string>
+  <string name="month">Monat</string>
+  <string name="three_months">3 Monate</string>
+  <string name="six_months">6 Monate</string>
+  <string name="twelve_months">12 Monate</string>
+  <string name="subscribe_prompt_thanks">Für das Abonnieren bekommst Du diese nützlichen Vorteile: </string>
+  <string name="subscription_status">Abonnement Status</string>
+  <string name="byLeader">von %s</string>
+  <string name="challenge_details">Wettbewerbdetails</string>
+  <string name="challenge_leave_title">Wettbewerb verlassen</string>
+  <string name="challenge_leave_text">Bist Du Dir sicher, dass du den Wettbewerb \"%s\" verlassen willst?</string>
+  <string name="challenge_remove_tasks_title">Aufgaben entfernen</string>
+  <string name="challenge_remove_tasks_text">Willst du deine Aufgaben wirklich entfernen?</string>
+  <string name="remove_tasks">Entfernen</string>
+  <string name="keep_tasks">Behalten</string>
+  <string name="my_challenges">Meine Wettbewerbe</string>
+  <string name="public_challenges">Öffentlich</string>
+  <string name="challenges">Wettbewerbe</string>
+  <string name="daily">Tägliche Aufgabe</string>
+  <string name="habit">Gewohnheit</string>
+  <string name="reward">Belohnung</string>
+  <string name="todo">To-Do</string>
+  <string name="official">Offiziell</string>
+  <string name="participating">Beigetreten</string>
+  <string name="challenge">Wettbewerb</string>
+  <string name="go_to_challenge">Gehe zum Wettbewerb</string>
+  <string name="not_part_of_a_challenge">Du nimmst im Moment an keinen Wettbewerben teil!</string>
+  <string name="join_a_challenge">Trete einem Wettbewerb bei, um ein ausgewähltes Set von Aufgaben zu deiner Liste hinzuzufügen. Trete dann gegen andere Habitica-Mitglieder an, um Erfolge und sogar Edelsteine zu gewinnen!</string>
+  <string name="check_the_public_challenge_tab">Drücke auf den \"Öffentlich\"-Tab, um die von Mitgliedern erstellten Wettbewerbe zu finden, die am besten zu Dir passen!</string>
+  <string name="add_reminder">Erinnerung hinzufügen</string>
+  <string name="warning">Warnung</string>
+  <string name="open_settings">Einstellungen öffnen</string>
+  <string name="dont_keep_activities_warning">Es sieht so aus, als wäre die Entwickleroption \\"Aktivitäten nicht behalten\\" aktiviert. Momentan können dadurch Probleme in der Habitica App entstehen, deshalb empfehlen wir Dir, die Option zu deaktivieren.</string>
+  <string name="inbox">Posteingang</string>
+  <string name="FAQ">Häufig gestellte Fragen</string>
+  <string name="special">Spezial</string>
+  <string name="gem_for_gold_description">Weil Du Habitica abonnierst, kannst Du jeden Monat eine Anzahl von Edelsteinen mit Gold kaufen. </string>
+  <string name="limited_count">%d übrig</string>
+  <string name="gem_shop">Edelstein</string>
+  <string name="mystery_item">Überraschungsgegenstand</string>
+  <string name="myster_item_notes">Jeden Monat bekommen Abonnenten einen Überraschungsgegenstand. Dieser wird üblicherweise circa eine Woche vor Ende des Monats veröffentlicht.</string>
+  <string name="open">Öffnen</string>
+  <string name="notification_mystery_item">Du öffnest die Kiste und findest %s!</string>
+  <string name="checkInRewardEarned">Du hast ein %1$s als Belohnung für Deine Hingabe, dein Leben zu verbessern, erhalten.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Deine nächste Belohnung wird nach %1$d Log-Ins freigeschalten </string>
+  <string name="pending_approval">Zustimmung ausstehend</string>
+  <string name="filters">Filter</string>
+  <string name="done">Fertig</string>
+  <string name="group_tasks_edit_description">Gruppenaufgaben können nicht bearbeitet werden.</string>
+  <string name="group_tasks_edit_title">Aufgabe kann nicht bearbeitet werden</string>
+  <string name="groups">Gruppen</string>
+  <string name="all">Alles</string>
+  <string name="none">Nichts</string>
+  <string name="owned">Im Besitz</string>
+  <string name="not_owned">Nicht im Besitz</string>
+  <string name="login_btn_fb">Mit Facebook-Konto einloggen</string>
+  <string name="login_btn_google">Mit Google-Konto einloggen</string>
+  <string name="welcome_text">Oh, Du musst neu hier sein. Ich bin Justin, der Stadtführer von Habitica.\n\nAls erstes erstellen wir Dir einen Avatar.</string>
+  <string name="avatar_extras">Extras</string>
+  <string name="avatar_skin_color">Hautfarbe</string>
+  <string name="avatar_hair_color">Haarfarbe</string>
+  <string name="avatar_hair_bangs">Pony</string>
+  <string name="avatar_hair_ponytail">Zopf</string>
+  <string name="avatar_glasses">Brille</string>
+  <string name="avatar_wheelchair">Rollstuhl</string>
+  <string name="weak">Schwach</string>
+  <string name="strong">Stark</string>
+  <string name="completed">Vervollständigt</string>
+  <string name="setuP_group_other">Anderes</string>
+  <string name="clear">löschen</string>
+  <string name="empty_title_habits">Du hast keine Gewohnheiten</string>
+  <string name="empty_description_habits">Gewohnheiten sind Aufgaben ohne festen Zeitplan. Du kannst sie mehrmals am Tag oder gar nicht abhaken.</string>
+  <string name="empty_title_dailies">Du hast keine täglichen Aufgaben</string>
+  <string name="empty_description_dailies">Tägliche Aufgaben sind sich regelmäßig wiederholende Aufgaben. Such Dir den Zeitplan aus, der Dir am besten passt!</string>
+  <string name="empty_title_todos">Du hast keine To-Dos</string>
+  <string name="empty_description_todos">To-Dos sind Aufgaben, die nur einmal abgehakt werden. Füge Unteraufgaben zu To-Dos hinzu, um deren Wert zu steigern.</string>
+  <string name="empty_title_rewards">Du hast keine Belohnungen</string>
+</resources>
diff --git a/Habitica/res/values-es/strings.profile.xml b/Habitica/res/values-es/strings.profile.xml
index c57e22076..e0f399a0c 100644
--- a/Habitica/res/values-es/strings.profile.xml
+++ b/Habitica/res/values-es/strings.profile.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">Mascotas y monturas</string>
-    <string name="profile_pets_found">Mascotas encontradas</string>
-    <string name="profile_mounts_tamed">Monturas domadas</string>
-    <string name="profile_loading_data">Cargando datos de miembro.</string>
-    <string name="profile_send_message_to">Enviar mensaje a %s</string>
-    <string name="profile_message_sent_to">Mensaje enviado a %s</string>
-    <string name="profile_level">Nivel:</string>
-    <string name="profile_class_bonus">Bonus de clase:</string>
-    <string name="profile_allocated">Asignado:</string>
-    <string name="profile_boosts">Incrementos:</string>
-    <string name="profile_private_message">Mensaje privado</string>
-    <string name="profile_achievements">Logros</string>
-    <string name="profile_achievement_ok">Ok</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Mascotas y monturas</string>
+    <string name="profile_pets_found">Mascotas encontradas</string>
+    <string name="profile_mounts_tamed">Monturas domadas</string>
+    <string name="profile_loading_data">Cargando datos de miembro.</string>
+    <string name="profile_send_message_to">Enviar mensaje a %s</string>
+    <string name="profile_message_sent_to">Mensaje enviado a %s</string>
+    <string name="profile_level">Nivel:</string>
+    <string name="profile_class_bonus">Bonus de clase:</string>
+    <string name="profile_allocated">Asignado:</string>
+    <string name="profile_boosts">Incrementos:</string>
+    <string name="profile_private_message">Mensaje privado</string>
+    <string name="profile_achievements">Logros</string>
+    <string name="profile_achievement_ok">Ok</string>
     </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-es/strings.tutorial.xml b/Habitica/res/values-es/strings.tutorial.xml
index 717549c73..14a0aa4f6 100644
--- a/Habitica/res/values-es/strings.tutorial.xml
+++ b/Habitica/res/values-es/strings.tutorial.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_equipment">Cuando compres artículos de equipamiento, aparecerán aquí. El equipo de batalla que elijas afectará a tus estadísticas, y el disfraz (si lo habilitas) será lo que lleve tu personaje.</string>
-  <string name="tutorial_items">Consigue artículos completando tareas y subiendo de nivel. Pulsa en un artículo para usarlo.</string>
-  <string name="tutorial_pets">A medida que completes tareas del mundo real, a partir de ahora, podrás encontrar huevos y pociones al azar. Combínalos para que nazca una mascota.</string>
-  <string name="tutorial_skills">Las habilidades son competencias especiales con efectos muy poderosos. Para usar una habilidad, solo tienes que pulsar en ella. Te costará maná (la barra azul), que puedes recuperar entrando todos los días y realizando tareas en la vida real. Para obtener más información, consulta las preguntas frecuentes, en el menú.</string>
-  <string name="tutorial_party">Aquí es donde tú y tus amigos podéis estar pendientes unos de otros para cumplir vuestros objetivos y combatir monstruos con vuestras tareas.</string>
-  <string name="tutorial_tavern">Te damos la bienvenida a la Taberna, una sala de chat para todos los públicos y todas las edades. Aquí, puedes hablar de productividad y preguntar lo que quieras. ¡Que te diviertas!</string>
-  <string name="tutorial_classes">¡Decide si quieres ser guerrero, mago, sanador o pícaro! Cada clase tiene sus propias habilidades y equipamiento. Si necesitas más información, pulsa en (?).</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_equipment">Cuando compres artículos de equipamiento, aparecerán aquí. El equipo de batalla que elijas afectará a tus estadísticas, y el disfraz (si lo habilitas) será lo que lleve tu personaje.</string>
+  <string name="tutorial_items">Consigue artículos completando tareas y subiendo de nivel. Pulsa en un artículo para usarlo.</string>
+  <string name="tutorial_pets">A medida que completes tareas del mundo real, a partir de ahora, podrás encontrar huevos y pociones al azar. Combínalos para que nazca una mascota.</string>
+  <string name="tutorial_skills">Las habilidades son competencias especiales con efectos muy poderosos. Para usar una habilidad, solo tienes que pulsar en ella. Te costará maná (la barra azul), que puedes recuperar entrando todos los días y realizando tareas en la vida real. Para obtener más información, consulta las preguntas frecuentes, en el menú.</string>
+  <string name="tutorial_party">Aquí es donde tú y tus amigos podéis estar pendientes unos de otros para cumplir vuestros objetivos y combatir monstruos con vuestras tareas.</string>
+  <string name="tutorial_tavern">Te damos la bienvenida a la Taberna, una sala de chat para todos los públicos y todas las edades. Aquí, puedes hablar de productividad y preguntar lo que quieras. ¡Que te diviertas!</string>
+  <string name="tutorial_classes">¡Decide si quieres ser guerrero, mago, sanador o pícaro! Cada clase tiene sus propias habilidades y equipamiento. Si necesitas más información, pulsa en (?).</string>
+</resources>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 0ed18ef14..0bf88176f 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -1,466 +1,466 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Actualizar</string>
-  <string name="XP_default">Experiencia</string>
-  <string name="HP_default">Salud</string>
-  <string name="MP_default">Maná</string>
-  <string name="ERR_pb_barcode">No se han podido cargar las preferencias a partir del código de barras</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Ajustes</string>
-  <string name="SP_address_hint">Tu servidor personalizado</string>
-  <string name="SP_userID_title">ID de usuario</string>
-  <string name="SP_userID_summary">Tu ID de usuario</string>
-  <string name="SP_APIToken_title">Token de API</string>
-  <string name="SP_APIToken_summary">Tu token de API</string>
-  <string name="Language_title">Idioma</string>
-  <string name="Language_summary">Cambiar el idioma de Habitica</string>
-  <string name="SP_user_qr_code">Tu código QR</string>
-  <string name="PS_contact_title">Contactar</string>
-  <string name="pref_account_header">Cuenta</string>
-  <string name="pref_first_day_of_the_week_title">Primer día de la semana</string>
-  <string name="pref_first_day_of_the_week_summary">Primer día de la semana en todos los calendarios</string>
-  <string name="pref_reminder_header">Recordatorio diario</string>
-  <string name="pref_reminder_checkbox">Activar recordatorio</string>
-  <string name="pref_reminder_picker">Establecer hora de recordatorio</string>
-  <string name="pref_cds_header">Personalizar comienzo del día</string>
-  <string name="pref_cds_picker">Establecer hora del comienzo del día personalizado</string>
-  <string name="pref_push_notifications_checkbox">Notificaciones push del usuario</string>
-  <string name="push_notifications">Notificaciones push</string>
-  <string name="push_notifications_sum">Establecer tu configuración de notificaciones push</string>
-  <string name="preference_push_you_won_challenge">¡Has ganado un desafío!</string>
-  <string name="preference_push_received_a_private_message">Has recibido un mensaje privado</string>
-  <string name="preference_push_gifted_gems">Gemas regaladas</string>
-  <string name="preference_push_gifted_subscription">Suscripción regalada</string>
-  <string name="preference_push_invited_to_party">Invitado a un grupo</string>
-  <string name="preference_push_invited_to_guild">Invitado a un Gremio</string>
-  <string name="preference_push_your_quest_has_begun">La misión ha comenzado</string>
-  <string name="preference_push_invited_to_quest">Invitado a una misión</string>
-  <!--Adding tasks-->
-  <string name="task_value">Valor</string>
-  <string name="action_edit">Editar</string>
-  <string name="action_delete">Borrar</string>
-  <string name="action_cancel">Cancelar</string>
-  <string name="login_btn">Iniciar sesión</string>
-  <string name="register_btn">Registrarse</string>
-  <string name="username">Nombre de usuario</string>
-  <string name="email_username">Correo electrónico o nombre de usuario</string>
-  <string name="password">Contraseña</string>
-  <string name="emailAddress">Correo electrónico</string>
-  <string name="confirmpassword">Confirma la contraseña</string>
-  <string name="logout">Cerrar sesión</string>
-  <string name="logout_description">Cierra la sesión de tu cuenta</string>
-  <string name="account_details_sum">Revisa los detalles de tu cuenta.</string>
-  <string name="account_details">Detalles de la cuenta</string>
-  <string name="LoginActivityName">Te damos la bienvenida</string>
-  <string name="string_revive">Revivir</string>
-  <string name="please_connect">Antes de usar un widget, conéctate a través de la aplicación</string>
-  <string name="about.title">Información</string>
-  <string name="about.libraries">Bibliotecas</string>
-  <string name="about.versionhistory">Historial de versiones</string>
-  <string name="about.habitica_open_source">Habitica está disponible como software de código abierto en Github</string>
-  <string name="about.rate_our_app">Califica nuestra aplicación</string>
-  <string name="about.give_us_feedback">Envíanos tus comentarios</string>
-  <string name="about.bugreport">Notificar un error</string>
-  <string name="about.source_code">Código fuente</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Error de conexión</string>
-  <string name="network_error_no_network_body">No tienes conexión a Internet.</string>
-  <string name="internal_error_api">Parece que hay un problema con el servidor. Vuelve a intentarlo más tarde.</string>
-  <string name="authentication_error_title">Error de autenticación</string>
-  <string name="authentication_error_body">Tu usuario y/o contraseña es incorrecto.</string>
-  <string name="login_validation_error_title">Error de validación</string>
-  <string name="login_validation_error_fieldsmissing">Tienes que rellenar todos los campos.</string>
-  <string name="save_changes">Guardar</string>
-  <string name="copy">Copiar</string>
-  <string name="notes">Notas</string>
-  <string name="text">Texto</string>
-  <string name="difficulty">Dificultad</string>
-  <string name="tags">Etiquetas</string>
-  <string name="trivial">Trivial</string>
-  <string name="easy">Fácil</string>
-  <string name="medium">Intermedia</string>
-  <string name="hard">Difícil</string>
-  <string name="start_date">Fecha de inicio</string>
-  <string name="positive_habit_form">Positivo ( + )</string>
-  <string name="negative_habit_form">Negativo ( - )</string>
-  <string name="checklist">Listado</string>
-  <string name="reminders">Recordatorios</string>
-  <string name="actions">Acciones</string>
-  <string name="attributes">Atributos</string>
-  <string name="physical">Físico</string>
-  <string name="mental">Mental</string>
-  <string name="social">Social</string>
-  <string name="other">Otros</string>
-  <string name="frequency">Frecuencia</string>
-  <string name="frequency_weekly">Ciertos días de la semana</string>
-  <string name="frequency_daily">Cada X días</string>
-  <string name="monday">Lunes</string>
-  <string name="tuesday">Martes</string>
-  <string name="wednesday">Miércoles</string>
-  <string name="thursday">Jueves</string>
-  <string name="friday">Viernes</string>
-  <string name="saturday">Sábado</string>
-  <string name="sunday">Domingo</string>
-  <string name="levelup_header">¡Has subido de nivel!</string>
-  <string name="levelup_detail">Cumpliendo tus metas en la vida real, has pasado al nivel %1$d.</string>
-  <string name="levelup_health">¡Has recuperado toda tu salud!</string>
-  <string name="levelup_button">¡Hurra!</string>
-  <string name="faint_subtitle">¡No desesperes!</string>
-  <string name="faint_penalty_body">Has perdido un nivel, todo tu oro y una pieza de tu equipamiento, ¡pero puedes recuperarlo todo con tu esfuerzo! Buena suerte, lo harás genial.</string>
-  <string name="faint_header">¡Te has quedado sin salud!</string>
-  <string name="faint_button">Recuperar toda la salud y volver a intentarlo</string>
-  <string name="filter">Filtro</string>
-  <string name="profile_image">Imagen de perfil</string>
-  <string name="mana_price_button">%d PM</string>
-  <string name="used_skill">Has usado %1$s por %2$d de maná.</string>
-  <string name="used_skill_without_mana">Has usado %1$s.</string>
-  <string name="new_checklist_item">nuevo elemento de lista</string>
-  <string name="add_checklist_item">Añadir</string>
-  <string name="reminder_title">¡Acuérdate de completar tus tareas diarias!</string>
-  <string name="skill_progress_title">Usando habilidad</string>
-  <string name="coming_soon">Próximamente</string>
-  <string name="chat_flag_confirmation">¿Seguro que quieres informar de que este mensaje incumple las normas?</string>
-  <string name="flag_confirm">Denunciar mensaje</string>
-  <string name="unlock_lvl_11">Se desbloquea en el nivel 11</string>
-  <string name="no_party_message">No formas parte de ningún grupo. Para unirte a uno, entra en la página web.</string>
-  <string name="forgot_pw_btn">He olvidado la contraseña</string>
-  <string name="forgot_pw_tv">¿No recuerdas tu contraseña? Entra en el sitio web para móviles.</string>
-  <string name="tavern.inn.checkOut">Reactivar tareas diarias</string>
-  <string name="tavern.inn.rest">Pausar tareas diarias</string>
-  <string name="reward.dialog.buy">Comprar</string>
-  <string name="reward.dialog.dismiss">Descartar</string>
-  <string name="party">Grupo</string>
-  <string name="chat">Conversación</string>
-  <string name="members">Miembros</string>
-  <string name="habits">Hábitos</string>
-  <string name="dailies">Tareas diarias</string>
-  <string name="todos">Tareas</string>
-  <string name="rewards">Recompensas</string>
-  <string name="taskform.delete.title">¿Seguro?</string>
-  <string name="taskform.delete.message">¿Seguro que quieres borrarlo?</string>
-  <string name="yes">Sí</string>
-  <string name="no">No</string>
-  <string name="quest">Misión</string>
-  <string name="avatar_body">Cuerpo</string>
-  <string name="avatar_hair">Cabello</string>
-  <string name="avatar_shirt">Camisa</string>
-  <string name="avatar_skin">Piel</string>
-  <string name="avatar_ears">Orejas de animales</string>
-  <string name="avatar_base">Base</string>
-  <string name="avatar_color">Color</string>
-  <string name="avatar_beard">Barba</string>
-  <string name="avatar_mustache">Bigote</string>
-  <string name="avatar_flower">Flor</string>
-  <string name="avatar_bangs">Flequillo</string>
-  <string name="avatar_nothing">Nada seleccionado</string>
-  <string name="avatar_size">Talla</string>
-  <string name="avatar_size_slim">Delgado</string>
-  <string name="avatar_size_broad">Ancho</string>
-  <string name="avatar_background">Fondo</string>
-  <string name="purchase_customization">Comprar personalización</string>
-  <string name="purchase_set_button">Desbloquear el conjunto por %d gemas</string>
-  <string name="purchase_button">Comprar</string>
-  <string name="purchase_set_title">Comprar conjunto %s</string>
-  <string name="due_date">Fecha límite</string>
-  <string name="quest.accept">Aceptar</string>
-  <string name="quest.reject">Rechazar</string>
-  <string name="quest.begin">Comenzar misión</string>
-  <string name="quest.cancel">Cancelar invitación</string>
-  <string name="quest.abort">Anular misión</string>
-  <string name="quest.leave">Abandonar misión</string>
-  <string name="quest.pending">Pendiente</string>
-  <string name="quest.accepted">Aceptada</string>
-  <string name="quest.rejected">Rechazada</string>
-  <string name="quest.participants">Participantes</string>
-  <string name="version_info">Versión %1$s (%2$d)</string>
-  <string name="sidebar_help">Ayuda y preguntas frecuentes</string>
-  <string name="complete_tutorial">¡Ya está!</string>
-  <string name="dismiss_tutorial">Vuelve a recordármelo</string>
-  <string name="intro_3_description">No pierdas de vista tus objetivos y deja que te ayuden tus amigos. ¡Apoyaos mutuamente en la vida y en la lucha para mejorar juntos!</string>
-  <string name="previous_button">Anterior</string>
-  <string name="next_button">Siguiente</string>
-  <string name="skip_button">Omitir</string>
-  <string name="setup_welcome_description">Te damos la bienvenida a Habitica, donde al progresar dentro del juego, mejorarás en la vida real. A medida que cumplas tus objetivos del mundo real, desbloquearás piezas de equipamiento, mascotas, misiones y mucho más.</string>
-  <string name="setup_welcome_title">Te damos la bienvenida</string>
-  <string name="setup_group_work">Trabajo</string>
-  <string name="setup_group_exercise">Ejercicio</string>
-  <string name="setup_group_school">Clases</string>
-  <string name="setup_group_teams">Equipos</string>
-  <string name="setup_group_chores">Labores domésticas</string>
-  <string name="setup_group_creativity">Creatividad</string>
-  <string name="setup_task_work_1">Procesar correo</string>
-  <string name="setup_task_work_2">Tarea más importante</string>
-  <string name="setup_task_work_3">Proyecto profesional</string>
-  <string name="setup_task_exercise_1">10 minutos de ejercicio</string>
-  <string name="setup_task_exercise_2">Estiramientos</string>
-  <string name="setup_task_exercise_3">Decidir un plan de entrenamiento</string>
-  <string name="setup_task_healthWellness_1">Comer comida sana / comida basura</string>
-  <string name="setup_task_healthWellness_2">Usar hilo dental</string>
-  <string name="setup_task_healthWellness_3">Planificar reunión</string>
-  <string name="setup_task_school_1">Estudiar/vaguear</string>
-  <string name="setup_task_school_2">Hacer los deberes</string>
-  <string name="setup_task_school_3">Acabar trabajo para clase</string>
-  <string name="setup_task_teams_1">Quedar con el grupo</string>
-  <string name="setup_task_teams_2">Poner al día al grupo</string>
-  <string name="setup_task_teams_3">Acabar trabajo en equipo</string>
-  <string name="setup_task_chores_1">Limpiar 10 minutos</string>
-  <string name="setup_task_chores_2">Lavar los platos</string>
-  <string name="setup_task_chores_3">Ordenar el armario</string>
-  <string name="setup_task_creativity_1">Estudiar hasta dominar la técnica</string>
-  <string name="setup_task_creativity_2">Trabajar en proyecto creativo</string>
-  <string name="setup_task_creativity_3">Terminar proyecto creativo</string>
-  <string name="gem.purchase.support">¿Quieres contribuir a que Habitica siga en funcionamiento? Puedes ayudar a los desarrolladores comprando gemas.\n\nLas gemas te permiten comprar artículos adicionales para tu cuenta, por ejemplo: \n\n - Fantásticos trajes para tu personaje\n - Increíbles fondos\n - Divertidas misiones que te recompensan con huevos de mascotas\n - La capacidad de cambiar de clase antes de llegar al nivel 100\n\nMuchísimas gracias por ayudarnos a hacer que Habitica sea lo mejor posible. ¡Valoramos enormemente vuestras contribuciones!</string>
-  <string name="my_guilds">Mis gremios</string>
-  <string name="public_guilds">Gremios públicos</string>
-  <string name="guild">Gremio</string>
-  <string name="leave">Abandonar</string>
-  <string name="join">Unirse</string>
-  <string name="leader">Líder</string>
-  <string name="gems">Gemas</string>
-  <string name="send_pm">Enviar mensaje privado</string>
-  <string name="flag">Marcar</string>
-  <string name="delete">Borrar</string>
-  <string name="name">Nombre</string>
-  <string name="description">Descripción</string>
-  <string name="privacy">Privacidad</string>
-  <string name="write_message">Escribir mensaje</string>
-  <string name="post">Publicar</string>
-  <string name="guild_search_hint">Buscar gremios</string>
-  <string name="todo_due">Para: %s</string>
-  <string name="daily_streak">racha actual: %d</string>
-  <string name="todo_has_duedate">La tarea tiene fecha límite</string>
-  <string name="battle_gear">Equipo de batalla</string>
-  <string name="costume">Disfraz</string>
-  <string name="outfit_head">Cabeza</string>
-  <string name="outfit_headAccessory">Accesorio para la cabeza</string>
-  <string name="outfit_eyewear">Gafas</string>
-  <string name="outfit_armor">Armadura</string>
-  <string name="outfit_back">Espalda</string>
-  <string name="outfit_body">Cuerpo</string>
-  <string name="outfit_shield">Escudo</string>
-  <string name="outfit_weapon">Arma</string>
-  <string name="wear_costume">Llevar disfraz</string>
-  <string name="equipped">Equipado</string>
-  <string name="quest_cancel_message">¿Seguro que quieres cancelar esta misión? Se perderán todas las invitaciones que se hayan aceptado y el propietario de la misión recuperará el pergamino.</string>
-  <string name="quest.invitation">Invitación a misión</string>
-  <string name="quest_begin_message">¿Seguro que quieres comenzar la misión? Una vez comenzada, no podrán unirse a esta misión más miembros del grupo.</string>
-  <string name="quest.invitation.text">Te han invitado a participar en una misión.</string>
-  <string name="ago_1day">Hace 1 día</string>
-  <string name="ago_days">Hace %d días</string>
-  <string name="ago_1Minute">Hace 1 minuto</string>
-  <string name="ago_minutes">Hace %d minutos</string>
-  <string name="ago_hours">Hace %d horas</string>
-  <string name="ago_1hour">Hace 1 hora</string>
-  <string name="today">Hoy</string>
-  <string name="sidebar_items">Artículos</string>
-  <string name="eggs">Huevos</string>
-  <string name="hatching_potions">Pociones de nacimiento</string>
-  <string name="food">Comida</string>
-  <string name="quests">Misiones</string>
-  <string name="pets">Mascotas</string>
-  <string name="mounts">Monturas</string>
-  <string name="armoireEquipment">¡Genial! Has encontrado una prenda insólita en el Armario: %s.</string>
-  <string name="armoireFood">Rebuscando en el Armario, encuentras esto: %1$s %2$s. ¿Qué hace aquí?</string>
-  <string name="armoireExp">Te peleas con el Armario y ganas experiencia. ¡Ahí lo llevas!</string>
-  <string name="armoireNotesFull">Abre el Armario para recibir prendas especiales, experiencia o comida al azar. Prendas que te faltan por conseguir: %d.</string>
-  <string name="armoireLastItem">Has encontrado la última prenda insólita del Armario encantado.</string>
-  <string name="armoireNotesEmpty">El Armario dispone de nuevas prendas la primera semana de cada mes. Hasta entonces, sigue haciendo clic en él para ganar experiencia y comida.</string>
-  <string name="sell">Vender (%d de oro)</string>
-  <string name="hatch_with_potion">Mezclar con poción</string>
-  <string name="feed_to_pet">Alimentar a mascota</string>
-  <string name="hatch_egg">Mezclar con huevo</string>
-  <string name="invite_party">Invitar al grupo</string>
-  <string name="dialog_feeding">Dar de comer a %2$s %1$s:</string>
-  <string name="use_animal">Usar</string>
-  <string name="feed">Alimentar</string>
-  <string name="hatch_with">Criar mascota con %s</string>
-  <string name="hatched_pet_title">¡Ha nacido un/a %2$s %1$s!</string>
-  <string name="close">Cerrar</string>
-  <string name="share">Compartir</string>
-  <string name="notification_pet_fed">¡Tu %2$s %1$s ha comido!</string>
-  <string name="notification_purchase">Has comprado %s</string>
-  <string name="sectionpets">Mascotas básicas</string>
-  <string name="sectionpremiumPets">Mascotas de pociones mágicas</string>
-  <string name="sectionquestPets">Mascotas de misiones</string>
-  <string name="sectionspecialPets">Mascotas insólitas</string>
-  <string name="sectionmounts">Monturas básicas</string>
-  <string name="sectionpremiumMounts">Monturas de pociones mágicas</string>
-  <string name="sectionquestMounts">Monturas de misiones</string>
-  <string name="sectionspecialMounts">Monturas insólitas</string>
-  <string name="world_quest">Misión mundial</string>
-  <string name="inn_description">Descansa en la posada para que tus tareas diarias sin completar no te hagan daño por la noche. (Nota: No evita que el jefe te dañe).</string>
-  <string name="empty_items">No tienes %s</string>
-  <string name="user_level">Nivel %d</string>
-  <string name="user_level_with_class">Nivel %1$d %2$s</string>
-  <string name="warrior">Guerrero</string>
-  <string name="rogue">Pícaro</string>
-  <string name="mage">Mago</string>
-  <string name="healer">Sanador</string>
-  <string name="warrior_description">Los guerreros obtienen «rachas críticas» mejores y más frecuentes, que aportan oro y experiencia adicionales de forma aleatoria, y tienen más probabilidades de conseguir artículos al completar tareas. Además, hacen mucho daño a los monstruos. Juega como guerrero si lo que más te motiva es obtener recompensas aleatorias e impredecibles, o si disfrutas poniendo en su sitio a los monstruos de las misiones.</string>
-  <string name="mage_description">Los magos aprenden rápido y tardan menos que otras clases en ganar experiencia y subir de nivel. Además, disponen de una gran cantidad de maná para usar sus habilidades especiales. Juega como mago si disfrutas con los aspectos estratégicos de Habitica, o si lo que más te motiva es subir de nivel y desbloquear funciones avanzadas.</string>
-  <string name="rogue_description">A los pícaros les encanta acumular riquezas: ganan más oro que ninguna otra clase y son expertos en encontrar artículos por azar. Su habilidad más característica, la del sigilo, les permite eludir las consecuencias de no completar las tareas diarias. Juega como pícaro si lo que más te motiva es conseguir recompensas, logros, botines e insignias.</string>
-  <string name="healer_description">Los sanadores se mantienen impertérritos ante los daños y ofrecen esa protección a los demás. Las tareas diarias sin cumplir y los hábitos negativos no les quitan el sueño, y tienen maneras de recuperar la salud cuando algo va mal. Juega como sanador si te gusta ayudar a los otros miembros del grupo o si te atrae la idea de esquivar a la Muerte con tu esfuerzo.</string>
-  <string name="select_class">Elegir clase</string>
-  <string name="opt_out_class">No elegir</string>
-  <string name="opt_out_description">¿Te dan igual las clases? ¿Quieres decidirlo más adelante? No elijas nada y serás un guerrero sin ninguna habilidad especial. Cuando quieras, puedes informarte sobre el sistema de clases en la wiki y activarlas.</string>
-  <string name="class_confirmation">¿Seguro que quieres ser %s?</string>
-  <string name="class_changed">¡Ahora eres un %s!</string>
-  <string name="class_changed_description">¡Tienes nuevo Equipamiento de Batalla que te puedes poner en tu Equipamiento!</string>
-  <string name="choose_class">Elegir clase</string>
-  <string name="dialog_go_back">Volver</string>
-  <string name="opt_out_confirmation">¿Seguro que no quieres elegir?</string>
-  <string name="change_class">Cambiar de clase</string>
-  <string name="change_class_description">Cambia de clase y recupera tus puntos de atributos por 3 gemas. Puedes asignar los puntos de atributos en el sitio web.</string>
-  <string name="enable_class">Activar sistema de clases</string>
-  <string name="changing_class_progress">Cambio de clase</string>
-  <string name="by_email">Por correo electrónico</string>
-  <string name="invite_existing_users">Invitar a usuarios registrados</string>
-  <string name="send">Enviar</string>
-  <string name="invite">Invitar a amigos</string>
-  <string name="invite_id_description">Si tienes amigos que ya usan Habitica, invítalos desde aquí indicando su ID de usuario.</string>
-  <string name="invite_email_description">Si un amigo se apunta a Habitica a través del correo electrónico que le has enviado, se le invitará automáticamente a tu grupo.</string>
-  <string name="add_invites">Añadir invitaciones</string>
-  <string name="user_id">ID de usuario</string>
-  <string name="email">Correo electrónico</string>
-  <string name="invite_users">Invitar al grupo</string>
-  <string name="share_using">Compartir con</string>
-  <string name="share_levelup">¡He subido al nivel %d en Habitica mejorando mis hábitos en el mundo real!</string>
-  <string name="share_hatched">¡He criado un %1$s %2$s de mascota en Habitica realizando tareas en mi vida real!</string>
-  <string name="share_raised">¡He conseguido una montura de %1$s %2$s en Habitica realizando tareas en mi vida real!</string>
-  <string name="open_in_store">Abrir en Play Store</string>
-  <string name="change_class_confirmation">¿Seguro que quieres cambiar de clase? Te costará 3 gemas.</string>
-  <string name="change_class_equipment_warning">Aviso: Ya no podrás comprar equipamiento para la clase %s</string>
-  <string name="leaderMessage">Mensaje de %1$s</string>
-  <string name="leaderName">Líder: %1$s</string>
-  <string name="confirm">Confirmar</string>
-  <string name="market">Mercado</string>
-  <string name="timeTravelers">Viajeros del tiempo</string>
-  <string name="seasonalShop">Tienda estacional</string>
-  <string name="empty_inbox">No tienes ningún mensaje en la bandeja de entrada. Puedes enviar un mensaje a un usuario desde los mensajes de chat públicos que hayan enviado.</string>
-  <string name="party_invite">Desbloquéala invitando a tus amigos</string>
-  <string name="no_gold">No tienes suficiente oro</string>
-  <string name="no_potion">No necesitas comprar una poción de salud</string>
-  <string name="successful_purchase">Has comprado %1$s</string>
-  <string name="purchase_confirmation_title">Confirmar la compra</string>
-  <string name="confirm_purchase_text">Comprar %1$s para %2$s %3$s</string>
-  <string name="gem">gema</string>
-  <string name="hourglass">reloj de arena</string>
-  <string name="hourglasses">relojes de arena</string>
-  <string name="gold_singular">oro</string>
-  <string name="gold_plural">oro</string>
-  <string name="chat_message_copied">Mensaje copiado al portapapeles</string>
-  <string name="copy_chat_message">Copiar al portapapeles</string>
-  <string name="edit_tag_title">Editar etiqueta</string>
-  <string name="edit_tag_btn_edit">Editar</string>
-  <string name="edit_tag_btn_done">Listo</string>
-  <string name="edit_tag_btn_delete">Eliminar</string>
-  <string name="confirm_delete_tag_title">¿Seguro?</string>
-  <string name="confirm_delete_tag_message">¿Seguro que quieres realizar la eliminación?</string>
-  <string name="filter_drawer_edit_tags">Editar etiquetas</string>
-  <string name="filter_drawer_filter_tags">Filtrar por etiquetas</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Pídele a alguien que te invite con este código QR</string>
-  <string name="qr_save_message">Código QR guardado en</string>
-  <string name="qr_dialogue_title">Tu código QR</string>
-  <string name="download">Descargar</string>
-  <string name="send_new_message">Enviar un nuevo mensaje</string>
-  <string name="choose_recipient_title">Elige el destinatario del mensaje</string>
-  <string name="action_continue">Continuar</string>
-  <string name="scan_qr_code">Leer código QR</string>
-  <string name="enter_recipient_uuid">Introduce el ID de usuario del destinatario</string>
-  <string name="invited_to_party">¡Te han invitado a un grupo!</string>
-  <string name="stats_widget_label">Estadísticas de Habitica</string>
-  <string name="add_task">Añadir tarea</string>
-  <string name="add_habit">Añadir hábito</string>
-  <string name="add_daily">Añadir tarea diaria</string>
-  <string name="add_todo">Añadir quehacer</string>
-  <string name="add_reward">Añadir recompensa</string>
-  <string name="all_dailies_completed">Ha completado todas las tareas diarias. ¡Buen trabajo!</string>
-  <string name="widget_habit_button">Hábitos Habitica</string>
-  <string name="widget_dailies">Tareas diarias Habitica</string>
-  <string name="widget_add_task">Añade tareas Habitica</string>
-  <string name="google_services_missing">Los servidores de Google Play no pueden ser encontrados.</string>
-  <string name="gem.purchase.toolbartitle">Comprar</string>
-  <string name="gem.purchase.title">Comprar gemas apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
-  <string name="gem.purchase.subtitle">Las gemas te permiten comprar diversion extra a tu cuenta, incluyendo:</string>
-  <string name="gem.purchase.listitem1">Asombrosos disfrases para tu personaje</string>
-  <string name="gem.purchase.listitem2">Increibles fondos</string>
-  <string name="gem.purchase.listitem3">Misiones que te recompensan con huevos de mascotas</string>
-  <string name="gem.purchase.listitem4">La habilidad de cambiar tu clase antes del nivel 100</string>
-  <string name="support_habitica">Ayuda Habitica</string>
-  <string name="skill_transformation_use">Usar</string>
-  <string name="hatching_market_info">¿No tienes la poción correcta? Revisa el Mercado</string>
-  <string name="feeding_market_info">¿Necesitas un alimento diferente? ¡Compra más desde el Mercado!</string>
-  <string name="open_market">Abrir Mercado</string>
-  <string name="cds_description">Tus Tareas Diarias serán reiniciadas la próxima vez que uses Habitica por primera vez despues de %1$s. ¡Asegurate de completar todas tus Tareas Diarias antes de tiempo!</string>
-  <string name="AudioTheme_title">Tema de audio</string>
-  <string name="AudioTheme_summary">Cambiar el tema de audio de Habitica</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">¡Hasta mañana!</string>
-  <string name="belongs_to_challenge">Pertenece a un Desafío</string>
-  <string name="has_reminder">Tiene Recordatorio</string>
-  <string name="has_tag">Tiene Etiqueta</string>
-  <string name="subscribe.title">Comprar gemas apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
-  <string name="subscribe_prompt">Conviertete en suscriptor y disfrutarás de estos útiles beneficios:</string>
-  <string name="subscribe.listitem1">Compra gemas con oro</string>
-  <string name="subscribe.listitem2">Artículos exclusivos mensuales</string>
-  <string name="subscriptions">Suscripciónes</string>
-  <string name="subscribe">Suscríbirse</string>
-  <string name="subscribe1month.gemcap">El límite de gemas comienza en 25</string>
-  <string name="subscribe3month.gemcap">Límite de gemas aumentado a 30</string>
-  <string name="subscribe6month.gemcap">Límite de gemas aumentado a 35</string>
-  <string name="subscribe12month.gemcap">Límite de gemas aumentado a 45</string>
-  <string name="subscription_hourglasses">+%d Relojes de Arena Místicos</string>
-  <string name="payment_method">Método de pago</string>
-  <string name="subscription">Suscripción</string>
-  <string name="active">Activa</string>
-  <string name="cancel_subscription">Cancelar suscripción</string>
-  <string name="visit_habitica_website">Visitar la página de Habitica</string>
-  <string name="current_bonuses">Bonificaciones Actuales</string>
-  <string name="months_subscribed">Meses suscrito</string>
-  <string name="current_hourclasses">Relojes de Arena Místicos actuales</string>
-  <string name="monthly_gem_cap">Límite mensual de gemas</string>
-  <string name="inactive">Inactiva</string>
-  <string name="one_month">1 Mes</string>
-  <string name="months">%d Meses</string>
-  <string name="month">mes</string>
-  <string name="three_months">3 meses</string>
-  <string name="six_months">6 meses</string>
-  <string name="twelve_months">12 meses</string>
-  <string name="subscribe_prompt_thanks">Por Suscribirte disfrutas de estos útiles beneficios:</string>
-  <string name="subscription_status">Estado de Suscripción</string>
-  <string name="byLeader">por %s</string>
-  <string name="challenge_details">Detalles del Desafío</string>
-  <string name="challenge_leave_title">Abandonar Desafío</string>
-  <string name="challenge_leave_text">¿Seguro que quieres abandonar el Desafio \"%s\"?</string>
-  <string name="my_challenges">Mis Desafíos</string>
-  <string name="public_challenges">Público</string>
-  <string name="challenges">Desafíos</string>
-  <string name="daily">Tarea diaria</string>
-  <string name="habit">Hábito</string>
-  <string name="reward">Recompensa</string>
-  <string name="todo">Tarea</string>
-  <string name="official">Oficial</string>
-  <string name="participating">Participando</string>
-  <string name="challenge">Desafío</string>
-  <string name="go_to_challenge">Ir al Desafío</string>
-  <string name="not_part_of_a_challenge">¡Ahora mismo no formas parte de ningún Desafío!</string>
-  <string name="add_reminder">Añadir Recordatorio</string>
-  <string name="warning">Aviso</string>
-  <string name="open_settings">Abrir Ajustes</string>
-  <string name="inbox">Bandeja de entrada</string>
-  <string name="FAQ">Preguntas Frequentes</string>
-  <string name="special">Especial</string>
-  <string name="gem_for_gold_description">Por estar suscrito a Habitica, puedes comprar cierta cantidad de Gemas cada mes utilizando Oro.</string>
-  <string name="limited_count">%d restantes</string>
-  <string name="gem_shop">Gema</string>
-  <string name="mystery_item">Objeto Misterioso</string>
-  <string name="myster_item_notes">Cada mes, los suscriptores recibirán un elemento misterioso. Este se lanza cerca de una semana antes del final del mes.</string>
-  <string name="open">Abrir</string>
-  <string name="notification_mystery_item">¡Abres la caja y encuentras %s!</string>
-  <string name="checkInRewardEarned">Ganaste %1$s en recompensa por tu devoción por mejorar tu vida. </string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Su próximo premio se desbloquea en %1$d registros</string>
-  <string name="pending_approval">Esperando aprobación</string>
-  <string name="group_tasks_edit_description">Las Tareas de Equipo no pueden ser editadas</string>
-  <string name="group_tasks_edit_title">No se puede editar tarea</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Actualizar</string>
+  <string name="XP_default">Experiencia</string>
+  <string name="HP_default">Salud</string>
+  <string name="MP_default">Maná</string>
+  <string name="ERR_pb_barcode">No se han podido cargar las preferencias a partir del código de barras</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Ajustes</string>
+  <string name="SP_address_hint">Tu servidor personalizado</string>
+  <string name="SP_userID_title">ID de usuario</string>
+  <string name="SP_userID_summary">Tu ID de usuario</string>
+  <string name="SP_APIToken_title">Token de API</string>
+  <string name="SP_APIToken_summary">Tu token de API</string>
+  <string name="Language_title">Idioma</string>
+  <string name="Language_summary">Cambiar el idioma de Habitica</string>
+  <string name="SP_user_qr_code">Tu código QR</string>
+  <string name="PS_contact_title">Contactar</string>
+  <string name="pref_account_header">Cuenta</string>
+  <string name="pref_first_day_of_the_week_title">Primer día de la semana</string>
+  <string name="pref_first_day_of_the_week_summary">Primer día de la semana en todos los calendarios</string>
+  <string name="pref_reminder_header">Recordatorio diario</string>
+  <string name="pref_reminder_checkbox">Activar recordatorio</string>
+  <string name="pref_reminder_picker">Establecer hora de recordatorio</string>
+  <string name="pref_cds_header">Personalizar comienzo del día</string>
+  <string name="pref_cds_picker">Establecer hora del comienzo del día personalizado</string>
+  <string name="pref_push_notifications_checkbox">Notificaciones push del usuario</string>
+  <string name="push_notifications">Notificaciones push</string>
+  <string name="push_notifications_sum">Establecer tu configuración de notificaciones push</string>
+  <string name="preference_push_you_won_challenge">¡Has ganado un desafío!</string>
+  <string name="preference_push_received_a_private_message">Has recibido un mensaje privado</string>
+  <string name="preference_push_gifted_gems">Gemas regaladas</string>
+  <string name="preference_push_gifted_subscription">Suscripción regalada</string>
+  <string name="preference_push_invited_to_party">Invitado a un grupo</string>
+  <string name="preference_push_invited_to_guild">Invitado a un Gremio</string>
+  <string name="preference_push_your_quest_has_begun">La misión ha comenzado</string>
+  <string name="preference_push_invited_to_quest">Invitado a una misión</string>
+  <!--Adding tasks-->
+  <string name="task_value">Valor</string>
+  <string name="action_edit">Editar</string>
+  <string name="action_delete">Borrar</string>
+  <string name="action_cancel">Cancelar</string>
+  <string name="login_btn">Iniciar sesión</string>
+  <string name="register_btn">Registrarse</string>
+  <string name="username">Nombre de usuario</string>
+  <string name="email_username">Correo electrónico o nombre de usuario</string>
+  <string name="password">Contraseña</string>
+  <string name="emailAddress">Correo electrónico</string>
+  <string name="confirmpassword">Confirma la contraseña</string>
+  <string name="logout">Cerrar sesión</string>
+  <string name="logout_description">Cierra la sesión de tu cuenta</string>
+  <string name="account_details_sum">Revisa los detalles de tu cuenta.</string>
+  <string name="account_details">Detalles de la cuenta</string>
+  <string name="LoginActivityName">Te damos la bienvenida</string>
+  <string name="string_revive">Revivir</string>
+  <string name="please_connect">Antes de usar un widget, conéctate a través de la aplicación</string>
+  <string name="about.title">Información</string>
+  <string name="about.libraries">Bibliotecas</string>
+  <string name="about.versionhistory">Historial de versiones</string>
+  <string name="about.habitica_open_source">Habitica está disponible como software de código abierto en Github</string>
+  <string name="about.rate_our_app">Califica nuestra aplicación</string>
+  <string name="about.give_us_feedback">Envíanos tus comentarios</string>
+  <string name="about.bugreport">Notificar un error</string>
+  <string name="about.source_code">Código fuente</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Error de conexión</string>
+  <string name="network_error_no_network_body">No tienes conexión a Internet.</string>
+  <string name="internal_error_api">Parece que hay un problema con el servidor. Vuelve a intentarlo más tarde.</string>
+  <string name="authentication_error_title">Error de autenticación</string>
+  <string name="authentication_error_body">Tu usuario y/o contraseña es incorrecto.</string>
+  <string name="login_validation_error_title">Error de validación</string>
+  <string name="login_validation_error_fieldsmissing">Tienes que rellenar todos los campos.</string>
+  <string name="save_changes">Guardar</string>
+  <string name="copy">Copiar</string>
+  <string name="notes">Notas</string>
+  <string name="text">Texto</string>
+  <string name="difficulty">Dificultad</string>
+  <string name="tags">Etiquetas</string>
+  <string name="trivial">Trivial</string>
+  <string name="easy">Fácil</string>
+  <string name="medium">Intermedia</string>
+  <string name="hard">Difícil</string>
+  <string name="start_date">Fecha de inicio</string>
+  <string name="positive_habit_form">Positivo ( + )</string>
+  <string name="negative_habit_form">Negativo ( - )</string>
+  <string name="checklist">Listado</string>
+  <string name="reminders">Recordatorios</string>
+  <string name="actions">Acciones</string>
+  <string name="attributes">Atributos</string>
+  <string name="physical">Físico</string>
+  <string name="mental">Mental</string>
+  <string name="social">Social</string>
+  <string name="other">Otros</string>
+  <string name="frequency">Frecuencia</string>
+  <string name="frequency_weekly">Ciertos días de la semana</string>
+  <string name="frequency_daily">Cada X días</string>
+  <string name="monday">Lunes</string>
+  <string name="tuesday">Martes</string>
+  <string name="wednesday">Miércoles</string>
+  <string name="thursday">Jueves</string>
+  <string name="friday">Viernes</string>
+  <string name="saturday">Sábado</string>
+  <string name="sunday">Domingo</string>
+  <string name="levelup_header">¡Has subido de nivel!</string>
+  <string name="levelup_detail">Cumpliendo tus metas en la vida real, has pasado al nivel %1$d.</string>
+  <string name="levelup_health">¡Has recuperado toda tu salud!</string>
+  <string name="levelup_button">¡Hurra!</string>
+  <string name="faint_subtitle">¡No desesperes!</string>
+  <string name="faint_penalty_body">Has perdido un nivel, todo tu oro y una pieza de tu equipamiento, ¡pero puedes recuperarlo todo con tu esfuerzo! Buena suerte, lo harás genial.</string>
+  <string name="faint_header">¡Te has quedado sin salud!</string>
+  <string name="faint_button">Recuperar toda la salud y volver a intentarlo</string>
+  <string name="filter">Filtro</string>
+  <string name="profile_image">Imagen de perfil</string>
+  <string name="mana_price_button">%d PM</string>
+  <string name="used_skill">Has usado %1$s por %2$d de maná.</string>
+  <string name="used_skill_without_mana">Has usado %1$s.</string>
+  <string name="new_checklist_item">nuevo elemento de lista</string>
+  <string name="add_checklist_item">Añadir</string>
+  <string name="reminder_title">¡Acuérdate de completar tus tareas diarias!</string>
+  <string name="skill_progress_title">Usando habilidad</string>
+  <string name="coming_soon">Próximamente</string>
+  <string name="chat_flag_confirmation">¿Seguro que quieres informar de que este mensaje incumple las normas?</string>
+  <string name="flag_confirm">Denunciar mensaje</string>
+  <string name="unlock_lvl_11">Se desbloquea en el nivel 11</string>
+  <string name="no_party_message">No formas parte de ningún grupo. Para unirte a uno, entra en la página web.</string>
+  <string name="forgot_pw_btn">He olvidado la contraseña</string>
+  <string name="forgot_pw_tv">¿No recuerdas tu contraseña? Entra en el sitio web para móviles.</string>
+  <string name="tavern.inn.checkOut">Reactivar tareas diarias</string>
+  <string name="tavern.inn.rest">Pausar tareas diarias</string>
+  <string name="reward.dialog.buy">Comprar</string>
+  <string name="reward.dialog.dismiss">Descartar</string>
+  <string name="party">Grupo</string>
+  <string name="chat">Conversación</string>
+  <string name="members">Miembros</string>
+  <string name="habits">Hábitos</string>
+  <string name="dailies">Tareas diarias</string>
+  <string name="todos">Tareas</string>
+  <string name="rewards">Recompensas</string>
+  <string name="taskform.delete.title">¿Seguro?</string>
+  <string name="taskform.delete.message">¿Seguro que quieres borrarlo?</string>
+  <string name="yes">Sí</string>
+  <string name="no">No</string>
+  <string name="quest">Misión</string>
+  <string name="avatar_body">Cuerpo</string>
+  <string name="avatar_hair">Cabello</string>
+  <string name="avatar_shirt">Camisa</string>
+  <string name="avatar_skin">Piel</string>
+  <string name="avatar_ears">Orejas de animales</string>
+  <string name="avatar_base">Base</string>
+  <string name="avatar_color">Color</string>
+  <string name="avatar_beard">Barba</string>
+  <string name="avatar_mustache">Bigote</string>
+  <string name="avatar_flower">Flor</string>
+  <string name="avatar_bangs">Flequillo</string>
+  <string name="avatar_nothing">Nada seleccionado</string>
+  <string name="avatar_size">Talla</string>
+  <string name="avatar_size_slim">Delgado</string>
+  <string name="avatar_size_broad">Ancho</string>
+  <string name="avatar_background">Fondo</string>
+  <string name="purchase_customization">Comprar personalización</string>
+  <string name="purchase_set_button">Desbloquear el conjunto por %d gemas</string>
+  <string name="purchase_button">Comprar</string>
+  <string name="purchase_set_title">Comprar conjunto %s</string>
+  <string name="due_date">Fecha límite</string>
+  <string name="quest.accept">Aceptar</string>
+  <string name="quest.reject">Rechazar</string>
+  <string name="quest.begin">Comenzar misión</string>
+  <string name="quest.cancel">Cancelar invitación</string>
+  <string name="quest.abort">Anular misión</string>
+  <string name="quest.leave">Abandonar misión</string>
+  <string name="quest.pending">Pendiente</string>
+  <string name="quest.accepted">Aceptada</string>
+  <string name="quest.rejected">Rechazada</string>
+  <string name="quest.participants">Participantes</string>
+  <string name="version_info">Versión %1$s (%2$d)</string>
+  <string name="sidebar_help">Ayuda y preguntas frecuentes</string>
+  <string name="complete_tutorial">¡Ya está!</string>
+  <string name="dismiss_tutorial">Vuelve a recordármelo</string>
+  <string name="intro_3_description">No pierdas de vista tus objetivos y deja que te ayuden tus amigos. ¡Apoyaos mutuamente en la vida y en la lucha para mejorar juntos!</string>
+  <string name="previous_button">Anterior</string>
+  <string name="next_button">Siguiente</string>
+  <string name="skip_button">Omitir</string>
+  <string name="setup_welcome_description">Te damos la bienvenida a Habitica, donde al progresar dentro del juego, mejorarás en la vida real. A medida que cumplas tus objetivos del mundo real, desbloquearás piezas de equipamiento, mascotas, misiones y mucho más.</string>
+  <string name="setup_welcome_title">Te damos la bienvenida</string>
+  <string name="setup_group_work">Trabajo</string>
+  <string name="setup_group_exercise">Ejercicio</string>
+  <string name="setup_group_school">Clases</string>
+  <string name="setup_group_teams">Equipos</string>
+  <string name="setup_group_chores">Labores domésticas</string>
+  <string name="setup_group_creativity">Creatividad</string>
+  <string name="setup_task_work_1">Procesar correo</string>
+  <string name="setup_task_work_2">Tarea más importante</string>
+  <string name="setup_task_work_3">Proyecto profesional</string>
+  <string name="setup_task_exercise_1">10 minutos de ejercicio</string>
+  <string name="setup_task_exercise_2">Estiramientos</string>
+  <string name="setup_task_exercise_3">Decidir un plan de entrenamiento</string>
+  <string name="setup_task_healthWellness_1">Comer comida sana / comida basura</string>
+  <string name="setup_task_healthWellness_2">Usar hilo dental</string>
+  <string name="setup_task_healthWellness_3">Planificar reunión</string>
+  <string name="setup_task_school_1">Estudiar/vaguear</string>
+  <string name="setup_task_school_2">Hacer los deberes</string>
+  <string name="setup_task_school_3">Acabar trabajo para clase</string>
+  <string name="setup_task_teams_1">Quedar con el grupo</string>
+  <string name="setup_task_teams_2">Poner al día al grupo</string>
+  <string name="setup_task_teams_3">Acabar trabajo en equipo</string>
+  <string name="setup_task_chores_1">Limpiar 10 minutos</string>
+  <string name="setup_task_chores_2">Lavar los platos</string>
+  <string name="setup_task_chores_3">Ordenar el armario</string>
+  <string name="setup_task_creativity_1">Estudiar hasta dominar la técnica</string>
+  <string name="setup_task_creativity_2">Trabajar en proyecto creativo</string>
+  <string name="setup_task_creativity_3">Terminar proyecto creativo</string>
+  <string name="gem.purchase.support">¿Quieres contribuir a que Habitica siga en funcionamiento? Puedes ayudar a los desarrolladores comprando gemas.\n\nLas gemas te permiten comprar artículos adicionales para tu cuenta, por ejemplo: \n\n - Fantásticos trajes para tu personaje\n - Increíbles fondos\n - Divertidas misiones que te recompensan con huevos de mascotas\n - La capacidad de cambiar de clase antes de llegar al nivel 100\n\nMuchísimas gracias por ayudarnos a hacer que Habitica sea lo mejor posible. ¡Valoramos enormemente vuestras contribuciones!</string>
+  <string name="my_guilds">Mis gremios</string>
+  <string name="public_guilds">Gremios públicos</string>
+  <string name="guild">Gremio</string>
+  <string name="leave">Abandonar</string>
+  <string name="join">Unirse</string>
+  <string name="leader">Líder</string>
+  <string name="gems">Gemas</string>
+  <string name="send_pm">Enviar mensaje privado</string>
+  <string name="flag">Marcar</string>
+  <string name="delete">Borrar</string>
+  <string name="name">Nombre</string>
+  <string name="description">Descripción</string>
+  <string name="privacy">Privacidad</string>
+  <string name="write_message">Escribir mensaje</string>
+  <string name="post">Publicar</string>
+  <string name="guild_search_hint">Buscar gremios</string>
+  <string name="todo_due">Para: %s</string>
+  <string name="daily_streak">racha actual: %d</string>
+  <string name="todo_has_duedate">La tarea tiene fecha límite</string>
+  <string name="battle_gear">Equipo de batalla</string>
+  <string name="costume">Disfraz</string>
+  <string name="outfit_head">Cabeza</string>
+  <string name="outfit_headAccessory">Accesorio para la cabeza</string>
+  <string name="outfit_eyewear">Gafas</string>
+  <string name="outfit_armor">Armadura</string>
+  <string name="outfit_back">Espalda</string>
+  <string name="outfit_body">Cuerpo</string>
+  <string name="outfit_shield">Escudo</string>
+  <string name="outfit_weapon">Arma</string>
+  <string name="wear_costume">Llevar disfraz</string>
+  <string name="equipped">Equipado</string>
+  <string name="quest_cancel_message">¿Seguro que quieres cancelar esta misión? Se perderán todas las invitaciones que se hayan aceptado y el propietario de la misión recuperará el pergamino.</string>
+  <string name="quest.invitation">Invitación a misión</string>
+  <string name="quest_begin_message">¿Seguro que quieres comenzar la misión? Una vez comenzada, no podrán unirse a esta misión más miembros del grupo.</string>
+  <string name="quest.invitation.text">Te han invitado a participar en una misión.</string>
+  <string name="ago_1day">Hace 1 día</string>
+  <string name="ago_days">Hace %d días</string>
+  <string name="ago_1Minute">Hace 1 minuto</string>
+  <string name="ago_minutes">Hace %d minutos</string>
+  <string name="ago_hours">Hace %d horas</string>
+  <string name="ago_1hour">Hace 1 hora</string>
+  <string name="today">Hoy</string>
+  <string name="sidebar_items">Artículos</string>
+  <string name="eggs">Huevos</string>
+  <string name="hatching_potions">Pociones de nacimiento</string>
+  <string name="food">Comida</string>
+  <string name="quests">Misiones</string>
+  <string name="pets">Mascotas</string>
+  <string name="mounts">Monturas</string>
+  <string name="armoireEquipment">¡Genial! Has encontrado una prenda insólita en el Armario: %s.</string>
+  <string name="armoireFood">Rebuscando en el Armario, encuentras esto: %1$s %2$s. ¿Qué hace aquí?</string>
+  <string name="armoireExp">Te peleas con el Armario y ganas experiencia. ¡Ahí lo llevas!</string>
+  <string name="armoireNotesFull">Abre el Armario para recibir prendas especiales, experiencia o comida al azar. Prendas que te faltan por conseguir: %d.</string>
+  <string name="armoireLastItem">Has encontrado la última prenda insólita del Armario encantado.</string>
+  <string name="armoireNotesEmpty">El Armario dispone de nuevas prendas la primera semana de cada mes. Hasta entonces, sigue haciendo clic en él para ganar experiencia y comida.</string>
+  <string name="sell">Vender (%d de oro)</string>
+  <string name="hatch_with_potion">Mezclar con poción</string>
+  <string name="feed_to_pet">Alimentar a mascota</string>
+  <string name="hatch_egg">Mezclar con huevo</string>
+  <string name="invite_party">Invitar al grupo</string>
+  <string name="dialog_feeding">Dar de comer a %2$s %1$s:</string>
+  <string name="use_animal">Usar</string>
+  <string name="feed">Alimentar</string>
+  <string name="hatch_with">Criar mascota con %s</string>
+  <string name="hatched_pet_title">¡Ha nacido un/a %2$s %1$s!</string>
+  <string name="close">Cerrar</string>
+  <string name="share">Compartir</string>
+  <string name="notification_pet_fed">¡Tu %2$s %1$s ha comido!</string>
+  <string name="notification_purchase">Has comprado %s</string>
+  <string name="sectionpets">Mascotas básicas</string>
+  <string name="sectionpremiumPets">Mascotas de pociones mágicas</string>
+  <string name="sectionquestPets">Mascotas de misiones</string>
+  <string name="sectionspecialPets">Mascotas insólitas</string>
+  <string name="sectionmounts">Monturas básicas</string>
+  <string name="sectionpremiumMounts">Monturas de pociones mágicas</string>
+  <string name="sectionquestMounts">Monturas de misiones</string>
+  <string name="sectionspecialMounts">Monturas insólitas</string>
+  <string name="world_quest">Misión mundial</string>
+  <string name="inn_description">Descansa en la posada para que tus tareas diarias sin completar no te hagan daño por la noche. (Nota: No evita que el jefe te dañe).</string>
+  <string name="empty_items">No tienes %s</string>
+  <string name="user_level">Nivel %d</string>
+  <string name="user_level_with_class">Nivel %1$d %2$s</string>
+  <string name="warrior">Guerrero</string>
+  <string name="rogue">Pícaro</string>
+  <string name="mage">Mago</string>
+  <string name="healer">Sanador</string>
+  <string name="warrior_description">Los guerreros obtienen «rachas críticas» mejores y más frecuentes, que aportan oro y experiencia adicionales de forma aleatoria, y tienen más probabilidades de conseguir artículos al completar tareas. Además, hacen mucho daño a los monstruos. Juega como guerrero si lo que más te motiva es obtener recompensas aleatorias e impredecibles, o si disfrutas poniendo en su sitio a los monstruos de las misiones.</string>
+  <string name="mage_description">Los magos aprenden rápido y tardan menos que otras clases en ganar experiencia y subir de nivel. Además, disponen de una gran cantidad de maná para usar sus habilidades especiales. Juega como mago si disfrutas con los aspectos estratégicos de Habitica, o si lo que más te motiva es subir de nivel y desbloquear funciones avanzadas.</string>
+  <string name="rogue_description">A los pícaros les encanta acumular riquezas: ganan más oro que ninguna otra clase y son expertos en encontrar artículos por azar. Su habilidad más característica, la del sigilo, les permite eludir las consecuencias de no completar las tareas diarias. Juega como pícaro si lo que más te motiva es conseguir recompensas, logros, botines e insignias.</string>
+  <string name="healer_description">Los sanadores se mantienen impertérritos ante los daños y ofrecen esa protección a los demás. Las tareas diarias sin cumplir y los hábitos negativos no les quitan el sueño, y tienen maneras de recuperar la salud cuando algo va mal. Juega como sanador si te gusta ayudar a los otros miembros del grupo o si te atrae la idea de esquivar a la Muerte con tu esfuerzo.</string>
+  <string name="select_class">Elegir clase</string>
+  <string name="opt_out_class">No elegir</string>
+  <string name="opt_out_description">¿Te dan igual las clases? ¿Quieres decidirlo más adelante? No elijas nada y serás un guerrero sin ninguna habilidad especial. Cuando quieras, puedes informarte sobre el sistema de clases en la wiki y activarlas.</string>
+  <string name="class_confirmation">¿Seguro que quieres ser %s?</string>
+  <string name="class_changed">¡Ahora eres un %s!</string>
+  <string name="class_changed_description">¡Tienes nuevo Equipamiento de Batalla que te puedes poner en tu Equipamiento!</string>
+  <string name="choose_class">Elegir clase</string>
+  <string name="dialog_go_back">Volver</string>
+  <string name="opt_out_confirmation">¿Seguro que no quieres elegir?</string>
+  <string name="change_class">Cambiar de clase</string>
+  <string name="change_class_description">Cambia de clase y recupera tus puntos de atributos por 3 gemas. Puedes asignar los puntos de atributos en el sitio web.</string>
+  <string name="enable_class">Activar sistema de clases</string>
+  <string name="changing_class_progress">Cambio de clase</string>
+  <string name="by_email">Por correo electrónico</string>
+  <string name="invite_existing_users">Invitar a usuarios registrados</string>
+  <string name="send">Enviar</string>
+  <string name="invite">Invitar a amigos</string>
+  <string name="invite_id_description">Si tienes amigos que ya usan Habitica, invítalos desde aquí indicando su ID de usuario.</string>
+  <string name="invite_email_description">Si un amigo se apunta a Habitica a través del correo electrónico que le has enviado, se le invitará automáticamente a tu grupo.</string>
+  <string name="add_invites">Añadir invitaciones</string>
+  <string name="user_id">ID de usuario</string>
+  <string name="email">Correo electrónico</string>
+  <string name="invite_users">Invitar al grupo</string>
+  <string name="share_using">Compartir con</string>
+  <string name="share_levelup">¡He subido al nivel %d en Habitica mejorando mis hábitos en el mundo real!</string>
+  <string name="share_hatched">¡He criado un %1$s %2$s de mascota en Habitica realizando tareas en mi vida real!</string>
+  <string name="share_raised">¡He conseguido una montura de %1$s %2$s en Habitica realizando tareas en mi vida real!</string>
+  <string name="open_in_store">Abrir en Play Store</string>
+  <string name="change_class_confirmation">¿Seguro que quieres cambiar de clase? Te costará 3 gemas.</string>
+  <string name="change_class_equipment_warning">Aviso: Ya no podrás comprar equipamiento para la clase %s</string>
+  <string name="leaderMessage">Mensaje de %1$s</string>
+  <string name="leaderName">Líder: %1$s</string>
+  <string name="confirm">Confirmar</string>
+  <string name="market">Mercado</string>
+  <string name="timeTravelers">Viajeros del tiempo</string>
+  <string name="seasonalShop">Tienda estacional</string>
+  <string name="empty_inbox">No tienes ningún mensaje en la bandeja de entrada. Puedes enviar un mensaje a un usuario desde los mensajes de chat públicos que hayan enviado.</string>
+  <string name="party_invite">Desbloquéala invitando a tus amigos</string>
+  <string name="no_gold">No tienes suficiente oro</string>
+  <string name="no_potion">No necesitas comprar una poción de salud</string>
+  <string name="successful_purchase">Has comprado %1$s</string>
+  <string name="purchase_confirmation_title">Confirmar la compra</string>
+  <string name="confirm_purchase_text">Comprar %1$s para %2$s %3$s</string>
+  <string name="gem">gema</string>
+  <string name="hourglass">reloj de arena</string>
+  <string name="hourglasses">relojes de arena</string>
+  <string name="gold_singular">oro</string>
+  <string name="gold_plural">oro</string>
+  <string name="chat_message_copied">Mensaje copiado al portapapeles</string>
+  <string name="copy_chat_message">Copiar al portapapeles</string>
+  <string name="edit_tag_title">Editar etiqueta</string>
+  <string name="edit_tag_btn_edit">Editar</string>
+  <string name="edit_tag_btn_done">Listo</string>
+  <string name="edit_tag_btn_delete">Eliminar</string>
+  <string name="confirm_delete_tag_title">¿Seguro?</string>
+  <string name="confirm_delete_tag_message">¿Seguro que quieres realizar la eliminación?</string>
+  <string name="filter_drawer_edit_tags">Editar etiquetas</string>
+  <string name="filter_drawer_filter_tags">Filtrar por etiquetas</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Pídele a alguien que te invite con este código QR</string>
+  <string name="qr_save_message">Código QR guardado en</string>
+  <string name="qr_dialogue_title">Tu código QR</string>
+  <string name="download">Descargar</string>
+  <string name="send_new_message">Enviar un nuevo mensaje</string>
+  <string name="choose_recipient_title">Elige el destinatario del mensaje</string>
+  <string name="action_continue">Continuar</string>
+  <string name="scan_qr_code">Leer código QR</string>
+  <string name="enter_recipient_uuid">Introduce el ID de usuario del destinatario</string>
+  <string name="invited_to_party">¡Te han invitado a un grupo!</string>
+  <string name="stats_widget_label">Estadísticas de Habitica</string>
+  <string name="add_task">Añadir tarea</string>
+  <string name="add_habit">Añadir hábito</string>
+  <string name="add_daily">Añadir tarea diaria</string>
+  <string name="add_todo">Añadir quehacer</string>
+  <string name="add_reward">Añadir recompensa</string>
+  <string name="all_dailies_completed">Ha completado todas las tareas diarias. ¡Buen trabajo!</string>
+  <string name="widget_habit_button">Hábitos Habitica</string>
+  <string name="widget_dailies">Tareas diarias Habitica</string>
+  <string name="widget_add_task">Añade tareas Habitica</string>
+  <string name="google_services_missing">Los servidores de Google Play no pueden ser encontrados.</string>
+  <string name="gem.purchase.toolbartitle">Comprar</string>
+  <string name="gem.purchase.title">Comprar gemas apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
+  <string name="gem.purchase.subtitle">Las gemas te permiten comprar diversion extra a tu cuenta, incluyendo:</string>
+  <string name="gem.purchase.listitem1">Asombrosos disfrases para tu personaje</string>
+  <string name="gem.purchase.listitem2">Increibles fondos</string>
+  <string name="gem.purchase.listitem3">Misiones que te recompensan con huevos de mascotas</string>
+  <string name="gem.purchase.listitem4">La habilidad de cambiar tu clase antes del nivel 100</string>
+  <string name="support_habitica">Ayuda Habitica</string>
+  <string name="skill_transformation_use">Usar</string>
+  <string name="hatching_market_info">¿No tienes la poción correcta? Revisa el Mercado</string>
+  <string name="feeding_market_info">¿Necesitas un alimento diferente? ¡Compra más desde el Mercado!</string>
+  <string name="open_market">Abrir Mercado</string>
+  <string name="cds_description">Tus Tareas Diarias serán reiniciadas la próxima vez que uses Habitica por primera vez despues de %1$s. ¡Asegurate de completar todas tus Tareas Diarias antes de tiempo!</string>
+  <string name="AudioTheme_title">Tema de audio</string>
+  <string name="AudioTheme_summary">Cambiar el tema de audio de Habitica</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">¡Hasta mañana!</string>
+  <string name="belongs_to_challenge">Pertenece a un Desafío</string>
+  <string name="has_reminder">Tiene Recordatorio</string>
+  <string name="has_tag">Tiene Etiqueta</string>
+  <string name="subscribe.title">Comprar gemas apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
+  <string name="subscribe_prompt">Conviertete en suscriptor y disfrutarás de estos útiles beneficios:</string>
+  <string name="subscribe.listitem1">Compra gemas con oro</string>
+  <string name="subscribe.listitem2">Artículos exclusivos mensuales</string>
+  <string name="subscriptions">Suscripciónes</string>
+  <string name="subscribe">Suscríbirse</string>
+  <string name="subscribe1month.gemcap">El límite de gemas comienza en 25</string>
+  <string name="subscribe3month.gemcap">Límite de gemas aumentado a 30</string>
+  <string name="subscribe6month.gemcap">Límite de gemas aumentado a 35</string>
+  <string name="subscribe12month.gemcap">Límite de gemas aumentado a 45</string>
+  <string name="subscription_hourglasses">+%d Relojes de Arena Místicos</string>
+  <string name="payment_method">Método de pago</string>
+  <string name="subscription">Suscripción</string>
+  <string name="active">Activa</string>
+  <string name="cancel_subscription">Cancelar suscripción</string>
+  <string name="visit_habitica_website">Visitar la página de Habitica</string>
+  <string name="current_bonuses">Bonificaciones Actuales</string>
+  <string name="months_subscribed">Meses suscrito</string>
+  <string name="current_hourclasses">Relojes de Arena Místicos actuales</string>
+  <string name="monthly_gem_cap">Límite mensual de gemas</string>
+  <string name="inactive">Inactiva</string>
+  <string name="one_month">1 Mes</string>
+  <string name="months">%d Meses</string>
+  <string name="month">mes</string>
+  <string name="three_months">3 meses</string>
+  <string name="six_months">6 meses</string>
+  <string name="twelve_months">12 meses</string>
+  <string name="subscribe_prompt_thanks">Por Suscribirte disfrutas de estos útiles beneficios:</string>
+  <string name="subscription_status">Estado de Suscripción</string>
+  <string name="byLeader">por %s</string>
+  <string name="challenge_details">Detalles del Desafío</string>
+  <string name="challenge_leave_title">Abandonar Desafío</string>
+  <string name="challenge_leave_text">¿Seguro que quieres abandonar el Desafio \"%s\"?</string>
+  <string name="my_challenges">Mis Desafíos</string>
+  <string name="public_challenges">Público</string>
+  <string name="challenges">Desafíos</string>
+  <string name="daily">Tarea diaria</string>
+  <string name="habit">Hábito</string>
+  <string name="reward">Recompensa</string>
+  <string name="todo">Tarea</string>
+  <string name="official">Oficial</string>
+  <string name="participating">Participando</string>
+  <string name="challenge">Desafío</string>
+  <string name="go_to_challenge">Ir al Desafío</string>
+  <string name="not_part_of_a_challenge">¡Ahora mismo no formas parte de ningún Desafío!</string>
+  <string name="add_reminder">Añadir Recordatorio</string>
+  <string name="warning">Aviso</string>
+  <string name="open_settings">Abrir Ajustes</string>
+  <string name="inbox">Bandeja de entrada</string>
+  <string name="FAQ">Preguntas Frequentes</string>
+  <string name="special">Especial</string>
+  <string name="gem_for_gold_description">Por estar suscrito a Habitica, puedes comprar cierta cantidad de Gemas cada mes utilizando Oro.</string>
+  <string name="limited_count">%d restantes</string>
+  <string name="gem_shop">Gema</string>
+  <string name="mystery_item">Objeto Misterioso</string>
+  <string name="myster_item_notes">Cada mes, los suscriptores recibirán un elemento misterioso. Este se lanza cerca de una semana antes del final del mes.</string>
+  <string name="open">Abrir</string>
+  <string name="notification_mystery_item">¡Abres la caja y encuentras %s!</string>
+  <string name="checkInRewardEarned">Ganaste %1$s en recompensa por tu devoción por mejorar tu vida. </string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Su próximo premio se desbloquea en %1$d registros</string>
+  <string name="pending_approval">Esperando aprobación</string>
+  <string name="group_tasks_edit_description">Las Tareas de Equipo no pueden ser editadas</string>
+  <string name="group_tasks_edit_title">No se puede editar tarea</string>
+</resources>
diff --git a/Habitica/res/values-fr/strings.profile.xml b/Habitica/res/values-fr/strings.profile.xml
index 448f06739..7b367cff3 100644
--- a/Habitica/res/values-fr/strings.profile.xml
+++ b/Habitica/res/values-fr/strings.profile.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">Familiers &amp; Montures</string>
-    <string name="profile_pets_found">Familiers trouvés</string>
-    <string name="profile_mounts_tamed">Montures dressées</string>
-    <string name="profile_loading_data">chargement des données de membre.</string>
-    <string name="profile_send_message_to">Envoyer un message à %s</string>
-    <string name="profile_message_sent_to">Message envoyé à %s</string>
-    <string name="profile_level">Niveau:</string>
-    <string name="profile_class_bonus">Bonus de classe:</string>
-    <string name="profile_allocated">Points alloués :</string>
-    <string name="profile_boosts">Bonus:</string>
-    <string name="profile_private_message">Message privé</string>
-    <string name="profile_achievements">Succès</string>
-    <string name="profile_achievement_ok">Ok</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Familiers &amp; Montures</string>
+    <string name="profile_pets_found">Familiers trouvés</string>
+    <string name="profile_mounts_tamed">Montures dressées</string>
+    <string name="profile_loading_data">chargement des données de membre.</string>
+    <string name="profile_send_message_to">Envoyer un message à %s</string>
+    <string name="profile_message_sent_to">Message envoyé à %s</string>
+    <string name="profile_level">Niveau:</string>
+    <string name="profile_class_bonus">Bonus de classe:</string>
+    <string name="profile_allocated">Points alloués :</string>
+    <string name="profile_boosts">Bonus:</string>
+    <string name="profile_private_message">Message privé</string>
+    <string name="profile_achievements">Succès</string>
+    <string name="profile_achievement_ok">Ok</string>
     </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-fr/strings.tutorial.xml b/Habitica/res/values-fr/strings.tutorial.xml
index 73673bdb4..8bba713cb 100644
--- a/Habitica/res/values-fr/strings.tutorial.xml
+++ b/Habitica/res/values-fr/strings.tutorial.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_equipment">Quand vous achetez de l\'équipement, il apparaît ici. Votre Equipement de Combat affecte vos caractéristiques, et votre Costume (si utilisé) change l\'apparence de votre avatar.</string>
-  <string name="tutorial_items">Gagnez des objets en accomplissant des tâches et en changeant de niveau. Tapez sur un objet pour l\'utiliser !</string>
-  <string name="tutorial_pets">En accomplissant des tâches dans le monde réel, vous avez désormais une chance de trouver des œufs et des potions. Combinez-les pour faire éclore des familiers</string>
-  <string name="tutorial_skills">Les compétences sont des capacités spéciales qui ont des effets puissants ! Tapez sur une compétence pour l\'utiliser. Cela vous coûtera de la Mana (la barre bleue), que vous gagnez en faisant le point tous les jours et en accomplissant des tâches dans la vie réelle. Allez voir les FAQ dans le menu pour plus d\'infos !</string>
-  <string name="tutorial_party">Voici l\'endroit où vos amis et vous pouvez vous tenir mutuellement responsables de vos buts et combattre des monstres grâce à vos tâches !</string>
-  <string name="tutorial_tavern">Bienvenue à la Taverne, un salon de discussion public pour tous les âges ! Ici, vous pouvez discuter de productivité et poser des questions. Amusez-vous bien !</string>
-  <string name="tutorial_classes">Devenez, au choix, Guerrier, Mage, Guérisseur ou Voleur ! Chaque classe possède des équipements et des compétences uniques. Tapez sur (?) pour en savoir plus !</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_equipment">Quand vous achetez de l\'équipement, il apparaît ici. Votre Equipement de Combat affecte vos caractéristiques, et votre Costume (si utilisé) change l\'apparence de votre avatar.</string>
+  <string name="tutorial_items">Gagnez des objets en accomplissant des tâches et en changeant de niveau. Tapez sur un objet pour l\'utiliser !</string>
+  <string name="tutorial_pets">En accomplissant des tâches dans le monde réel, vous avez désormais une chance de trouver des œufs et des potions. Combinez-les pour faire éclore des familiers</string>
+  <string name="tutorial_skills">Les compétences sont des capacités spéciales qui ont des effets puissants ! Tapez sur une compétence pour l\'utiliser. Cela vous coûtera de la Mana (la barre bleue), que vous gagnez en faisant le point tous les jours et en accomplissant des tâches dans la vie réelle. Allez voir les FAQ dans le menu pour plus d\'infos !</string>
+  <string name="tutorial_party">Voici l\'endroit où vos amis et vous pouvez vous tenir mutuellement responsables de vos buts et combattre des monstres grâce à vos tâches !</string>
+  <string name="tutorial_tavern">Bienvenue à la Taverne, un salon de discussion public pour tous les âges ! Ici, vous pouvez discuter de productivité et poser des questions. Amusez-vous bien !</string>
+  <string name="tutorial_classes">Devenez, au choix, Guerrier, Mage, Guérisseur ou Voleur ! Chaque classe possède des équipements et des compétences uniques. Tapez sur (?) pour en savoir plus !</string>
+</resources>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index 850fff634..5c2ee7b48 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -1,532 +1,532 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Actualiser</string>
-  <string name="XP_default">Expérience</string>
-  <string name="HP_default">Santé</string>
-  <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Les préférences n\'ont pas pu être chargées depuis le QR Code</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Paramètres</string>
-  <string name="SP_address_hint">Votre serveur personnalisé</string>
-  <string name="SP_userID_title">ID d\'utilisateur</string>
-  <string name="SP_userID_summary">Votre ID d\'utilisateur</string>
-  <string name="SP_APIToken_title">Jeton d\'API</string>
-  <string name="SP_APIToken_summary">Votre Jeton d\'API</string>
-  <string name="Language_title">Langage</string>
-  <string name="Language_summary">Changer le langage d\'Habitica</string>
-  <string name="SP_user_qr_code">Votre QR code</string>
-  <string name="PS_contact_title">Contactez-moi</string>
-  <string name="unknown_error">Une erreur est survenue...</string>
-  <string name="pref_account_header">Compte</string>
-  <string name="pref_first_day_of_the_week_title">Premier jour de la semaine</string>
-  <string name="pref_first_day_of_the_week_summary">Premier jour de la semaine dans tous les calendriers</string>
-  <string name="pref_reminder_header">Rappel Quotidien</string>
-  <string name="pref_reminder_checkbox">Activer le rappel</string>
-  <string name="pref_reminder_picker">Changer l\'heure du rappel</string>
-  <string name="pref_cds_header">Heure personnalisée de début de journée</string>
-  <string name="pref_cds_picker">Définir l\'heure personnalisée de début de journée</string>
-  <string name="pref_push_notifications_checkbox">Notifications Push de l\'utilisateur</string>
-  <string name="push_notifications">Notifications Push</string>
-  <string name="push_notifications_sum">Paramétrez vos notifications push</string>
-  <string name="preference_push_you_won_challenge">Vous avez gagné un défi !</string>
-  <string name="preference_push_received_a_private_message">Message privé reçu</string>
-  <string name="preference_push_gifted_gems">Gemmes offertes</string>
-  <string name="preference_push_gifted_subscription">Abonnement offert</string>
-  <string name="preference_push_invited_to_party">Invitation dans une équipe</string>
-  <string name="preference_push_invited_to_guild">Invitation dans une guilde</string>
-  <string name="preference_push_your_quest_has_begun">Votre quête a commencé</string>
-  <string name="preference_push_invited_to_quest">Invitation à une quête</string>
-  <!--Adding tasks-->
-  <string name="task_value">Valeur</string>
-  <string name="new_todo">Nouvelle tâche À Faire</string>
-  <string name="new_reward">Nouvelle Récompense</string>
-  <string name="new_daily">Nouvelle Quotidienne</string>
-  <string name="new_habit">Nouvelle Habitude</string>
-  <string name="action_edit">Modifier</string>
-  <string name="action_delete">Supprimer</string>
-  <string name="action_cancel">Annuler</string>
-  <string name="login_btn">Connexion</string>
-  <string name="register_btn">Créer un compte</string>
-  <string name="username">Nom d\'utilisateur</string>
-  <string name="email_username">E-mail ou Nom d\'utilisateur</string>
-  <string name="password">Mot de passe</string>
-  <string name="emailAddress">Adresse e-mail</string>
-  <string name="confirmpassword">Confirmez votre mot de passe</string>
-  <string name="logout">Déconnexion</string>
-  <string name="logout_description">Déconnexion de votre compte</string>
-  <string name="account_details_sum">Vérifiez les détails de votre compte</string>
-  <string name="account_details">Détails du compte</string>
-  <string name="LoginActivityName">Bienvenue</string>
-  <string name="string_revive">Résurrection</string>
-  <string name="please_connect">Veuillez vous connecter à l\'application avant d\'utiliser un widget</string>
-  <string name="about.title">À propos</string>
-  <string name="about.libraries">Bibliothèques</string>
-  <string name="about.versionhistory">Historique des versions</string>
-  <string name="about.habitica_open_source">Habitica est disponible sur Github en open source </string>
-  <string name="about.rate_our_app">Notez notre application</string>
-  <string name="about.give_us_feedback">Envoyez nous votre avis !</string>
-  <string name="about.bugreport">Signaler un bug</string>
-  <string name="about.source_code">Code source</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Erreur lors de la connexion</string>
-  <string name="network_error_no_network_body">Vous n\'êtes pas connecté·e à Internet.</string>
-  <string name="internal_error_api">Il semblerait qu\'il y ait un problème avec le serveur. Essayez plus tard.</string>
-  <string name="authentication_error_title">Erreur d\'authentification</string>
-  <string name="authentication_error_body">Votre Nom d\'utilisateur et/ou Mot de passe est incorrect.</string>
-  <string name="login_validation_error_title">Erreur de validation</string>
-  <string name="login_validation_error_fieldsmissing">Vous devez renseigner tous les champs.</string>
-  <string name="save_changes">Enregistrer</string>
-  <string name="copy">Copier</string>
-  <string name="notes">Notes</string>
-  <string name="text">Texte</string>
-  <string name="difficulty">Difficulté</string>
-  <string name="tags">Étiquettes</string>
-  <string name="trivial">Banal</string>
-  <string name="easy">Facile</string>
-  <string name="medium">Moyen</string>
-  <string name="hard">Difficile</string>
-  <string name="start_date">Date de début</string>
-  <string name="positive_habit_form">Positif ( + )</string>
-  <string name="negative_habit_form">Négatif ( - )</string>
-  <string name="checklist">Liste de vérification</string>
-  <string name="reminders">Rappels</string>
-  <string name="actions">Instructions/Actions</string>
-  <string name="attributes">Attributs</string>
-  <string name="physical">Physique</string>
-  <string name="mental">Mental</string>
-  <string name="social">Social</string>
-  <string name="other">Autre</string>
-  <string name="frequency">Répéter</string>
-  <string name="frequency_weekly">Certains jours de la semaine</string>
-  <string name="frequency_daily">Tous les X Jours</string>
-  <string name="monday">Lundi</string>
-  <string name="tuesday">Mardi</string>
-  <string name="wednesday">Mercredi</string>
-  <string name="thursday">Jeudi</string>
-  <string name="friday">Vendredi</string>
-  <string name="saturday">Samedi</string>
-  <string name="sunday">Dimanche</string>
-  <string name="levelup_header">Vous avez gagné un niveau !</string>
-  <string name="levelup_detail">En atteignant vos buts dans la vie réelle, vous avez atteint le Niveau %1$d !</string>
-  <string name="levelup_health">Vous avez été guéri·e complètement !</string>
-  <string name="levelup_button">Bravo !</string>
-  <string name="faint_subtitle">Ne désespérez pas !</string>
-  <string name="faint_penalty_body">Vous avez perdu un niveau, de l\'or, et une pièce d\'équipement, mais vous pouvez tous les récupérer en travaillant dur ! Bonne chance--vous y arriverez.</string>
-  <string name="faint_header">Vous n\'avez plus de points de vie !</string>
-  <string name="faint_button">Reprendre des forces &amp; réessayer</string>
-  <string name="filter">Filtrer</string>
-  <string name="profile_image">Image de Profil</string>
-  <string name="mana_price_button">%d Points de Mana</string>
-  <string name="used_skill">Vous avez utilisé %1$s pour %2$d points de mana.</string>
-  <string name="used_skill_without_mana">Vous avez utilisé %1$s.</string>
-  <string name="new_checklist_item">Nouvelle vérification</string>
-  <string name="add_checklist_item">Ajouter</string>
-  <string name="reminder_title">N\'oubliez pas de cocher vos tâches Quotidiennes !</string>
-  <string name="skill_progress_title">Utiliser une compétence</string>
-  <string name="coming_soon">Bientôt disponible</string>
-  <string name="chat_flag_confirmation">Êtes-vous sûr·e de vouloir signaler ce message pour infraction ?</string>
-  <string name="flag_confirm">Signaler</string>
-  <string name="unlock_lvl_11">Disponible au niveau 11</string>
-  <string name="no_party_message">Vous ne faites pas partie d\'une équipe. Pour rejoindre une équipe, veuillez visiter le site.</string>
-  <string name="forgot_pw_btn">Mot de passe oublié</string>
-  <string name="forgot_pw_tv">Mot de passe oublié ? Veuillez vous rendre sur la version mobile du site.</string>
-  <string name="tavern.inn.checkOut">Réactiver vos Quotidiennes</string>
-  <string name="tavern.inn.rest">Suspendre vos Quotidiennes</string>
-  <string name="reward.dialog.buy">Acheter</string>
-  <string name="reward.dialog.dismiss">Annuler</string>
-  <string name="party">Équipe</string>
-  <string name="chat">Discussion</string>
-  <string name="members">Membres</string>
-  <string name="habits">Habitudes</string>
-  <string name="dailies">Tâches Quotidiennes</string>
-  <string name="todos">A faire</string>
-  <string name="rewards">Récompenses</string>
-  <string name="taskform.delete.title">Êtes-vous sûr·e ?</string>
-  <string name="taskform.delete.message">Voulez-vous vraiment supprimer ceci ?</string>
-  <string name="yes">Oui</string>
-  <string name="no">Non</string>
-  <string name="quest">Quête</string>
-  <string name="avatar_body">Corps</string>
-  <string name="avatar_hair">Cheveux</string>
-  <string name="avatar_shirt">Tunique</string>
-  <string name="avatar_skin">Peau</string>
-  <string name="avatar_ears">Oreilles d\'Animaux</string>
-  <string name="avatar_base">Nuque</string>
-  <string name="avatar_color">Couleur</string>
-  <string name="avatar_beard">Barbe</string>
-  <string name="avatar_mustache">Moustache</string>
-  <string name="avatar_flower">Fleur</string>
-  <string name="avatar_bangs">Franges</string>
-  <string name="avatar_nothing">Sélection vide</string>
-  <string name="avatar_size">Taille</string>
-  <string name="avatar_size_slim">Mince</string>
-  <string name="avatar_size_broad">Trapu</string>
-  <string name="avatar_background">Arrière-plan</string>
-  <string name="purchase_customization">Acheter une personnalisation</string>
-  <string name="purchase_set_button">Débloquer le lot pour %d gemmes</string>
-  <string name="purchase_button">Acheter</string>
-  <string name="purchase_set_title">Acheter le lot %s</string>
-  <string name="due_date">Échéance</string>
-  <string name="quest.accept">Accepter</string>
-  <string name="quest.reject">Refuser</string>
-  <string name="quest.begin">Lancer la Quête</string>
-  <string name="quest.cancel">Annuler l\'invitation</string>
-  <string name="quest.abort">Annuler la Quête</string>
-  <string name="quest.leave">Abandonner la Quête</string>
-  <string name="quest.pending">En attente</string>
-  <string name="quest.accepted">Acceptée</string>
-  <string name="quest.rejected">Rejetée</string>
-  <string name="quest.participants">Participants</string>
-  <string name="version_info">Version %1$s (%2$d)</string>
-  <string name="sidebar_help">Aide &amp; FAQ</string>
-  <string name="complete_tutorial">J\'ai compris !</string>
-  <string name="dismiss_tutorial">Rappelez-le moi plus tard</string>
-  <string name="intro_1_subtitle">Bienvenue sur</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Il est temps de s\'amuser en menant vos tâches à bien. Rejoignez plus de %s personnes qui progressent dans la vie tâche par tâche.</string>
-  <string name="intro_2_subtitle">Progrès en jeu</string>
-  <string name="intro_2_title">Progrès dans la vie</string>
-  <string name="intro_2_description">Débloquez des fonctionnalités en jeu en validant vos tâches dans la vraie vie. Obtenez des équipements, des familiers, et d\'autres récompenses pour l\'accomplissement de vos objectifs.</string>
-  <string name="intro_3_subtitle">Combattez des monstres</string>
-  <string name="intro_3_description">Restez sur les rails de l\'accomplissement de vos buts avez l\'aide de vos amis. Épaulez-vous dans la vie et dans la bataille en vous améliorant ensemble !</string>
-  <string name="intro_finish_button">C\'est parti !</string>
-  <string name="previous_button">Précédent</string>
-  <string name="next_button">Suivant</string>
-  <string name="skip_button">Passer</string>
-  <string name="setup_welcome_description">Bienvenue sur Habitica, où progresser dans le jeu améliorera votre vie quotidienne ! En accomplissant vos buts dans le monde réel, vous débloquerez de l’expérience, des animaux, des quêtes, et bien plus encore.</string>
-  <string name="setup_welcome_title">Bienvenue</string>
-  <string name="avatar_setup_description">Alors, à quoi voudriez-vous ressembler ? Ne vous inquiétez pas, vous pourrez changer d\'apparence plus tard.</string>
-  <string name="task_setup_description">Bien ! Maintenant, que voudriez-vous travailler pendant cette aventure ?</string>
-  <string name="setup_group_work">Travailler</string>
-  <string name="setup_group_exercise">Faire de l\'exercice</string>
-  <string name="setup_group_health">Santé</string>
-  <string name="setup_group_school">Ecole</string>
-  <string name="setup_group_teams">Equipes</string>
-  <string name="setup_group_chores">Tâches ménagères</string>
-  <string name="setup_group_creativity">Créativité</string>
-  <string name="setup_task_work_1">Traiter les e-mails</string>
-  <string name="setup_task_work_2">Tâche la plus importante</string>
-  <string name="setup_task_work_3">Projet de travail</string>
-  <string name="setup_task_exercise_1">10 minutes de cardio</string>
-  <string name="setup_task_exercise_2">Stretching</string>
-  <string name="setup_task_exercise_3">Définir des horaires où faire du sport</string>
-  <string name="setup_task_healthWellness_1">Manger sainement / Malbouffe</string>
-  <string name="setup_task_healthWellness_2">Utiliser du fil dentaire</string>
-  <string name="setup_task_healthWellness_3">Planifier un bilan</string>
-  <string name="setup_task_school_1">Etudier/Procrastiner</string>
-  <string name="setup_task_school_2">Faire mes devoirs</string>
-  <string name="setup_task_school_3">Finir un devoir pour l\'école</string>
-  <string name="setup_task_teams_1">Faire le point avec l\'équipe</string>
-  <string name="setup_task_teams_2">Informer l\'équipe de l\'état d\'avancement</string>
-  <string name="setup_task_teams_3">Finir un projet de groupe</string>
-  <string name="setup_task_chores_1">10 minutes de nettoyage</string>
-  <string name="setup_task_chores_2">Faire la vaisselle</string>
-  <string name="setup_task_chores_3">Organiser mon placard</string>
-  <string name="setup_task_creativity_1">Etudier un maître de l\'art</string>
-  <string name="setup_task_creativity_2">Travailler à un projet créatif</string>
-  <string name="setup_task_creativity_3">Finir un projet créatif</string>
-  <string name="gem.purchase.support">Vous voulez aider Habitica à continuer d\'exister ? Vous pouvez soutenir les développeurs en achetant des gemmes !\n\nLes gemmes vous permettent d\'acheter des éléments supplémentaires pour votre compte, comme : \n\n - De supers costumes pour votre avatar\n - Des arrière-plans géniaux\n - Des quêtes amusantes où vous gagnez des œufs de familiers\n - La possibilité de changer de classe avant le niveau 100\n\nMerci infiniment de nous aider à faire d\'Habitica le meilleur site possible. Votre soutien signifie beaucoup pour nous.</string>
-  <string name="my_guilds">Mes Guildes</string>
-  <string name="public_guilds">Guildes Publiques</string>
-  <string name="guild">Guilde</string>
-  <string name="leave">Quitter</string>
-  <string name="join">Rejoindre</string>
-  <string name="leader">Responsable</string>
-  <string name="gems">Gemmes</string>
-  <string name="copy_as_todo">Copier comme une tâche À Faire</string>
-  <string name="send_pm">Envoyer un MP</string>
-  <string name="flag">Signaler</string>
-  <string name="delete">Supprimer</string>
-  <string name="name">Nom</string>
-  <string name="description">Description</string>
-  <string name="privacy">Sécurité</string>
-  <string name="write_message">Écrire un message</string>
-  <string name="post">Envoyer</string>
-  <string name="guild_search_hint">Chercher des guildes</string>
-  <string name="todo_due">Échéance : %s</string>
-  <string name="daily_streak">combo actuel : %d</string>
-  <string name="todo_has_duedate">La tâche a une date d\'échéance</string>
-  <string name="battle_gear">Équipement de combat</string>
-  <string name="costume">Costume</string>
-  <string name="outfit_head">Tête</string>
-  <string name="outfit_headAccessory">Accessoire de tête</string>
-  <string name="outfit_eyewear">Lunettes</string>
-  <string name="outfit_armor">Armure</string>
-  <string name="outfit_back">Dos</string>
-  <string name="outfit_body">Corps</string>
-  <string name="outfit_shield">Bouclier</string>
-  <string name="outfit_weapon">Arme</string>
-  <string name="wear_costume">Porter un costume</string>
-  <string name="equipped">Équipé</string>
-  <string name="quest_cancel_message">Êtes-vous sûr·e de vouloir annuler cette quête ? Toutes les invitations ayant été acceptées seront perdues. Le lanceur de la quête gardera le parchemin de la quête en sa possession.</string>
-  <string name="quest.invitation">Invitation à une quête</string>
-  <string name="quest_begin_message">Êtes-vous sûr·e de vouloir commencer la quête ? Une fois lancée, aucun autre membre de l\'équipe ne peut rejoindre la quête.</string>
-  <string name="quest.invitation.text">Vous avez été invité·e à participer à une quête !</string>
-  <string name="ago_1day">il y a 1 jour</string>
-  <string name="ago_days">il y a %d jours</string>
-  <string name="ago_1Minute">il y a 1 minute</string>
-  <string name="ago_minutes">il y a %d minutes</string>
-  <string name="ago_hours">il y a %d heures</string>
-  <string name="ago_1hour">il y a 1 heure</string>
-  <string name="today">Aujourd\'hui</string>
-  <string name="sidebar_items">Objets</string>
-  <string name="eggs">Œufs</string>
-  <string name="hatching_potions">Potions d\'éclosion</string>
-  <string name="food">Nourriture</string>
-  <string name="quests">Quêtes</string>
-  <string name="pets">Familiers</string>
-  <string name="mounts">Montures</string>
-  <string name="armoireEquipment">Vous avez trouvé une pièce d\'Équipement rare dans l\'Armoire : %s! Génial !</string>
-  <string name="armoireFood">Vous farfouillez dans l\'Armoire et trouvez %1$s %2$s. Qu\'est-ce que ça fait là ?</string>
-  <string name="armoireExp">Vous luttez contre l\'Armoire et gagnez de l\'expérience. Prends ça !</string>
-  <string name="armoireNotesFull">Ouvrez l\'Armoire pour recevoir au hasard de l\'équipement spécial, de l\'expérience ou de la nourriture ! Pièces d\'équipement restantes : %d</string>
-  <string name="armoireLastItem">Vous avez trouvé la dernière pièce d\'équipement rare dans l\'Armoire enchantée.</string>
-  <string name="armoireNotesEmpty">L\'Armoire contiendra de nouvelles pièces d\'équipement la première semaine de chaque mois. D\'ici là, continuez à cliquer pour obtenir de l\'expérience et de la nourriture!</string>
-  <string name="sell">Vendre (%d pièces d\'or)</string>
-  <string name="hatch_with_potion">Faire éclore avec la potion</string>
-  <string name="feed_to_pet">Donner au familier</string>
-  <string name="hatch_egg">Faire éclore avec l\'œuf</string>
-  <string name="invite_party">Inviter l\'équipe</string>
-  <string name="dialog_feeding">Nourrissez %1$s %2$s avec :</string>
-  <string name="use_animal">Utiliser</string>
-  <string name="feed">Nourrir</string>
-  <string name="hatch_with">Faire éclore le familier avec %s</string>
-  <string name="hatched_pet_title">Vous avez fait éclore un·e %1$s %2$s !</string>
-  <string name="close">Fermer</string>
-  <string name="share">Partager</string>
-  <string name="notification_pet_fed">Vous avez nourri votre %1$s %2$s !</string>
-  <string name="notification_purchase">%s acheté</string>
-  <string name="sectionpets">Familiers basiques</string>
-  <string name="sectionpremiumPets">Familiers magiques</string>
-  <string name="sectionquestPets">Familiers de quête</string>
-  <string name="sectionspecialPets">Familiers rares</string>
-  <string name="sectionmounts">Montures basiques</string>
-  <string name="sectionpremiumMounts">Montures magiques</string>
-  <string name="sectionquestMounts">Montures de quête</string>
-  <string name="sectionspecialMounts">Montures rares</string>
-  <string name="world_quest">Quête mondiale</string>
-  <string name="inn_description">Reposez-vous à l\'auberge pour éviter les dégâts causés par les quotidiennes que vous n\'avez pas réalisées ! (Note : cela ne vous immunise pas contre les dégâts causés par les boss.)</string>
-  <string name="empty_items">Vous n\'avez pas de %s</string>
-  <string name="user_level">Niv %d</string>
-  <string name="user_level_with_class">Niv %1$d - %2$s</string>
-  <string name="warrior">Guerrier</string>
-  <string name="rogue">Voleur</string>
-  <string name="mage">Mage</string>
-  <string name="healer">Guérisseur</string>
-  <string name="warrior_description">Les Guerriers font plus de \"coups critiques\" et ils sont plus puissants, tandis qu\'ils reçoivent aléatoirement des bonus d\'Or, d\'Expérience, et de chance d\'obtenir du butin en achevant une tâche. Ils infligent également de lourds dommages aux boss. Jouez un Guerrier si vous êtes motivé par des récompenses aléatoires de style jackpot, ou si vous voulez distribuez des gnons dans les Quêtes de boss!</string>
-  <string name="mage_description">Les Mages apprennent vite, gagnant Expérience et Niveaux plus rapidement que les autres classes. Ils reçoivent également de grandes réserves de Mana pour utiliser les capacités spéciales. Jouez un Mage si vous aimez l\'aspect tactique du jeu, ou si vous êtes très motivé à monter beaucoup de niveaux et débloquer des options avancées!</string>
-  <string name="rogue_description">Les Voleurs adorent amasser des richesses, récupérant plus d\'Or que qui que ce soit d\'autre, et sont doués pour trouver des objets par hasard. Leur légendaire capacité de Furtivité leur permet d\'esquiver les conséquences des Quotidiennes manquées. Jouez un Voleur si vous êtes fortement motivé par les Récompenses et les Succès, à la recherche de butin et de badges!</string>
-  <string name="healer_description">Les Guérisseurs sont imperméable aux dégâts et étendent cette protection aux autres. Les Quotidiennes manquées et les mauvaises Habitudes ne les affectent pas tant que ça et ils ont des moyens pour retrouver la Santé après un échec. Jouez un Guérisseur si vous aimez assister les membres de votre équipe, ou si l\'idée de tromper la mort par le dur labeur vous inspire!</string>
-  <string name="select_class">Sélectionner une classe</string>
-  <string name="opt_out_class">Désactiver</string>
-  <string name="opt_out_description">Les classes vous ennuient ? Vous voulez choisir plus tard ? Désactivez-les - vous serez un combattant sans capacités spéciales. Vous pouvez vous renseigner plus tard sur le système de classe sur le wiki et activer les classes à tout moment.</string>
-  <string name="class_confirmation">Êtes vous sûr de vouloir devenir un %s?</string>
-  <string name="class_changed">Vous êtes maintenant un %s !</string>
-  <string name="class_changed_description">Vous avez une nouvelle tenue de combat par défaut que vous pouvez changer dans l\'équipement !</string>
-  <string name="choose_class">Choisissez une classe</string>
-  <string name="dialog_go_back">Revenir</string>
-  <string name="opt_out_confirmation">Êtes-vous sûr-e de vouloir désactiver votre compte?</string>
-  <string name="change_class">Changez votre classe</string>
-  <string name="change_class_description">Changez de classe et remboursez les points d\'attribut en échange de 3 gemmes. Vous pourrez attribuer vos points sur le site web</string>
-  <string name="enable_class">Activer le système de classe</string>
-  <string name="changing_class_progress">Changer de classe</string>
-  <string name="by_email">Par email</string>
-  <string name="invite_existing_users">Inviter des utilisateurs•trices existant•e•s</string>
-  <string name="send">Envoyer</string>
-  <string name="invite">Inviter des ami•e•s</string>
-  <string name="invite_id_description">Si vous avez des ami•e•s qui jouent déjà à Habitica, invitez-les en utilisant leurs ID d\'utilisateur.</string>
-  <string name="invite_email_description">Si un•e ami•e rejoint Habitica via votre email, il ou elle sera automatiquement invité•e à rejoindre votre équipe !</string>
-  <string name="add_invites">Ajouter des invitations</string>
-  <string name="user_id">ID d\'utilisateur</string>
-  <string name="email">Email</string>
-  <string name="invite_users">Inviter dans l\'équipe</string>
-  <string name="share_using">Partager avec</string>
-  <string name="share_levelup">J\'ai atteint le niveau %d à Habitica en améliorant mes habitudes dans le monde réel !</string>
-  <string name="share_hatched">Je viens de faire éclore un familier%1$s %2$s à Habitica en réalisant mes tâches quotidiennes</string>
-  <string name="share_raised">Je viens de gagner un-e %1$s %2$s monture en réalisant mes tâches quotidiennes!</string>
-  <string name="open_in_store">Ouvrir dans le Play Store</string>
-  <string name="change_class_confirmation">Êtes-vous sûr·e de vouloir changer de classe ? Cela vous coûtera 3 gemmes.</string>
-  <string name="change_class_equipment_warning">Attention : vous ne pourrez plus acheter l\'équipement de la classe %s.</string>
-  <string name="leaderMessage">Message de %1$s</string>
-  <string name="leaderName">Leader : %1$s</string>
-  <string name="confirm">Confirmer</string>
-  <string name="market">Marché</string>
-  <string name="timeTravelers">Voyageurs temporels</string>
-  <string name="seasonalShop">Boutique saisonnière</string>
-  <string name="empty_inbox">Vous n\'avez pas de messages dans votre boîte de réception. Vous pouvez envoyer un nouveau message à partir des messages de discussion publics de chaque personne.</string>
-  <string name="party_invite">Débloquer en invitant des ami•e•s</string>
-  <string name="no_gold">Pas assez d\'or</string>
-  <string name="no_potion">Vous n\'avez pas besoin d\'acheter une potion de santé</string>
-  <string name="successful_purchase">%1$s acheté avec succès</string>
-  <string name="purchase_confirmation_title">Confirmer l\'achat</string>
-  <string name="confirm_purchase_text">Acheter %1$s pour %2$s %3$s</string>
-  <string name="gem">gemme</string>
-  <string name="hourglass">sablier</string>
-  <string name="hourglasses">sabliers</string>
-  <string name="gold_singular">pièce d\'or</string>
-  <string name="gold_plural">pièces d\'or</string>
-  <string name="chat_message_copied">Message copié dans le presse-papier</string>
-  <string name="copy_chat_message">Copier dans le presse-papier</string>
-  <string name="edit_tag_title">Modifier l\'étiquette</string>
-  <string name="edit_tag_btn_edit">Modifier</string>
-  <string name="edit_tag_btn_done">Terminé</string>
-  <string name="edit_tag_btn_delete">Supprimer</string>
-  <string name="confirm_delete_tag_title">Êtes-vous sûr•e?</string>
-  <string name="confirm_delete_tag_message">Voulez-vous vraiment supprimer ceci?</string>
-  <string name="filter_drawer_edit_tags">Modifier les étiquettes</string>
-  <string name="filter_drawer_filter_tags">Filtrer par étiquette</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Laissez quelqu\'un vous inviter avec ce QR code</string>
-  <string name="qr_save_message">QR code enregistré sous</string>
-  <string name="qr_dialogue_title">Votre QR code</string>
-  <string name="download">Télécharger</string>
-  <string name="send_new_message">Envoyer un nouveau message</string>
-  <string name="choose_recipient_title">Choisissez un destinataire</string>
-  <string name="action_continue">Continuer</string>
-  <string name="scan_qr_code">Scanner le QR code</string>
-  <string name="enter_recipient_uuid">Saisissez l\'identifiant du destinataire</string>
-  <string name="invited_to_party">Vous avez été invité·e à rejoindre une équipe !</string>
-  <string name="stats_widget_label">Statistiques d\'Habitica</string>
-  <string name="add_task">Ajouter une tâche</string>
-  <string name="add_habit">Ajouter une habitude</string>
-  <string name="add_daily">Ajouter une quotidienne</string>
-  <string name="add_todo">Ajouter une tâche à faire</string>
-  <string name="add_reward">Ajouter une récompense</string>
-  <string name="all_dailies_completed">Vous avez accompli toutes vos tâches quotidiennes. Bravo !</string>
-  <string name="widget_habit_button">Réaliser une tâche Habitica</string>
-  <string name="widget_dailies">Quotidiennes Habitica</string>
-  <string name="widget_add_task">Ajouter une tâche Habitica</string>
-  <string name="google_services_missing">Le service Google Play n\'a pas pu être trouvé.</string>
-  <string name="gem.purchase.toolbartitle">Acheter</string>
-  <string name="gem.purchase.title">Acheter des gemmes soutient les développeurs et aide Habitica à fonctionner</string>
-  <string name="gem.purchase.subtitle">Les gemmes permettent d\'acheter des extras amusants pour votre compte, comme :</string>
-  <string name="gem.purchase.listitem1">Des costumes chouettes pour votre avatar</string>
-  <string name="gem.purchase.listitem2">De magnifiques arrière-plans</string>
-  <string name="gem.purchase.listitem3">Des quêtes qui vous récompensent avec des oeufs de familiers</string>
-  <string name="gem.purchase.listitem4">La possibilité de changer de classe avant le niveau 100</string>
-  <string name="support_habitica">Soutenir Habitica</string>
-  <string name="skill_transformation_use">Utiliser</string>
-  <string name="hatching_market_info">Vous ne recevez pas le bon butin ? Allez voir au marché !</string>
-  <string name="feeding_market_info">Besoin de plus de nourriture ? Achetez-en au marché !</string>
-  <string name="open_market">Ouvrir le Marché</string>
-  <string name="cds_description">Vos Quotidiennes se réinitialiseront la première fois que vous utiliserez Habitica après %1$s. Faites attention à les accomplir avant cette heure !</string>
-  <string name="AudioTheme_title">Thème audio</string>
-  <string name="AudioTheme_summary">Changer le thème audio d\'Habitica</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">A demain !</string>
-  <string name="belongs_to_challenge">Appartient au défi</string>
-  <string name="has_reminder">A un rappel</string>
-  <string name="has_tag">A une étiquette</string>
-  <string name="subscribe.title">L\'abonnement aide l\'équipe de développement et permet à Habitica de fonctionner</string>
-  <string name="subscribe_prompt">Abonnez vous et vous obtiendrez ces bénéfices utiles :</string>
-  <string name="subscribe.listitem1">Acheter des gemmes avec de l\'or</string>
-  <string name="subscribe.listitem2">Objets mensuels exclusifs</string>
-  <string name="subscribe.listitem3">Conservez plus d\'historique de tâches</string>
-  <string name="subscribe.listitem4">Limites de butin doublées</string>
-  <string name="subscriptions">Abonnements</string>
-  <string name="subscription_duration">Périodique tous les %s</string>
-  <string name="subscribe">S\'abonner</string>
-  <string name="subscribe.listitem1.description">Alexander le marchand vous vendra des gemmes au prix de 20 pièces d\'or par gemme.\n\nSes commandes mensuelles sont plafonnées initialement à 25 gemmes par mois mais peut augmenter en fonction de la durée de votre abonnement\n\n. Ce plafond augmente de 5 gemmes pour chaque période de trois mois consécutif d\'abonnement, jusqu\'à un maximum de 50 gemmes par mois !</string>
-  <string name="subscribe.listitem2.description">Chaque mois vous recevrez un objet cosmétique unique pour votre avatar !\n\nEn plus, pour chaque période de trois mois d\'abonnement consécutif, les voyageurs temporels vous donneront accès à des objets cosmétiques passés (ou futurs).</string>
-  <string name="subscribe.listitem3.description">Rend l\'historique des tâches disponible plus longtemps.</string>
-  <string name="subscribe.listitem4.description">Doubler le plafond de butin vous permettra de recevoir plus d\'objets pour avoir rempli des tâches chaque jour, vous aidant ainsi à compléter votre étable plus rapidement !</string>
-  <string name="subscribe1month.gemcap">La limite de gemmes commence à 25</string>
-  <string name="subscribe3month.gemcap">La limite de gemmes est augmentée à 30</string>
-  <string name="subscribe6month.gemcap">La limite de gemmes est augmentée à 35</string>
-  <string name="subscribe12month.gemcap">La limite de gemmes est augmentée à 45</string>
-  <string name="subscription_hourglasses">+%d sabliers mystiques</string>
-  <string name="payment_method">Méthode de paiement</string>
-  <string name="subscription">Abonnement</string>
-  <string name="active">Actif</string>
-  <string name="cancel_subscription">Annuler l\'inscription</string>
-  <string name="cancel_subscription_google.description">Vous ne voulez plus vous abonner ? Vous trouverez l\'option pour vous désabonner dans la section \"Mes applications\" de Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Vous ne voulez plus vous abonner ? A cause de votre méthode de paiement, vous ne pouvez vous désinscrire qu\'à travers le site. Cliquez sur le bouton ci-dessous pour ouvrir le site dans votre navigateur !</string>
-  <string name="visit_habitica_website">Rendez vous sur le site Habitica</string>
-  <string name="current_bonuses">Bonus actuels</string>
-  <string name="months_subscribed">Mois souscrits</string>
-  <string name="current_hourclasses">Sabliers mystiques actuels</string>
-  <string name="monthly_gem_cap">Limite de gemmes mensuelle</string>
-  <string name="inactive">Inactif</string>
-  <string name="one_month">1 mois</string>
-  <string name="months">%d mois</string>
-  <string name="month">mois</string>
-  <string name="three_months">3 mois</string>
-  <string name="six_months">6 mois</string>
-  <string name="twelve_months">12 mois</string>
-  <string name="subscribe_prompt_thanks">Pour votre abonnement, vous recevez ces bénéfices :</string>
-  <string name="subscription_status">Etat de l\'abonnement</string>
-  <string name="byLeader">par %s</string>
-  <string name="challenge_details">Détails du défi</string>
-  <string name="challenge_leave_title">Quitter le défi</string>
-  <string name="challenge_leave_text">Voulez-vous vraiment quitter le défi \"%s\" ?</string>
-  <string name="challenge_remove_tasks_title">Supprimer les tâches</string>
-  <string name="challenge_remove_tasks_text">Voulez-vous supprimer les tâches ?</string>
-  <string name="remove_tasks">Supprimer</string>
-  <string name="keep_tasks">Conserver</string>
-  <string name="my_challenges">Mes défis</string>
-  <string name="public_challenges">Publique</string>
-  <string name="challenges">Défis</string>
-  <string name="daily">Quotidienne</string>
-  <string name="habit">Habitude</string>
-  <string name="reward">Récompense</string>
-  <string name="todo">A faire</string>
-  <string name="official">Officiel</string>
-  <string name="participating">Participe</string>
-  <string name="challenge">Défi</string>
-  <string name="go_to_challenge">Aller au défi</string>
-  <string name="not_part_of_a_challenge">Vous ne faites pas encore partie de ce défi !</string>
-  <string name="join_a_challenge">Rejoignez un défi pour ajouter une sélection de tâches à votre liste, puis affrontez les autres participants pour gagner des succès ou même des gemmes !</string>
-  <string name="check_the_public_challenge_tab">Sélectionnez l\'onglet \"Publique\" pour trouver les défi créés par la communauté qui vous sont le plus adaptés !</string>
-  <string name="add_reminder">Ajouter un rappel</string>
-  <string name="warning">Attention</string>
-  <string name="open_settings">Ouvrir les paramètres</string>
-  <string name="dont_keep_activities_warning">Il semblerait que vous ayez l\'option développeur \\"Ne pas conserver les activités\\" activées. Actuellement, cette option provoque des problèmes avec l\'application Habitica, nous vous suggérons de la désactiver.</string>
-  <string name="inbox">Boîte de réception</string>
-  <string name="FAQ">Questions fréquentes (FAQ)</string>
-  <string name="special">Spécial</string>
-  <string name="gem_for_gold_description">Grâce à votre abonnement, vous pouvez acheter des gemmes chaque mois en utilisant de l\'or.</string>
-  <string name="limited_count">%d restantes</string>
-  <string name="gem_shop">Gemme</string>
-  <string name="mystery_item">Objet mystère</string>
-  <string name="myster_item_notes">Chaque mois, votre abonnement vous donnera accès à un objet mystère. Il est généralement disponible une semaine avant la fin du mois.</string>
-  <string name="open">Ouvrir</string>
-  <string name="notification_mystery_item">Vous ouvrez le paquet et trouvez %s !</string>
-  <string name="checkInRewardEarned">Vous avez mérité cette récompense : %1$s pour votre dévotion à améliorer votre vie.</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Votre prochain prix sera débloqué à %1$d connexions</string>
-  <string name="pending_approval">En attente de validation</string>
-  <string name="filters">Filtres</string>
-  <string name="done">Complétées</string>
-  <string name="group_tasks_edit_description">Les tâches de groupe ne peuvent pas être modifiées.</string>
-  <string name="group_tasks_edit_title">Tâche non modifiable</string>
-  <string name="groups">Groupes</string>
-  <string name="all">Tous</string>
-  <string name="none">Aucun</string>
-  <string name="owned">Possédé</string>
-  <string name="not_owned">Non possédé</string>
-  <string name="new_game">Nouvelle\nPartie</string>
-  <string name="login_btn_fb">Se connecter via Facebook</string>
-  <string name="login_btn_google">Se connecter via Google</string>
-  <string name="action_back">Retour</string>
-  <string name="welcome_text">Oh, vous devez être nouveau·nouvelle. Je m\'appelle Justin et je vais vous guider dans Habitica.\n\nPour commencer, vous devez créer un avatar.</string>
-  <string name="randomize">Aléatoire</string>
-  <string name="avatar_extras">Bonus</string>
-  <string name="avatar_skin_color">Couleur de peau</string>
-  <string name="avatar_hair_color">Couleur de cheveux</string>
-  <string name="avatar_hair_bangs">Frange</string>
-  <string name="avatar_hair_ponytail">Queue de cheval</string>
-  <string name="avatar_glasses">Lunettes</string>
-  <string name="avatar_wheelchair">Fauteuil roulant</string>
-  <string name="weak">Faibles</string>
-  <string name="strong">Fortes</string>
-  <string name="dated">Datées</string>
-  <string name="completed">Terminé</string>
-  <string name="setuP_group_other">Autre</string>
-  <string name="clear">Effacer</string>
-  <string name="empty_title_habits">Vous n\'avez aucune habitude</string>
-  <string name="empty_description_habits">Les habitudes sont des tâches qui n\'ont pas de planning défini. Vous pouvez les valider plusieurs fois par jour, ou pas du tout.</string>
-  <string name="empty_title_dailies">Vous n\'avez aucune tâche quotidienne</string>
-  <string name="empty_description_dailies">Les quotidiennes sont des tâches qui se répètent de façon régulière. Choisissez la planification qui vous convient !</string>
-  <string name="empty_title_todos">Vous n\'avez aucune tâche à faire</string>
-  <string name="empty_description_todos">Les tâches à faire sont des tâches qui ne doivent être validées qu\'une seule fois. Ajoutez des listes de vérifications pour augmenter leur valeur.</string>
-  <string name="empty_title_rewards">Vous n\'avez aucune récompense</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Actualiser</string>
+  <string name="XP_default">Expérience</string>
+  <string name="HP_default">Santé</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Les préférences n\'ont pas pu être chargées depuis le QR Code</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Paramètres</string>
+  <string name="SP_address_hint">Votre serveur personnalisé</string>
+  <string name="SP_userID_title">ID d\'utilisateur</string>
+  <string name="SP_userID_summary">Votre ID d\'utilisateur</string>
+  <string name="SP_APIToken_title">Jeton d\'API</string>
+  <string name="SP_APIToken_summary">Votre Jeton d\'API</string>
+  <string name="Language_title">Langage</string>
+  <string name="Language_summary">Changer le langage d\'Habitica</string>
+  <string name="SP_user_qr_code">Votre QR code</string>
+  <string name="PS_contact_title">Contactez-moi</string>
+  <string name="unknown_error">Une erreur est survenue...</string>
+  <string name="pref_account_header">Compte</string>
+  <string name="pref_first_day_of_the_week_title">Premier jour de la semaine</string>
+  <string name="pref_first_day_of_the_week_summary">Premier jour de la semaine dans tous les calendriers</string>
+  <string name="pref_reminder_header">Rappel Quotidien</string>
+  <string name="pref_reminder_checkbox">Activer le rappel</string>
+  <string name="pref_reminder_picker">Changer l\'heure du rappel</string>
+  <string name="pref_cds_header">Heure personnalisée de début de journée</string>
+  <string name="pref_cds_picker">Définir l\'heure personnalisée de début de journée</string>
+  <string name="pref_push_notifications_checkbox">Notifications Push de l\'utilisateur</string>
+  <string name="push_notifications">Notifications Push</string>
+  <string name="push_notifications_sum">Paramétrez vos notifications push</string>
+  <string name="preference_push_you_won_challenge">Vous avez gagné un défi !</string>
+  <string name="preference_push_received_a_private_message">Message privé reçu</string>
+  <string name="preference_push_gifted_gems">Gemmes offertes</string>
+  <string name="preference_push_gifted_subscription">Abonnement offert</string>
+  <string name="preference_push_invited_to_party">Invitation dans une équipe</string>
+  <string name="preference_push_invited_to_guild">Invitation dans une guilde</string>
+  <string name="preference_push_your_quest_has_begun">Votre quête a commencé</string>
+  <string name="preference_push_invited_to_quest">Invitation à une quête</string>
+  <!--Adding tasks-->
+  <string name="task_value">Valeur</string>
+  <string name="new_todo">Nouvelle tâche À Faire</string>
+  <string name="new_reward">Nouvelle Récompense</string>
+  <string name="new_daily">Nouvelle Quotidienne</string>
+  <string name="new_habit">Nouvelle Habitude</string>
+  <string name="action_edit">Modifier</string>
+  <string name="action_delete">Supprimer</string>
+  <string name="action_cancel">Annuler</string>
+  <string name="login_btn">Connexion</string>
+  <string name="register_btn">Créer un compte</string>
+  <string name="username">Nom d\'utilisateur</string>
+  <string name="email_username">E-mail ou Nom d\'utilisateur</string>
+  <string name="password">Mot de passe</string>
+  <string name="emailAddress">Adresse e-mail</string>
+  <string name="confirmpassword">Confirmez votre mot de passe</string>
+  <string name="logout">Déconnexion</string>
+  <string name="logout_description">Déconnexion de votre compte</string>
+  <string name="account_details_sum">Vérifiez les détails de votre compte</string>
+  <string name="account_details">Détails du compte</string>
+  <string name="LoginActivityName">Bienvenue</string>
+  <string name="string_revive">Résurrection</string>
+  <string name="please_connect">Veuillez vous connecter à l\'application avant d\'utiliser un widget</string>
+  <string name="about.title">À propos</string>
+  <string name="about.libraries">Bibliothèques</string>
+  <string name="about.versionhistory">Historique des versions</string>
+  <string name="about.habitica_open_source">Habitica est disponible sur Github en open source </string>
+  <string name="about.rate_our_app">Notez notre application</string>
+  <string name="about.give_us_feedback">Envoyez nous votre avis !</string>
+  <string name="about.bugreport">Signaler un bug</string>
+  <string name="about.source_code">Code source</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Erreur lors de la connexion</string>
+  <string name="network_error_no_network_body">Vous n\'êtes pas connecté·e à Internet.</string>
+  <string name="internal_error_api">Il semblerait qu\'il y ait un problème avec le serveur. Essayez plus tard.</string>
+  <string name="authentication_error_title">Erreur d\'authentification</string>
+  <string name="authentication_error_body">Votre Nom d\'utilisateur et/ou Mot de passe est incorrect.</string>
+  <string name="login_validation_error_title">Erreur de validation</string>
+  <string name="login_validation_error_fieldsmissing">Vous devez renseigner tous les champs.</string>
+  <string name="save_changes">Enregistrer</string>
+  <string name="copy">Copier</string>
+  <string name="notes">Notes</string>
+  <string name="text">Texte</string>
+  <string name="difficulty">Difficulté</string>
+  <string name="tags">Étiquettes</string>
+  <string name="trivial">Banal</string>
+  <string name="easy">Facile</string>
+  <string name="medium">Moyen</string>
+  <string name="hard">Difficile</string>
+  <string name="start_date">Date de début</string>
+  <string name="positive_habit_form">Positif ( + )</string>
+  <string name="negative_habit_form">Négatif ( - )</string>
+  <string name="checklist">Liste de vérification</string>
+  <string name="reminders">Rappels</string>
+  <string name="actions">Instructions/Actions</string>
+  <string name="attributes">Attributs</string>
+  <string name="physical">Physique</string>
+  <string name="mental">Mental</string>
+  <string name="social">Social</string>
+  <string name="other">Autre</string>
+  <string name="frequency">Répéter</string>
+  <string name="frequency_weekly">Certains jours de la semaine</string>
+  <string name="frequency_daily">Tous les X Jours</string>
+  <string name="monday">Lundi</string>
+  <string name="tuesday">Mardi</string>
+  <string name="wednesday">Mercredi</string>
+  <string name="thursday">Jeudi</string>
+  <string name="friday">Vendredi</string>
+  <string name="saturday">Samedi</string>
+  <string name="sunday">Dimanche</string>
+  <string name="levelup_header">Vous avez gagné un niveau !</string>
+  <string name="levelup_detail">En atteignant vos buts dans la vie réelle, vous avez atteint le Niveau %1$d !</string>
+  <string name="levelup_health">Vous avez été guéri·e complètement !</string>
+  <string name="levelup_button">Bravo !</string>
+  <string name="faint_subtitle">Ne désespérez pas !</string>
+  <string name="faint_penalty_body">Vous avez perdu un niveau, de l\'or, et une pièce d\'équipement, mais vous pouvez tous les récupérer en travaillant dur ! Bonne chance--vous y arriverez.</string>
+  <string name="faint_header">Vous n\'avez plus de points de vie !</string>
+  <string name="faint_button">Reprendre des forces &amp; réessayer</string>
+  <string name="filter">Filtrer</string>
+  <string name="profile_image">Image de Profil</string>
+  <string name="mana_price_button">%d Points de Mana</string>
+  <string name="used_skill">Vous avez utilisé %1$s pour %2$d points de mana.</string>
+  <string name="used_skill_without_mana">Vous avez utilisé %1$s.</string>
+  <string name="new_checklist_item">Nouvelle vérification</string>
+  <string name="add_checklist_item">Ajouter</string>
+  <string name="reminder_title">N\'oubliez pas de cocher vos tâches Quotidiennes !</string>
+  <string name="skill_progress_title">Utiliser une compétence</string>
+  <string name="coming_soon">Bientôt disponible</string>
+  <string name="chat_flag_confirmation">Êtes-vous sûr·e de vouloir signaler ce message pour infraction ?</string>
+  <string name="flag_confirm">Signaler</string>
+  <string name="unlock_lvl_11">Disponible au niveau 11</string>
+  <string name="no_party_message">Vous ne faites pas partie d\'une équipe. Pour rejoindre une équipe, veuillez visiter le site.</string>
+  <string name="forgot_pw_btn">Mot de passe oublié</string>
+  <string name="forgot_pw_tv">Mot de passe oublié ? Veuillez vous rendre sur la version mobile du site.</string>
+  <string name="tavern.inn.checkOut">Réactiver vos Quotidiennes</string>
+  <string name="tavern.inn.rest">Suspendre vos Quotidiennes</string>
+  <string name="reward.dialog.buy">Acheter</string>
+  <string name="reward.dialog.dismiss">Annuler</string>
+  <string name="party">Équipe</string>
+  <string name="chat">Discussion</string>
+  <string name="members">Membres</string>
+  <string name="habits">Habitudes</string>
+  <string name="dailies">Tâches Quotidiennes</string>
+  <string name="todos">A faire</string>
+  <string name="rewards">Récompenses</string>
+  <string name="taskform.delete.title">Êtes-vous sûr·e ?</string>
+  <string name="taskform.delete.message">Voulez-vous vraiment supprimer ceci ?</string>
+  <string name="yes">Oui</string>
+  <string name="no">Non</string>
+  <string name="quest">Quête</string>
+  <string name="avatar_body">Corps</string>
+  <string name="avatar_hair">Cheveux</string>
+  <string name="avatar_shirt">Tunique</string>
+  <string name="avatar_skin">Peau</string>
+  <string name="avatar_ears">Oreilles d\'Animaux</string>
+  <string name="avatar_base">Nuque</string>
+  <string name="avatar_color">Couleur</string>
+  <string name="avatar_beard">Barbe</string>
+  <string name="avatar_mustache">Moustache</string>
+  <string name="avatar_flower">Fleur</string>
+  <string name="avatar_bangs">Franges</string>
+  <string name="avatar_nothing">Sélection vide</string>
+  <string name="avatar_size">Taille</string>
+  <string name="avatar_size_slim">Mince</string>
+  <string name="avatar_size_broad">Trapu</string>
+  <string name="avatar_background">Arrière-plan</string>
+  <string name="purchase_customization">Acheter une personnalisation</string>
+  <string name="purchase_set_button">Débloquer le lot pour %d gemmes</string>
+  <string name="purchase_button">Acheter</string>
+  <string name="purchase_set_title">Acheter le lot %s</string>
+  <string name="due_date">Échéance</string>
+  <string name="quest.accept">Accepter</string>
+  <string name="quest.reject">Refuser</string>
+  <string name="quest.begin">Lancer la Quête</string>
+  <string name="quest.cancel">Annuler l\'invitation</string>
+  <string name="quest.abort">Annuler la Quête</string>
+  <string name="quest.leave">Abandonner la Quête</string>
+  <string name="quest.pending">En attente</string>
+  <string name="quest.accepted">Acceptée</string>
+  <string name="quest.rejected">Rejetée</string>
+  <string name="quest.participants">Participants</string>
+  <string name="version_info">Version %1$s (%2$d)</string>
+  <string name="sidebar_help">Aide &amp; FAQ</string>
+  <string name="complete_tutorial">J\'ai compris !</string>
+  <string name="dismiss_tutorial">Rappelez-le moi plus tard</string>
+  <string name="intro_1_subtitle">Bienvenue sur</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Il est temps de s\'amuser en menant vos tâches à bien. Rejoignez plus de %s personnes qui progressent dans la vie tâche par tâche.</string>
+  <string name="intro_2_subtitle">Progrès en jeu</string>
+  <string name="intro_2_title">Progrès dans la vie</string>
+  <string name="intro_2_description">Débloquez des fonctionnalités en jeu en validant vos tâches dans la vraie vie. Obtenez des équipements, des familiers, et d\'autres récompenses pour l\'accomplissement de vos objectifs.</string>
+  <string name="intro_3_subtitle">Combattez des monstres</string>
+  <string name="intro_3_description">Restez sur les rails de l\'accomplissement de vos buts avez l\'aide de vos amis. Épaulez-vous dans la vie et dans la bataille en vous améliorant ensemble !</string>
+  <string name="intro_finish_button">C\'est parti !</string>
+  <string name="previous_button">Précédent</string>
+  <string name="next_button">Suivant</string>
+  <string name="skip_button">Passer</string>
+  <string name="setup_welcome_description">Bienvenue sur Habitica, où progresser dans le jeu améliorera votre vie quotidienne ! En accomplissant vos buts dans le monde réel, vous débloquerez de l’expérience, des animaux, des quêtes, et bien plus encore.</string>
+  <string name="setup_welcome_title">Bienvenue</string>
+  <string name="avatar_setup_description">Alors, à quoi voudriez-vous ressembler ? Ne vous inquiétez pas, vous pourrez changer d\'apparence plus tard.</string>
+  <string name="task_setup_description">Bien ! Maintenant, que voudriez-vous travailler pendant cette aventure ?</string>
+  <string name="setup_group_work">Travailler</string>
+  <string name="setup_group_exercise">Faire de l\'exercice</string>
+  <string name="setup_group_health">Santé</string>
+  <string name="setup_group_school">Ecole</string>
+  <string name="setup_group_teams">Equipes</string>
+  <string name="setup_group_chores">Tâches ménagères</string>
+  <string name="setup_group_creativity">Créativité</string>
+  <string name="setup_task_work_1">Traiter les e-mails</string>
+  <string name="setup_task_work_2">Tâche la plus importante</string>
+  <string name="setup_task_work_3">Projet de travail</string>
+  <string name="setup_task_exercise_1">10 minutes de cardio</string>
+  <string name="setup_task_exercise_2">Stretching</string>
+  <string name="setup_task_exercise_3">Définir des horaires où faire du sport</string>
+  <string name="setup_task_healthWellness_1">Manger sainement / Malbouffe</string>
+  <string name="setup_task_healthWellness_2">Utiliser du fil dentaire</string>
+  <string name="setup_task_healthWellness_3">Planifier un bilan</string>
+  <string name="setup_task_school_1">Etudier/Procrastiner</string>
+  <string name="setup_task_school_2">Faire mes devoirs</string>
+  <string name="setup_task_school_3">Finir un devoir pour l\'école</string>
+  <string name="setup_task_teams_1">Faire le point avec l\'équipe</string>
+  <string name="setup_task_teams_2">Informer l\'équipe de l\'état d\'avancement</string>
+  <string name="setup_task_teams_3">Finir un projet de groupe</string>
+  <string name="setup_task_chores_1">10 minutes de nettoyage</string>
+  <string name="setup_task_chores_2">Faire la vaisselle</string>
+  <string name="setup_task_chores_3">Organiser mon placard</string>
+  <string name="setup_task_creativity_1">Etudier un maître de l\'art</string>
+  <string name="setup_task_creativity_2">Travailler à un projet créatif</string>
+  <string name="setup_task_creativity_3">Finir un projet créatif</string>
+  <string name="gem.purchase.support">Vous voulez aider Habitica à continuer d\'exister ? Vous pouvez soutenir les développeurs en achetant des gemmes !\n\nLes gemmes vous permettent d\'acheter des éléments supplémentaires pour votre compte, comme : \n\n - De supers costumes pour votre avatar\n - Des arrière-plans géniaux\n - Des quêtes amusantes où vous gagnez des œufs de familiers\n - La possibilité de changer de classe avant le niveau 100\n\nMerci infiniment de nous aider à faire d\'Habitica le meilleur site possible. Votre soutien signifie beaucoup pour nous.</string>
+  <string name="my_guilds">Mes Guildes</string>
+  <string name="public_guilds">Guildes Publiques</string>
+  <string name="guild">Guilde</string>
+  <string name="leave">Quitter</string>
+  <string name="join">Rejoindre</string>
+  <string name="leader">Responsable</string>
+  <string name="gems">Gemmes</string>
+  <string name="copy_as_todo">Copier comme une tâche À Faire</string>
+  <string name="send_pm">Envoyer un MP</string>
+  <string name="flag">Signaler</string>
+  <string name="delete">Supprimer</string>
+  <string name="name">Nom</string>
+  <string name="description">Description</string>
+  <string name="privacy">Sécurité</string>
+  <string name="write_message">Écrire un message</string>
+  <string name="post">Envoyer</string>
+  <string name="guild_search_hint">Chercher des guildes</string>
+  <string name="todo_due">Échéance : %s</string>
+  <string name="daily_streak">combo actuel : %d</string>
+  <string name="todo_has_duedate">La tâche a une date d\'échéance</string>
+  <string name="battle_gear">Équipement de combat</string>
+  <string name="costume">Costume</string>
+  <string name="outfit_head">Tête</string>
+  <string name="outfit_headAccessory">Accessoire de tête</string>
+  <string name="outfit_eyewear">Lunettes</string>
+  <string name="outfit_armor">Armure</string>
+  <string name="outfit_back">Dos</string>
+  <string name="outfit_body">Corps</string>
+  <string name="outfit_shield">Bouclier</string>
+  <string name="outfit_weapon">Arme</string>
+  <string name="wear_costume">Porter un costume</string>
+  <string name="equipped">Équipé</string>
+  <string name="quest_cancel_message">Êtes-vous sûr·e de vouloir annuler cette quête ? Toutes les invitations ayant été acceptées seront perdues. Le lanceur de la quête gardera le parchemin de la quête en sa possession.</string>
+  <string name="quest.invitation">Invitation à une quête</string>
+  <string name="quest_begin_message">Êtes-vous sûr·e de vouloir commencer la quête ? Une fois lancée, aucun autre membre de l\'équipe ne peut rejoindre la quête.</string>
+  <string name="quest.invitation.text">Vous avez été invité·e à participer à une quête !</string>
+  <string name="ago_1day">il y a 1 jour</string>
+  <string name="ago_days">il y a %d jours</string>
+  <string name="ago_1Minute">il y a 1 minute</string>
+  <string name="ago_minutes">il y a %d minutes</string>
+  <string name="ago_hours">il y a %d heures</string>
+  <string name="ago_1hour">il y a 1 heure</string>
+  <string name="today">Aujourd\'hui</string>
+  <string name="sidebar_items">Objets</string>
+  <string name="eggs">Œufs</string>
+  <string name="hatching_potions">Potions d\'éclosion</string>
+  <string name="food">Nourriture</string>
+  <string name="quests">Quêtes</string>
+  <string name="pets">Familiers</string>
+  <string name="mounts">Montures</string>
+  <string name="armoireEquipment">Vous avez trouvé une pièce d\'Équipement rare dans l\'Armoire : %s! Génial !</string>
+  <string name="armoireFood">Vous farfouillez dans l\'Armoire et trouvez %1$s %2$s. Qu\'est-ce que ça fait là ?</string>
+  <string name="armoireExp">Vous luttez contre l\'Armoire et gagnez de l\'expérience. Prends ça !</string>
+  <string name="armoireNotesFull">Ouvrez l\'Armoire pour recevoir au hasard de l\'équipement spécial, de l\'expérience ou de la nourriture ! Pièces d\'équipement restantes : %d</string>
+  <string name="armoireLastItem">Vous avez trouvé la dernière pièce d\'équipement rare dans l\'Armoire enchantée.</string>
+  <string name="armoireNotesEmpty">L\'Armoire contiendra de nouvelles pièces d\'équipement la première semaine de chaque mois. D\'ici là, continuez à cliquer pour obtenir de l\'expérience et de la nourriture!</string>
+  <string name="sell">Vendre (%d pièces d\'or)</string>
+  <string name="hatch_with_potion">Faire éclore avec la potion</string>
+  <string name="feed_to_pet">Donner au familier</string>
+  <string name="hatch_egg">Faire éclore avec l\'œuf</string>
+  <string name="invite_party">Inviter l\'équipe</string>
+  <string name="dialog_feeding">Nourrissez %1$s %2$s avec :</string>
+  <string name="use_animal">Utiliser</string>
+  <string name="feed">Nourrir</string>
+  <string name="hatch_with">Faire éclore le familier avec %s</string>
+  <string name="hatched_pet_title">Vous avez fait éclore un·e %1$s %2$s !</string>
+  <string name="close">Fermer</string>
+  <string name="share">Partager</string>
+  <string name="notification_pet_fed">Vous avez nourri votre %1$s %2$s !</string>
+  <string name="notification_purchase">%s acheté</string>
+  <string name="sectionpets">Familiers basiques</string>
+  <string name="sectionpremiumPets">Familiers magiques</string>
+  <string name="sectionquestPets">Familiers de quête</string>
+  <string name="sectionspecialPets">Familiers rares</string>
+  <string name="sectionmounts">Montures basiques</string>
+  <string name="sectionpremiumMounts">Montures magiques</string>
+  <string name="sectionquestMounts">Montures de quête</string>
+  <string name="sectionspecialMounts">Montures rares</string>
+  <string name="world_quest">Quête mondiale</string>
+  <string name="inn_description">Reposez-vous à l\'auberge pour éviter les dégâts causés par les quotidiennes que vous n\'avez pas réalisées ! (Note : cela ne vous immunise pas contre les dégâts causés par les boss.)</string>
+  <string name="empty_items">Vous n\'avez pas de %s</string>
+  <string name="user_level">Niv %d</string>
+  <string name="user_level_with_class">Niv %1$d - %2$s</string>
+  <string name="warrior">Guerrier</string>
+  <string name="rogue">Voleur</string>
+  <string name="mage">Mage</string>
+  <string name="healer">Guérisseur</string>
+  <string name="warrior_description">Les Guerriers font plus de \"coups critiques\" et ils sont plus puissants, tandis qu\'ils reçoivent aléatoirement des bonus d\'Or, d\'Expérience, et de chance d\'obtenir du butin en achevant une tâche. Ils infligent également de lourds dommages aux boss. Jouez un Guerrier si vous êtes motivé par des récompenses aléatoires de style jackpot, ou si vous voulez distribuez des gnons dans les Quêtes de boss!</string>
+  <string name="mage_description">Les Mages apprennent vite, gagnant Expérience et Niveaux plus rapidement que les autres classes. Ils reçoivent également de grandes réserves de Mana pour utiliser les capacités spéciales. Jouez un Mage si vous aimez l\'aspect tactique du jeu, ou si vous êtes très motivé à monter beaucoup de niveaux et débloquer des options avancées!</string>
+  <string name="rogue_description">Les Voleurs adorent amasser des richesses, récupérant plus d\'Or que qui que ce soit d\'autre, et sont doués pour trouver des objets par hasard. Leur légendaire capacité de Furtivité leur permet d\'esquiver les conséquences des Quotidiennes manquées. Jouez un Voleur si vous êtes fortement motivé par les Récompenses et les Succès, à la recherche de butin et de badges!</string>
+  <string name="healer_description">Les Guérisseurs sont imperméable aux dégâts et étendent cette protection aux autres. Les Quotidiennes manquées et les mauvaises Habitudes ne les affectent pas tant que ça et ils ont des moyens pour retrouver la Santé après un échec. Jouez un Guérisseur si vous aimez assister les membres de votre équipe, ou si l\'idée de tromper la mort par le dur labeur vous inspire!</string>
+  <string name="select_class">Sélectionner une classe</string>
+  <string name="opt_out_class">Désactiver</string>
+  <string name="opt_out_description">Les classes vous ennuient ? Vous voulez choisir plus tard ? Désactivez-les - vous serez un combattant sans capacités spéciales. Vous pouvez vous renseigner plus tard sur le système de classe sur le wiki et activer les classes à tout moment.</string>
+  <string name="class_confirmation">Êtes vous sûr de vouloir devenir un %s?</string>
+  <string name="class_changed">Vous êtes maintenant un %s !</string>
+  <string name="class_changed_description">Vous avez une nouvelle tenue de combat par défaut que vous pouvez changer dans l\'équipement !</string>
+  <string name="choose_class">Choisissez une classe</string>
+  <string name="dialog_go_back">Revenir</string>
+  <string name="opt_out_confirmation">Êtes-vous sûr-e de vouloir désactiver votre compte?</string>
+  <string name="change_class">Changez votre classe</string>
+  <string name="change_class_description">Changez de classe et remboursez les points d\'attribut en échange de 3 gemmes. Vous pourrez attribuer vos points sur le site web</string>
+  <string name="enable_class">Activer le système de classe</string>
+  <string name="changing_class_progress">Changer de classe</string>
+  <string name="by_email">Par email</string>
+  <string name="invite_existing_users">Inviter des utilisateurs•trices existant•e•s</string>
+  <string name="send">Envoyer</string>
+  <string name="invite">Inviter des ami•e•s</string>
+  <string name="invite_id_description">Si vous avez des ami•e•s qui jouent déjà à Habitica, invitez-les en utilisant leurs ID d\'utilisateur.</string>
+  <string name="invite_email_description">Si un•e ami•e rejoint Habitica via votre email, il ou elle sera automatiquement invité•e à rejoindre votre équipe !</string>
+  <string name="add_invites">Ajouter des invitations</string>
+  <string name="user_id">ID d\'utilisateur</string>
+  <string name="email">Email</string>
+  <string name="invite_users">Inviter dans l\'équipe</string>
+  <string name="share_using">Partager avec</string>
+  <string name="share_levelup">J\'ai atteint le niveau %d à Habitica en améliorant mes habitudes dans le monde réel !</string>
+  <string name="share_hatched">Je viens de faire éclore un familier%1$s %2$s à Habitica en réalisant mes tâches quotidiennes</string>
+  <string name="share_raised">Je viens de gagner un-e %1$s %2$s monture en réalisant mes tâches quotidiennes!</string>
+  <string name="open_in_store">Ouvrir dans le Play Store</string>
+  <string name="change_class_confirmation">Êtes-vous sûr·e de vouloir changer de classe ? Cela vous coûtera 3 gemmes.</string>
+  <string name="change_class_equipment_warning">Attention : vous ne pourrez plus acheter l\'équipement de la classe %s.</string>
+  <string name="leaderMessage">Message de %1$s</string>
+  <string name="leaderName">Leader : %1$s</string>
+  <string name="confirm">Confirmer</string>
+  <string name="market">Marché</string>
+  <string name="timeTravelers">Voyageurs temporels</string>
+  <string name="seasonalShop">Boutique saisonnière</string>
+  <string name="empty_inbox">Vous n\'avez pas de messages dans votre boîte de réception. Vous pouvez envoyer un nouveau message à partir des messages de discussion publics de chaque personne.</string>
+  <string name="party_invite">Débloquer en invitant des ami•e•s</string>
+  <string name="no_gold">Pas assez d\'or</string>
+  <string name="no_potion">Vous n\'avez pas besoin d\'acheter une potion de santé</string>
+  <string name="successful_purchase">%1$s acheté avec succès</string>
+  <string name="purchase_confirmation_title">Confirmer l\'achat</string>
+  <string name="confirm_purchase_text">Acheter %1$s pour %2$s %3$s</string>
+  <string name="gem">gemme</string>
+  <string name="hourglass">sablier</string>
+  <string name="hourglasses">sabliers</string>
+  <string name="gold_singular">pièce d\'or</string>
+  <string name="gold_plural">pièces d\'or</string>
+  <string name="chat_message_copied">Message copié dans le presse-papier</string>
+  <string name="copy_chat_message">Copier dans le presse-papier</string>
+  <string name="edit_tag_title">Modifier l\'étiquette</string>
+  <string name="edit_tag_btn_edit">Modifier</string>
+  <string name="edit_tag_btn_done">Terminé</string>
+  <string name="edit_tag_btn_delete">Supprimer</string>
+  <string name="confirm_delete_tag_title">Êtes-vous sûr•e?</string>
+  <string name="confirm_delete_tag_message">Voulez-vous vraiment supprimer ceci?</string>
+  <string name="filter_drawer_edit_tags">Modifier les étiquettes</string>
+  <string name="filter_drawer_filter_tags">Filtrer par étiquette</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Laissez quelqu\'un vous inviter avec ce QR code</string>
+  <string name="qr_save_message">QR code enregistré sous</string>
+  <string name="qr_dialogue_title">Votre QR code</string>
+  <string name="download">Télécharger</string>
+  <string name="send_new_message">Envoyer un nouveau message</string>
+  <string name="choose_recipient_title">Choisissez un destinataire</string>
+  <string name="action_continue">Continuer</string>
+  <string name="scan_qr_code">Scanner le QR code</string>
+  <string name="enter_recipient_uuid">Saisissez l\'identifiant du destinataire</string>
+  <string name="invited_to_party">Vous avez été invité·e à rejoindre une équipe !</string>
+  <string name="stats_widget_label">Statistiques d\'Habitica</string>
+  <string name="add_task">Ajouter une tâche</string>
+  <string name="add_habit">Ajouter une habitude</string>
+  <string name="add_daily">Ajouter une quotidienne</string>
+  <string name="add_todo">Ajouter une tâche à faire</string>
+  <string name="add_reward">Ajouter une récompense</string>
+  <string name="all_dailies_completed">Vous avez accompli toutes vos tâches quotidiennes. Bravo !</string>
+  <string name="widget_habit_button">Réaliser une tâche Habitica</string>
+  <string name="widget_dailies">Quotidiennes Habitica</string>
+  <string name="widget_add_task">Ajouter une tâche Habitica</string>
+  <string name="google_services_missing">Le service Google Play n\'a pas pu être trouvé.</string>
+  <string name="gem.purchase.toolbartitle">Acheter</string>
+  <string name="gem.purchase.title">Acheter des gemmes soutient les développeurs et aide Habitica à fonctionner</string>
+  <string name="gem.purchase.subtitle">Les gemmes permettent d\'acheter des extras amusants pour votre compte, comme :</string>
+  <string name="gem.purchase.listitem1">Des costumes chouettes pour votre avatar</string>
+  <string name="gem.purchase.listitem2">De magnifiques arrière-plans</string>
+  <string name="gem.purchase.listitem3">Des quêtes qui vous récompensent avec des oeufs de familiers</string>
+  <string name="gem.purchase.listitem4">La possibilité de changer de classe avant le niveau 100</string>
+  <string name="support_habitica">Soutenir Habitica</string>
+  <string name="skill_transformation_use">Utiliser</string>
+  <string name="hatching_market_info">Vous ne recevez pas le bon butin ? Allez voir au marché !</string>
+  <string name="feeding_market_info">Besoin de plus de nourriture ? Achetez-en au marché !</string>
+  <string name="open_market">Ouvrir le Marché</string>
+  <string name="cds_description">Vos Quotidiennes se réinitialiseront la première fois que vous utiliserez Habitica après %1$s. Faites attention à les accomplir avant cette heure !</string>
+  <string name="AudioTheme_title">Thème audio</string>
+  <string name="AudioTheme_summary">Changer le thème audio d\'Habitica</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">A demain !</string>
+  <string name="belongs_to_challenge">Appartient au défi</string>
+  <string name="has_reminder">A un rappel</string>
+  <string name="has_tag">A une étiquette</string>
+  <string name="subscribe.title">L\'abonnement aide l\'équipe de développement et permet à Habitica de fonctionner</string>
+  <string name="subscribe_prompt">Abonnez vous et vous obtiendrez ces bénéfices utiles :</string>
+  <string name="subscribe.listitem1">Acheter des gemmes avec de l\'or</string>
+  <string name="subscribe.listitem2">Objets mensuels exclusifs</string>
+  <string name="subscribe.listitem3">Conservez plus d\'historique de tâches</string>
+  <string name="subscribe.listitem4">Limites de butin doublées</string>
+  <string name="subscriptions">Abonnements</string>
+  <string name="subscription_duration">Périodique tous les %s</string>
+  <string name="subscribe">S\'abonner</string>
+  <string name="subscribe.listitem1.description">Alexander le marchand vous vendra des gemmes au prix de 20 pièces d\'or par gemme.\n\nSes commandes mensuelles sont plafonnées initialement à 25 gemmes par mois mais peut augmenter en fonction de la durée de votre abonnement\n\n. Ce plafond augmente de 5 gemmes pour chaque période de trois mois consécutif d\'abonnement, jusqu\'à un maximum de 50 gemmes par mois !</string>
+  <string name="subscribe.listitem2.description">Chaque mois vous recevrez un objet cosmétique unique pour votre avatar !\n\nEn plus, pour chaque période de trois mois d\'abonnement consécutif, les voyageurs temporels vous donneront accès à des objets cosmétiques passés (ou futurs).</string>
+  <string name="subscribe.listitem3.description">Rend l\'historique des tâches disponible plus longtemps.</string>
+  <string name="subscribe.listitem4.description">Doubler le plafond de butin vous permettra de recevoir plus d\'objets pour avoir rempli des tâches chaque jour, vous aidant ainsi à compléter votre étable plus rapidement !</string>
+  <string name="subscribe1month.gemcap">La limite de gemmes commence à 25</string>
+  <string name="subscribe3month.gemcap">La limite de gemmes est augmentée à 30</string>
+  <string name="subscribe6month.gemcap">La limite de gemmes est augmentée à 35</string>
+  <string name="subscribe12month.gemcap">La limite de gemmes est augmentée à 45</string>
+  <string name="subscription_hourglasses">+%d sabliers mystiques</string>
+  <string name="payment_method">Méthode de paiement</string>
+  <string name="subscription">Abonnement</string>
+  <string name="active">Actif</string>
+  <string name="cancel_subscription">Annuler l\'inscription</string>
+  <string name="cancel_subscription_google.description">Vous ne voulez plus vous abonner ? Vous trouverez l\'option pour vous désabonner dans la section \"Mes applications\" de Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle.description">Vous ne voulez plus vous abonner ? A cause de votre méthode de paiement, vous ne pouvez vous désinscrire qu\'à travers le site. Cliquez sur le bouton ci-dessous pour ouvrir le site dans votre navigateur !</string>
+  <string name="visit_habitica_website">Rendez vous sur le site Habitica</string>
+  <string name="current_bonuses">Bonus actuels</string>
+  <string name="months_subscribed">Mois souscrits</string>
+  <string name="current_hourclasses">Sabliers mystiques actuels</string>
+  <string name="monthly_gem_cap">Limite de gemmes mensuelle</string>
+  <string name="inactive">Inactif</string>
+  <string name="one_month">1 mois</string>
+  <string name="months">%d mois</string>
+  <string name="month">mois</string>
+  <string name="three_months">3 mois</string>
+  <string name="six_months">6 mois</string>
+  <string name="twelve_months">12 mois</string>
+  <string name="subscribe_prompt_thanks">Pour votre abonnement, vous recevez ces bénéfices :</string>
+  <string name="subscription_status">Etat de l\'abonnement</string>
+  <string name="byLeader">par %s</string>
+  <string name="challenge_details">Détails du défi</string>
+  <string name="challenge_leave_title">Quitter le défi</string>
+  <string name="challenge_leave_text">Voulez-vous vraiment quitter le défi \"%s\" ?</string>
+  <string name="challenge_remove_tasks_title">Supprimer les tâches</string>
+  <string name="challenge_remove_tasks_text">Voulez-vous supprimer les tâches ?</string>
+  <string name="remove_tasks">Supprimer</string>
+  <string name="keep_tasks">Conserver</string>
+  <string name="my_challenges">Mes défis</string>
+  <string name="public_challenges">Publique</string>
+  <string name="challenges">Défis</string>
+  <string name="daily">Quotidienne</string>
+  <string name="habit">Habitude</string>
+  <string name="reward">Récompense</string>
+  <string name="todo">A faire</string>
+  <string name="official">Officiel</string>
+  <string name="participating">Participe</string>
+  <string name="challenge">Défi</string>
+  <string name="go_to_challenge">Aller au défi</string>
+  <string name="not_part_of_a_challenge">Vous ne faites pas encore partie de ce défi !</string>
+  <string name="join_a_challenge">Rejoignez un défi pour ajouter une sélection de tâches à votre liste, puis affrontez les autres participants pour gagner des succès ou même des gemmes !</string>
+  <string name="check_the_public_challenge_tab">Sélectionnez l\'onglet \"Publique\" pour trouver les défi créés par la communauté qui vous sont le plus adaptés !</string>
+  <string name="add_reminder">Ajouter un rappel</string>
+  <string name="warning">Attention</string>
+  <string name="open_settings">Ouvrir les paramètres</string>
+  <string name="dont_keep_activities_warning">Il semblerait que vous ayez l\'option développeur \\"Ne pas conserver les activités\\" activées. Actuellement, cette option provoque des problèmes avec l\'application Habitica, nous vous suggérons de la désactiver.</string>
+  <string name="inbox">Boîte de réception</string>
+  <string name="FAQ">Questions fréquentes (FAQ)</string>
+  <string name="special">Spécial</string>
+  <string name="gem_for_gold_description">Grâce à votre abonnement, vous pouvez acheter des gemmes chaque mois en utilisant de l\'or.</string>
+  <string name="limited_count">%d restantes</string>
+  <string name="gem_shop">Gemme</string>
+  <string name="mystery_item">Objet mystère</string>
+  <string name="myster_item_notes">Chaque mois, votre abonnement vous donnera accès à un objet mystère. Il est généralement disponible une semaine avant la fin du mois.</string>
+  <string name="open">Ouvrir</string>
+  <string name="notification_mystery_item">Vous ouvrez le paquet et trouvez %s !</string>
+  <string name="checkInRewardEarned">Vous avez mérité cette récompense : %1$s pour votre dévotion à améliorer votre vie.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Votre prochain prix sera débloqué à %1$d connexions</string>
+  <string name="pending_approval">En attente de validation</string>
+  <string name="filters">Filtres</string>
+  <string name="done">Complétées</string>
+  <string name="group_tasks_edit_description">Les tâches de groupe ne peuvent pas être modifiées.</string>
+  <string name="group_tasks_edit_title">Tâche non modifiable</string>
+  <string name="groups">Groupes</string>
+  <string name="all">Tous</string>
+  <string name="none">Aucun</string>
+  <string name="owned">Possédé</string>
+  <string name="not_owned">Non possédé</string>
+  <string name="new_game">Nouvelle\nPartie</string>
+  <string name="login_btn_fb">Se connecter via Facebook</string>
+  <string name="login_btn_google">Se connecter via Google</string>
+  <string name="action_back">Retour</string>
+  <string name="welcome_text">Oh, vous devez être nouveau·nouvelle. Je m\'appelle Justin et je vais vous guider dans Habitica.\n\nPour commencer, vous devez créer un avatar.</string>
+  <string name="randomize">Aléatoire</string>
+  <string name="avatar_extras">Bonus</string>
+  <string name="avatar_skin_color">Couleur de peau</string>
+  <string name="avatar_hair_color">Couleur de cheveux</string>
+  <string name="avatar_hair_bangs">Frange</string>
+  <string name="avatar_hair_ponytail">Queue de cheval</string>
+  <string name="avatar_glasses">Lunettes</string>
+  <string name="avatar_wheelchair">Fauteuil roulant</string>
+  <string name="weak">Faibles</string>
+  <string name="strong">Fortes</string>
+  <string name="dated">Datées</string>
+  <string name="completed">Terminé</string>
+  <string name="setuP_group_other">Autre</string>
+  <string name="clear">Effacer</string>
+  <string name="empty_title_habits">Vous n\'avez aucune habitude</string>
+  <string name="empty_description_habits">Les habitudes sont des tâches qui n\'ont pas de planning défini. Vous pouvez les valider plusieurs fois par jour, ou pas du tout.</string>
+  <string name="empty_title_dailies">Vous n\'avez aucune tâche quotidienne</string>
+  <string name="empty_description_dailies">Les quotidiennes sont des tâches qui se répètent de façon régulière. Choisissez la planification qui vous convient !</string>
+  <string name="empty_title_todos">Vous n\'avez aucune tâche à faire</string>
+  <string name="empty_description_todos">Les tâches à faire sont des tâches qui ne doivent être validées qu\'une seule fois. Ajoutez des listes de vérifications pour augmenter leur valeur.</string>
+  <string name="empty_title_rewards">Vous n\'avez aucune récompense</string>
+</resources>
diff --git a/Habitica/res/values-in/strings.tutorial.xml b/Habitica/res/values-in/strings.tutorial.xml
index 5e11b34c2..6db1aadd5 100644
--- a/Habitica/res/values-in/strings.tutorial.xml
+++ b/Habitica/res/values-in/strings.tutorial.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_equipment">Perlengkapan yang kamu beli akan muncul di sini. Perlengkapan Bertarung milikmu akan mempengaruhi status, dan Kostum (jika dicentang) hanya mempengaruhi apa yang avatarmu kenakan.</string>
-  <string name="tutorial_items">Dapatkan item dengan menyelesaikan tugas dan meningkatkan level. Ketuk pada item untuk menggunakannya!</string>
-  <string name="tutorial_pets">Seiring kamu menyelesaikan tugas dunia-nyata, kamu sekarang memiliki kesempatan acak untuk menemukan telur dan ramuan. Campurkan mereka untuk menetaskan peliharaan</string>
-  <string name="tutorial_skills">Keahlian adalah kemampuan spesial yang memiliki efek yang kuat! Ketuk pada suatu keahlian untuk menggunakannya. Keahlian akan mengurangi Mana (baris biru), di mana kamu bisa mendapatkannya dengan mengecek aplikasi setiap hari dan dengan menyelesaikan tugas dunia-nyatamu. Periksa FAQ pada menu untuk info lebih lanjut!</string>
-  <string name="tutorial_party">Ini adalah bagian dimana kamu dan teman-temanmu dapat menjaga masing-masing agar tetap bertanggung jawab sekaligus melawan monster-monster dengan tugasmu!</string>
-  <string name="tutorial_tavern">Selamat datang di Kedai Minuman, ruang berbincang publik untuk semua umur! Disini kamu dapat berbincang mengenai produktivitas dan menanyakan pertanyaan. Selamat bersenang-senang!</string>
-  <string name="tutorial_classes">Pilih untuk menjadi Prajurit, Penyihir, Penyembuh, atau Perampok! Setiap kelas memiliki perlengkapan dan kemampuan yang unik. Ketuk (?) untuk mengetahui lebih lanjut!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_equipment">Perlengkapan yang kamu beli akan muncul di sini. Perlengkapan Bertarung milikmu akan mempengaruhi status, dan Kostum (jika dicentang) hanya mempengaruhi apa yang avatarmu kenakan.</string>
+  <string name="tutorial_items">Dapatkan item dengan menyelesaikan tugas dan meningkatkan level. Ketuk pada item untuk menggunakannya!</string>
+  <string name="tutorial_pets">Seiring kamu menyelesaikan tugas dunia-nyata, kamu sekarang memiliki kesempatan acak untuk menemukan telur dan ramuan. Campurkan mereka untuk menetaskan peliharaan</string>
+  <string name="tutorial_skills">Keahlian adalah kemampuan spesial yang memiliki efek yang kuat! Ketuk pada suatu keahlian untuk menggunakannya. Keahlian akan mengurangi Mana (baris biru), di mana kamu bisa mendapatkannya dengan mengecek aplikasi setiap hari dan dengan menyelesaikan tugas dunia-nyatamu. Periksa FAQ pada menu untuk info lebih lanjut!</string>
+  <string name="tutorial_party">Ini adalah bagian dimana kamu dan teman-temanmu dapat menjaga masing-masing agar tetap bertanggung jawab sekaligus melawan monster-monster dengan tugasmu!</string>
+  <string name="tutorial_tavern">Selamat datang di Kedai Minuman, ruang berbincang publik untuk semua umur! Disini kamu dapat berbincang mengenai produktivitas dan menanyakan pertanyaan. Selamat bersenang-senang!</string>
+  <string name="tutorial_classes">Pilih untuk menjadi Prajurit, Penyihir, Penyembuh, atau Perampok! Setiap kelas memiliki perlengkapan dan kemampuan yang unik. Ketuk (?) untuk mengetahui lebih lanjut!</string>
+</resources>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index 8ca3a0589..c315522ce 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -1,402 +1,402 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Muat Ulang</string>
-  <string name="XP_default">Pengalaman </string>
-  <string name="HP_default">Kesehatan</string>
-  <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Pengaturan tidak dapat dimuat dari barkode</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Pengaturan</string>
-  <string name="SP_address_hint">Server kustom anda</string>
-  <string name="SP_userID_title">ID Pengguna</string>
-  <string name="SP_userID_summary">ID Pengguna Anda</string>
-  <string name="SP_APIToken_title">Token API</string>
-  <string name="SP_APIToken_summary">Token API Anda</string>
-  <string name="Language_title">Bahasa</string>
-  <string name="Language_summary">Ganti bahasa dalam Habitica</string>
-  <string name="SP_user_qr_code">QR Kodemu</string>
-  <string name="PS_contact_title">Kontak saya</string>
-  <string name="pref_account_header">Akun</string>
-  <string name="pref_first_day_of_the_week_title">Hari Pertama dalam Minggu</string>
-  <string name="pref_first_day_of_the_week_summary">Hari pertama dalam minggu di semua kalender</string>
-  <string name="pref_reminder_header">Peringatan Harian</string>
-  <string name="pref_reminder_checkbox">Aktifkan Peringatan</string>
-  <string name="pref_reminder_picker">Atur Waktu Peringatan</string>
-  <string name="pref_cds_header">Awal Hari</string>
-  <string name="pref_cds_picker">Atur Awal Hari</string>
-  <string name="pref_push_notifications_checkbox">Notifikasi Tampil Pengguna</string>
-  <string name="push_notifications">Notifikasi Tampil</string>
-  <string name="push_notifications_sum">Pengaturan notifikasi</string>
-  <string name="preference_push_you_won_challenge">Kamu memenangkan sebuah Tantangan!</string>
-  <string name="preference_push_received_a_private_message">Menerima sebuah Pesan Pribadi</string>
-  <string name="preference_push_gifted_gems">Permata terhadiahkan</string>
-  <string name="preference_push_gifted_subscription">Langganan terhadiahkan</string>
-  <string name="preference_push_invited_to_party">Terundang ke Kelompok</string>
-  <string name="preference_push_invited_to_guild">Telah diundang ke dalam Guild</string>
-  <string name="preference_push_your_quest_has_begun">Tugasmu telah Dimulai</string>
-  <string name="preference_push_invited_to_quest">Terundang ke Tugas</string>
-  <!--Adding tasks-->
-  <string name="task_value">Nilai</string>
-  <string name="action_edit">Edit</string>
-  <string name="action_delete">Hapus</string>
-  <string name="action_cancel">Batal</string>
-  <string name="login_btn">Masuk</string>
-  <string name="register_btn">Daftar</string>
-  <string name="username">Username</string>
-  <string name="email_username">Email atau Username</string>
-  <string name="password">Kata Sandi</string>
-  <string name="emailAddress">Alamat Email</string>
-  <string name="confirmpassword">Konfirmasi kata sandi</string>
-  <string name="logout">Keluar</string>
-  <string name="logout_description">Keluar dari akun anda</string>
-  <string name="account_details_sum">Cek detail akun anda</string>
-  <string name="account_details">Detail Akun</string>
-  <string name="LoginActivityName">Selamat Datang</string>
-  <string name="string_revive">Pulihkan</string>
-  <string name="please_connect">Tolong hubungkan aplikasi sebelum menggunakan widget</string>
-  <string name="about.title">Tentang Kami</string>
-  <string name="about.libraries">Pustaka</string>
-  <string name="about.versionhistory">Sejarah Versi</string>
-  <string name="about.habitica_open_source">Habitica tersedia sebagai perangkat lunak open source pada Github</string>
-  <string name="about.rate_our_app">Nilai Aplikasi kami</string>
-  <string name="about.give_us_feedback">Kirimkan kami Feedback!</string>
-  <string name="about.bugreport">Laporkan Gangguan</string>
-  <string name="about.source_code">Kode</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Koneksi Gagal</string>
-  <string name="network_error_no_network_body">Anda tidak terhubung ke internet.</string>
-  <string name="internal_error_api">Terdapat masalah pada server. Cobalah beberapa saat lagi.</string>
-  <string name="authentication_error_title">Autentikasi Gagal</string>
-  <string name="authentication_error_body">Username Anda dan/atau Kata Sandi salah.</string>
-  <string name="login_validation_error_title">Validasi Gagal</string>
-  <string name="login_validation_error_fieldsmissing">Anda harus mengisi semua kolom.</string>
-  <string name="save_changes">Simpan</string>
-  <string name="copy">Salin</string>
-  <string name="notes">Catatan</string>
-  <string name="text">Teks</string>
-  <string name="difficulty">Tingkat Kesulitan</string>
-  <string name="tags">Label</string>
-  <string name="trivial">Sangat Mudah</string>
-  <string name="easy">Mudah</string>
-  <string name="medium">Sedang</string>
-  <string name="hard">Susah</string>
-  <string name="start_date">Tanggal Mulai</string>
-  <string name="positive_habit_form">Positif (+)</string>
-  <string name="negative_habit_form">Negatif (-)</string>
-  <string name="checklist">Ceklis</string>
-  <string name="reminders">Pengingat</string>
-  <string name="actions">Aksi</string>
-  <string name="attributes">Atribut</string>
-  <string name="physical">Fisik</string>
-  <string name="mental">Mental</string>
-  <string name="social">Sosial</string>
-  <string name="other">Lain-lain</string>
-  <string name="frequency">Frekuensi</string>
-  <string name="frequency_weekly">Pada Hari Tertentu dalam Seminggu</string>
-  <string name="frequency_daily">Setiap X Hari</string>
-  <string name="monday">Senin</string>
-  <string name="tuesday">Selasa</string>
-  <string name="wednesday">Rabu</string>
-  <string name="thursday">Kamis</string>
-  <string name="friday">Jumat</string>
-  <string name="saturday">Sabtu</string>
-  <string name="sunday">Minggu</string>
-  <string name="levelup_header">Kamu mendapatkan level!</string>
-  <string name="levelup_detail">Dengan menyelesaikan tujuan dunia-nyatamu, kamu meningkat ke Level %1$d!</string>
-  <string name="levelup_health">Kamu telah disembuhkan!</string>
-  <string name="levelup_button">Hore!</string>
-  <string name="faint_subtitle">Jangan bersedih!</string>
-  <string name="faint_penalty_body">Kamu kehilangan Level, Emasmu, dan sepotong Perlengkapan, tetapi kamu dapat mendapatkannya kembali dengan kerja keras! Semoga berhasil--kamu pasti bisa.</string>
-  <string name="faint_header">Kamu kehabisan Nyawa!</string>
-  <string name="faint_button">Isi ulang Kesehatan &amp; Ulang Lagi</string>
-  <string name="filter">Filter</string>
-  <string name="profile_image">Gambar Profil</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Kamu menggunakan %1$s dengan %2$d mana.</string>
-  <string name="used_skill_without_mana">Kamu menggunakan %1$s</string>
-  <string name="new_checklist_item">ceklis item baru</string>
-  <string name="add_checklist_item">Tambahkan</string>
-  <string name="reminder_title">Ingatlah untuk mencentang Keseharianmu!</string>
-  <string name="skill_progress_title">Gunakan Kemampuan</string>
-  <string name="coming_soon">Akan Datang</string>
-  <string name="chat_flag_confirmation">Apakah kamu yakin kamu ingin melaporkan pesan ini sebagai pelanggaran?</string>
-  <string name="flag_confirm">Laporkan Pesan</string>
-  <string name="unlock_lvl_11">Buka pada lvl 11</string>
-  <string name="no_party_message">Kamu tidak memiliki teman. Untuk mencari teman, tolong kunjungi situs.</string>
-  <string name="forgot_pw_btn">Lupa Kata Sandi</string>
-  <string name="forgot_pw_tv">Lupa Kata Sandi? Tolong gunakan Situs mobile</string>
-  <string name="tavern.inn.checkOut">Aktifkan kembali Keseharianmu</string>
-  <string name="tavern.inn.rest">Nonaktifkan Keseharianmu</string>
-  <string name="reward.dialog.buy">Beli</string>
-  <string name="reward.dialog.dismiss">Hilangkan</string>
-  <string name="party">Teman</string>
-  <string name="chat">Obrolan</string>
-  <string name="members">Anggota</string>
-  <string name="habits">Kebiasaan</string>
-  <string name="dailies">Keseharian</string>
-  <string name="todos">Tugas</string>
-  <string name="rewards">Hadiah</string>
-  <string name="taskform.delete.title">Apakah kamu yakin?</string>
-  <string name="taskform.delete.message">Apakah kamu benar-benar ingin menghapus?</string>
-  <string name="yes">Ya</string>
-  <string name="no">Tidak</string>
-  <string name="quest">Misi</string>
-  <string name="avatar_body">Tubuh</string>
-  <string name="avatar_hair">Rambut</string>
-  <string name="avatar_shirt">Baju</string>
-  <string name="avatar_skin">Kulit</string>
-  <string name="avatar_ears">Telinga Hewan</string>
-  <string name="avatar_base">Dasar</string>
-  <string name="avatar_color">Warna</string>
-  <string name="avatar_beard">Janggut</string>
-  <string name="avatar_mustache">Kumis</string>
-  <string name="avatar_flower">Bunga</string>
-  <string name="avatar_bangs">Poni</string>
-  <string name="avatar_nothing">Tidak ada yang digunakan</string>
-  <string name="avatar_size">Ukuran</string>
-  <string name="avatar_size_slim">Kurus</string>
-  <string name="avatar_size_broad">Bidang</string>
-  <string name="avatar_background">Latar Belakang</string>
-  <string name="purchase_customization">Beli Kustomisasi</string>
-  <string name="purchase_set_button">Buka set seharga %d permata</string>
-  <string name="purchase_button">Beli</string>
-  <string name="purchase_set_title">Beli set %s</string>
-  <string name="due_date">Tenggat Waktu</string>
-  <string name="quest.accept">Terima</string>
-  <string name="quest.reject">Tolak</string>
-  <string name="quest.begin">Mulai Misi</string>
-  <string name="quest.cancel">Batalkan Undangan</string>
-  <string name="quest.abort">Batalkan Misi</string>
-  <string name="quest.leave">Tinggalkan Misi</string>
-  <string name="quest.pending">Tunda</string>
-  <string name="quest.accepted">Diterima</string>
-  <string name="quest.rejected">Ditolak</string>
-  <string name="quest.participants">Partisipan</string>
-  <string name="version_info">Versi %1$s (%2$d)</string>
-  <string name="sidebar_help">Bantuan &amp; FAQ</string>
-  <string name="complete_tutorial">Aku mengerti!</string>
-  <string name="dismiss_tutorial">Peringatkan aku lagi</string>
-  <string name="intro_3_description">Tetaplah berusaha meraih tujuan dengan bantuan teman-teman. Dukung satu sama lain dalam hidup dan bertarunglah sekaligus meningkatkan kehidupan bersama-sama!</string>
-  <string name="previous_button">Sebelumnya</string>
-  <string name="next_button">Berikutnya</string>
-  <string name="skip_button">Lewati</string>
-  <string name="setup_welcome_description">Selamat datang di Habitica, di mana meningkatkan diri dalam permainan akan meningkatkan kehidupan nyata! Seiring kamu menyelesaikan tujuan dunia-nyata, kamu akan membuka perlengkapan, peliharaan, misi, dan banyak lagi.</string>
-  <string name="setup_welcome_title">Selamat Datang</string>
-  <string name="setup_group_work">Kerja</string>
-  <string name="setup_group_exercise">Latihan Fisik</string>
-  <string name="setup_group_school">Sekolah</string>
-  <string name="setup_group_teams">Tim</string>
-  <string name="setup_group_chores">Pekerjaan Rumah Tangga</string>
-  <string name="setup_group_creativity">Kreativitas</string>
-  <string name="setup_task_work_1">Proses Email</string>
-  <string name="setup_task_work_2">Tugas paling penting</string>
-  <string name="setup_task_work_3">Proyek Kerja</string>
-  <string name="setup_task_exercise_1">10 menit cardio</string>
-  <string name="setup_task_exercise_2">Pelemasan</string>
-  <string name="setup_task_exercise_3">Atur jadwan latihan</string>
-  <string name="setup_task_healthWellness_1">Makan makanan bergizi / cepat saji</string>
-  <string name="setup_task_healthWellness_2">Gunakan Benang Gigi</string>
-  <string name="setup_task_healthWellness_3">Periksa Jadwal</string>
-  <string name="setup_task_school_1">Belajar/Bermalas-malasan</string>
-  <string name="setup_task_school_2">Mengerjakan PR</string>
-  <string name="setup_task_school_3">Selesaikan tugas</string>
-  <string name="setup_task_teams_1">Periksa tim</string>
-  <string name="setup_task_teams_2">Perbaharui tim mengenai status</string>
-  <string name="setup_task_teams_3">Selesaikan proyek tim</string>
-  <string name="setup_task_chores_1">10 menit bersih-bersih</string>
-  <string name="setup_task_chores_2">Cuci Piring</string>
-  <string name="setup_task_chores_3">Rapikan lemari</string>
-  <string name="setup_task_creativity_1">Belajar menguasai kemampuan</string>
-  <string name="setup_task_creativity_2">Mengerjakan proyek kreatif</string>
-  <string name="setup_task_creativity_3">Menyelesaikan proyek kreatif</string>
-  <string name="gem.purchase.support">Ingin membantu kami menjaga Habitica tetap berjalan? Kamu dapat mendukung pengembang dengan membeli permata!\n\nPermata membuatmu dapat membeli aksesoris menarik untuk akunmu, termasuk: \n\n - Kostum keren untuk avatarmu\n - Latar belakang keren\n - Misi menarik yang memberimu hadiah telur peliharaan unik\n - Kemampuan untuk mengganti kelas sebelum level 100\n\nTerima kasih banyak untuk bantuan kepada Habitca untuk menjadi yang terbaik. Dukunganmu sangat berarti bagi kami!</string>
-  <string name="my_guilds">Perkumpulan Saya</string>
-  <string name="public_guilds">Perkumpulan Publik</string>
-  <string name="guild">Perkumpulan</string>
-  <string name="leave">Tinggalkan</string>
-  <string name="join">Gabung</string>
-  <string name="leader">Ketua</string>
-  <string name="gems">Permata</string>
-  <string name="send_pm">Kirim PM</string>
-  <string name="flag">Tandai</string>
-  <string name="delete">Hapus</string>
-  <string name="name">Nama </string>
-  <string name="description">Deskripsi</string>
-  <string name="privacy">Privasi</string>
-  <string name="write_message">Tulis Pesan</string>
-  <string name="post">Kirim</string>
-  <string name="guild_search_hint">Mencari Perserikatan</string>
-  <string name="todo_due">Tenggat: %s</string>
-  <string name="daily_streak">%d kali berturut-turut</string>
-  <string name="todo_has_duedate">Tugas memiliki Tenggat Waktu</string>
-  <string name="battle_gear">Perlengkapan Bertarung</string>
-  <string name="costume">Kostum</string>
-  <string name="outfit_head">Kepala</string>
-  <string name="outfit_headAccessory">Aksesoris Kepala</string>
-  <string name="outfit_eyewear">Aksesori Mata</string>
-  <string name="outfit_armor">Baju Perang</string>
-  <string name="outfit_back">Punggung</string>
-  <string name="outfit_body">Tubuh</string>
-  <string name="outfit_shield">Perisai</string>
-  <string name="outfit_weapon">Senjata</string>
-  <string name="wear_costume">Gunakan Kostum</string>
-  <string name="equipped">Digunakan</string>
-  <string name="quest_cancel_message">Apakah kamu yakin kamu ingin membatalkan misi ini? Semua undangan yang disetujui akan hilang. Pemilik misi akan mendapatkan gulungan misi kembali.</string>
-  <string name="quest.invitation">Undangan Misi</string>
-  <string name="quest_begin_message">Apakah kamu yakin kamu ingin memulai misi? Setelah aktif, tidak ada anggota kelompok lain yang dapat bergabung.</string>
-  <string name="quest.invitation.text">Kamu telah diundang untuk berpartisipasi dalam misi!</string>
-  <string name="ago_1day">1 hari yang lalu</string>
-  <string name="ago_days">%d hari yang lalu</string>
-  <string name="ago_1Minute">1 menit yang lalu</string>
-  <string name="ago_minutes">%d menit yang lalu</string>
-  <string name="ago_hours">%d jam yang lalu</string>
-  <string name="ago_1hour">1 jam yang lalu</string>
-  <string name="today">Hari Ini</string>
-  <string name="sidebar_items">Item</string>
-  <string name="eggs">Telur</string>
-  <string name="hatching_potions">Ramuan Penetas</string>
-  <string name="food">Makanan</string>
-  <string name="quests">Misi</string>
-  <string name="pets">Peliharaan</string>
-  <string name="mounts">Tunggangan</string>
-  <string name="armoireEquipment">Kamu menemukan perlengkapan langka di dalam Peti Harta Karun: %s! Keren!</string>
-  <string name="armoireFood">Kamu mengacak-acak Peti Harta Karun dan menemukan %2$s %1$s. Kenapa berada di dalam sini, ya?</string>
-  <string name="armoireExp">Kamu bergulat dengan Peti Harta Karun dan mendapatkan Pengalaman. Rasakan itu!</string>
-  <string name="armoireNotesFull">Buka Peti Harta Karun untuk mendapatkan perlengkapan spesial, Pengalaman, atau makanan secara acak! Perlengkapan yang tersisa: %d</string>
-  <string name="armoireLastItem">Kamu menemukan perlengkapan terakhir di dalam Peti Harta Karun.</string>
-  <string name="armoireNotesEmpty">Peti Harta Karun akan memiliki perlengkapan baru pada minggu pertama setiap bulan. Sementara itu, tetaplah klik untuk mendapatkan Pengalaman dan Makanan!</string>
-  <string name="sell">Jual (%d Emas)</string>
-  <string name="hatch_with_potion">Tetaskan dengan ramuan</string>
-  <string name="feed_to_pet">Beri makan peliharaan</string>
-  <string name="hatch_egg">Tetaskan dengan telur</string>
-  <string name="invite_party">Undang teman</string>
-  <string name="dialog_feeding">Beri makan %2$s %1$s dengan:</string>
-  <string name="use_animal">Gunakan</string>
-  <string name="feed">Beri makan</string>
-  <string name="hatch_with">Tetaskan dengan %s</string>
-  <string name="hatched_pet_title">Kamu menetaskan seekor %2$s %1$s!</string>
-  <string name="close">Tutup</string>
-  <string name="share">Bagikan</string>
-  <string name="notification_pet_fed">Kamu memberi makan %2$s %1$s !</string>
-  <string name="notification_purchase">%s telah dibeli</string>
-  <string name="sectionpets">Peliharaan Dasar</string>
-  <string name="sectionpremiumPets">Peliharaan Ramuan Ajaib</string>
-  <string name="sectionquestPets">Peliharaan Misi</string>
-  <string name="sectionspecialPets">Peliharaan Langka</string>
-  <string name="sectionmounts">Tunggangan Dasar</string>
-  <string name="sectionpremiumMounts">Tunggangan Ramuan Ajaib</string>
-  <string name="sectionquestMounts">Tunggangan Misi</string>
-  <string name="sectionspecialMounts">Tunggangan Langka</string>
-  <string name="world_quest">Misi Dunia</string>
-  <string name="inn_description">Beristirahat di dalam Penginapan untuk mencegah Keseharian yang belum selesai menyakitimu semalaman! (Catatan: tidak dapat mencegahmu mendapatkan serangan Bos Monster.)</string>
-  <string name="empty_items">Kamu tidak memiliki %s</string>
-  <string name="user_level">LVL %d</string>
-  <string name="user_level_with_class">LVL %1$d - %2$s</string>
-  <string name="warrior">Prajurit</string>
-  <string name="rogue">Perampok</string>
-  <string name="mage">Penyihir</string>
-  <string name="healer">Penyembuh</string>
-  <string name="warrior_description">Prajurit mendapatkan skor lebih dan \'serangan kritis\' lebih baik, yang akan secara acak memberikan bonus Emas, Pengalaman, dan kesempatan menemukan item saat menyelesaikan tugas. Mereka juga memberikan serangan berat kepada bos monster. Mainkan Perampok jika kamu termotivasi dengan hadiah bergaya jackpot yang sulit diprediksi, atau ingin memberikan serangan besar kepada bos misi!</string>
-  <string name="mage_description">Penyihir belajar dengan cepat, mendapatkan Pengalaman dan Level lebih cepat daripada kelas lainnya. Mereka juga mendapatkan Mana yang besar dengan menggunakan kemampuan spesial. Mainkan penyihir jika kamu menyukai aspek taktis dari permainan Kebiasaan, atau jika kamu begitu termotivasi dengan meningkatkan level dan membuka fitur baru!</string>
-  <string name="rogue_description">Perampok senang mengumpulkan kekayaan, mendapatkan banyak Emas daripada yang lainnya, dan mahir menemukan item acak. Kemampuan Bersembunyi mereka yang terkenal membuat mereka mampu menghindari konsekuensi dari Keseharian yang terlewat. Mainkan Perampok jika kamu termotivasi dengan Hadiah dan Pencapaian, juga mendapatkan banyak barang jarahan dan lencana!</string>
-  <string name="healer_description">Penyembuh tahan terhadap serangan, dan dapat membagi perlindungannya pada sesama. Keseharian yang terlewat dan kebiasaan buruk tidak terlalu banyak mengganggu mereka, dan mereka memiliki cara untuk mengembalikan nyawa dari kesalahan mereka. Mainkan seorang Penyembuh jika kamu senang membantu teman dalam kelompok, atau ide mencurangi kematian dengan kerja keras membuatmu terinspirasi!</string>
-  <string name="select_class">Pilih Profesi</string>
-  <string name="opt_out_class">Matikan Fitur</string>
-  <string name="opt_out_description">Tidak ingin diganggu dengan profesi? Ingin memilih nanti saja? Matikan fitur - kamu akan menjadi seorang Prajurit tanpa kemampuan spesial. Kamu dapat membaca mengenai sistem profesi nanti di wiki dan mengaktifkan fitur profesi kapan saja.</string>
-  <string name="class_confirmation">Apakah kamu yakin ingin menjadi seorang %s?</string>
-  <string name="class_changed">Kamu sekarang seorang %s! </string>
-  <string name="class_changed_description">Kamu memiliki Baju Perang baru yang dapat diganti pada menu Perlengkapan! </string>
-  <string name="choose_class">Pilih Kelas</string>
-  <string name="dialog_go_back">Kembali</string>
-  <string name="opt_out_confirmation">Apakah kamu yakin kamu ingin mematikan fitur?</string>
-  <string name="change_class">Ganti profesi</string>
-  <string name="change_class_description">Ubah kelasmu dan terima kembali nilai atribut sebanyak 3 permata. Kamu bisa menempatkan nilai atribut melalui laman web</string>
-  <string name="enable_class">Aktifkan Sistem Profesi</string>
-  <string name="changing_class_progress">Ganti Profesi</string>
-  <string name="by_email">Melalui Email</string>
-  <string name="invite_existing_users">Undang Pengguna yang telah ada</string>
-  <string name="send">Kirim</string>
-  <string name="invite">Undang Teman</string>
-  <string name="invite_id_description">Jika kamu memiliki teman yang telah menggunakan Habitica, undang melalui ID Pengguna di sini.</string>
-  <string name="invite_email_description">Jika seorang teman bergabung dengan Habitica melalui emailmu, mereka otomatis akan diundang ke dalam kelompokmu!</string>
-  <string name="add_invites">Tambahkan Undangan</string>
-  <string name="user_id">ID Pengguna</string>
-  <string name="email">Email</string>
-  <string name="invite_users">Undang sebagai Teman</string>
-  <string name="share_using">Bagikan dengan</string>
-  <string name="share_hatched">Saya menetaskan peliharaan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya! </string>
-  <string name="share_raised">Saya baru mendapatkan tunggangan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya!</string>
-  <string name="open_in_store">Buka di Play Store</string>
-  <string name="change_class_confirmation">Apa kamu yakin untuk mengubah kelas? Ini akan membutuhkan 3 permata.</string>
-  <string name="change_class_equipment_warning">Peringatan: Kamu tidak akan dapat membeli perlengkapan untuk profesi %s. </string>
-  <string name="leaderMessage">Pesan dari %1$s</string>
-  <string name="leaderName">Ketua: %1$s</string>
-  <string name="confirm">Pastikan</string>
-  <string name="market">Pasar</string>
-  <string name="timeTravelers">Penjelajah Waktu</string>
-  <string name="seasonalShop">Toko Musiman</string>
-  <string name="empty_inbox">Kamu tidak memiliki pesan dalam Kotak Masuk. Kamu bisa mengirim pesan baru ke pengguna lain melalui pesan publik!</string>
-  <string name="party_invite">Buka dengan mengundang teman</string>
-  <string name="no_gold">Koin Emas tidak cukup</string>
-  <string name="no_potion">Kamu tidak perlu membeli ramuan kesehatan</string>
-  <string name="successful_purchase">%1$s telah sukses terbeli</string>
-  <string name="purchase_confirmation_title">Pastikan belian</string>
-  <string name="confirm_purchase_text">Membeli %1$s untuk %2$s %3$s</string>
-  <string name="gem">Permata</string>
-  <string name="hourglass">Jam Pasir</string>
-  <string name="hourglasses">Jam-jam Pasir</string>
-  <string name="gold_singular">Koin Emas</string>
-  <string name="gold_plural">Koin Emas</string>
-  <string name="chat_message_copied">Pesan telah tersalin di Papan pencatat</string>
-  <string name="copy_chat_message">Salin di Papan pencatat</string>
-  <string name="edit_tag_title">Rubah Label</string>
-  <string name="edit_tag_btn_edit">Rubah</string>
-  <string name="edit_tag_btn_done">Selesai</string>
-  <string name="edit_tag_btn_delete">Hapus</string>
-  <string name="confirm_delete_tag_title">Kamu yakin?</string>
-  <string name="confirm_delete_tag_message">Apa kamu yakin ingin menghapus?</string>
-  <string name="filter_drawer_edit_tags">Rubah Label</string>
-  <string name="filter_drawer_filter_tags">Saring berdasarkan Label</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Pinta seseorang untuk mengundangmu melalui Kode QR</string>
-  <string name="qr_save_message">Kode QR tersimpan pada</string>
-  <string name="qr_dialogue_title">Kode QR-mu</string>
-  <string name="download">Unduh</string>
-  <string name="send_new_message">Kirim pesan baru</string>
-  <string name="choose_recipient_title">Pilih Penerima Pesan</string>
-  <string name="action_continue">Lanjutkan</string>
-  <string name="scan_qr_code">Pindai Kode QR</string>
-  <string name="enter_recipient_uuid">Masukan User ID Penerima</string>
-  <string name="invited_to_party">Kamu telah diundang untuk bergabung dalam sebuah party!</string>
-  <string name="stats_widget_label">Status Habitica</string>
-  <string name="add_task">Tambah Tugas</string>
-  <string name="add_habit">Tambah Kebiasaan</string>
-  <string name="add_daily">Tambah Kegiatan Harian</string>
-  <string name="add_todo">Tambah Untuk Dilakukan</string>
-  <string name="add_reward">Tambah Hadiah</string>
-  <string name="all_dailies_completed">Anda telah menyelesaikan semua keseharianmu. Selamat!</string>
-  <string name="widget_habit_button">Habitica Melakukan Kebiasaan</string>
-  <string name="widget_dailies">Keseharian Habitica</string>
-  <string name="widget_add_task">Habitica Menambahkan Tugas</string>
-  <string name="google_services_missing">Google play services tidak dapat ditemukan.</string>
-  <string name="gem.purchase.toolbartitle">Bayar</string>
-  <string name="gem.purchase.title">Membeli gem dapat mendukung pengembang dan menjaga Habitica tetap berjalan</string>
-  <string name="gem.purchase.subtitle">Permata membuatmu dapat membeli tambahan yang menyenangkan untuk akunmu, termasuk:</string>
-  <string name="gem.purchase.listitem1">Kostum keren untuk avatarmu</string>
-  <string name="gem.purchase.listitem2">Latar belakang yang keren</string>
-  <string name="gem.purchase.listitem3">Misi yang memberikanmu hadiah telur</string>
-  <string name="gem.purchase.listitem4">Kemampuan untuk mengganti profesi sebelum level 100</string>
-  <string name="support_habitica">Dukung Habitica</string>
-  <string name="skill_transformation_use">gunakan</string>
-  <string name="hatching_market_info">Tidak mendapatkan item yang diinginkan? Beli di Market!</string>
-  <string name="feeding_market_info">Butuh makanan yang berbeda? Beli lebih dari pasar!</string>
-  <string name="open_market">Buka Pasar</string>
-  <string name="cds_description">Keseharianmu akan reset pada saat kamu membuka Habitica di atas %1$s. Pastikan kamu telah menyelesaikan Keseharianmu sebelum jam tersebut!</string>
-  <string name="AudioTheme_title">Tema Nada</string>
-  <string name="AudioTheme_summary">Ganti Tema Nada Habitica</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">Sampai jumpa besok! </string>
-  <string name="belongs_to_challenge">Milik Tantangan</string>
-  <string name="has_reminder">Memiliki Pengingat</string>
-  <string name="has_tag">Memiliki Label</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Muat Ulang</string>
+  <string name="XP_default">Pengalaman </string>
+  <string name="HP_default">Kesehatan</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Pengaturan tidak dapat dimuat dari barkode</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Pengaturan</string>
+  <string name="SP_address_hint">Server kustom anda</string>
+  <string name="SP_userID_title">ID Pengguna</string>
+  <string name="SP_userID_summary">ID Pengguna Anda</string>
+  <string name="SP_APIToken_title">Token API</string>
+  <string name="SP_APIToken_summary">Token API Anda</string>
+  <string name="Language_title">Bahasa</string>
+  <string name="Language_summary">Ganti bahasa dalam Habitica</string>
+  <string name="SP_user_qr_code">QR Kodemu</string>
+  <string name="PS_contact_title">Kontak saya</string>
+  <string name="pref_account_header">Akun</string>
+  <string name="pref_first_day_of_the_week_title">Hari Pertama dalam Minggu</string>
+  <string name="pref_first_day_of_the_week_summary">Hari pertama dalam minggu di semua kalender</string>
+  <string name="pref_reminder_header">Peringatan Harian</string>
+  <string name="pref_reminder_checkbox">Aktifkan Peringatan</string>
+  <string name="pref_reminder_picker">Atur Waktu Peringatan</string>
+  <string name="pref_cds_header">Awal Hari</string>
+  <string name="pref_cds_picker">Atur Awal Hari</string>
+  <string name="pref_push_notifications_checkbox">Notifikasi Tampil Pengguna</string>
+  <string name="push_notifications">Notifikasi Tampil</string>
+  <string name="push_notifications_sum">Pengaturan notifikasi</string>
+  <string name="preference_push_you_won_challenge">Kamu memenangkan sebuah Tantangan!</string>
+  <string name="preference_push_received_a_private_message">Menerima sebuah Pesan Pribadi</string>
+  <string name="preference_push_gifted_gems">Permata terhadiahkan</string>
+  <string name="preference_push_gifted_subscription">Langganan terhadiahkan</string>
+  <string name="preference_push_invited_to_party">Terundang ke Kelompok</string>
+  <string name="preference_push_invited_to_guild">Telah diundang ke dalam Guild</string>
+  <string name="preference_push_your_quest_has_begun">Tugasmu telah Dimulai</string>
+  <string name="preference_push_invited_to_quest">Terundang ke Tugas</string>
+  <!--Adding tasks-->
+  <string name="task_value">Nilai</string>
+  <string name="action_edit">Edit</string>
+  <string name="action_delete">Hapus</string>
+  <string name="action_cancel">Batal</string>
+  <string name="login_btn">Masuk</string>
+  <string name="register_btn">Daftar</string>
+  <string name="username">Username</string>
+  <string name="email_username">Email atau Username</string>
+  <string name="password">Kata Sandi</string>
+  <string name="emailAddress">Alamat Email</string>
+  <string name="confirmpassword">Konfirmasi kata sandi</string>
+  <string name="logout">Keluar</string>
+  <string name="logout_description">Keluar dari akun anda</string>
+  <string name="account_details_sum">Cek detail akun anda</string>
+  <string name="account_details">Detail Akun</string>
+  <string name="LoginActivityName">Selamat Datang</string>
+  <string name="string_revive">Pulihkan</string>
+  <string name="please_connect">Tolong hubungkan aplikasi sebelum menggunakan widget</string>
+  <string name="about.title">Tentang Kami</string>
+  <string name="about.libraries">Pustaka</string>
+  <string name="about.versionhistory">Sejarah Versi</string>
+  <string name="about.habitica_open_source">Habitica tersedia sebagai perangkat lunak open source pada Github</string>
+  <string name="about.rate_our_app">Nilai Aplikasi kami</string>
+  <string name="about.give_us_feedback">Kirimkan kami Feedback!</string>
+  <string name="about.bugreport">Laporkan Gangguan</string>
+  <string name="about.source_code">Kode</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Koneksi Gagal</string>
+  <string name="network_error_no_network_body">Anda tidak terhubung ke internet.</string>
+  <string name="internal_error_api">Terdapat masalah pada server. Cobalah beberapa saat lagi.</string>
+  <string name="authentication_error_title">Autentikasi Gagal</string>
+  <string name="authentication_error_body">Username Anda dan/atau Kata Sandi salah.</string>
+  <string name="login_validation_error_title">Validasi Gagal</string>
+  <string name="login_validation_error_fieldsmissing">Anda harus mengisi semua kolom.</string>
+  <string name="save_changes">Simpan</string>
+  <string name="copy">Salin</string>
+  <string name="notes">Catatan</string>
+  <string name="text">Teks</string>
+  <string name="difficulty">Tingkat Kesulitan</string>
+  <string name="tags">Label</string>
+  <string name="trivial">Sangat Mudah</string>
+  <string name="easy">Mudah</string>
+  <string name="medium">Sedang</string>
+  <string name="hard">Susah</string>
+  <string name="start_date">Tanggal Mulai</string>
+  <string name="positive_habit_form">Positif (+)</string>
+  <string name="negative_habit_form">Negatif (-)</string>
+  <string name="checklist">Ceklis</string>
+  <string name="reminders">Pengingat</string>
+  <string name="actions">Aksi</string>
+  <string name="attributes">Atribut</string>
+  <string name="physical">Fisik</string>
+  <string name="mental">Mental</string>
+  <string name="social">Sosial</string>
+  <string name="other">Lain-lain</string>
+  <string name="frequency">Frekuensi</string>
+  <string name="frequency_weekly">Pada Hari Tertentu dalam Seminggu</string>
+  <string name="frequency_daily">Setiap X Hari</string>
+  <string name="monday">Senin</string>
+  <string name="tuesday">Selasa</string>
+  <string name="wednesday">Rabu</string>
+  <string name="thursday">Kamis</string>
+  <string name="friday">Jumat</string>
+  <string name="saturday">Sabtu</string>
+  <string name="sunday">Minggu</string>
+  <string name="levelup_header">Kamu mendapatkan level!</string>
+  <string name="levelup_detail">Dengan menyelesaikan tujuan dunia-nyatamu, kamu meningkat ke Level %1$d!</string>
+  <string name="levelup_health">Kamu telah disembuhkan!</string>
+  <string name="levelup_button">Hore!</string>
+  <string name="faint_subtitle">Jangan bersedih!</string>
+  <string name="faint_penalty_body">Kamu kehilangan Level, Emasmu, dan sepotong Perlengkapan, tetapi kamu dapat mendapatkannya kembali dengan kerja keras! Semoga berhasil--kamu pasti bisa.</string>
+  <string name="faint_header">Kamu kehabisan Nyawa!</string>
+  <string name="faint_button">Isi ulang Kesehatan &amp; Ulang Lagi</string>
+  <string name="filter">Filter</string>
+  <string name="profile_image">Gambar Profil</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Kamu menggunakan %1$s dengan %2$d mana.</string>
+  <string name="used_skill_without_mana">Kamu menggunakan %1$s</string>
+  <string name="new_checklist_item">ceklis item baru</string>
+  <string name="add_checklist_item">Tambahkan</string>
+  <string name="reminder_title">Ingatlah untuk mencentang Keseharianmu!</string>
+  <string name="skill_progress_title">Gunakan Kemampuan</string>
+  <string name="coming_soon">Akan Datang</string>
+  <string name="chat_flag_confirmation">Apakah kamu yakin kamu ingin melaporkan pesan ini sebagai pelanggaran?</string>
+  <string name="flag_confirm">Laporkan Pesan</string>
+  <string name="unlock_lvl_11">Buka pada lvl 11</string>
+  <string name="no_party_message">Kamu tidak memiliki teman. Untuk mencari teman, tolong kunjungi situs.</string>
+  <string name="forgot_pw_btn">Lupa Kata Sandi</string>
+  <string name="forgot_pw_tv">Lupa Kata Sandi? Tolong gunakan Situs mobile</string>
+  <string name="tavern.inn.checkOut">Aktifkan kembali Keseharianmu</string>
+  <string name="tavern.inn.rest">Nonaktifkan Keseharianmu</string>
+  <string name="reward.dialog.buy">Beli</string>
+  <string name="reward.dialog.dismiss">Hilangkan</string>
+  <string name="party">Teman</string>
+  <string name="chat">Obrolan</string>
+  <string name="members">Anggota</string>
+  <string name="habits">Kebiasaan</string>
+  <string name="dailies">Keseharian</string>
+  <string name="todos">Tugas</string>
+  <string name="rewards">Hadiah</string>
+  <string name="taskform.delete.title">Apakah kamu yakin?</string>
+  <string name="taskform.delete.message">Apakah kamu benar-benar ingin menghapus?</string>
+  <string name="yes">Ya</string>
+  <string name="no">Tidak</string>
+  <string name="quest">Misi</string>
+  <string name="avatar_body">Tubuh</string>
+  <string name="avatar_hair">Rambut</string>
+  <string name="avatar_shirt">Baju</string>
+  <string name="avatar_skin">Kulit</string>
+  <string name="avatar_ears">Telinga Hewan</string>
+  <string name="avatar_base">Dasar</string>
+  <string name="avatar_color">Warna</string>
+  <string name="avatar_beard">Janggut</string>
+  <string name="avatar_mustache">Kumis</string>
+  <string name="avatar_flower">Bunga</string>
+  <string name="avatar_bangs">Poni</string>
+  <string name="avatar_nothing">Tidak ada yang digunakan</string>
+  <string name="avatar_size">Ukuran</string>
+  <string name="avatar_size_slim">Kurus</string>
+  <string name="avatar_size_broad">Bidang</string>
+  <string name="avatar_background">Latar Belakang</string>
+  <string name="purchase_customization">Beli Kustomisasi</string>
+  <string name="purchase_set_button">Buka set seharga %d permata</string>
+  <string name="purchase_button">Beli</string>
+  <string name="purchase_set_title">Beli set %s</string>
+  <string name="due_date">Tenggat Waktu</string>
+  <string name="quest.accept">Terima</string>
+  <string name="quest.reject">Tolak</string>
+  <string name="quest.begin">Mulai Misi</string>
+  <string name="quest.cancel">Batalkan Undangan</string>
+  <string name="quest.abort">Batalkan Misi</string>
+  <string name="quest.leave">Tinggalkan Misi</string>
+  <string name="quest.pending">Tunda</string>
+  <string name="quest.accepted">Diterima</string>
+  <string name="quest.rejected">Ditolak</string>
+  <string name="quest.participants">Partisipan</string>
+  <string name="version_info">Versi %1$s (%2$d)</string>
+  <string name="sidebar_help">Bantuan &amp; FAQ</string>
+  <string name="complete_tutorial">Aku mengerti!</string>
+  <string name="dismiss_tutorial">Peringatkan aku lagi</string>
+  <string name="intro_3_description">Tetaplah berusaha meraih tujuan dengan bantuan teman-teman. Dukung satu sama lain dalam hidup dan bertarunglah sekaligus meningkatkan kehidupan bersama-sama!</string>
+  <string name="previous_button">Sebelumnya</string>
+  <string name="next_button">Berikutnya</string>
+  <string name="skip_button">Lewati</string>
+  <string name="setup_welcome_description">Selamat datang di Habitica, di mana meningkatkan diri dalam permainan akan meningkatkan kehidupan nyata! Seiring kamu menyelesaikan tujuan dunia-nyata, kamu akan membuka perlengkapan, peliharaan, misi, dan banyak lagi.</string>
+  <string name="setup_welcome_title">Selamat Datang</string>
+  <string name="setup_group_work">Kerja</string>
+  <string name="setup_group_exercise">Latihan Fisik</string>
+  <string name="setup_group_school">Sekolah</string>
+  <string name="setup_group_teams">Tim</string>
+  <string name="setup_group_chores">Pekerjaan Rumah Tangga</string>
+  <string name="setup_group_creativity">Kreativitas</string>
+  <string name="setup_task_work_1">Proses Email</string>
+  <string name="setup_task_work_2">Tugas paling penting</string>
+  <string name="setup_task_work_3">Proyek Kerja</string>
+  <string name="setup_task_exercise_1">10 menit cardio</string>
+  <string name="setup_task_exercise_2">Pelemasan</string>
+  <string name="setup_task_exercise_3">Atur jadwan latihan</string>
+  <string name="setup_task_healthWellness_1">Makan makanan bergizi / cepat saji</string>
+  <string name="setup_task_healthWellness_2">Gunakan Benang Gigi</string>
+  <string name="setup_task_healthWellness_3">Periksa Jadwal</string>
+  <string name="setup_task_school_1">Belajar/Bermalas-malasan</string>
+  <string name="setup_task_school_2">Mengerjakan PR</string>
+  <string name="setup_task_school_3">Selesaikan tugas</string>
+  <string name="setup_task_teams_1">Periksa tim</string>
+  <string name="setup_task_teams_2">Perbaharui tim mengenai status</string>
+  <string name="setup_task_teams_3">Selesaikan proyek tim</string>
+  <string name="setup_task_chores_1">10 menit bersih-bersih</string>
+  <string name="setup_task_chores_2">Cuci Piring</string>
+  <string name="setup_task_chores_3">Rapikan lemari</string>
+  <string name="setup_task_creativity_1">Belajar menguasai kemampuan</string>
+  <string name="setup_task_creativity_2">Mengerjakan proyek kreatif</string>
+  <string name="setup_task_creativity_3">Menyelesaikan proyek kreatif</string>
+  <string name="gem.purchase.support">Ingin membantu kami menjaga Habitica tetap berjalan? Kamu dapat mendukung pengembang dengan membeli permata!\n\nPermata membuatmu dapat membeli aksesoris menarik untuk akunmu, termasuk: \n\n - Kostum keren untuk avatarmu\n - Latar belakang keren\n - Misi menarik yang memberimu hadiah telur peliharaan unik\n - Kemampuan untuk mengganti kelas sebelum level 100\n\nTerima kasih banyak untuk bantuan kepada Habitca untuk menjadi yang terbaik. Dukunganmu sangat berarti bagi kami!</string>
+  <string name="my_guilds">Perkumpulan Saya</string>
+  <string name="public_guilds">Perkumpulan Publik</string>
+  <string name="guild">Perkumpulan</string>
+  <string name="leave">Tinggalkan</string>
+  <string name="join">Gabung</string>
+  <string name="leader">Ketua</string>
+  <string name="gems">Permata</string>
+  <string name="send_pm">Kirim PM</string>
+  <string name="flag">Tandai</string>
+  <string name="delete">Hapus</string>
+  <string name="name">Nama </string>
+  <string name="description">Deskripsi</string>
+  <string name="privacy">Privasi</string>
+  <string name="write_message">Tulis Pesan</string>
+  <string name="post">Kirim</string>
+  <string name="guild_search_hint">Mencari Perserikatan</string>
+  <string name="todo_due">Tenggat: %s</string>
+  <string name="daily_streak">%d kali berturut-turut</string>
+  <string name="todo_has_duedate">Tugas memiliki Tenggat Waktu</string>
+  <string name="battle_gear">Perlengkapan Bertarung</string>
+  <string name="costume">Kostum</string>
+  <string name="outfit_head">Kepala</string>
+  <string name="outfit_headAccessory">Aksesoris Kepala</string>
+  <string name="outfit_eyewear">Aksesori Mata</string>
+  <string name="outfit_armor">Baju Perang</string>
+  <string name="outfit_back">Punggung</string>
+  <string name="outfit_body">Tubuh</string>
+  <string name="outfit_shield">Perisai</string>
+  <string name="outfit_weapon">Senjata</string>
+  <string name="wear_costume">Gunakan Kostum</string>
+  <string name="equipped">Digunakan</string>
+  <string name="quest_cancel_message">Apakah kamu yakin kamu ingin membatalkan misi ini? Semua undangan yang disetujui akan hilang. Pemilik misi akan mendapatkan gulungan misi kembali.</string>
+  <string name="quest.invitation">Undangan Misi</string>
+  <string name="quest_begin_message">Apakah kamu yakin kamu ingin memulai misi? Setelah aktif, tidak ada anggota kelompok lain yang dapat bergabung.</string>
+  <string name="quest.invitation.text">Kamu telah diundang untuk berpartisipasi dalam misi!</string>
+  <string name="ago_1day">1 hari yang lalu</string>
+  <string name="ago_days">%d hari yang lalu</string>
+  <string name="ago_1Minute">1 menit yang lalu</string>
+  <string name="ago_minutes">%d menit yang lalu</string>
+  <string name="ago_hours">%d jam yang lalu</string>
+  <string name="ago_1hour">1 jam yang lalu</string>
+  <string name="today">Hari Ini</string>
+  <string name="sidebar_items">Item</string>
+  <string name="eggs">Telur</string>
+  <string name="hatching_potions">Ramuan Penetas</string>
+  <string name="food">Makanan</string>
+  <string name="quests">Misi</string>
+  <string name="pets">Peliharaan</string>
+  <string name="mounts">Tunggangan</string>
+  <string name="armoireEquipment">Kamu menemukan perlengkapan langka di dalam Peti Harta Karun: %s! Keren!</string>
+  <string name="armoireFood">Kamu mengacak-acak Peti Harta Karun dan menemukan %2$s %1$s. Kenapa berada di dalam sini, ya?</string>
+  <string name="armoireExp">Kamu bergulat dengan Peti Harta Karun dan mendapatkan Pengalaman. Rasakan itu!</string>
+  <string name="armoireNotesFull">Buka Peti Harta Karun untuk mendapatkan perlengkapan spesial, Pengalaman, atau makanan secara acak! Perlengkapan yang tersisa: %d</string>
+  <string name="armoireLastItem">Kamu menemukan perlengkapan terakhir di dalam Peti Harta Karun.</string>
+  <string name="armoireNotesEmpty">Peti Harta Karun akan memiliki perlengkapan baru pada minggu pertama setiap bulan. Sementara itu, tetaplah klik untuk mendapatkan Pengalaman dan Makanan!</string>
+  <string name="sell">Jual (%d Emas)</string>
+  <string name="hatch_with_potion">Tetaskan dengan ramuan</string>
+  <string name="feed_to_pet">Beri makan peliharaan</string>
+  <string name="hatch_egg">Tetaskan dengan telur</string>
+  <string name="invite_party">Undang teman</string>
+  <string name="dialog_feeding">Beri makan %2$s %1$s dengan:</string>
+  <string name="use_animal">Gunakan</string>
+  <string name="feed">Beri makan</string>
+  <string name="hatch_with">Tetaskan dengan %s</string>
+  <string name="hatched_pet_title">Kamu menetaskan seekor %2$s %1$s!</string>
+  <string name="close">Tutup</string>
+  <string name="share">Bagikan</string>
+  <string name="notification_pet_fed">Kamu memberi makan %2$s %1$s !</string>
+  <string name="notification_purchase">%s telah dibeli</string>
+  <string name="sectionpets">Peliharaan Dasar</string>
+  <string name="sectionpremiumPets">Peliharaan Ramuan Ajaib</string>
+  <string name="sectionquestPets">Peliharaan Misi</string>
+  <string name="sectionspecialPets">Peliharaan Langka</string>
+  <string name="sectionmounts">Tunggangan Dasar</string>
+  <string name="sectionpremiumMounts">Tunggangan Ramuan Ajaib</string>
+  <string name="sectionquestMounts">Tunggangan Misi</string>
+  <string name="sectionspecialMounts">Tunggangan Langka</string>
+  <string name="world_quest">Misi Dunia</string>
+  <string name="inn_description">Beristirahat di dalam Penginapan untuk mencegah Keseharian yang belum selesai menyakitimu semalaman! (Catatan: tidak dapat mencegahmu mendapatkan serangan Bos Monster.)</string>
+  <string name="empty_items">Kamu tidak memiliki %s</string>
+  <string name="user_level">LVL %d</string>
+  <string name="user_level_with_class">LVL %1$d - %2$s</string>
+  <string name="warrior">Prajurit</string>
+  <string name="rogue">Perampok</string>
+  <string name="mage">Penyihir</string>
+  <string name="healer">Penyembuh</string>
+  <string name="warrior_description">Prajurit mendapatkan skor lebih dan \'serangan kritis\' lebih baik, yang akan secara acak memberikan bonus Emas, Pengalaman, dan kesempatan menemukan item saat menyelesaikan tugas. Mereka juga memberikan serangan berat kepada bos monster. Mainkan Perampok jika kamu termotivasi dengan hadiah bergaya jackpot yang sulit diprediksi, atau ingin memberikan serangan besar kepada bos misi!</string>
+  <string name="mage_description">Penyihir belajar dengan cepat, mendapatkan Pengalaman dan Level lebih cepat daripada kelas lainnya. Mereka juga mendapatkan Mana yang besar dengan menggunakan kemampuan spesial. Mainkan penyihir jika kamu menyukai aspek taktis dari permainan Kebiasaan, atau jika kamu begitu termotivasi dengan meningkatkan level dan membuka fitur baru!</string>
+  <string name="rogue_description">Perampok senang mengumpulkan kekayaan, mendapatkan banyak Emas daripada yang lainnya, dan mahir menemukan item acak. Kemampuan Bersembunyi mereka yang terkenal membuat mereka mampu menghindari konsekuensi dari Keseharian yang terlewat. Mainkan Perampok jika kamu termotivasi dengan Hadiah dan Pencapaian, juga mendapatkan banyak barang jarahan dan lencana!</string>
+  <string name="healer_description">Penyembuh tahan terhadap serangan, dan dapat membagi perlindungannya pada sesama. Keseharian yang terlewat dan kebiasaan buruk tidak terlalu banyak mengganggu mereka, dan mereka memiliki cara untuk mengembalikan nyawa dari kesalahan mereka. Mainkan seorang Penyembuh jika kamu senang membantu teman dalam kelompok, atau ide mencurangi kematian dengan kerja keras membuatmu terinspirasi!</string>
+  <string name="select_class">Pilih Profesi</string>
+  <string name="opt_out_class">Matikan Fitur</string>
+  <string name="opt_out_description">Tidak ingin diganggu dengan profesi? Ingin memilih nanti saja? Matikan fitur - kamu akan menjadi seorang Prajurit tanpa kemampuan spesial. Kamu dapat membaca mengenai sistem profesi nanti di wiki dan mengaktifkan fitur profesi kapan saja.</string>
+  <string name="class_confirmation">Apakah kamu yakin ingin menjadi seorang %s?</string>
+  <string name="class_changed">Kamu sekarang seorang %s! </string>
+  <string name="class_changed_description">Kamu memiliki Baju Perang baru yang dapat diganti pada menu Perlengkapan! </string>
+  <string name="choose_class">Pilih Kelas</string>
+  <string name="dialog_go_back">Kembali</string>
+  <string name="opt_out_confirmation">Apakah kamu yakin kamu ingin mematikan fitur?</string>
+  <string name="change_class">Ganti profesi</string>
+  <string name="change_class_description">Ubah kelasmu dan terima kembali nilai atribut sebanyak 3 permata. Kamu bisa menempatkan nilai atribut melalui laman web</string>
+  <string name="enable_class">Aktifkan Sistem Profesi</string>
+  <string name="changing_class_progress">Ganti Profesi</string>
+  <string name="by_email">Melalui Email</string>
+  <string name="invite_existing_users">Undang Pengguna yang telah ada</string>
+  <string name="send">Kirim</string>
+  <string name="invite">Undang Teman</string>
+  <string name="invite_id_description">Jika kamu memiliki teman yang telah menggunakan Habitica, undang melalui ID Pengguna di sini.</string>
+  <string name="invite_email_description">Jika seorang teman bergabung dengan Habitica melalui emailmu, mereka otomatis akan diundang ke dalam kelompokmu!</string>
+  <string name="add_invites">Tambahkan Undangan</string>
+  <string name="user_id">ID Pengguna</string>
+  <string name="email">Email</string>
+  <string name="invite_users">Undang sebagai Teman</string>
+  <string name="share_using">Bagikan dengan</string>
+  <string name="share_hatched">Saya menetaskan peliharaan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya! </string>
+  <string name="share_raised">Saya baru mendapatkan tunggangan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya!</string>
+  <string name="open_in_store">Buka di Play Store</string>
+  <string name="change_class_confirmation">Apa kamu yakin untuk mengubah kelas? Ini akan membutuhkan 3 permata.</string>
+  <string name="change_class_equipment_warning">Peringatan: Kamu tidak akan dapat membeli perlengkapan untuk profesi %s. </string>
+  <string name="leaderMessage">Pesan dari %1$s</string>
+  <string name="leaderName">Ketua: %1$s</string>
+  <string name="confirm">Pastikan</string>
+  <string name="market">Pasar</string>
+  <string name="timeTravelers">Penjelajah Waktu</string>
+  <string name="seasonalShop">Toko Musiman</string>
+  <string name="empty_inbox">Kamu tidak memiliki pesan dalam Kotak Masuk. Kamu bisa mengirim pesan baru ke pengguna lain melalui pesan publik!</string>
+  <string name="party_invite">Buka dengan mengundang teman</string>
+  <string name="no_gold">Koin Emas tidak cukup</string>
+  <string name="no_potion">Kamu tidak perlu membeli ramuan kesehatan</string>
+  <string name="successful_purchase">%1$s telah sukses terbeli</string>
+  <string name="purchase_confirmation_title">Pastikan belian</string>
+  <string name="confirm_purchase_text">Membeli %1$s untuk %2$s %3$s</string>
+  <string name="gem">Permata</string>
+  <string name="hourglass">Jam Pasir</string>
+  <string name="hourglasses">Jam-jam Pasir</string>
+  <string name="gold_singular">Koin Emas</string>
+  <string name="gold_plural">Koin Emas</string>
+  <string name="chat_message_copied">Pesan telah tersalin di Papan pencatat</string>
+  <string name="copy_chat_message">Salin di Papan pencatat</string>
+  <string name="edit_tag_title">Rubah Label</string>
+  <string name="edit_tag_btn_edit">Rubah</string>
+  <string name="edit_tag_btn_done">Selesai</string>
+  <string name="edit_tag_btn_delete">Hapus</string>
+  <string name="confirm_delete_tag_title">Kamu yakin?</string>
+  <string name="confirm_delete_tag_message">Apa kamu yakin ingin menghapus?</string>
+  <string name="filter_drawer_edit_tags">Rubah Label</string>
+  <string name="filter_drawer_filter_tags">Saring berdasarkan Label</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Pinta seseorang untuk mengundangmu melalui Kode QR</string>
+  <string name="qr_save_message">Kode QR tersimpan pada</string>
+  <string name="qr_dialogue_title">Kode QR-mu</string>
+  <string name="download">Unduh</string>
+  <string name="send_new_message">Kirim pesan baru</string>
+  <string name="choose_recipient_title">Pilih Penerima Pesan</string>
+  <string name="action_continue">Lanjutkan</string>
+  <string name="scan_qr_code">Pindai Kode QR</string>
+  <string name="enter_recipient_uuid">Masukan User ID Penerima</string>
+  <string name="invited_to_party">Kamu telah diundang untuk bergabung dalam sebuah party!</string>
+  <string name="stats_widget_label">Status Habitica</string>
+  <string name="add_task">Tambah Tugas</string>
+  <string name="add_habit">Tambah Kebiasaan</string>
+  <string name="add_daily">Tambah Kegiatan Harian</string>
+  <string name="add_todo">Tambah Untuk Dilakukan</string>
+  <string name="add_reward">Tambah Hadiah</string>
+  <string name="all_dailies_completed">Anda telah menyelesaikan semua keseharianmu. Selamat!</string>
+  <string name="widget_habit_button">Habitica Melakukan Kebiasaan</string>
+  <string name="widget_dailies">Keseharian Habitica</string>
+  <string name="widget_add_task">Habitica Menambahkan Tugas</string>
+  <string name="google_services_missing">Google play services tidak dapat ditemukan.</string>
+  <string name="gem.purchase.toolbartitle">Bayar</string>
+  <string name="gem.purchase.title">Membeli gem dapat mendukung pengembang dan menjaga Habitica tetap berjalan</string>
+  <string name="gem.purchase.subtitle">Permata membuatmu dapat membeli tambahan yang menyenangkan untuk akunmu, termasuk:</string>
+  <string name="gem.purchase.listitem1">Kostum keren untuk avatarmu</string>
+  <string name="gem.purchase.listitem2">Latar belakang yang keren</string>
+  <string name="gem.purchase.listitem3">Misi yang memberikanmu hadiah telur</string>
+  <string name="gem.purchase.listitem4">Kemampuan untuk mengganti profesi sebelum level 100</string>
+  <string name="support_habitica">Dukung Habitica</string>
+  <string name="skill_transformation_use">gunakan</string>
+  <string name="hatching_market_info">Tidak mendapatkan item yang diinginkan? Beli di Market!</string>
+  <string name="feeding_market_info">Butuh makanan yang berbeda? Beli lebih dari pasar!</string>
+  <string name="open_market">Buka Pasar</string>
+  <string name="cds_description">Keseharianmu akan reset pada saat kamu membuka Habitica di atas %1$s. Pastikan kamu telah menyelesaikan Keseharianmu sebelum jam tersebut!</string>
+  <string name="AudioTheme_title">Tema Nada</string>
+  <string name="AudioTheme_summary">Ganti Tema Nada Habitica</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Sampai jumpa besok! </string>
+  <string name="belongs_to_challenge">Milik Tantangan</string>
+  <string name="has_reminder">Memiliki Pengingat</string>
+  <string name="has_tag">Memiliki Label</string>
+</resources>
diff --git a/Habitica/res/values-it/strings.profile.xml b/Habitica/res/values-it/strings.profile.xml
index a5a025896..94e9f3d1a 100644
--- a/Habitica/res/values-it/strings.profile.xml
+++ b/Habitica/res/values-it/strings.profile.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">Animali &amp; Cavalcature</string>
-    <string name="profile_pets_found">Animali trovati</string>
-    <string name="profile_mounts_tamed">Cavalcature domate</string>
-    <string name="profile_loading_data">caricamento dati.</string>
-    <string name="profile_send_message_to">Invia messaggio a %s</string>
-    <string name="profile_message_sent_to">Messaggio inviato a %s</string>
-    <string name="profile_level">Livello:</string>
-    <string name="profile_class_bonus">Bonus classe:</string>
-    <string name="profile_allocated">Allocati:</string>
-    <string name="profile_boosts">Bonus:</string>
-    <string name="profile_private_message">Messaggio privato</string>
-    <string name="profile_achievements">Medaglie</string>
-    <string name="profile_achievement_ok">Ok</string>
-    <string name="profile_qrcode_close">Chiudi</string>
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Animali &amp; Cavalcature</string>
+    <string name="profile_pets_found">Animali trovati</string>
+    <string name="profile_mounts_tamed">Cavalcature domate</string>
+    <string name="profile_loading_data">caricamento dati.</string>
+    <string name="profile_send_message_to">Invia messaggio a %s</string>
+    <string name="profile_message_sent_to">Messaggio inviato a %s</string>
+    <string name="profile_level">Livello:</string>
+    <string name="profile_class_bonus">Bonus classe:</string>
+    <string name="profile_allocated">Allocati:</string>
+    <string name="profile_boosts">Bonus:</string>
+    <string name="profile_private_message">Messaggio privato</string>
+    <string name="profile_achievements">Medaglie</string>
+    <string name="profile_achievement_ok">Ok</string>
+    <string name="profile_qrcode_close">Chiudi</string>
+
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-it/strings.tutorial.xml b/Habitica/res/values-it/strings.tutorial.xml
index a46666b74..4e8e9423b 100644
--- a/Habitica/res/values-it/strings.tutorial.xml
+++ b/Habitica/res/values-it/strings.tutorial.xml
@@ -1,19 +1,19 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_overview">Eccoci qui! Ho creato alcune attività per te basate sui tuoi interessi. Prova ad aggiungerne qualcuna anche tu. Puoi modificare un\'attività toccando il titolo.</string>
-  <string name="tutorial_habits_1">Per prima cosa ci sono le Habit, le abitudini. Possono essere abitudini positive che vuoi migliorare o abitudini negative che vuoi abbandonare.</string>
-  <string name="tutorial_habits_2">Ogni volta che porti a termine un\'abitudine positiva, tocca il + per ottenere esperienza ed oro!</string>
-  <string name="tutorial_habits_3">Se ti fai tentare da un\'abitudine negativa, toccando - il tuo avatar perderà punti salute, per aiutarti a non farlo di nuovo.</string>
-  <string name="tutorial_todos_1">Usa le To-do per tenere traccia delle cose che devi fare solo una volta.</string>
-  <string name="tutorial_todos_2">Se le tue To-do devono essere completate entro un certo giorno, imposta una data di scadenza. Pare che tu possa completarne una, prova!</string>
-  <string name="tutorial_rewards_1">Compra oggetti per il tuo avatar con l\'oro che ottieni!</string>
-  <string name="tutorial_rewards_2">Puoi anche creare delle ricompense reali, basate su ciò che ti motiva.</string>
-  <string name="tutorial_tasks_complete">Per ora è tutto. Se hai bisogno di un ripasso, consulta la sezione FAQ.</string>
-  <string name="tutorial_equipment">Quando compri dell\'equipaggiamento, apparirà qui. Il tuo equipaggiamento di battaglia influisce sulle tue statistiche, e il tuo Costume (se attivato) cambia ciò che indossa il tuo avatar.</string>
-  <string name="tutorial_items">Guadagnati degli oggetti completando attività e salendo di livello. Tocca un oggetto per usarlo!</string>
-  <string name="tutorial_pets">Man mano che porti a termine attività nella vita reale, ora potrai trovare casualmente uova e pozioni. Combinali per far nascere degli animali!</string>
-  <string name="tutorial_skills">Le Abilità sono dei poteri con straordinari effetti! Tocca un\'abilità per utilizzarla. Costerà del Mana (la barra blu), che puoi ottenere usando Habitica ogni giorno e completando attività. Dai un\'occhiata alle FAQ nel menù per avere maggiori informazioni!</string>
-  <string name="tutorial_party">Qui è dove tu e i tuoi amici potete motivarvi a vicenda e combattere i mostri con le vostre attività!</string>
-  <string name="tutorial_tavern">Benvenuto nella Taverna, una chat pubblica per tutte le età! Qui puoi chiacchierare e fare delle domande. Divertiti!</string>
-  <string name="tutorial_classes">Scegli di diventare un Guerriero, un Mago, un Guaritore o un Assassino! Ogni classe ha equipaggiamento ed abilità uniche. Tocca (?) per saperne di più!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_overview">Eccoci qui! Ho creato alcune attività per te basate sui tuoi interessi. Prova ad aggiungerne qualcuna anche tu. Puoi modificare un\'attività toccando il titolo.</string>
+  <string name="tutorial_habits_1">Per prima cosa ci sono le Habit, le abitudini. Possono essere abitudini positive che vuoi migliorare o abitudini negative che vuoi abbandonare.</string>
+  <string name="tutorial_habits_2">Ogni volta che porti a termine un\'abitudine positiva, tocca il + per ottenere esperienza ed oro!</string>
+  <string name="tutorial_habits_3">Se ti fai tentare da un\'abitudine negativa, toccando - il tuo avatar perderà punti salute, per aiutarti a non farlo di nuovo.</string>
+  <string name="tutorial_todos_1">Usa le To-do per tenere traccia delle cose che devi fare solo una volta.</string>
+  <string name="tutorial_todos_2">Se le tue To-do devono essere completate entro un certo giorno, imposta una data di scadenza. Pare che tu possa completarne una, prova!</string>
+  <string name="tutorial_rewards_1">Compra oggetti per il tuo avatar con l\'oro che ottieni!</string>
+  <string name="tutorial_rewards_2">Puoi anche creare delle ricompense reali, basate su ciò che ti motiva.</string>
+  <string name="tutorial_tasks_complete">Per ora è tutto. Se hai bisogno di un ripasso, consulta la sezione FAQ.</string>
+  <string name="tutorial_equipment">Quando compri dell\'equipaggiamento, apparirà qui. Il tuo equipaggiamento di battaglia influisce sulle tue statistiche, e il tuo Costume (se attivato) cambia ciò che indossa il tuo avatar.</string>
+  <string name="tutorial_items">Guadagnati degli oggetti completando attività e salendo di livello. Tocca un oggetto per usarlo!</string>
+  <string name="tutorial_pets">Man mano che porti a termine attività nella vita reale, ora potrai trovare casualmente uova e pozioni. Combinali per far nascere degli animali!</string>
+  <string name="tutorial_skills">Le Abilità sono dei poteri con straordinari effetti! Tocca un\'abilità per utilizzarla. Costerà del Mana (la barra blu), che puoi ottenere usando Habitica ogni giorno e completando attività. Dai un\'occhiata alle FAQ nel menù per avere maggiori informazioni!</string>
+  <string name="tutorial_party">Qui è dove tu e i tuoi amici potete motivarvi a vicenda e combattere i mostri con le vostre attività!</string>
+  <string name="tutorial_tavern">Benvenuto nella Taverna, una chat pubblica per tutte le età! Qui puoi chiacchierare e fare delle domande. Divertiti!</string>
+  <string name="tutorial_classes">Scegli di diventare un Guerriero, un Mago, un Guaritore o un Assassino! Ogni classe ha equipaggiamento ed abilità uniche. Tocca (?) per saperne di più!</string>
+</resources>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 242f4a9ee..ef45a0f28 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -1,543 +1,543 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Sincronizza</string>
-  <string name="XP_default">Esperienza</string>
-  <string name="HP_default">Salute</string>
-  <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Le preferenze non possono essere importate dal codice a barre</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Impostazioni</string>
-  <string name="SP_address_hint">Il tuo server personalizzato</string>
-  <string name="SP_userID_title">ID utente</string>
-  <string name="SP_userID_summary">Il tuo ID utente</string>
-  <string name="SP_APIToken_title">API Token</string>
-  <string name="SP_APIToken_summary">Il tuo API Token</string>
-  <string name="Language_title">Lingua</string>
-  <string name="Language_summary">Cambia la lingua di Habitica</string>
-  <string name="SP_user_qr_code">Il tuo codice QR</string>
-  <string name="PS_contact_title">Contattami</string>
-  <string name="unknown_error">Si è verificato un errore...</string>
-  <string name="pref_account_header">Account</string>
-  <string name="pref_first_day_of_the_week_title">Primo giorno della settimana</string>
-  <string name="pref_first_day_of_the_week_summary">Primo giorno della settimana in tutti i calendari</string>
-  <string name="pref_reminder_header">Notifica giornaliera</string>
-  <string name="pref_reminder_checkbox">Attiva notifica</string>
-  <string name="pref_reminder_picker">Imposta ora notifica</string>
-  <string name="pref_cds_header">Inizio giorno personalizzato</string>
-  <string name="pref_cds_picker">Imposta ora di inizio giorno</string>
-  <string name="pref_push_notifications_checkbox">Notifiche push utente</string>
-  <string name="push_notifications">Notifiche Push</string>
-  <string name="push_notifications_sum">Gestisci le impostazioni delle notifiche push</string>
-  <string name="preference_push_you_won_challenge">Hai vinto una Sfida!</string>
-  <string name="preference_push_received_a_private_message">Nuovo messaggio privato ricevuto</string>
-  <string name="preference_push_gifted_gems">Gemme regalate</string>
-  <string name="preference_push_gifted_subscription">Abbonamento Regalato</string>
-  <string name="preference_push_invited_to_party">Invito in una Squadra</string>
-  <string name="preference_push_invited_to_guild">Invito Gilda</string>
-  <string name="preference_push_your_quest_has_begun">La tua Missione è cominciata</string>
-  <string name="preference_push_invited_to_quest">Invito ad una Missione</string>
-  <!--Adding tasks-->
-  <string name="task_value">Valore</string>
-  <string name="new_todo">Nuova To-Do</string>
-  <string name="new_reward">Nuova ricompensa</string>
-  <string name="new_daily">Nuova Daily</string>
-  <string name="new_habit">Nuova Habit</string>
-  <string name="action_edit">Modifica</string>
-  <string name="action_delete">Elimina</string>
-  <string name="action_cancel">Annulla</string>
-  <string name="login_btn">Accedi</string>
-  <string name="register_btn">Registrati</string>
-  <string name="username">Nome utente</string>
-  <string name="email_username">E-mail o nome utente</string>
-  <string name="password">Password</string>
-  <string name="emailAddress">Indirizzo e-mail</string>
-  <string name="confirmpassword">Conferma password</string>
-  <string name="logout">Esci</string>
-  <string name="logout_description">Esci dal tuo account</string>
-  <string name="account_details_sum">Controlla i dettagli del tuo account</string>
-  <string name="account_details">Dettagli account</string>
-  <string name="LoginActivityName">Benvenuto</string>
-  <string name="string_revive">Rianima</string>
-  <string name="please_connect">Dovresti connetterti attraverso l\'applicazione prima di usare un widget</string>
-  <string name="about.title">Info</string>
-  <string name="about.libraries">Librerie</string>
-  <string name="about.versionhistory">Cronologia versioni</string>
-  <string name="about.habitica_open_source">Habitica è disponibile come software open source su Github</string>
-  <string name="about.rate_our_app">Valuta la nostra app</string>
-  <string name="about.give_us_feedback">Invia suggerimenti!</string>
-  <string name="about.bugreport">Segnala un bug</string>
-  <string name="about.source_code">Codice sorgente</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Errore di connessione</string>
-  <string name="network_error_no_network_body">Non sei connesso ad internet.</string>
-  <string name="internal_error_api">Sembra esserci un problema col server. Riprova più tardi.</string>
-  <string name="authentication_error_title">Errore di autenticazione</string>
-  <string name="authentication_error_body">Il tuo nome utente e/o password non è corretto.</string>
-  <string name="login_validation_error_title">Errore di validazione</string>
-  <string name="login_validation_error_fieldsmissing">Devi compilare tutti i campi.</string>
-  <string name="save_changes">Salva</string>
-  <string name="copy">Copia</string>
-  <string name="notes">Note</string>
-  <string name="text">Testo</string>
-  <string name="difficulty">Difficoltà</string>
-  <string name="tags">Etichette</string>
-  <string name="trivial">Triviale</string>
-  <string name="easy">Facile</string>
-  <string name="medium">Media</string>
-  <string name="hard">Difficile</string>
-  <string name="start_date">Data di partenza</string>
-  <string name="positive_habit_form">Positiva ( + )</string>
-  <string name="negative_habit_form">Negativa ( - )</string>
-  <string name="checklist">Checklist</string>
-  <string name="reminders">Promemoria</string>
-  <string name="actions">Azioni</string>
-  <string name="attributes">Attributi</string>
-  <string name="physical">Fisica</string>
-  <string name="mental">Mentale</string>
-  <string name="social">Sociale</string>
-  <string name="other">Altro</string>
-  <string name="frequency">Frequenza</string>
-  <string name="frequency_weekly">Certi giorni della settimana</string>
-  <string name="frequency_daily">Ogni X giorni</string>
-  <string name="monday">Lunedì</string>
-  <string name="tuesday">Martedì</string>
-  <string name="wednesday">Mercoledì</string>
-  <string name="thursday">Giovedì</string>
-  <string name="friday">Venerdì</string>
-  <string name="saturday">Sabato</string>
-  <string name="sunday">Domenica</string>
-  <string name="levelup_header">Nuovo livello!</string>
-  <string name="levelup_detail">Raggiungendo obiettivi nella vita reale, sei salito al Livello %1$d!</string>
-  <string name="levelup_health">Sei stato completamente curato!</string>
-  <string name="levelup_button">Urrà!</string>
-  <string name="faint_subtitle">Non disperarti!</string>
-  <string name="faint_penalty_body">Hai perso un livello, il tuo oro e un pezzo di equipaggiamento, ma puoi riottenere ogni cosa lavorando sodo! Buona fortuna - vedrai che ci riuscirai.</string>
-  <string name="faint_header">Hai finito i punti salute!</string>
-  <string name="faint_button">Ripristina Salute &amp; Riprova</string>
-  <string name="filter">Filtro</string>
-  <string name="profile_image">Immagine profilo</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Hai usato %1$s per %2$d mana.</string>
-  <string name="used_skill_without_mana">Hai usato %1$s.</string>
-  <string name="new_checklist_item">Nuovo elemento checklist</string>
-  <string name="add_checklist_item">Aggiungi</string>
-  <string name="reminder_title">Ricorda di completare le tue Daily!</string>
-  <string name="skill_progress_title">Usando abilità</string>
-  <string name="coming_soon">Presto disponibile</string>
-  <string name="chat_flag_confirmation">Vuoi davvero segnalare questo messaggio per violazione?</string>
-  <string name="flag_confirm">Segnala messaggio</string>
-  <string name="unlock_lvl_11">Sblocca al liv. 11</string>
-  <string name="no_party_message">Non sei in una squadra. Per unirti ad una squadra, per favore visita il sito web di Habitica.</string>
-  <string name="forgot_pw_btn">Password dimenticata</string>
-  <string name="forgot_pw_tv">Hai dimenticato la password? Per favore usa il sito web di Habitica.</string>
-  <string name="tavern.inn.checkOut">Riattiva le tue Daily</string>
-  <string name="tavern.inn.rest">Sospendi le tue Daily</string>
-  <string name="reward.dialog.buy">Compra</string>
-  <string name="reward.dialog.dismiss">Annulla</string>
-  <string name="party">Squadra</string>
-  <string name="chat">Chat</string>
-  <string name="members">Membri</string>
-  <string name="habits">Habit</string>
-  <string name="dailies">Daily</string>
-  <string name="todos">To-do</string>
-  <string name="rewards">Ricompense</string>
-  <string name="taskform.delete.title">Sei sicuro?</string>
-  <string name="taskform.delete.message">Vuoi davvero eliminare?</string>
-  <string name="yes">Sì</string>
-  <string name="no">No</string>
-  <string name="quest">Missione</string>
-  <string name="avatar_body">Corpo</string>
-  <string name="avatar_hair">Capelli</string>
-  <string name="avatar_shirt">Maglia</string>
-  <string name="avatar_skin">Pelle</string>
-  <string name="avatar_ears">Orecchie animali</string>
-  <string name="avatar_base">Base</string>
-  <string name="avatar_color">Colore</string>
-  <string name="avatar_beard">Barba</string>
-  <string name="avatar_mustache">Baffi</string>
-  <string name="avatar_flower">Fiore</string>
-  <string name="avatar_bangs">Frangia</string>
-  <string name="avatar_nothing">Niente impostato</string>
-  <string name="avatar_size">Corporatura</string>
-  <string name="avatar_size_slim">Snello</string>
-  <string name="avatar_size_broad">Robusto</string>
-  <string name="avatar_background">Sfondo</string>
-  <string name="purchase_customization">Compra personalizzazione</string>
-  <string name="purchase_set_button">Sblocca set per %d gemme</string>
-  <string name="purchase_button">Compra</string>
-  <string name="purchase_set_title">Compra set  %s</string>
-  <string name="due_date">Data di scadenza</string>
-  <string name="quest.accept">Accetta</string>
-  <string name="quest.reject">Rifiuta</string>
-  <string name="quest.begin">Inizia missione</string>
-  <string name="quest.cancel">Annulla invito</string>
-  <string name="quest.abort">Annulla missione</string>
-  <string name="quest.leave">Abbandona Missione</string>
-  <string name="quest.pending">In attesa</string>
-  <string name="quest.accepted">Accettata</string>
-  <string name="quest.rejected">Rifiutata</string>
-  <string name="quest.participants">Partecipanti</string>
-  <string name="version_info">Versione %1$s (%2$d)</string>
-  <string name="sidebar_help">Aiuto &amp; FAQ</string>
-  <string name="complete_tutorial">Capito!</string>
-  <string name="dismiss_tutorial">Ricordamelo ancora</string>
-  <string name="intro_1_subtitle">Benvenuto in</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">È il momento di divertirsi raggiungendo i propri obiettivi. Unisciti ad oltre %s altre persone che migliorano la propria vita un\'attività alla volta.</string>
-  <string name="intro_2_subtitle">Progressi nel gioco</string>
-  <string name="intro_2_title">Progressi nella vita</string>
-  <string name="intro_2_description">Sblocca nuovi elementi nel gioco portando a termine gli impegni della vita reale. Ottieni armature, animali e altro come ricompensa per aver raggiunto i tuoi obiettivi.</string>
-  <string name="intro_3_subtitle">Combatti mostri</string>
-  <string name="intro_3_title">Sii Social</string>
-  <string name="intro_3_description">Tieni traccia dei tuoi obiettivi con l\'aiuto dei tuoi amici. Supportatevi a vicenda nella vita e nelle battaglie per migliorare insieme!</string>
-  <string name="intro_finish_button">Iniziamo!</string>
-  <string name="previous_button">Indietro</string>
-  <string name="next_button">Avanti</string>
-  <string name="skip_button">Salta</string>
-  <string name="setup_welcome_description">Benvenuto in Habitica, dove progredire nel gioco migliorerà la tua vita! Man mano che raggiungerai obiettivi nella vita reale, sbloccherai equipaggiamento, animali, missioni e altro.</string>
-  <string name="setup_welcome_title">Benvenuto</string>
-  <string name="avatar_setup_description">Quindi, che aspetto ti piacerebbe avere? Non preoccuparti, lo potrai cambiare in seguito.</string>
-  <string name="task_setup_description">Splendido! Ora dimmi, su cosa vorresti lavorare durante questo viaggio?</string>
-  <string name="setup_group_work">Lavoro</string>
-  <string name="setup_group_exercise">Esercizio fisico</string>
-  <string name="setup_group_health">Salute</string>
-  <string name="setup_group_school">Scuola</string>
-  <string name="setup_group_teams">Team</string>
-  <string name="setup_group_chores">Faccende di casa</string>
-  <string name="setup_group_creativity">Creatività</string>
-  <string name="setup_task_work_1">Controlla le e-mail</string>
-  <string name="setup_task_work_2">La cosa più importante da fare oggi</string>
-  <string name="setup_task_work_3">Progetto di lavoro</string>
-  <string name="setup_task_exercise_1">10 min di cardio</string>
-  <string name="setup_task_exercise_2">Stretching</string>
-  <string name="setup_task_exercise_3">Imposta una tabella per l\'allenamento</string>
-  <string name="setup_task_healthWellness_1">Mangia cibo salutare</string>
-  <string name="setup_task_healthWellness_2">Lavati i denti</string>
-  <string name="setup_task_healthWellness_3">Pianifica il controllo</string>
-  <string name="setup_task_school_1">Studia/Procrastina</string>
-  <string name="setup_task_school_2">Fai i compiti</string>
-  <string name="setup_task_school_3">Finisci il progetto scolastico</string>
-  <string name="setup_task_teams_1">Contatta il team</string>
-  <string name="setup_task_teams_2">Aggiorna il team sullo stato del progetto</string>
-  <string name="setup_task_teams_3">Completa progetto di gruppo</string>
-  <string name="setup_task_chores_1">Pulisci 10 minuti</string>
-  <string name="setup_task_chores_2">Lava i piatti</string>
-  <string name="setup_task_chores_3">Riordina l\'armadio</string>
-  <string name="setup_task_creativity_1">Studia un artista</string>
-  <string name="setup_task_creativity_2">Lavora su un progetto creativo</string>
-  <string name="setup_task_creativity_3">Completa un progetto creativo</string>
-  <string name="gem.purchase.support">Vuoi aiutare a tenere Habitica attivo? Puoi sostenere gli sviluppatori comprando delle gemme!\n\nLe gemme ti permettono di comprare dei simpatici extra per il tuo account, inclusi: \n\n - Originali costumi per il tuo avatar\n - Sfondi magnifici\n - Divertenti missioni che ti premiano con uova di animali\n - La possibilità di cambiare classe prima del livello 10\n\nGrazie infinite per aiutarci a rendere Habitica sempre migliore. Il tuo supporto significa molto per noi!</string>
-  <string name="my_guilds">Le mie Gilde</string>
-  <string name="public_guilds">Gilde pubbliche</string>
-  <string name="guild">Gilda</string>
-  <string name="leave">Abbandona</string>
-  <string name="join">Partecipa</string>
-  <string name="leader">Leader</string>
-  <string name="gems">Gemme</string>
-  <string name="copy_as_todo">Copia come To-Do</string>
-  <string name="send_pm">Invia messaggio privato</string>
-  <string name="flag">Segnala</string>
-  <string name="delete">Elimina</string>
-  <string name="name">Nome</string>
-  <string name="description">Descrizione</string>
-  <string name="add_tag">Aggiungi una nuova etichetta</string>
-  <string name="privacy">Privacy</string>
-  <string name="write_message">Scrivi messaggio</string>
-  <string name="post">Invia</string>
-  <string name="guild_search_hint">Cerca gilde</string>
-  <string name="todo_due">Scade: %s</string>
-  <string name="daily_streak">serie: %d</string>
-  <string name="todo_has_duedate">L\' attività ha una scadenza</string>
-  <string name="battle_gear">Assetto da battaglia</string>
-  <string name="costume">Costume</string>
-  <string name="outfit_head">Testa</string>
-  <string name="outfit_headAccessory">Accessorio da testa</string>
-  <string name="outfit_eyewear">Occhi</string>
-  <string name="outfit_armor">Armatura</string>
-  <string name="outfit_back">Schiena</string>
-  <string name="outfit_body">Corpo</string>
-  <string name="outfit_shield">Scudo</string>
-  <string name="outfit_weapon">Arma</string>
-  <string name="wear_costume">Indossa Costume</string>
-  <string name="equipped">Equipaggiato</string>
-  <string name="quest_cancel_message">Vuoi davvero annullare questa missione? Tutti gli inviti accettati andranno persi. Il proprietario della missione tornerà in possesso della Pergamena.</string>
-  <string name="quest.invitation">Invito Missione</string>
-  <string name="quest_begin_message">Vuoi davvero iniziare la missione? Una volta attiva, nessun altro membro della squadra potrà unirsi alla missione.</string>
-  <string name="quest.invitation.text">Sei stato invitato a partecipare ad una missione!</string>
-  <string name="ago_1day">1 giorno fa</string>
-  <string name="ago_days">%d giorni fa</string>
-  <string name="ago_1Minute">1 minuto fa</string>
-  <string name="ago_minutes">%d minuti fa</string>
-  <string name="ago_hours">%d ore fa</string>
-  <string name="ago_1hour">1 ora fa</string>
-  <string name="today">Oggi</string>
-  <string name="sidebar_items">Oggetti</string>
-  <string name="eggs">Uova</string>
-  <string name="hatching_potions">Pozioni di schiusura</string>
-  <string name="food">Cibo</string>
-  <string name="quests">Missioni</string>
-  <string name="pets">Animali</string>
-  <string name="mounts">Cavalcature</string>
-  <string name="armoireEquipment">Hai trovato dell\'equipaggiamento raro nello Scrigno Incantato: %s! Fantastico!</string>
-  <string name="armoireFood">Frughi nello Scrigno e trovi %1$s %2$s. Cosa ci fa qui dentro?</string>
-  <string name="armoireExp">Fai a botte con lo Scrigno e ottieni Esperienza. Prendi questo!</string>
-  <string name="armoireNotesFull">Apri lo Scrigno Incantato per ricevere casualmente Equipaggiamento speciale, Esperienza o cibo! Oggetti rimanenti: %d</string>
-  <string name="armoireLastItem">Hai trovato l\'ultimo oggetto raro disponibile nello Scrigno Incantato.</string>
-  <string name="armoireNotesEmpty">Nello Scrigno Incantato compariranno nuovi oggetti la prima settimana di ogni mese. Fino ad allora, continua a cliccare sullo Scrigno per ottenere Esperienza e Cibo!</string>
-  <string name="sell">Vendi (%d Oro)</string>
-  <string name="hatch_with_potion">Schiudi con pozione</string>
-  <string name="feed_to_pet">Dai ad animale</string>
-  <string name="hatch_egg">Schiudi con uovo</string>
-  <string name="invite_party">Invita squadra</string>
-  <string name="dialog_feeding">Dai da mangiare a %1$s %2$s:</string>
-  <string name="use_animal">Usa</string>
-  <string name="feed">Dai da mangiare</string>
-  <string name="hatch_with">Fai nascere un animale con %s</string>
-  <string name="hatched_pet_title">È nato un %2$s %1$s!</string>
-  <string name="close">Chiudi</string>
-  <string name="share">Condividi</string>
-  <string name="notification_pet_fed">Hai dato da mangiare al tuo %1$s %2$s!</string>
-  <string name="notification_purchase">Hai acquistato %s</string>
-  <string name="sectionpets">Animali base</string>
-  <string name="sectionpremiumPets">Animali Pozione Magica</string>
-  <string name="sectionquestPets">Animali Missione</string>
-  <string name="sectionspecialPets">Animali rari</string>
-  <string name="sectionmounts">Cavalcature base</string>
-  <string name="sectionpremiumMounts">Calvalcature Pozione Magica</string>
-  <string name="sectionquestMounts">Cavalcature Missione</string>
-  <string name="sectionspecialMounts">Cavalcature rare</string>
-  <string name="world_quest">World Quest</string>
-  <string name="inn_description">Riposare nella Locanda impedisce alle tue Daily di danneggiarti al cambio di giorno! (Nota:  questo non impedisce di ricevere danni dai Boss)</string>
-  <string name="empty_items">Non hai alcun %s</string>
-  <string name="user_level">LV %d</string>
-  <string name="user_level_with_class">LV %1$d - %2$s</string>
-  <string name="warrior">Guerriero</string>
-  <string name="rogue">Assassino</string>
-  <string name="mage">Mago</string>
-  <string name="healer">Guaritore</string>
-  <string name="warrior_description">I Guerrieri possono eseguire un gran numero di \"colpi critici\" molto potenti, che forniscono un bonus di Oro ed Esperienza (e a volte degli oggetti) casualmente al completamento di una attività. Inoltre, infliggono ingenti danni ai mostri boss. Diventa un Guerriero se trovi accattivanti le imprevedibili ricompense in stile jackpot, o se vuoi dimenticarti del dolore durante le missioni boss!</string>
-  <string name="mage_description">I Maghi imparano più velocemente, guadagnano Esperienza e Livelli più velocemente delle altre classi. Hanno anche a loro disposizione molto mana per l\'utilizzo di abilità speciali. Utilizza il Mago se ti piace giocare tatticamente su Habit, o se sei fortemente motivato dal livellare e sbloccare opzioni aggiuntive!</string>
-  <string name="rogue_description">Gli Assassini amano accumulare ricchezza: guadagnano più Oro di chiunque altro, e sono inclini al trovare oggetti casuali. La loro iconica abilità Furtività li rende in grado di prendersi gioco delle conseguenze delle Daily mancate. Diventa un Assassino se trovi una forte motivazione nelle Ricompense e nelle Medaglie, lottando per un bottino e dei riconoscimenti!</string>
-  <string name="healer_description">I Guaritori resistono fortemente ai danni, ed estendono la loro protezione agli altri.
-Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre modo di recuperare Vita dagli sbagli. Gioca come Guaritore se vuoi aiutare gli altri giocatori della tua squadra, o se l\'idea di fregare la morte con il duro lavoro ti ispira!</string>
-  <string name="select_class">Seleziona classe</string>
-  <string name="opt_out_class">Rinuncia</string>
-  <string name="opt_out_description">Non ti vuoi preoccupare dellle classi? Vuoi scegliere dopo? Puoi essere un guerriero senza abilità speciali. Puoi leggere a proposito del sistema di classi più tardi nella Wiki ed abilitare le classi quando vuoi.</string>
-  <string name="class_confirmation">Vuoi davvero essere un %s?</string>
-  <string name="class_changed">Ora sei un %s!</string>
-  <string name="class_changed_description">Hai del nuovo equipaggiamento da battaglia che puoi indossare, vai nella sezione Equipaggiamento!</string>
-  <string name="choose_class">Scegli classe</string>
-  <string name="dialog_go_back">Ritorna</string>
-  <string name="opt_out_confirmation">Vuoi davvero rinunciare?</string>
-  <string name="change_class">Cambia la tua classe</string>
-  <string name="change_class_description">Cambia classe e riottieni i tuoi punti attributo per 3 gemme. Puoi assegnare i punti attributo attraverso il sito web.</string>
-  <string name="enable_class">Abilita sistema delle classi</string>
-  <string name="changing_class_progress">Cambiamento classe</string>
-  <string name="by_email">Per e-mail</string>
-  <string name="invite_existing_users">Invita utenti esistenti</string>
-  <string name="send">Invia</string>
-  <string name="invite">Invita amici</string>
-  <string name="invite_id_description">Se hai degli amici che già usano Habitica, invitali inserendo qui il loro ID Utente.</string>
-  <string name="invite_email_description">Se un amico/a si unisce ad Habitica attraverso la tua e-mail, verrà automaticamente invitato/a nella tua squadra!</string>
-  <string name="add_invites">Aggiungi inviti</string>
-  <string name="user_id">ID Utente</string>
-  <string name="email">E-mail</string>
-  <string name="invite_users">Invita nella squadra</string>
-  <string name="share_using">Condividi con</string>
-  <string name="share_levelup">Ho raggiunto il livello %d su Habitica migliorando le mie abitudini nella vita reale!</string>
-  <string name="share_hatched">Oh apena schiuso un %1$s %2$s beniamino in Habitica completando I miei compiti nella vita reale!</string>
-  <string name="share_raised">Oh apena guadagnato una %1$s %2$s montatura in Habitica completando I miei compiti nella vita reale!</string>
-  <string name="open_in_store">Apri nel Play Store</string>
-  <string name="change_class_confirmation">Vuoi davvero cambiare la tua classe? Costerà 3 gemme.</string>
-  <string name="change_class_equipment_warning">Attenzione: non potrai più comprare equipaggiamento per la classe %s.</string>
-  <string name="leaderMessage">Messaggio da %1$s</string>
-  <string name="leaderName">Leader: %1$s</string>
-  <string name="confirm">Conferma</string>
-  <string name="market">Mercato</string>
-  <string name="timeTravelers">Viaggiatori del Tempo</string>
-  <string name="seasonalShop">Negozio Stagionale</string>
-  <string name="empty_inbox">Non hai nessun messaggio. Puoi inviare un messaggio privato ad un utente dai loro messaggi nelle chat pubbliche!</string>
-  <string name="party_invite">Sblocca invitando amici</string>
-  <string name="no_gold">Non hai abbastanza Oro</string>
-  <string name="no_potion">Non hai bisogno di comprare una pozione di salute</string>
-  <string name="successful_purchase">%1$s comprato con successo</string>
-  <string name="purchase_confirmation_title">Conferma acquisto</string>
-  <string name="confirm_purchase_text">Compra %1$s per %2$s %3$s</string>
-  <string name="gem">gemma</string>
-  <string name="hourglass">clessidra</string>
-  <string name="hourglasses">clessidre</string>
-  <string name="gold_singular">oro</string>
-  <string name="gold_plural">oro</string>
-  <string name="chat_message_copied">Messaggio copiato negli Appunti</string>
-  <string name="copy_chat_message">Copia negli appunti</string>
-  <string name="edit_tag_title">Modifica etichetta</string>
-  <string name="edit_tag_btn_edit">Modifica</string>
-  <string name="edit_tag_btn_done">Fatto</string>
-  <string name="edit_tag_btn_delete">Elimina</string>
-  <string name="confirm_delete_tag_title">Sei sicuro?</string>
-  <string name="confirm_delete_tag_message">Vuoi davvero eliminare?</string>
-  <string name="filter_drawer_edit_tags">Modifica etichette</string>
-  <string name="filter_drawer_filter_tags">Filtra per etichette</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Fatti invitare da qualcuno con questo codice QR</string>
-  <string name="qr_save_message">Codice QR salvato a</string>
-  <string name="qr_dialogue_title">Il tuo codice QR</string>
-  <string name="download">Scarica</string>
-  <string name="send_new_message">Invia nuovo messaggio</string>
-  <string name="choose_recipient_title">Scegli destinatario messaggio</string>
-  <string name="action_continue">Continua</string>
-  <string name="scan_qr_code">Rileva codice QR</string>
-  <string name="enter_recipient_uuid">Inserisci ID Utente destinatario</string>
-  <string name="invited_to_party">Hai ricevuto un invito per unirti a una squadra!</string>
-  <string name="stats_widget_label">Statistiche Habitica</string>
-  <string name="add_task">Aggiungi Attività</string>
-  <string name="add_habit">Aggiungi Abitudine</string>
-  <string name="add_daily">Aggiungi Daily</string>
-  <string name="add_todo">Aggiungi To-Do</string>
-  <string name="add_reward">Aggiungi Ricompensa</string>
-  <string name="all_dailies_completed">Hai completato tutte le tue Daily. Ottimo lavoro!</string>
-  <string name="widget_habit_button">Habitica esegui abitudine</string>
-  <string name="widget_dailies">Habitica Daily</string>
-  <string name="widget_todo_list">Lista To-Do Habitica</string>
-  <string name="widget_add_task">Habitica aggiungi attività</string>
-  <string name="google_services_missing">Impossibile trovare Google Play Services.</string>
-  <string name="gem.purchase.toolbartitle">Compra</string>
-  <string name="gem.purchase.title">Comprando gemme supporti gli sviluppatori e tieni in vita Habitica</string>
-  <string name="gem.purchase.subtitle">Le Gemme ti permettono di ottenere simpatici extra per il tuo account, tra cui:</string>
-  <string name="gem.purchase.listitem1">Costumi per il tuo avatar</string>
-  <string name="gem.purchase.listitem2">Magnifici sfondi</string>
-  <string name="gem.purchase.listitem3">Missioni che ti premiano con uova di animali</string>
-  <string name="gem.purchase.listitem4">La possibilità di cambiare classe prima del livello 100</string>
-  <string name="support_habitica">Supporta Habitica</string>
-  <string name="skill_transformation_use">usa</string>
-  <string name="hatching_market_info">Non trovi i drop giusti? Dai un\'occhiata al Mercato!</string>
-  <string name="feeding_market_info">Hai bisogno di cibo diverso? Comprane un po\' nel Mercato!</string>
-  <string name="open_market">Vai nel Mercato</string>
-  <string name="cds_description">Le tue Daily saranno resettate la prima volta che userai Habitica dopo %1$s. Assicurati di aver completato le tue Daily prima di allora!</string>
-  <string name="AudioTheme_title">Tema sonoro</string>
-  <string name="AudioTheme_summary">Cambia il tema sonoro di Habitica</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">Ci vediamo domani!</string>
-  <string name="belongs_to_challenge">Appartiene alla Sfida</string>
-  <string name="has_reminder">Ha promemoria</string>
-  <string name="has_tag">Ha etichetta</string>
-  <string name="subscribe.title">Gli abbonamenti aiutano a supportare gli sviluppatori e a tenere Habitica in vita </string>
-  <string name="subscribe_prompt">Abbonati per ottenere questi utili benefici:</string>
-  <string name="subscribe.listitem1">Compra gemme con l\'oro</string>
-  <string name="subscribe.listitem2">Oggetti mensili esclusivi</string>
-  <string name="subscribe.listitem3">Più elementi nella cronologia attività</string>
-  <string name="subscribe.listitem4">Limite di drop giornaliero raddoppiato</string>
-  <string name="subscriptions">Abbonamenti</string>
-  <string name="subscription_duration">Ricorrente ogni %s</string>
-  <string name="subscribe">Abbonati</string>
-  <string name="subscribe.listitem1.description">Ora Alexander il Mercante ti venderà Gemme al prezzo di 20 Oro l\'una!\n\nLe sue consegne mensili sono inizialmente limitate a 25 Gemme al mese, ma possono aumentare a seconda della durata del tuo abbonamento.\n\nIl limite aumenta di 5 Gemme ogni tre mesi di abbonamento consecutivi, fino ad un massimo di 50 Gemme al mese!</string>
-  <string name="subscribe.listitem2.description">Ogni mese riceverai un oggetto davvero unico per il tuo avatar!\n\nIn più, ogni tre mesi di abbonamento consecutivi, i misteriosi Viaggiatori del Tempo ti permetteranno di ottenere oggetti antichi (e futuri!).</string>
-  <string name="subscribe.listitem3.description">Rende le To-Do completate e la cronologia dei progressi delle attività disponibili più a lungo.</string>
-  <string name="subscribe.listitem4.description">Raddoppiare il numero massimo di drop giornalieri ti farà ricevere più oggetti dalle attività completate ogni giorno, aiutandoti a completare la tua scuderia più velocemente!</string>
-  <string name="subscribe1month.gemcap">Il limite gemme iniziale è 25</string>
-  <string name="subscribe3month.gemcap">Limite gemme alzato a 30</string>
-  <string name="subscribe6month.gemcap">Limite gemme alzato a 35</string>
-  <string name="subscribe12month.gemcap">Limite gemme alzato a 45</string>
-  <string name="subscription_hourglasses">+%d Clessidra Mistica</string>
-  <string name="payment_method">Metodo di pagamento</string>
-  <string name="subscription">Abbonamento</string>
-  <string name="active">Attivo</string>
-  <string name="cancel_subscription">Annulla abbonamento</string>
-  <string name="cancel_subscription_google.description">Vuoi interrompere il tuo abbonamento? Puoi trovare l\'opzione per annullare l\'abbonamento nella sezione \"Le mie app\" nel Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Vuoi interrompere il tuo abbonamento? A causa del tuo metodo di pagamento, puoi completare questa operazione solo attraverso il sito web. Clicca sul bottone qui sotto per aprire il sito nel tuo browser!</string>
-  <string name="visit_habitica_website">Visita il sito web di Habitica</string>
-  <string name="current_bonuses">Bonus attivi</string>
-  <string name="months_subscribed">Mesi come abbonato</string>
-  <string name="current_hourclasses">Clessidre Mistiche attuali</string>
-  <string name="monthly_gem_cap">Limite gemme mensile</string>
-  <string name="inactive">Inattivo</string>
-  <string name="one_month">1 mese</string>
-  <string name="months">%d mesi</string>
-  <string name="month">mese</string>
-  <string name="three_months">3 mesi</string>
-  <string name="six_months">6 mesi</string>
-  <string name="twelve_months">12 mesi</string>
-  <string name="subscribe_prompt_thanks">Come abbonato hai questi utili benefici:</string>
-  <string name="subscription_status">Stato abbonamento</string>
-  <string name="byLeader">di %s</string>
-  <string name="challenge_details">Dettagli sfida</string>
-  <string name="challenge_leave_title">Abbandona sfida</string>
-  <string name="challenge_leave_text">Vuoi davvero abbandonare la sfida \"%s\"?</string>
-  <string name="challenge_remove_tasks_title">Rimuovi attività</string>
-  <string name="challenge_remove_tasks_text">Vuoi rimuovere le attività?</string>
-  <string name="remove_tasks">Rimuovi</string>
-  <string name="keep_tasks">Tieni</string>
-  <string name="my_challenges">Le mie sfide</string>
-  <string name="public_challenges">Pubbliche</string>
-  <string name="challenges">Sfide</string>
-  <string name="daily">Daily</string>
-  <string name="habit">Abitudine</string>
-  <string name="reward">Ricompensa</string>
-  <string name="todo">To-Do</string>
-  <string name="official">Ufficiale</string>
-  <string name="participating">Sto partecipando</string>
-  <string name="challenge">Sfida</string>
-  <string name="go_to_challenge">Vai alla Sfida</string>
-  <string name="not_part_of_a_challenge">Al momento non stai partecipando a nessuna sfida!</string>
-  <string name="join_a_challenge">Partecipa ad una sfida per aggiungere delle attività specifiche alla tua lista, poi competi contro altri utenti di Habitica per vincere Medaglie o addirittura delle Gemme!</string>
-  <string name="check_the_public_challenge_tab">Vai nella sezione “Pubbliche” per trovare le sfide create dagli utenti più adatte a te!</string>
-  <string name="add_reminder">Aggiungi promemoria</string>
-  <string name="warning">Attenzione</string>
-  <string name="open_settings">Apri impostazioni</string>
-  <string name="dont_keep_activities_warning">Pare che tu abbia l\'opzione sviluppatore \\"Non conservare attività\\" abilitata. Al momento questa opzione causa dei problemi all\'app di Habitica, quindi consigliamo di disabilitarla.</string>
-  <string name="inbox">Messaggi</string>
-  <string name="FAQ">Domande frequenti</string>
-  <string name="special">Speciale</string>
-  <string name="gem_for_gold_description">Grazie al tuo abbonamento ad Habitica, ogni mese puoi comprare delle Gemme usando il tuo Oro.</string>
-  <string name="limited_count">%d rimaste</string>
-  <string name="gem_shop">Gemma</string>
-  <string name="mystery_item">Oggetto Misterioso</string>
-  <string name="myster_item_notes">Ogni mese, gli abbonati ricevono un oggetto misterioso. Questo oggetto in genere viene rilasciato circa una settimana prima della fine del mese.</string>
-  <string name="open">Apri</string>
-  <string name="notification_mystery_item">Apri il pacco e trovi %s!</string>
-  <string name="checkInRewardEarned">Hai meritato %1$s come premio per la tua costanza nel migliorare la tua vita.</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Il prossimo premio verrà sbloccato a %1$d accessi</string>
-  <string name="pending_approval">in attesa di approvazione</string>
-  <string name="filters">Filtri</string>
-  <string name="done">Fatto</string>
-  <string name="group_tasks_edit_description">Le attività di gruppo non possono essere modificate.</string>
-  <string name="group_tasks_edit_title">Non puoi modificare questa attività</string>
-  <string name="groups">Gruppi</string>
-  <string name="all">Tutti</string>
-  <string name="none">Nessuno</string>
-  <string name="owned">Posseduto</string>
-  <string name="not_owned">Non posseduto</string>
-  <string name="new_game">Nuovo\nGioco</string>
-  <string name="login_btn_fb">Accedi con Facebook</string>
-  <string name="login_btn_google">Accedi con Google</string>
-  <string name="action_back">Indietro</string>
-  <string name="welcome_text">Oh, devi essere nuovo da queste parti. Mi chiamo Justin, e sarò la tua guida qui ad Habitica.\n\nPer cominciare, devi per prima cosa creare un avatar.</string>
-  <string name="randomize">Rendi casuale</string>
-  <string name="avatar_extras">Extra</string>
-  <string name="avatar_skin_color">Colore pelle</string>
-  <string name="avatar_hair_color">Colore capelli</string>
-  <string name="avatar_hair_bangs">Frangia</string>
-  <string name="avatar_hair_ponytail">Coda</string>
-  <string name="avatar_glasses">Occhiali</string>
-  <string name="avatar_wheelchair">Sedia a rotelle</string>
-  <string name="weak">Deboli</string>
-  <string name="strong">Forti</string>
-  <string name="gray">Grigie</string>
-  <string name="dated">Con scadenza</string>
-  <string name="completed">Completate</string>
-  <string name="setuP_group_other">Altro</string>
-  <string name="clear">Deseleziona</string>
-  <string name="empty_title_habits">Non hai alcuna Habit.</string>
-  <string name="empty_description_habits">Le Habit sono attività che possono essere svolte in modo molto flessibile. Puoi usarle diverse volte al giorno, o non usarle affatto.</string>
-  <string name="empty_title_dailies">Non hai nessuna Daily</string>
-  <string name="empty_description_dailies">Le Daily sono delle attività che vanno svolte regolarmente. Scegli la frequenza con cui ti trovi meglio!</string>
-  <string name="empty_title_todos">Non hai alcuna To-do.</string>
-  <string name="empty_description_todos">Le To-do sono attività da completare solo una volta. Aggiungi una checklist alle tue To-do per aumentarne il valore.</string>
-  <string name="empty_title_rewards">Non hai nessuna Ricompensa</string>
-  <string name="reset_walkthrough">Ripristina la spiegazione introduttiva di Justin</string>
-  <string name="read_community_guidelines">Per favore, leggi le Linee guida della community prima di scrivere un post.</string>
-  <string name="maintenance">Manutenzione</string>
-  <string name="reload_content">Ricarica contenuti</string>
-  <string name="dailyDueDefaultView">Visualizza lista Daily incomplete di default</string>
-  <string name="dailyDueDefaultViewDescription">Con questa opzione selezionata, le Daily mostrate saranno quelle della lista \'incomplete\' invece che \'tutte\'.</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Sincronizza</string>
+  <string name="XP_default">Esperienza</string>
+  <string name="HP_default">Salute</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Le preferenze non possono essere importate dal codice a barre</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Impostazioni</string>
+  <string name="SP_address_hint">Il tuo server personalizzato</string>
+  <string name="SP_userID_title">ID utente</string>
+  <string name="SP_userID_summary">Il tuo ID utente</string>
+  <string name="SP_APIToken_title">API Token</string>
+  <string name="SP_APIToken_summary">Il tuo API Token</string>
+  <string name="Language_title">Lingua</string>
+  <string name="Language_summary">Cambia la lingua di Habitica</string>
+  <string name="SP_user_qr_code">Il tuo codice QR</string>
+  <string name="PS_contact_title">Contattami</string>
+  <string name="unknown_error">Si è verificato un errore...</string>
+  <string name="pref_account_header">Account</string>
+  <string name="pref_first_day_of_the_week_title">Primo giorno della settimana</string>
+  <string name="pref_first_day_of_the_week_summary">Primo giorno della settimana in tutti i calendari</string>
+  <string name="pref_reminder_header">Notifica giornaliera</string>
+  <string name="pref_reminder_checkbox">Attiva notifica</string>
+  <string name="pref_reminder_picker">Imposta ora notifica</string>
+  <string name="pref_cds_header">Inizio giorno personalizzato</string>
+  <string name="pref_cds_picker">Imposta ora di inizio giorno</string>
+  <string name="pref_push_notifications_checkbox">Notifiche push utente</string>
+  <string name="push_notifications">Notifiche Push</string>
+  <string name="push_notifications_sum">Gestisci le impostazioni delle notifiche push</string>
+  <string name="preference_push_you_won_challenge">Hai vinto una Sfida!</string>
+  <string name="preference_push_received_a_private_message">Nuovo messaggio privato ricevuto</string>
+  <string name="preference_push_gifted_gems">Gemme regalate</string>
+  <string name="preference_push_gifted_subscription">Abbonamento Regalato</string>
+  <string name="preference_push_invited_to_party">Invito in una Squadra</string>
+  <string name="preference_push_invited_to_guild">Invito Gilda</string>
+  <string name="preference_push_your_quest_has_begun">La tua Missione è cominciata</string>
+  <string name="preference_push_invited_to_quest">Invito ad una Missione</string>
+  <!--Adding tasks-->
+  <string name="task_value">Valore</string>
+  <string name="new_todo">Nuova To-Do</string>
+  <string name="new_reward">Nuova ricompensa</string>
+  <string name="new_daily">Nuova Daily</string>
+  <string name="new_habit">Nuova Habit</string>
+  <string name="action_edit">Modifica</string>
+  <string name="action_delete">Elimina</string>
+  <string name="action_cancel">Annulla</string>
+  <string name="login_btn">Accedi</string>
+  <string name="register_btn">Registrati</string>
+  <string name="username">Nome utente</string>
+  <string name="email_username">E-mail o nome utente</string>
+  <string name="password">Password</string>
+  <string name="emailAddress">Indirizzo e-mail</string>
+  <string name="confirmpassword">Conferma password</string>
+  <string name="logout">Esci</string>
+  <string name="logout_description">Esci dal tuo account</string>
+  <string name="account_details_sum">Controlla i dettagli del tuo account</string>
+  <string name="account_details">Dettagli account</string>
+  <string name="LoginActivityName">Benvenuto</string>
+  <string name="string_revive">Rianima</string>
+  <string name="please_connect">Dovresti connetterti attraverso l\'applicazione prima di usare un widget</string>
+  <string name="about.title">Info</string>
+  <string name="about.libraries">Librerie</string>
+  <string name="about.versionhistory">Cronologia versioni</string>
+  <string name="about.habitica_open_source">Habitica è disponibile come software open source su Github</string>
+  <string name="about.rate_our_app">Valuta la nostra app</string>
+  <string name="about.give_us_feedback">Invia suggerimenti!</string>
+  <string name="about.bugreport">Segnala un bug</string>
+  <string name="about.source_code">Codice sorgente</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Errore di connessione</string>
+  <string name="network_error_no_network_body">Non sei connesso ad internet.</string>
+  <string name="internal_error_api">Sembra esserci un problema col server. Riprova più tardi.</string>
+  <string name="authentication_error_title">Errore di autenticazione</string>
+  <string name="authentication_error_body">Il tuo nome utente e/o password non è corretto.</string>
+  <string name="login_validation_error_title">Errore di validazione</string>
+  <string name="login_validation_error_fieldsmissing">Devi compilare tutti i campi.</string>
+  <string name="save_changes">Salva</string>
+  <string name="copy">Copia</string>
+  <string name="notes">Note</string>
+  <string name="text">Testo</string>
+  <string name="difficulty">Difficoltà</string>
+  <string name="tags">Etichette</string>
+  <string name="trivial">Triviale</string>
+  <string name="easy">Facile</string>
+  <string name="medium">Media</string>
+  <string name="hard">Difficile</string>
+  <string name="start_date">Data di partenza</string>
+  <string name="positive_habit_form">Positiva ( + )</string>
+  <string name="negative_habit_form">Negativa ( - )</string>
+  <string name="checklist">Checklist</string>
+  <string name="reminders">Promemoria</string>
+  <string name="actions">Azioni</string>
+  <string name="attributes">Attributi</string>
+  <string name="physical">Fisica</string>
+  <string name="mental">Mentale</string>
+  <string name="social">Sociale</string>
+  <string name="other">Altro</string>
+  <string name="frequency">Frequenza</string>
+  <string name="frequency_weekly">Certi giorni della settimana</string>
+  <string name="frequency_daily">Ogni X giorni</string>
+  <string name="monday">Lunedì</string>
+  <string name="tuesday">Martedì</string>
+  <string name="wednesday">Mercoledì</string>
+  <string name="thursday">Giovedì</string>
+  <string name="friday">Venerdì</string>
+  <string name="saturday">Sabato</string>
+  <string name="sunday">Domenica</string>
+  <string name="levelup_header">Nuovo livello!</string>
+  <string name="levelup_detail">Raggiungendo obiettivi nella vita reale, sei salito al Livello %1$d!</string>
+  <string name="levelup_health">Sei stato completamente curato!</string>
+  <string name="levelup_button">Urrà!</string>
+  <string name="faint_subtitle">Non disperarti!</string>
+  <string name="faint_penalty_body">Hai perso un livello, il tuo oro e un pezzo di equipaggiamento, ma puoi riottenere ogni cosa lavorando sodo! Buona fortuna - vedrai che ci riuscirai.</string>
+  <string name="faint_header">Hai finito i punti salute!</string>
+  <string name="faint_button">Ripristina Salute &amp; Riprova</string>
+  <string name="filter">Filtro</string>
+  <string name="profile_image">Immagine profilo</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Hai usato %1$s per %2$d mana.</string>
+  <string name="used_skill_without_mana">Hai usato %1$s.</string>
+  <string name="new_checklist_item">Nuovo elemento checklist</string>
+  <string name="add_checklist_item">Aggiungi</string>
+  <string name="reminder_title">Ricorda di completare le tue Daily!</string>
+  <string name="skill_progress_title">Usando abilità</string>
+  <string name="coming_soon">Presto disponibile</string>
+  <string name="chat_flag_confirmation">Vuoi davvero segnalare questo messaggio per violazione?</string>
+  <string name="flag_confirm">Segnala messaggio</string>
+  <string name="unlock_lvl_11">Sblocca al liv. 11</string>
+  <string name="no_party_message">Non sei in una squadra. Per unirti ad una squadra, per favore visita il sito web di Habitica.</string>
+  <string name="forgot_pw_btn">Password dimenticata</string>
+  <string name="forgot_pw_tv">Hai dimenticato la password? Per favore usa il sito web di Habitica.</string>
+  <string name="tavern.inn.checkOut">Riattiva le tue Daily</string>
+  <string name="tavern.inn.rest">Sospendi le tue Daily</string>
+  <string name="reward.dialog.buy">Compra</string>
+  <string name="reward.dialog.dismiss">Annulla</string>
+  <string name="party">Squadra</string>
+  <string name="chat">Chat</string>
+  <string name="members">Membri</string>
+  <string name="habits">Habit</string>
+  <string name="dailies">Daily</string>
+  <string name="todos">To-do</string>
+  <string name="rewards">Ricompense</string>
+  <string name="taskform.delete.title">Sei sicuro?</string>
+  <string name="taskform.delete.message">Vuoi davvero eliminare?</string>
+  <string name="yes">Sì</string>
+  <string name="no">No</string>
+  <string name="quest">Missione</string>
+  <string name="avatar_body">Corpo</string>
+  <string name="avatar_hair">Capelli</string>
+  <string name="avatar_shirt">Maglia</string>
+  <string name="avatar_skin">Pelle</string>
+  <string name="avatar_ears">Orecchie animali</string>
+  <string name="avatar_base">Base</string>
+  <string name="avatar_color">Colore</string>
+  <string name="avatar_beard">Barba</string>
+  <string name="avatar_mustache">Baffi</string>
+  <string name="avatar_flower">Fiore</string>
+  <string name="avatar_bangs">Frangia</string>
+  <string name="avatar_nothing">Niente impostato</string>
+  <string name="avatar_size">Corporatura</string>
+  <string name="avatar_size_slim">Snello</string>
+  <string name="avatar_size_broad">Robusto</string>
+  <string name="avatar_background">Sfondo</string>
+  <string name="purchase_customization">Compra personalizzazione</string>
+  <string name="purchase_set_button">Sblocca set per %d gemme</string>
+  <string name="purchase_button">Compra</string>
+  <string name="purchase_set_title">Compra set  %s</string>
+  <string name="due_date">Data di scadenza</string>
+  <string name="quest.accept">Accetta</string>
+  <string name="quest.reject">Rifiuta</string>
+  <string name="quest.begin">Inizia missione</string>
+  <string name="quest.cancel">Annulla invito</string>
+  <string name="quest.abort">Annulla missione</string>
+  <string name="quest.leave">Abbandona Missione</string>
+  <string name="quest.pending">In attesa</string>
+  <string name="quest.accepted">Accettata</string>
+  <string name="quest.rejected">Rifiutata</string>
+  <string name="quest.participants">Partecipanti</string>
+  <string name="version_info">Versione %1$s (%2$d)</string>
+  <string name="sidebar_help">Aiuto &amp; FAQ</string>
+  <string name="complete_tutorial">Capito!</string>
+  <string name="dismiss_tutorial">Ricordamelo ancora</string>
+  <string name="intro_1_subtitle">Benvenuto in</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">È il momento di divertirsi raggiungendo i propri obiettivi. Unisciti ad oltre %s altre persone che migliorano la propria vita un\'attività alla volta.</string>
+  <string name="intro_2_subtitle">Progressi nel gioco</string>
+  <string name="intro_2_title">Progressi nella vita</string>
+  <string name="intro_2_description">Sblocca nuovi elementi nel gioco portando a termine gli impegni della vita reale. Ottieni armature, animali e altro come ricompensa per aver raggiunto i tuoi obiettivi.</string>
+  <string name="intro_3_subtitle">Combatti mostri</string>
+  <string name="intro_3_title">Sii Social</string>
+  <string name="intro_3_description">Tieni traccia dei tuoi obiettivi con l\'aiuto dei tuoi amici. Supportatevi a vicenda nella vita e nelle battaglie per migliorare insieme!</string>
+  <string name="intro_finish_button">Iniziamo!</string>
+  <string name="previous_button">Indietro</string>
+  <string name="next_button">Avanti</string>
+  <string name="skip_button">Salta</string>
+  <string name="setup_welcome_description">Benvenuto in Habitica, dove progredire nel gioco migliorerà la tua vita! Man mano che raggiungerai obiettivi nella vita reale, sbloccherai equipaggiamento, animali, missioni e altro.</string>
+  <string name="setup_welcome_title">Benvenuto</string>
+  <string name="avatar_setup_description">Quindi, che aspetto ti piacerebbe avere? Non preoccuparti, lo potrai cambiare in seguito.</string>
+  <string name="task_setup_description">Splendido! Ora dimmi, su cosa vorresti lavorare durante questo viaggio?</string>
+  <string name="setup_group_work">Lavoro</string>
+  <string name="setup_group_exercise">Esercizio fisico</string>
+  <string name="setup_group_health">Salute</string>
+  <string name="setup_group_school">Scuola</string>
+  <string name="setup_group_teams">Team</string>
+  <string name="setup_group_chores">Faccende di casa</string>
+  <string name="setup_group_creativity">Creatività</string>
+  <string name="setup_task_work_1">Controlla le e-mail</string>
+  <string name="setup_task_work_2">La cosa più importante da fare oggi</string>
+  <string name="setup_task_work_3">Progetto di lavoro</string>
+  <string name="setup_task_exercise_1">10 min di cardio</string>
+  <string name="setup_task_exercise_2">Stretching</string>
+  <string name="setup_task_exercise_3">Imposta una tabella per l\'allenamento</string>
+  <string name="setup_task_healthWellness_1">Mangia cibo salutare</string>
+  <string name="setup_task_healthWellness_2">Lavati i denti</string>
+  <string name="setup_task_healthWellness_3">Pianifica il controllo</string>
+  <string name="setup_task_school_1">Studia/Procrastina</string>
+  <string name="setup_task_school_2">Fai i compiti</string>
+  <string name="setup_task_school_3">Finisci il progetto scolastico</string>
+  <string name="setup_task_teams_1">Contatta il team</string>
+  <string name="setup_task_teams_2">Aggiorna il team sullo stato del progetto</string>
+  <string name="setup_task_teams_3">Completa progetto di gruppo</string>
+  <string name="setup_task_chores_1">Pulisci 10 minuti</string>
+  <string name="setup_task_chores_2">Lava i piatti</string>
+  <string name="setup_task_chores_3">Riordina l\'armadio</string>
+  <string name="setup_task_creativity_1">Studia un artista</string>
+  <string name="setup_task_creativity_2">Lavora su un progetto creativo</string>
+  <string name="setup_task_creativity_3">Completa un progetto creativo</string>
+  <string name="gem.purchase.support">Vuoi aiutare a tenere Habitica attivo? Puoi sostenere gli sviluppatori comprando delle gemme!\n\nLe gemme ti permettono di comprare dei simpatici extra per il tuo account, inclusi: \n\n - Originali costumi per il tuo avatar\n - Sfondi magnifici\n - Divertenti missioni che ti premiano con uova di animali\n - La possibilità di cambiare classe prima del livello 10\n\nGrazie infinite per aiutarci a rendere Habitica sempre migliore. Il tuo supporto significa molto per noi!</string>
+  <string name="my_guilds">Le mie Gilde</string>
+  <string name="public_guilds">Gilde pubbliche</string>
+  <string name="guild">Gilda</string>
+  <string name="leave">Abbandona</string>
+  <string name="join">Partecipa</string>
+  <string name="leader">Leader</string>
+  <string name="gems">Gemme</string>
+  <string name="copy_as_todo">Copia come To-Do</string>
+  <string name="send_pm">Invia messaggio privato</string>
+  <string name="flag">Segnala</string>
+  <string name="delete">Elimina</string>
+  <string name="name">Nome</string>
+  <string name="description">Descrizione</string>
+  <string name="add_tag">Aggiungi una nuova etichetta</string>
+  <string name="privacy">Privacy</string>
+  <string name="write_message">Scrivi messaggio</string>
+  <string name="post">Invia</string>
+  <string name="guild_search_hint">Cerca gilde</string>
+  <string name="todo_due">Scade: %s</string>
+  <string name="daily_streak">serie: %d</string>
+  <string name="todo_has_duedate">L\' attività ha una scadenza</string>
+  <string name="battle_gear">Assetto da battaglia</string>
+  <string name="costume">Costume</string>
+  <string name="outfit_head">Testa</string>
+  <string name="outfit_headAccessory">Accessorio da testa</string>
+  <string name="outfit_eyewear">Occhi</string>
+  <string name="outfit_armor">Armatura</string>
+  <string name="outfit_back">Schiena</string>
+  <string name="outfit_body">Corpo</string>
+  <string name="outfit_shield">Scudo</string>
+  <string name="outfit_weapon">Arma</string>
+  <string name="wear_costume">Indossa Costume</string>
+  <string name="equipped">Equipaggiato</string>
+  <string name="quest_cancel_message">Vuoi davvero annullare questa missione? Tutti gli inviti accettati andranno persi. Il proprietario della missione tornerà in possesso della Pergamena.</string>
+  <string name="quest.invitation">Invito Missione</string>
+  <string name="quest_begin_message">Vuoi davvero iniziare la missione? Una volta attiva, nessun altro membro della squadra potrà unirsi alla missione.</string>
+  <string name="quest.invitation.text">Sei stato invitato a partecipare ad una missione!</string>
+  <string name="ago_1day">1 giorno fa</string>
+  <string name="ago_days">%d giorni fa</string>
+  <string name="ago_1Minute">1 minuto fa</string>
+  <string name="ago_minutes">%d minuti fa</string>
+  <string name="ago_hours">%d ore fa</string>
+  <string name="ago_1hour">1 ora fa</string>
+  <string name="today">Oggi</string>
+  <string name="sidebar_items">Oggetti</string>
+  <string name="eggs">Uova</string>
+  <string name="hatching_potions">Pozioni di schiusura</string>
+  <string name="food">Cibo</string>
+  <string name="quests">Missioni</string>
+  <string name="pets">Animali</string>
+  <string name="mounts">Cavalcature</string>
+  <string name="armoireEquipment">Hai trovato dell\'equipaggiamento raro nello Scrigno Incantato: %s! Fantastico!</string>
+  <string name="armoireFood">Frughi nello Scrigno e trovi %1$s %2$s. Cosa ci fa qui dentro?</string>
+  <string name="armoireExp">Fai a botte con lo Scrigno e ottieni Esperienza. Prendi questo!</string>
+  <string name="armoireNotesFull">Apri lo Scrigno Incantato per ricevere casualmente Equipaggiamento speciale, Esperienza o cibo! Oggetti rimanenti: %d</string>
+  <string name="armoireLastItem">Hai trovato l\'ultimo oggetto raro disponibile nello Scrigno Incantato.</string>
+  <string name="armoireNotesEmpty">Nello Scrigno Incantato compariranno nuovi oggetti la prima settimana di ogni mese. Fino ad allora, continua a cliccare sullo Scrigno per ottenere Esperienza e Cibo!</string>
+  <string name="sell">Vendi (%d Oro)</string>
+  <string name="hatch_with_potion">Schiudi con pozione</string>
+  <string name="feed_to_pet">Dai ad animale</string>
+  <string name="hatch_egg">Schiudi con uovo</string>
+  <string name="invite_party">Invita squadra</string>
+  <string name="dialog_feeding">Dai da mangiare a %1$s %2$s:</string>
+  <string name="use_animal">Usa</string>
+  <string name="feed">Dai da mangiare</string>
+  <string name="hatch_with">Fai nascere un animale con %s</string>
+  <string name="hatched_pet_title">È nato un %2$s %1$s!</string>
+  <string name="close">Chiudi</string>
+  <string name="share">Condividi</string>
+  <string name="notification_pet_fed">Hai dato da mangiare al tuo %1$s %2$s!</string>
+  <string name="notification_purchase">Hai acquistato %s</string>
+  <string name="sectionpets">Animali base</string>
+  <string name="sectionpremiumPets">Animali Pozione Magica</string>
+  <string name="sectionquestPets">Animali Missione</string>
+  <string name="sectionspecialPets">Animali rari</string>
+  <string name="sectionmounts">Cavalcature base</string>
+  <string name="sectionpremiumMounts">Calvalcature Pozione Magica</string>
+  <string name="sectionquestMounts">Cavalcature Missione</string>
+  <string name="sectionspecialMounts">Cavalcature rare</string>
+  <string name="world_quest">World Quest</string>
+  <string name="inn_description">Riposare nella Locanda impedisce alle tue Daily di danneggiarti al cambio di giorno! (Nota:  questo non impedisce di ricevere danni dai Boss)</string>
+  <string name="empty_items">Non hai alcun %s</string>
+  <string name="user_level">LV %d</string>
+  <string name="user_level_with_class">LV %1$d - %2$s</string>
+  <string name="warrior">Guerriero</string>
+  <string name="rogue">Assassino</string>
+  <string name="mage">Mago</string>
+  <string name="healer">Guaritore</string>
+  <string name="warrior_description">I Guerrieri possono eseguire un gran numero di \"colpi critici\" molto potenti, che forniscono un bonus di Oro ed Esperienza (e a volte degli oggetti) casualmente al completamento di una attività. Inoltre, infliggono ingenti danni ai mostri boss. Diventa un Guerriero se trovi accattivanti le imprevedibili ricompense in stile jackpot, o se vuoi dimenticarti del dolore durante le missioni boss!</string>
+  <string name="mage_description">I Maghi imparano più velocemente, guadagnano Esperienza e Livelli più velocemente delle altre classi. Hanno anche a loro disposizione molto mana per l\'utilizzo di abilità speciali. Utilizza il Mago se ti piace giocare tatticamente su Habit, o se sei fortemente motivato dal livellare e sbloccare opzioni aggiuntive!</string>
+  <string name="rogue_description">Gli Assassini amano accumulare ricchezza: guadagnano più Oro di chiunque altro, e sono inclini al trovare oggetti casuali. La loro iconica abilità Furtività li rende in grado di prendersi gioco delle conseguenze delle Daily mancate. Diventa un Assassino se trovi una forte motivazione nelle Ricompense e nelle Medaglie, lottando per un bottino e dei riconoscimenti!</string>
+  <string name="healer_description">I Guaritori resistono fortemente ai danni, ed estendono la loro protezione agli altri.
+Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre modo di recuperare Vita dagli sbagli. Gioca come Guaritore se vuoi aiutare gli altri giocatori della tua squadra, o se l\'idea di fregare la morte con il duro lavoro ti ispira!</string>
+  <string name="select_class">Seleziona classe</string>
+  <string name="opt_out_class">Rinuncia</string>
+  <string name="opt_out_description">Non ti vuoi preoccupare dellle classi? Vuoi scegliere dopo? Puoi essere un guerriero senza abilità speciali. Puoi leggere a proposito del sistema di classi più tardi nella Wiki ed abilitare le classi quando vuoi.</string>
+  <string name="class_confirmation">Vuoi davvero essere un %s?</string>
+  <string name="class_changed">Ora sei un %s!</string>
+  <string name="class_changed_description">Hai del nuovo equipaggiamento da battaglia che puoi indossare, vai nella sezione Equipaggiamento!</string>
+  <string name="choose_class">Scegli classe</string>
+  <string name="dialog_go_back">Ritorna</string>
+  <string name="opt_out_confirmation">Vuoi davvero rinunciare?</string>
+  <string name="change_class">Cambia la tua classe</string>
+  <string name="change_class_description">Cambia classe e riottieni i tuoi punti attributo per 3 gemme. Puoi assegnare i punti attributo attraverso il sito web.</string>
+  <string name="enable_class">Abilita sistema delle classi</string>
+  <string name="changing_class_progress">Cambiamento classe</string>
+  <string name="by_email">Per e-mail</string>
+  <string name="invite_existing_users">Invita utenti esistenti</string>
+  <string name="send">Invia</string>
+  <string name="invite">Invita amici</string>
+  <string name="invite_id_description">Se hai degli amici che già usano Habitica, invitali inserendo qui il loro ID Utente.</string>
+  <string name="invite_email_description">Se un amico/a si unisce ad Habitica attraverso la tua e-mail, verrà automaticamente invitato/a nella tua squadra!</string>
+  <string name="add_invites">Aggiungi inviti</string>
+  <string name="user_id">ID Utente</string>
+  <string name="email">E-mail</string>
+  <string name="invite_users">Invita nella squadra</string>
+  <string name="share_using">Condividi con</string>
+  <string name="share_levelup">Ho raggiunto il livello %d su Habitica migliorando le mie abitudini nella vita reale!</string>
+  <string name="share_hatched">Oh apena schiuso un %1$s %2$s beniamino in Habitica completando I miei compiti nella vita reale!</string>
+  <string name="share_raised">Oh apena guadagnato una %1$s %2$s montatura in Habitica completando I miei compiti nella vita reale!</string>
+  <string name="open_in_store">Apri nel Play Store</string>
+  <string name="change_class_confirmation">Vuoi davvero cambiare la tua classe? Costerà 3 gemme.</string>
+  <string name="change_class_equipment_warning">Attenzione: non potrai più comprare equipaggiamento per la classe %s.</string>
+  <string name="leaderMessage">Messaggio da %1$s</string>
+  <string name="leaderName">Leader: %1$s</string>
+  <string name="confirm">Conferma</string>
+  <string name="market">Mercato</string>
+  <string name="timeTravelers">Viaggiatori del Tempo</string>
+  <string name="seasonalShop">Negozio Stagionale</string>
+  <string name="empty_inbox">Non hai nessun messaggio. Puoi inviare un messaggio privato ad un utente dai loro messaggi nelle chat pubbliche!</string>
+  <string name="party_invite">Sblocca invitando amici</string>
+  <string name="no_gold">Non hai abbastanza Oro</string>
+  <string name="no_potion">Non hai bisogno di comprare una pozione di salute</string>
+  <string name="successful_purchase">%1$s comprato con successo</string>
+  <string name="purchase_confirmation_title">Conferma acquisto</string>
+  <string name="confirm_purchase_text">Compra %1$s per %2$s %3$s</string>
+  <string name="gem">gemma</string>
+  <string name="hourglass">clessidra</string>
+  <string name="hourglasses">clessidre</string>
+  <string name="gold_singular">oro</string>
+  <string name="gold_plural">oro</string>
+  <string name="chat_message_copied">Messaggio copiato negli Appunti</string>
+  <string name="copy_chat_message">Copia negli appunti</string>
+  <string name="edit_tag_title">Modifica etichetta</string>
+  <string name="edit_tag_btn_edit">Modifica</string>
+  <string name="edit_tag_btn_done">Fatto</string>
+  <string name="edit_tag_btn_delete">Elimina</string>
+  <string name="confirm_delete_tag_title">Sei sicuro?</string>
+  <string name="confirm_delete_tag_message">Vuoi davvero eliminare?</string>
+  <string name="filter_drawer_edit_tags">Modifica etichette</string>
+  <string name="filter_drawer_filter_tags">Filtra per etichette</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Fatti invitare da qualcuno con questo codice QR</string>
+  <string name="qr_save_message">Codice QR salvato a</string>
+  <string name="qr_dialogue_title">Il tuo codice QR</string>
+  <string name="download">Scarica</string>
+  <string name="send_new_message">Invia nuovo messaggio</string>
+  <string name="choose_recipient_title">Scegli destinatario messaggio</string>
+  <string name="action_continue">Continua</string>
+  <string name="scan_qr_code">Rileva codice QR</string>
+  <string name="enter_recipient_uuid">Inserisci ID Utente destinatario</string>
+  <string name="invited_to_party">Hai ricevuto un invito per unirti a una squadra!</string>
+  <string name="stats_widget_label">Statistiche Habitica</string>
+  <string name="add_task">Aggiungi Attività</string>
+  <string name="add_habit">Aggiungi Abitudine</string>
+  <string name="add_daily">Aggiungi Daily</string>
+  <string name="add_todo">Aggiungi To-Do</string>
+  <string name="add_reward">Aggiungi Ricompensa</string>
+  <string name="all_dailies_completed">Hai completato tutte le tue Daily. Ottimo lavoro!</string>
+  <string name="widget_habit_button">Habitica esegui abitudine</string>
+  <string name="widget_dailies">Habitica Daily</string>
+  <string name="widget_todo_list">Lista To-Do Habitica</string>
+  <string name="widget_add_task">Habitica aggiungi attività</string>
+  <string name="google_services_missing">Impossibile trovare Google Play Services.</string>
+  <string name="gem.purchase.toolbartitle">Compra</string>
+  <string name="gem.purchase.title">Comprando gemme supporti gli sviluppatori e tieni in vita Habitica</string>
+  <string name="gem.purchase.subtitle">Le Gemme ti permettono di ottenere simpatici extra per il tuo account, tra cui:</string>
+  <string name="gem.purchase.listitem1">Costumi per il tuo avatar</string>
+  <string name="gem.purchase.listitem2">Magnifici sfondi</string>
+  <string name="gem.purchase.listitem3">Missioni che ti premiano con uova di animali</string>
+  <string name="gem.purchase.listitem4">La possibilità di cambiare classe prima del livello 100</string>
+  <string name="support_habitica">Supporta Habitica</string>
+  <string name="skill_transformation_use">usa</string>
+  <string name="hatching_market_info">Non trovi i drop giusti? Dai un\'occhiata al Mercato!</string>
+  <string name="feeding_market_info">Hai bisogno di cibo diverso? Comprane un po\' nel Mercato!</string>
+  <string name="open_market">Vai nel Mercato</string>
+  <string name="cds_description">Le tue Daily saranno resettate la prima volta che userai Habitica dopo %1$s. Assicurati di aver completato le tue Daily prima di allora!</string>
+  <string name="AudioTheme_title">Tema sonoro</string>
+  <string name="AudioTheme_summary">Cambia il tema sonoro di Habitica</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Ci vediamo domani!</string>
+  <string name="belongs_to_challenge">Appartiene alla Sfida</string>
+  <string name="has_reminder">Ha promemoria</string>
+  <string name="has_tag">Ha etichetta</string>
+  <string name="subscribe.title">Gli abbonamenti aiutano a supportare gli sviluppatori e a tenere Habitica in vita </string>
+  <string name="subscribe_prompt">Abbonati per ottenere questi utili benefici:</string>
+  <string name="subscribe.listitem1">Compra gemme con l\'oro</string>
+  <string name="subscribe.listitem2">Oggetti mensili esclusivi</string>
+  <string name="subscribe.listitem3">Più elementi nella cronologia attività</string>
+  <string name="subscribe.listitem4">Limite di drop giornaliero raddoppiato</string>
+  <string name="subscriptions">Abbonamenti</string>
+  <string name="subscription_duration">Ricorrente ogni %s</string>
+  <string name="subscribe">Abbonati</string>
+  <string name="subscribe.listitem1.description">Ora Alexander il Mercante ti venderà Gemme al prezzo di 20 Oro l\'una!\n\nLe sue consegne mensili sono inizialmente limitate a 25 Gemme al mese, ma possono aumentare a seconda della durata del tuo abbonamento.\n\nIl limite aumenta di 5 Gemme ogni tre mesi di abbonamento consecutivi, fino ad un massimo di 50 Gemme al mese!</string>
+  <string name="subscribe.listitem2.description">Ogni mese riceverai un oggetto davvero unico per il tuo avatar!\n\nIn più, ogni tre mesi di abbonamento consecutivi, i misteriosi Viaggiatori del Tempo ti permetteranno di ottenere oggetti antichi (e futuri!).</string>
+  <string name="subscribe.listitem3.description">Rende le To-Do completate e la cronologia dei progressi delle attività disponibili più a lungo.</string>
+  <string name="subscribe.listitem4.description">Raddoppiare il numero massimo di drop giornalieri ti farà ricevere più oggetti dalle attività completate ogni giorno, aiutandoti a completare la tua scuderia più velocemente!</string>
+  <string name="subscribe1month.gemcap">Il limite gemme iniziale è 25</string>
+  <string name="subscribe3month.gemcap">Limite gemme alzato a 30</string>
+  <string name="subscribe6month.gemcap">Limite gemme alzato a 35</string>
+  <string name="subscribe12month.gemcap">Limite gemme alzato a 45</string>
+  <string name="subscription_hourglasses">+%d Clessidra Mistica</string>
+  <string name="payment_method">Metodo di pagamento</string>
+  <string name="subscription">Abbonamento</string>
+  <string name="active">Attivo</string>
+  <string name="cancel_subscription">Annulla abbonamento</string>
+  <string name="cancel_subscription_google.description">Vuoi interrompere il tuo abbonamento? Puoi trovare l\'opzione per annullare l\'abbonamento nella sezione \"Le mie app\" nel Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle.description">Vuoi interrompere il tuo abbonamento? A causa del tuo metodo di pagamento, puoi completare questa operazione solo attraverso il sito web. Clicca sul bottone qui sotto per aprire il sito nel tuo browser!</string>
+  <string name="visit_habitica_website">Visita il sito web di Habitica</string>
+  <string name="current_bonuses">Bonus attivi</string>
+  <string name="months_subscribed">Mesi come abbonato</string>
+  <string name="current_hourclasses">Clessidre Mistiche attuali</string>
+  <string name="monthly_gem_cap">Limite gemme mensile</string>
+  <string name="inactive">Inattivo</string>
+  <string name="one_month">1 mese</string>
+  <string name="months">%d mesi</string>
+  <string name="month">mese</string>
+  <string name="three_months">3 mesi</string>
+  <string name="six_months">6 mesi</string>
+  <string name="twelve_months">12 mesi</string>
+  <string name="subscribe_prompt_thanks">Come abbonato hai questi utili benefici:</string>
+  <string name="subscription_status">Stato abbonamento</string>
+  <string name="byLeader">di %s</string>
+  <string name="challenge_details">Dettagli sfida</string>
+  <string name="challenge_leave_title">Abbandona sfida</string>
+  <string name="challenge_leave_text">Vuoi davvero abbandonare la sfida \"%s\"?</string>
+  <string name="challenge_remove_tasks_title">Rimuovi attività</string>
+  <string name="challenge_remove_tasks_text">Vuoi rimuovere le attività?</string>
+  <string name="remove_tasks">Rimuovi</string>
+  <string name="keep_tasks">Tieni</string>
+  <string name="my_challenges">Le mie sfide</string>
+  <string name="public_challenges">Pubbliche</string>
+  <string name="challenges">Sfide</string>
+  <string name="daily">Daily</string>
+  <string name="habit">Abitudine</string>
+  <string name="reward">Ricompensa</string>
+  <string name="todo">To-Do</string>
+  <string name="official">Ufficiale</string>
+  <string name="participating">Sto partecipando</string>
+  <string name="challenge">Sfida</string>
+  <string name="go_to_challenge">Vai alla Sfida</string>
+  <string name="not_part_of_a_challenge">Al momento non stai partecipando a nessuna sfida!</string>
+  <string name="join_a_challenge">Partecipa ad una sfida per aggiungere delle attività specifiche alla tua lista, poi competi contro altri utenti di Habitica per vincere Medaglie o addirittura delle Gemme!</string>
+  <string name="check_the_public_challenge_tab">Vai nella sezione “Pubbliche” per trovare le sfide create dagli utenti più adatte a te!</string>
+  <string name="add_reminder">Aggiungi promemoria</string>
+  <string name="warning">Attenzione</string>
+  <string name="open_settings">Apri impostazioni</string>
+  <string name="dont_keep_activities_warning">Pare che tu abbia l\'opzione sviluppatore \\"Non conservare attività\\" abilitata. Al momento questa opzione causa dei problemi all\'app di Habitica, quindi consigliamo di disabilitarla.</string>
+  <string name="inbox">Messaggi</string>
+  <string name="FAQ">Domande frequenti</string>
+  <string name="special">Speciale</string>
+  <string name="gem_for_gold_description">Grazie al tuo abbonamento ad Habitica, ogni mese puoi comprare delle Gemme usando il tuo Oro.</string>
+  <string name="limited_count">%d rimaste</string>
+  <string name="gem_shop">Gemma</string>
+  <string name="mystery_item">Oggetto Misterioso</string>
+  <string name="myster_item_notes">Ogni mese, gli abbonati ricevono un oggetto misterioso. Questo oggetto in genere viene rilasciato circa una settimana prima della fine del mese.</string>
+  <string name="open">Apri</string>
+  <string name="notification_mystery_item">Apri il pacco e trovi %s!</string>
+  <string name="checkInRewardEarned">Hai meritato %1$s come premio per la tua costanza nel migliorare la tua vita.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Il prossimo premio verrà sbloccato a %1$d accessi</string>
+  <string name="pending_approval">in attesa di approvazione</string>
+  <string name="filters">Filtri</string>
+  <string name="done">Fatto</string>
+  <string name="group_tasks_edit_description">Le attività di gruppo non possono essere modificate.</string>
+  <string name="group_tasks_edit_title">Non puoi modificare questa attività</string>
+  <string name="groups">Gruppi</string>
+  <string name="all">Tutti</string>
+  <string name="none">Nessuno</string>
+  <string name="owned">Posseduto</string>
+  <string name="not_owned">Non posseduto</string>
+  <string name="new_game">Nuovo\nGioco</string>
+  <string name="login_btn_fb">Accedi con Facebook</string>
+  <string name="login_btn_google">Accedi con Google</string>
+  <string name="action_back">Indietro</string>
+  <string name="welcome_text">Oh, devi essere nuovo da queste parti. Mi chiamo Justin, e sarò la tua guida qui ad Habitica.\n\nPer cominciare, devi per prima cosa creare un avatar.</string>
+  <string name="randomize">Rendi casuale</string>
+  <string name="avatar_extras">Extra</string>
+  <string name="avatar_skin_color">Colore pelle</string>
+  <string name="avatar_hair_color">Colore capelli</string>
+  <string name="avatar_hair_bangs">Frangia</string>
+  <string name="avatar_hair_ponytail">Coda</string>
+  <string name="avatar_glasses">Occhiali</string>
+  <string name="avatar_wheelchair">Sedia a rotelle</string>
+  <string name="weak">Deboli</string>
+  <string name="strong">Forti</string>
+  <string name="gray">Grigie</string>
+  <string name="dated">Con scadenza</string>
+  <string name="completed">Completate</string>
+  <string name="setuP_group_other">Altro</string>
+  <string name="clear">Deseleziona</string>
+  <string name="empty_title_habits">Non hai alcuna Habit.</string>
+  <string name="empty_description_habits">Le Habit sono attività che possono essere svolte in modo molto flessibile. Puoi usarle diverse volte al giorno, o non usarle affatto.</string>
+  <string name="empty_title_dailies">Non hai nessuna Daily</string>
+  <string name="empty_description_dailies">Le Daily sono delle attività che vanno svolte regolarmente. Scegli la frequenza con cui ti trovi meglio!</string>
+  <string name="empty_title_todos">Non hai alcuna To-do.</string>
+  <string name="empty_description_todos">Le To-do sono attività da completare solo una volta. Aggiungi una checklist alle tue To-do per aumentarne il valore.</string>
+  <string name="empty_title_rewards">Non hai nessuna Ricompensa</string>
+  <string name="reset_walkthrough">Ripristina la spiegazione introduttiva di Justin</string>
+  <string name="read_community_guidelines">Per favore, leggi le Linee guida della community prima di scrivere un post.</string>
+  <string name="maintenance">Manutenzione</string>
+  <string name="reload_content">Ricarica contenuti</string>
+  <string name="dailyDueDefaultView">Visualizza lista Daily incomplete di default</string>
+  <string name="dailyDueDefaultViewDescription">Con questa opzione selezionata, le Daily mostrate saranno quelle della lista \'incomplete\' invece che \'tutte\'.</string>
+</resources>
diff --git a/Habitica/res/values-iw/strings.tutorial.xml b/Habitica/res/values-iw/strings.tutorial.xml
index 2b2403403..dd682a0a3 100644
--- a/Habitica/res/values-iw/strings.tutorial.xml
+++ b/Habitica/res/values-iw/strings.tutorial.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_equipment">כאשר אתם קונים ציוד הוא מופיע כאן. ציוד הקרב שלכם משפיע על תכונות, והתחפושת שלכם (אם מאופשרת) משפיעה על הלבוש של הדמות שלכם.</string>
-  <string name="tutorial_items">הרוויחו חפצים על-ידי השלמת משימות ועלייה בדרגות. לחצו על חפץ כדי להשתמש בו!</string>
-  <string name="tutorial_pets">בזמן שאתם משלימים משימות בעולם האמיתי, יש לכם סיכוי למצוא ביצים ושיקויים. שלבו אותם כדי להבקיע חיות מחמד</string>
-  <string name="tutorial_skills">מיומנויות הן יכולות מיוחדות בעלות השפעה עוצמתית! לחצו על מיומנות כדי להשתמש בה. היא תעלה לכם מאנה (המד הכחול), שתרוויחו על ידי סימון משימות מידי יום ועל ידי השלמת משימות בחיים האמיתיים. בידקו את השאלות הנפוצות בתפריט למידע נוסף!</string>
-  <string name="tutorial_party">זה המקום בו אתם וחבריכם יכולים לישמור על עצמכם מחוייבים למטרות ולהלחם במפלצות עם המשימות שלכם!</string>
-  <string name="tutorial_tavern">ברוכים הבאים לפונדק, צ׳אט פומבי לכל הגילאים! כאן תוכלו לדבר על פרודוקטיביות ולשאול שאלות. תהנו!</string>
-  <string name="tutorial_classes">ביחרו להיות לוחמים, מכשפים, מרפאים או נוכלים! לכל מקצוע ציוד ומיומנויות משלו. לחצו על ה (?) כדי ללמוד עוד!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_equipment">כאשר אתם קונים ציוד הוא מופיע כאן. ציוד הקרב שלכם משפיע על תכונות, והתחפושת שלכם (אם מאופשרת) משפיעה על הלבוש של הדמות שלכם.</string>
+  <string name="tutorial_items">הרוויחו חפצים על-ידי השלמת משימות ועלייה בדרגות. לחצו על חפץ כדי להשתמש בו!</string>
+  <string name="tutorial_pets">בזמן שאתם משלימים משימות בעולם האמיתי, יש לכם סיכוי למצוא ביצים ושיקויים. שלבו אותם כדי להבקיע חיות מחמד</string>
+  <string name="tutorial_skills">מיומנויות הן יכולות מיוחדות בעלות השפעה עוצמתית! לחצו על מיומנות כדי להשתמש בה. היא תעלה לכם מאנה (המד הכחול), שתרוויחו על ידי סימון משימות מידי יום ועל ידי השלמת משימות בחיים האמיתיים. בידקו את השאלות הנפוצות בתפריט למידע נוסף!</string>
+  <string name="tutorial_party">זה המקום בו אתם וחבריכם יכולים לישמור על עצמכם מחוייבים למטרות ולהלחם במפלצות עם המשימות שלכם!</string>
+  <string name="tutorial_tavern">ברוכים הבאים לפונדק, צ׳אט פומבי לכל הגילאים! כאן תוכלו לדבר על פרודוקטיביות ולשאול שאלות. תהנו!</string>
+  <string name="tutorial_classes">ביחרו להיות לוחמים, מכשפים, מרפאים או נוכלים! לכל מקצוע ציוד ומיומנויות משלו. לחצו על ה (?) כדי ללמוד עוד!</string>
+</resources>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index 7fa971dc1..1b1356e87 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -1,360 +1,360 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">ריענון</string>
-  <string name="XP_default">ניסיון</string>
-  <string name="HP_default">בריאות</string>
-  <string name="MP_default">מאנה</string>
-  <string name="ERR_pb_barcode">העדפות לא הצליחו להטען מהבר-קוד</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">הגדרות</string>
-  <string name="SP_address_hint">שרת מותאם אישית אליכם</string>
-  <string name="SP_userID_title">מזהה משתמש</string>
-  <string name="SP_userID_summary">מזהה המשתמש שלכם</string>
-  <string name="SP_APIToken_title">מפתח API</string>
-  <string name="SP_APIToken_summary">מפתח ה API שלכם</string>
-  <string name="Language_title">שפה</string>
-  <string name="SP_user_qr_code">קוד ה QR שלכם</string>
-  <string name="PS_contact_title">צרו איתי קשר</string>
-  <string name="pref_account_header">חשבון</string>
-  <string name="pref_first_day_of_the_week_title">היום הראשון בשבוע</string>
-  <string name="pref_reminder_header">תזכורת יומית</string>
-  <string name="pref_reminder_checkbox">הפעל תזכורת</string>
-  <string name="pref_reminder_picker">קבע מועד תזכורת</string>
-  <string name="pref_push_notifications_checkbox">הודעות בדחיפה של משתמש</string>
-  <string name="push_notifications">התראות בדחיפה</string>
-  <string name="preference_push_you_won_challenge">זכיתם באתגר!</string>
-  <string name="preference_push_received_a_private_message">קיבלתם הודעה פרטית</string>
-  <string name="preference_push_gifted_gems">אבני חן ניתנו במתנה</string>
-  <string name="preference_push_gifted_subscription">מנוי ניתן במתנה</string>
-  <string name="preference_push_invited_to_party">הוזמנו לחבורה</string>
-  <string name="preference_push_your_quest_has_begun">ההרפתקה שלכם החלה</string>
-  <string name="preference_push_invited_to_quest">הוזמנו להרפתקה</string>
-  <!--Adding tasks-->
-  <string name="task_value">ערך</string>
-  <string name="action_edit">עריכה</string>
-  <string name="action_delete">מחיקה</string>
-  <string name="action_cancel">ביטול</string>
-  <string name="login_btn">התחברות</string>
-  <string name="register_btn">הרשמו</string>
-  <string name="username">שם משתמש</string>
-  <string name="email_username">כתובת מייל או שם משתמש</string>
-  <string name="password">סיסמה</string>
-  <string name="emailAddress">כתובת דואר אלקטרוני</string>
-  <string name="confirmpassword">אמתו סיסמה</string>
-  <string name="logout">התנתקות</string>
-  <string name="logout_description">התנתקו מהחשבון שלכם</string>
-  <string name="account_details_sum">בדוק את פרטי החשבון שלך</string>
-  <string name="account_details">פרטי חשבון</string>
-  <string name="LoginActivityName">ברוכים הבאים</string>
-  <string name="string_revive">קומו לתחייה</string>
-  <string name="please_connect">אנא התחברו דרך האפליקציה לפני שאתם משתמשים בוויג׳ט</string>
-  <string name="about.title">אודות</string>
-  <string name="about.libraries">ספריות</string>
-  <string name="about.versionhistory">היסטוריית גרסאות</string>
-  <string name="about.habitica_open_source">האביטיקה זמינה כתוכנה במקור פתוח בגיטהאב</string>
-  <string name="about.rate_our_app">דרגו את האפליקציה שלנו</string>
-  <string name="about.give_us_feedback">שלחו לנו משוב!</string>
-  <string name="about.bugreport">דווחו על תקלה</string>
-  <string name="about.source_code">קוד מקור</string>
-  <!--Network Errors-->
-  <string name="network_error_title">תקלת התחברות</string>
-  <string name="network_error_no_network_body">אינכם מחוברים לאינטרנט</string>
-  <string name="internal_error_api">נראה שיש בעיה עם השרת. אנא נסו מאוחר יותר.</string>
-  <string name="authentication_error_title">תקלת אימות</string>
-  <string name="authentication_error_body">שם המשתמש שלכם או הסיסמה שגויים.</string>
-  <string name="login_validation_error_title">שגיאת אימות</string>
-  <string name="login_validation_error_fieldsmissing">עליכם למלא את כל השדות.</string>
-  <string name="save_changes">שמור</string>
-  <string name="copy">העתק</string>
-  <string name="notes">הערות</string>
-  <string name="text">טקסט</string>
-  <string name="difficulty">רמת קושי</string>
-  <string name="tags">תגיות</string>
-  <string name="trivial">טריוויאלי</string>
-  <string name="easy">קל</string>
-  <string name="medium">בינוני</string>
-  <string name="hard">קשה</string>
-  <string name="start_date">תאריך התחלה</string>
-  <string name="positive_habit_form">חיובי ( + )</string>
-  <string name="negative_habit_form">שלילי ( - )</string>
-  <string name="checklist">רשימה</string>
-  <string name="reminders">תזכורות</string>
-  <string name="actions">פעולות</string>
-  <string name="attributes">תכונות</string>
-  <string name="physical">פיזי</string>
-  <string name="mental">שכלי</string>
-  <string name="social">חברתי</string>
-  <string name="other">אחר</string>
-  <string name="frequency">תדירות</string>
-  <string name="frequency_weekly">בימים מסויימים בשבוע</string>
-  <string name="frequency_daily">כל X ימים</string>
-  <string name="monday">שני</string>
-  <string name="tuesday">שלישי</string>
-  <string name="wednesday">רביעי</string>
-  <string name="thursday">חמישי</string>
-  <string name="friday">שישי</string>
-  <string name="saturday">שבת</string>
-  <string name="sunday">ראשון</string>
-  <string name="levelup_header">עליתם דרגה!</string>
-  <string name="levelup_detail">על-ידי הגשמת היעדים שלכם מהעולם האמיתי, הגעתם לדרגה %1$d!</string>
-  <string name="levelup_health">נרפאתם לחלוטין!</string>
-  <string name="levelup_button">ישש!</string>
-  <string name="faint_subtitle">אל ייאוש!</string>
-  <string name="faint_penalty_body">הפסדתם דרגה, זהב, וחפץ, אך אתם יכולים להשיג אותם שוב עם עבודה קשה! בהצלחה--אתם תצליחו.</string>
-  <string name="faint_header">נגמרה לכם הבריאות!</string>
-  <string name="faint_button">מלאו בריאות ונסו מחדש</string>
-  <string name="filter">מסנן</string>
-  <string name="profile_image">תמונת פרופיל</string>
-  <string name="mana_price_button">%d מאנה</string>
-  <string name="used_skill">השתמשתם ב %1$s בעבור %2$d מאנה.</string>
-  <string name="new_checklist_item">שורה חדשה לרשימה</string>
-  <string name="add_checklist_item">הוסף</string>
-  <string name="reminder_title">זיכרו לסמן את המטלות היומיות!</string>
-  <string name="skill_progress_title">שימוש ביכולת</string>
-  <string name="coming_soon">יגיע בקרוב</string>
-  <string name="chat_flag_confirmation">האם אתם בטוחים שאתם מעוניינים לדווח על ההודעה הזו?</string>
-  <string name="flag_confirm">סמן הודעה</string>
-  <string name="unlock_lvl_11">משתחרר בדרגה 11</string>
-  <string name="no_party_message">אתם לא בחבורה. כדי להצטרף לחבורה, בקרו באתר.</string>
-  <string name="forgot_pw_btn">שכחתי סיסמה</string>
-  <string name="forgot_pw_tv">שחכתם סיסמה? אנא השתמשו בגרסת האתר לניידים.</string>
-  <string name="tavern.inn.checkOut">הפעילו מחדש את המטלות היומיות שלכם</string>
-  <string name="tavern.inn.rest">עצרו את המטלות היומיות שלכם</string>
-  <string name="reward.dialog.buy">קנייה</string>
-  <string name="reward.dialog.dismiss">בטל</string>
-  <string name="party">חבורה</string>
-  <string name="chat">צ׳אט</string>
-  <string name="members">חברים</string>
-  <string name="habits">הרגלים</string>
-  <string name="dailies">מטלות יומיות</string>
-  <string name="todos">מטרות</string>
-  <string name="rewards">פרסים</string>
-  <string name="taskform.delete.title">האם אתם בטוחים?</string>
-  <string name="taskform.delete.message">האם אתם באמת רוצים למחוק?</string>
-  <string name="yes">כן</string>
-  <string name="no">לא</string>
-  <string name="quest">הרפתקאה</string>
-  <string name="avatar_body">גוף</string>
-  <string name="avatar_hair">שיער</string>
-  <string name="avatar_shirt">חולצה</string>
-  <string name="avatar_skin">עור</string>
-  <string name="avatar_ears">אוזני חיות</string>
-  <string name="avatar_base">בסיס</string>
-  <string name="avatar_color">צבע</string>
-  <string name="avatar_beard">זקן</string>
-  <string name="avatar_mustache">שפם</string>
-  <string name="avatar_flower">פרח</string>
-  <string name="avatar_bangs">טלטלים</string>
-  <string name="avatar_nothing">לא קבוע</string>
-  <string name="avatar_size">גודל</string>
-  <string name="avatar_size_slim">רזה</string>
-  <string name="avatar_size_broad">רחב</string>
-  <string name="avatar_background">רקע</string>
-  <string name="purchase_customization">ריכשו התאמה אישית</string>
-  <string name="purchase_set_button">שחררו סט בעבור %d אבני חן</string>
-  <string name="purchase_button">קנייה</string>
-  <string name="purchase_set_title">קנו סט %s</string>
-  <string name="due_date">תאריך יעד</string>
-  <string name="quest.accept">קבלו</string>
-  <string name="quest.reject">דחו</string>
-  <string name="quest.begin">התחילו הרפתקאה</string>
-  <string name="quest.cancel">בטלו הזמנה</string>
-  <string name="quest.abort">הפסיקו את ההרפתקאה</string>
-  <string name="quest.leave">עיזבו הרפתקאה</string>
-  <string name="quest.pending">ממתין</string>
-  <string name="quest.accepted">התקבל</string>
-  <string name="quest.rejected">נדחה</string>
-  <string name="quest.participants">משתתפים</string>
-  <string name="sidebar_help">עזרה ושאלות נפוצות</string>
-  <string name="complete_tutorial">הבנתי!</string>
-  <string name="dismiss_tutorial">הזכר לי שוב</string>
-  <string name="intro_3_description">שימרו על קצב התקדמות עם עזרה מחבריכם. תימכו אחד בשני בחיים ובקרב ככל שאתם משתפרים ביחד!</string>
-  <string name="previous_button">קודם</string>
-  <string name="next_button">הבא</string>
-  <string name="skip_button">דלגו</string>
-  <string name="setup_welcome_description">ברוכים הבאים להאביטיקה, המקום בו התקדמות במשחק תשפר אתכם בחיים האמיתיים! ככל שאתם משיגים יעדים בעולם האמיתי, תשחררו ציוד, חיות מחמד, הרפתקאות, ועוד.</string>
-  <string name="setup_welcome_title">ברוכים הבאים</string>
-  <string name="setup_group_work">עבודה</string>
-  <string name="setup_group_exercise">התעמלות</string>
-  <string name="setup_group_school">בית-ספר</string>
-  <string name="setup_group_teams">קבוצות</string>
-  <string name="setup_group_chores">מטלות</string>
-  <string name="setup_group_creativity">יצירתיות</string>
-  <string name="setup_task_work_1">לטפל במיילים</string>
-  <string name="setup_task_work_2">המשימה החשובה ביותר</string>
-  <string name="setup_task_work_3">פרוייקט לעבודה</string>
-  <string name="setup_task_exercise_1">10 דקות אירובי</string>
-  <string name="setup_task_exercise_2">מתיחות</string>
-  <string name="setup_task_exercise_3">לקבוע תוכנית אימונים</string>
-  <string name="setup_task_healthWellness_1">אכול בריא / ג׳אנק פוד</string>
-  <string name="setup_task_healthWellness_2">חוט-דנטלי</string>
-  <string name="setup_task_healthWellness_3">קבע בדיקה</string>
-  <string name="setup_task_school_1">לימודים/דחיינות</string>
-  <string name="setup_task_school_2">עשה שיעורי בית</string>
-  <string name="setup_task_school_3">סיים משימה לשיעור</string>
-  <string name="setup_task_teams_1">בדוק מה המצב עם הצוות</string>
-  <string name="setup_task_teams_2">עדכן את הצוות על המצב</string>
-  <string name="setup_task_teams_3">השלם פרוייקט צוותי</string>
-  <string name="setup_task_chores_1">10 דקות ניקיונות</string>
-  <string name="setup_task_chores_2">שטוף כלים</string>
-  <string name="setup_task_chores_3">סדר את הארון</string>
-  <string name="setup_task_creativity_1">לימדו אשף של המלאכה</string>
-  <string name="setup_task_creativity_2">עבוד על פרוייקט יצירתי</string>
-  <string name="setup_task_creativity_3">סיים פרוייקט יצירתי</string>
-  <string name="gem.purchase.support">רוצים לסייע לנו לשמור על האביטיקה באוויר? אתם יכולים לתמוך במפתחים על ידי רכישה של אבני חן!\n\nאבני חן מאפשרות לכם לרכוש תוספות מהנות לחשבון שלכם, כולל: \n\n - תחפושות מגניבות לדמות שלכם\n - רקעים מדהימים\n - הרפתקאות כיפיות שיתגמלו אתכם עם ביצי חיות מחמד\n - היכולת לשנות את מקצוע הדמות שלכם לפני דרגה 100\n\nתודה רבה על העזרה שלכם להפוך את האביטיקה להכי טובה שהיא יכולה להיות. התמיכה שלכם היא מאוד משמעותית מבחינתנו!</string>
-  <string name="my_guilds">הגילדות שלי</string>
-  <string name="public_guilds">גילדות פומביות</string>
-  <string name="guild">גילדה</string>
-  <string name="leave">עיזבו</string>
-  <string name="join">הצטרפו</string>
-  <string name="leader">מנהיג</string>
-  <string name="gems">אבני חן</string>
-  <string name="send_pm">שילחו הודעה פרטית</string>
-  <string name="flag">דיווח</string>
-  <string name="delete">מחיקה</string>
-  <string name="name">שם</string>
-  <string name="description">תיאור</string>
-  <string name="privacy">פרטיות</string>
-  <string name="write_message">כיתבו הודעה</string>
-  <string name="post">שליחה</string>
-  <string name="guild_search_hint">חיפוש אחר גילדות</string>
-  <string name="todo_due">חל: %s</string>
-  <string name="daily_streak">רצף נוכחי: %d</string>
-  <string name="todo_has_duedate">למשימה יש תאריך יעד</string>
-  <string name="battle_gear">ציוד קרב</string>
-  <string name="costume">תחפושת</string>
-  <string name="outfit_head">ראש</string>
-  <string name="outfit_headAccessory">אביזר ראש</string>
-  <string name="outfit_eyewear">משקפיים</string>
-  <string name="outfit_armor">שריון</string>
-  <string name="outfit_back">חזרה</string>
-  <string name="outfit_body">גוף</string>
-  <string name="outfit_shield">מגן</string>
-  <string name="outfit_weapon">נשק</string>
-  <string name="wear_costume">ליבשו תחפושת</string>
-  <string name="equipped">מצוייד</string>
-  <string name="quest_cancel_message">האם אתם בטוחים שאתם מעוניינים להפסיק את ההרפתקאה הזו? כל אישורי ההזמנות יאבדו. הבעלים של ההרפתקאה ימשיכו להחזיק במגילת ההרפתקאה.</string>
-  <string name="quest.invitation">הזמנה להרפתקאה</string>
-  <string name="quest_begin_message">האם אתם בטוחים שאתם מעוניינים להתחיל בהרפתקאה? ברגע שהיא מתחילה, חברי חבורה נוספים לא יכולים להצטרף אליה.</string>
-  <string name="quest.invitation.text">הוזמנתם להשתתף בהרפתקאה!</string>
-  <string name="ago_1day">לפני יום</string>
-  <string name="ago_days">לפני %d ימים</string>
-  <string name="ago_1Minute">לפני דקה</string>
-  <string name="ago_minutes">לפני %d דקות</string>
-  <string name="ago_hours">לפני %d שעות</string>
-  <string name="ago_1hour">לפני שעה</string>
-  <string name="today">היום</string>
-  <string name="sidebar_items">חפצים</string>
-  <string name="eggs">ביצים</string>
-  <string name="hatching_potions">שיקויי הבקעה</string>
-  <string name="food">אוכל</string>
-  <string name="quests">הרפתקאות</string>
-  <string name="pets">חיות מחמד</string>
-  <string name="mounts">חיות רכיבה</string>
-  <string name="armoireEquipment">מצאתם חתיכת ציוד נדיר בארמואר: %s! מגניב!</string>
-  <string name="armoireFood">אתם נוברים בארמואר ומוצאים %1$s %2$s. מה זה עושה פה?</string>
-  <string name="armoireExp">אתם נאבקים בארמואר וצוברים ניסיון. קבלו!</string>
-  <string name="armoireNotesFull">פתחו את הארמואר כדי לקבל ציוד מיוחד אקראי, ניסיון, או אוכל! חתיכות ציוד שנותרו: %d</string>
-  <string name="armoireLastItem">מצאתם את חתיכת הציוד הנדיר האחרונה בארמואר הקסום.</string>
-  <string name="armoireNotesEmpty">הארמואר יכיל ציוד חדש בשבוע הראשון של כל חודש. עד אז, המשיכו ללחוץ כדי לקבל ניסיון ואוכל!</string>
-  <string name="sell">מיכרו (%d זהב)</string>
-  <string name="hatch_with_potion">הבקיעו עם שיקוי</string>
-  <string name="feed_to_pet">האכילו חיית מחמד</string>
-  <string name="hatch_egg">הבקיעו עם ביצה</string>
-  <string name="invite_party">הזמינו חבורה</string>
-  <string name="dialog_feeding">האכלתם %1$s %2$s עם:</string>
-  <string name="use_animal">השתמשו</string>
-  <string name="feed">האכילו</string>
-  <string name="hatch_with">הבקיעו חיית מחמד עם %s</string>
-  <string name="hatched_pet_title">הבקעתם %1$s %2$s!</string>
-  <string name="close">סיגרו</string>
-  <string name="share">שתפו</string>
-  <string name="notification_pet_fed">האכלתם את ה %1$s %2$s שלכם!</string>
-  <string name="notification_purchase">%s נקנה</string>
-  <string name="sectionpets">חיות מחמד רגילות</string>
-  <string name="sectionpremiumPets">חיות מחמד משיקויים קסומים</string>
-  <string name="sectionquestPets">חיות מחמד מהרפתקאות</string>
-  <string name="sectionspecialPets">חיות מחמד נדירות</string>
-  <string name="sectionmounts">חיות רכיבה רגילות</string>
-  <string name="sectionpremiumMounts">חיות רכיבה משיקויים קסומים</string>
-  <string name="sectionquestMounts">חיות רכיבה מהרפתקאות</string>
-  <string name="sectionspecialMounts">חיות רכיבה נדירות</string>
-  <string name="world_quest">הרפתקאה עולמית</string>
-  <string name="inn_description">נוחו באכסנייה כדי למנוע ממטלות יומיות לא מושלמות לפגוע בכם במהלך הלילה! (שימו לב: לא מונע מכם להפגע מאוייבים.)</string>
-  <string name="empty_items">אין לכם כל %s</string>
-  <string name="user_level">דרגה %d</string>
-  <string name="user_level_with_class">דרגה %1$d - %2$s</string>
-  <string name="warrior">לוחם</string>
-  <string name="rogue">נוכל</string>
-  <string name="mage">מכשף</string>
-  <string name="healer">מרפא</string>
-  <string name="warrior_description">לוחמים גורמים ליותר ״פגיעות קריטיות״, שבאקראיות נותנות בונוס זהב, ניסיון, וסיכוי ל״נפילה״ בהשלמה של משימה. הם גם גורמים לנזק כבד לאוייבים. שחקו לוחמים אם אתם מקבלים מוטיבציה מזכיות אקראיות בסגנון של מכונת מזל, או אם אתם רוצים לגרום לכאב בהרפתקאות אוייבים!</string>
-  <string name="mage_description">מכשפים לומדים במהירות, וזוכים בניסיון ודרגות מהר יותר ממקצועות אחרים. הם גם מקבלים מנות גדולות של מאנה שמשמשות ליכולות מיוחדות. שחקו כמכשפים אם אתם נהנים מהצדדים הטקטיים של האביט, או אם עליה בדרגות והיבטים מתקדמים של המשחק הם גורמים שמדרבנים אתכם.</string>
-  <string name="rogue_description">נוכלים אוהבים לצבור עושר, זוכים ביותר זהב מכל בעל-מקצוע אחר, ומוכוונים למציאת חפצים אקראיים. יכולת ההתגנבות המפורסמת שלהם מאפשרת להם להתחמק מההשלכות של מטלות יומיות מפוספסות. שחקו בדמות של נוכל אם מדרבן אתכם לקבל פרסים, הישגים, שלל ועיטורים!</string>
-  <string name="healer_description">מרפאים הם עמידים בפני פגיעות, וחולקים את היכולת הזו עם אחרים. מטלות יומיות מפוספסות והרגלים רעים לא מבלבלים אותם כל כך, ויש להם יכולת להתאושש מכשלונות. שחקו במקצוע המרפא אם אתם נהנים לסייע לעמיתיכם לחבורה, או אם הרעיון של התחמקות ממוות דרך עבודה קשה מעורר בכם השראה!</string>
-  <string name="select_class">בחרו מקצוע</string>
-  <string name="opt_out_class">וותרו</string>
-  <string name="opt_out_description">לא מעניינים אתכם מקצועות? רוצים לבחור מאוחר יותר? וותרו - תהיו לוחמים ללא תכונות מיוחדות. תוכלו לקראו על מערכת המקצועות מאוחר יותר בוויקי ולאפשר מקצועות בכל שעה.</string>
-  <string name="class_confirmation">האם אתם בטוחים שברצונכם להיות %s?</string>
-  <string name="choose_class">בחרו מקצוע</string>
-  <string name="dialog_go_back">חזרה</string>
-  <string name="opt_out_confirmation">האם אתם בטוחים שאתם מעוניינים לוותר?</string>
-  <string name="change_class">שנו את המקצוע שלכם</string>
-  <string name="change_class_description">החליפו מקצוע וקבלו בחזרה את נקודות התכונה תמורת 3 אבני חן. תוכלו להקצות את נקודות התכונה מחדש דרך האתר.</string>
-  <string name="enable_class">אפשרו את מערכת המקצועות</string>
-  <string name="changing_class_progress">שנו מקצוע</string>
-  <string name="by_email">באמצעות מייל</string>
-  <string name="invite_existing_users">הזמינו משתמשים קיימים</string>
-  <string name="send">שילחו</string>
-  <string name="invite">הזמינו חברים</string>
-  <string name="invite_id_description">אם יש לכם חברים שכבר משתמשים בהאביטיקה, הזמינו אותם באמצעות מזהה המשתמש כאן.</string>
-  <string name="invite_email_description">אם חברים מצטרפים להאביטיקה באמצעות מייל שלכם, הם אוטומטית יוזמנו לחבורה שלכם!</string>
-  <string name="add_invites">הוסיפו מוזמנים</string>
-  <string name="user_id">מזהה משתמש</string>
-  <string name="email">מייל</string>
-  <string name="invite_users">הזמינו לחבורה</string>
-  <string name="share_using">שתפו באמצעות</string>
-  <string name="share_hatched">הרגע הבקעתי ביצת חיית מחמד של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
-  <string name="share_raised">הרגע הרווחתי חיית רכיבה של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
-  <string name="open_in_store">פתיחה בפליי סטור</string>
-  <string name="change_class_confirmation">האם אתם בטוחים שאתם מעוניינים להחליף מקצוע? זה יעלה לכם 3 אבני חן.</string>
-  <string name="leaderMessage">הודעה מאת %1$s</string>
-  <string name="confirm">אישור</string>
-  <string name="market">שוק</string>
-  <string name="timeTravelers">נוסעים בזמן</string>
-  <string name="seasonalShop">חנות עונתית</string>
-  <string name="empty_inbox">אין לכם הודעות בדואר הנכנס. אתם יכולים לשלוח למשתמשים הודעה חדשה מהצ׳אט הפומבי שלהם!</string>
-  <string name="party_invite">שחררו על-ידי הזמנת חברים</string>
-  <string name="no_gold">אין די זהב</string>
-  <string name="no_potion">אינכם צריכים לקנות שיקוי בריאות</string>
-  <string name="successful_purchase">%1$s נרכש בהצלחה</string>
-  <string name="purchase_confirmation_title">אשרו רכישה</string>
-  <string name="confirm_purchase_text">קנו %1$s בעבור %2$s %3$s</string>
-  <string name="gem">אבן חן</string>
-  <string name="hourglass">שעון חול</string>
-  <string name="hourglasses">שעוני חול</string>
-  <string name="gold_singular">זהב</string>
-  <string name="gold_plural">זהב</string>
-  <string name="chat_message_copied">הודעה הועתקה ללוח</string>
-  <string name="copy_chat_message">העתקה ללוח</string>
-  <string name="edit_tag_title">עריכת תג</string>
-  <string name="edit_tag_btn_edit">עריכה</string>
-  <string name="edit_tag_btn_done">בוצע</string>
-  <string name="edit_tag_btn_delete">מחיקה</string>
-  <string name="confirm_delete_tag_title">האם אתם בטוחים?</string>
-  <string name="confirm_delete_tag_message">האם אתם באמת רוצים למחוק?</string>
-  <string name="filter_drawer_edit_tags">עריכת תגים</string>
-  <string name="filter_drawer_filter_tags">סינון לפי תגיות</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">תנו למישהו להזמין אתכם עם קוד ה QR הזה</string>
-  <string name="qr_save_message">קוד QR נשמר ב</string>
-  <string name="qr_dialogue_title">קוד ה QR שלכם</string>
-  <string name="download">הורדה</string>
-  <string name="send_new_message">שליחת הודעה חדשה</string>
-  <string name="choose_recipient_title">בחרו נמען להודעה</string>
-  <string name="action_continue">המשך</string>
-  <string name="scan_qr_code">סריקת קוד QR</string>
-  <!--Login Incentives-->
-  <string name="subscriptions">הרשמות</string>
-  <string name="subscribe">הרשמה</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">ריענון</string>
+  <string name="XP_default">ניסיון</string>
+  <string name="HP_default">בריאות</string>
+  <string name="MP_default">מאנה</string>
+  <string name="ERR_pb_barcode">העדפות לא הצליחו להטען מהבר-קוד</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">הגדרות</string>
+  <string name="SP_address_hint">שרת מותאם אישית אליכם</string>
+  <string name="SP_userID_title">מזהה משתמש</string>
+  <string name="SP_userID_summary">מזהה המשתמש שלכם</string>
+  <string name="SP_APIToken_title">מפתח API</string>
+  <string name="SP_APIToken_summary">מפתח ה API שלכם</string>
+  <string name="Language_title">שפה</string>
+  <string name="SP_user_qr_code">קוד ה QR שלכם</string>
+  <string name="PS_contact_title">צרו איתי קשר</string>
+  <string name="pref_account_header">חשבון</string>
+  <string name="pref_first_day_of_the_week_title">היום הראשון בשבוע</string>
+  <string name="pref_reminder_header">תזכורת יומית</string>
+  <string name="pref_reminder_checkbox">הפעל תזכורת</string>
+  <string name="pref_reminder_picker">קבע מועד תזכורת</string>
+  <string name="pref_push_notifications_checkbox">הודעות בדחיפה של משתמש</string>
+  <string name="push_notifications">התראות בדחיפה</string>
+  <string name="preference_push_you_won_challenge">זכיתם באתגר!</string>
+  <string name="preference_push_received_a_private_message">קיבלתם הודעה פרטית</string>
+  <string name="preference_push_gifted_gems">אבני חן ניתנו במתנה</string>
+  <string name="preference_push_gifted_subscription">מנוי ניתן במתנה</string>
+  <string name="preference_push_invited_to_party">הוזמנו לחבורה</string>
+  <string name="preference_push_your_quest_has_begun">ההרפתקה שלכם החלה</string>
+  <string name="preference_push_invited_to_quest">הוזמנו להרפתקה</string>
+  <!--Adding tasks-->
+  <string name="task_value">ערך</string>
+  <string name="action_edit">עריכה</string>
+  <string name="action_delete">מחיקה</string>
+  <string name="action_cancel">ביטול</string>
+  <string name="login_btn">התחברות</string>
+  <string name="register_btn">הרשמו</string>
+  <string name="username">שם משתמש</string>
+  <string name="email_username">כתובת מייל או שם משתמש</string>
+  <string name="password">סיסמה</string>
+  <string name="emailAddress">כתובת דואר אלקטרוני</string>
+  <string name="confirmpassword">אמתו סיסמה</string>
+  <string name="logout">התנתקות</string>
+  <string name="logout_description">התנתקו מהחשבון שלכם</string>
+  <string name="account_details_sum">בדוק את פרטי החשבון שלך</string>
+  <string name="account_details">פרטי חשבון</string>
+  <string name="LoginActivityName">ברוכים הבאים</string>
+  <string name="string_revive">קומו לתחייה</string>
+  <string name="please_connect">אנא התחברו דרך האפליקציה לפני שאתם משתמשים בוויג׳ט</string>
+  <string name="about.title">אודות</string>
+  <string name="about.libraries">ספריות</string>
+  <string name="about.versionhistory">היסטוריית גרסאות</string>
+  <string name="about.habitica_open_source">האביטיקה זמינה כתוכנה במקור פתוח בגיטהאב</string>
+  <string name="about.rate_our_app">דרגו את האפליקציה שלנו</string>
+  <string name="about.give_us_feedback">שלחו לנו משוב!</string>
+  <string name="about.bugreport">דווחו על תקלה</string>
+  <string name="about.source_code">קוד מקור</string>
+  <!--Network Errors-->
+  <string name="network_error_title">תקלת התחברות</string>
+  <string name="network_error_no_network_body">אינכם מחוברים לאינטרנט</string>
+  <string name="internal_error_api">נראה שיש בעיה עם השרת. אנא נסו מאוחר יותר.</string>
+  <string name="authentication_error_title">תקלת אימות</string>
+  <string name="authentication_error_body">שם המשתמש שלכם או הסיסמה שגויים.</string>
+  <string name="login_validation_error_title">שגיאת אימות</string>
+  <string name="login_validation_error_fieldsmissing">עליכם למלא את כל השדות.</string>
+  <string name="save_changes">שמור</string>
+  <string name="copy">העתק</string>
+  <string name="notes">הערות</string>
+  <string name="text">טקסט</string>
+  <string name="difficulty">רמת קושי</string>
+  <string name="tags">תגיות</string>
+  <string name="trivial">טריוויאלי</string>
+  <string name="easy">קל</string>
+  <string name="medium">בינוני</string>
+  <string name="hard">קשה</string>
+  <string name="start_date">תאריך התחלה</string>
+  <string name="positive_habit_form">חיובי ( + )</string>
+  <string name="negative_habit_form">שלילי ( - )</string>
+  <string name="checklist">רשימה</string>
+  <string name="reminders">תזכורות</string>
+  <string name="actions">פעולות</string>
+  <string name="attributes">תכונות</string>
+  <string name="physical">פיזי</string>
+  <string name="mental">שכלי</string>
+  <string name="social">חברתי</string>
+  <string name="other">אחר</string>
+  <string name="frequency">תדירות</string>
+  <string name="frequency_weekly">בימים מסויימים בשבוע</string>
+  <string name="frequency_daily">כל X ימים</string>
+  <string name="monday">שני</string>
+  <string name="tuesday">שלישי</string>
+  <string name="wednesday">רביעי</string>
+  <string name="thursday">חמישי</string>
+  <string name="friday">שישי</string>
+  <string name="saturday">שבת</string>
+  <string name="sunday">ראשון</string>
+  <string name="levelup_header">עליתם דרגה!</string>
+  <string name="levelup_detail">על-ידי הגשמת היעדים שלכם מהעולם האמיתי, הגעתם לדרגה %1$d!</string>
+  <string name="levelup_health">נרפאתם לחלוטין!</string>
+  <string name="levelup_button">ישש!</string>
+  <string name="faint_subtitle">אל ייאוש!</string>
+  <string name="faint_penalty_body">הפסדתם דרגה, זהב, וחפץ, אך אתם יכולים להשיג אותם שוב עם עבודה קשה! בהצלחה--אתם תצליחו.</string>
+  <string name="faint_header">נגמרה לכם הבריאות!</string>
+  <string name="faint_button">מלאו בריאות ונסו מחדש</string>
+  <string name="filter">מסנן</string>
+  <string name="profile_image">תמונת פרופיל</string>
+  <string name="mana_price_button">%d מאנה</string>
+  <string name="used_skill">השתמשתם ב %1$s בעבור %2$d מאנה.</string>
+  <string name="new_checklist_item">שורה חדשה לרשימה</string>
+  <string name="add_checklist_item">הוסף</string>
+  <string name="reminder_title">זיכרו לסמן את המטלות היומיות!</string>
+  <string name="skill_progress_title">שימוש ביכולת</string>
+  <string name="coming_soon">יגיע בקרוב</string>
+  <string name="chat_flag_confirmation">האם אתם בטוחים שאתם מעוניינים לדווח על ההודעה הזו?</string>
+  <string name="flag_confirm">סמן הודעה</string>
+  <string name="unlock_lvl_11">משתחרר בדרגה 11</string>
+  <string name="no_party_message">אתם לא בחבורה. כדי להצטרף לחבורה, בקרו באתר.</string>
+  <string name="forgot_pw_btn">שכחתי סיסמה</string>
+  <string name="forgot_pw_tv">שחכתם סיסמה? אנא השתמשו בגרסת האתר לניידים.</string>
+  <string name="tavern.inn.checkOut">הפעילו מחדש את המטלות היומיות שלכם</string>
+  <string name="tavern.inn.rest">עצרו את המטלות היומיות שלכם</string>
+  <string name="reward.dialog.buy">קנייה</string>
+  <string name="reward.dialog.dismiss">בטל</string>
+  <string name="party">חבורה</string>
+  <string name="chat">צ׳אט</string>
+  <string name="members">חברים</string>
+  <string name="habits">הרגלים</string>
+  <string name="dailies">מטלות יומיות</string>
+  <string name="todos">מטרות</string>
+  <string name="rewards">פרסים</string>
+  <string name="taskform.delete.title">האם אתם בטוחים?</string>
+  <string name="taskform.delete.message">האם אתם באמת רוצים למחוק?</string>
+  <string name="yes">כן</string>
+  <string name="no">לא</string>
+  <string name="quest">הרפתקאה</string>
+  <string name="avatar_body">גוף</string>
+  <string name="avatar_hair">שיער</string>
+  <string name="avatar_shirt">חולצה</string>
+  <string name="avatar_skin">עור</string>
+  <string name="avatar_ears">אוזני חיות</string>
+  <string name="avatar_base">בסיס</string>
+  <string name="avatar_color">צבע</string>
+  <string name="avatar_beard">זקן</string>
+  <string name="avatar_mustache">שפם</string>
+  <string name="avatar_flower">פרח</string>
+  <string name="avatar_bangs">טלטלים</string>
+  <string name="avatar_nothing">לא קבוע</string>
+  <string name="avatar_size">גודל</string>
+  <string name="avatar_size_slim">רזה</string>
+  <string name="avatar_size_broad">רחב</string>
+  <string name="avatar_background">רקע</string>
+  <string name="purchase_customization">ריכשו התאמה אישית</string>
+  <string name="purchase_set_button">שחררו סט בעבור %d אבני חן</string>
+  <string name="purchase_button">קנייה</string>
+  <string name="purchase_set_title">קנו סט %s</string>
+  <string name="due_date">תאריך יעד</string>
+  <string name="quest.accept">קבלו</string>
+  <string name="quest.reject">דחו</string>
+  <string name="quest.begin">התחילו הרפתקאה</string>
+  <string name="quest.cancel">בטלו הזמנה</string>
+  <string name="quest.abort">הפסיקו את ההרפתקאה</string>
+  <string name="quest.leave">עיזבו הרפתקאה</string>
+  <string name="quest.pending">ממתין</string>
+  <string name="quest.accepted">התקבל</string>
+  <string name="quest.rejected">נדחה</string>
+  <string name="quest.participants">משתתפים</string>
+  <string name="sidebar_help">עזרה ושאלות נפוצות</string>
+  <string name="complete_tutorial">הבנתי!</string>
+  <string name="dismiss_tutorial">הזכר לי שוב</string>
+  <string name="intro_3_description">שימרו על קצב התקדמות עם עזרה מחבריכם. תימכו אחד בשני בחיים ובקרב ככל שאתם משתפרים ביחד!</string>
+  <string name="previous_button">קודם</string>
+  <string name="next_button">הבא</string>
+  <string name="skip_button">דלגו</string>
+  <string name="setup_welcome_description">ברוכים הבאים להאביטיקה, המקום בו התקדמות במשחק תשפר אתכם בחיים האמיתיים! ככל שאתם משיגים יעדים בעולם האמיתי, תשחררו ציוד, חיות מחמד, הרפתקאות, ועוד.</string>
+  <string name="setup_welcome_title">ברוכים הבאים</string>
+  <string name="setup_group_work">עבודה</string>
+  <string name="setup_group_exercise">התעמלות</string>
+  <string name="setup_group_school">בית-ספר</string>
+  <string name="setup_group_teams">קבוצות</string>
+  <string name="setup_group_chores">מטלות</string>
+  <string name="setup_group_creativity">יצירתיות</string>
+  <string name="setup_task_work_1">לטפל במיילים</string>
+  <string name="setup_task_work_2">המשימה החשובה ביותר</string>
+  <string name="setup_task_work_3">פרוייקט לעבודה</string>
+  <string name="setup_task_exercise_1">10 דקות אירובי</string>
+  <string name="setup_task_exercise_2">מתיחות</string>
+  <string name="setup_task_exercise_3">לקבוע תוכנית אימונים</string>
+  <string name="setup_task_healthWellness_1">אכול בריא / ג׳אנק פוד</string>
+  <string name="setup_task_healthWellness_2">חוט-דנטלי</string>
+  <string name="setup_task_healthWellness_3">קבע בדיקה</string>
+  <string name="setup_task_school_1">לימודים/דחיינות</string>
+  <string name="setup_task_school_2">עשה שיעורי בית</string>
+  <string name="setup_task_school_3">סיים משימה לשיעור</string>
+  <string name="setup_task_teams_1">בדוק מה המצב עם הצוות</string>
+  <string name="setup_task_teams_2">עדכן את הצוות על המצב</string>
+  <string name="setup_task_teams_3">השלם פרוייקט צוותי</string>
+  <string name="setup_task_chores_1">10 דקות ניקיונות</string>
+  <string name="setup_task_chores_2">שטוף כלים</string>
+  <string name="setup_task_chores_3">סדר את הארון</string>
+  <string name="setup_task_creativity_1">לימדו אשף של המלאכה</string>
+  <string name="setup_task_creativity_2">עבוד על פרוייקט יצירתי</string>
+  <string name="setup_task_creativity_3">סיים פרוייקט יצירתי</string>
+  <string name="gem.purchase.support">רוצים לסייע לנו לשמור על האביטיקה באוויר? אתם יכולים לתמוך במפתחים על ידי רכישה של אבני חן!\n\nאבני חן מאפשרות לכם לרכוש תוספות מהנות לחשבון שלכם, כולל: \n\n - תחפושות מגניבות לדמות שלכם\n - רקעים מדהימים\n - הרפתקאות כיפיות שיתגמלו אתכם עם ביצי חיות מחמד\n - היכולת לשנות את מקצוע הדמות שלכם לפני דרגה 100\n\nתודה רבה על העזרה שלכם להפוך את האביטיקה להכי טובה שהיא יכולה להיות. התמיכה שלכם היא מאוד משמעותית מבחינתנו!</string>
+  <string name="my_guilds">הגילדות שלי</string>
+  <string name="public_guilds">גילדות פומביות</string>
+  <string name="guild">גילדה</string>
+  <string name="leave">עיזבו</string>
+  <string name="join">הצטרפו</string>
+  <string name="leader">מנהיג</string>
+  <string name="gems">אבני חן</string>
+  <string name="send_pm">שילחו הודעה פרטית</string>
+  <string name="flag">דיווח</string>
+  <string name="delete">מחיקה</string>
+  <string name="name">שם</string>
+  <string name="description">תיאור</string>
+  <string name="privacy">פרטיות</string>
+  <string name="write_message">כיתבו הודעה</string>
+  <string name="post">שליחה</string>
+  <string name="guild_search_hint">חיפוש אחר גילדות</string>
+  <string name="todo_due">חל: %s</string>
+  <string name="daily_streak">רצף נוכחי: %d</string>
+  <string name="todo_has_duedate">למשימה יש תאריך יעד</string>
+  <string name="battle_gear">ציוד קרב</string>
+  <string name="costume">תחפושת</string>
+  <string name="outfit_head">ראש</string>
+  <string name="outfit_headAccessory">אביזר ראש</string>
+  <string name="outfit_eyewear">משקפיים</string>
+  <string name="outfit_armor">שריון</string>
+  <string name="outfit_back">חזרה</string>
+  <string name="outfit_body">גוף</string>
+  <string name="outfit_shield">מגן</string>
+  <string name="outfit_weapon">נשק</string>
+  <string name="wear_costume">ליבשו תחפושת</string>
+  <string name="equipped">מצוייד</string>
+  <string name="quest_cancel_message">האם אתם בטוחים שאתם מעוניינים להפסיק את ההרפתקאה הזו? כל אישורי ההזמנות יאבדו. הבעלים של ההרפתקאה ימשיכו להחזיק במגילת ההרפתקאה.</string>
+  <string name="quest.invitation">הזמנה להרפתקאה</string>
+  <string name="quest_begin_message">האם אתם בטוחים שאתם מעוניינים להתחיל בהרפתקאה? ברגע שהיא מתחילה, חברי חבורה נוספים לא יכולים להצטרף אליה.</string>
+  <string name="quest.invitation.text">הוזמנתם להשתתף בהרפתקאה!</string>
+  <string name="ago_1day">לפני יום</string>
+  <string name="ago_days">לפני %d ימים</string>
+  <string name="ago_1Minute">לפני דקה</string>
+  <string name="ago_minutes">לפני %d דקות</string>
+  <string name="ago_hours">לפני %d שעות</string>
+  <string name="ago_1hour">לפני שעה</string>
+  <string name="today">היום</string>
+  <string name="sidebar_items">חפצים</string>
+  <string name="eggs">ביצים</string>
+  <string name="hatching_potions">שיקויי הבקעה</string>
+  <string name="food">אוכל</string>
+  <string name="quests">הרפתקאות</string>
+  <string name="pets">חיות מחמד</string>
+  <string name="mounts">חיות רכיבה</string>
+  <string name="armoireEquipment">מצאתם חתיכת ציוד נדיר בארמואר: %s! מגניב!</string>
+  <string name="armoireFood">אתם נוברים בארמואר ומוצאים %1$s %2$s. מה זה עושה פה?</string>
+  <string name="armoireExp">אתם נאבקים בארמואר וצוברים ניסיון. קבלו!</string>
+  <string name="armoireNotesFull">פתחו את הארמואר כדי לקבל ציוד מיוחד אקראי, ניסיון, או אוכל! חתיכות ציוד שנותרו: %d</string>
+  <string name="armoireLastItem">מצאתם את חתיכת הציוד הנדיר האחרונה בארמואר הקסום.</string>
+  <string name="armoireNotesEmpty">הארמואר יכיל ציוד חדש בשבוע הראשון של כל חודש. עד אז, המשיכו ללחוץ כדי לקבל ניסיון ואוכל!</string>
+  <string name="sell">מיכרו (%d זהב)</string>
+  <string name="hatch_with_potion">הבקיעו עם שיקוי</string>
+  <string name="feed_to_pet">האכילו חיית מחמד</string>
+  <string name="hatch_egg">הבקיעו עם ביצה</string>
+  <string name="invite_party">הזמינו חבורה</string>
+  <string name="dialog_feeding">האכלתם %1$s %2$s עם:</string>
+  <string name="use_animal">השתמשו</string>
+  <string name="feed">האכילו</string>
+  <string name="hatch_with">הבקיעו חיית מחמד עם %s</string>
+  <string name="hatched_pet_title">הבקעתם %1$s %2$s!</string>
+  <string name="close">סיגרו</string>
+  <string name="share">שתפו</string>
+  <string name="notification_pet_fed">האכלתם את ה %1$s %2$s שלכם!</string>
+  <string name="notification_purchase">%s נקנה</string>
+  <string name="sectionpets">חיות מחמד רגילות</string>
+  <string name="sectionpremiumPets">חיות מחמד משיקויים קסומים</string>
+  <string name="sectionquestPets">חיות מחמד מהרפתקאות</string>
+  <string name="sectionspecialPets">חיות מחמד נדירות</string>
+  <string name="sectionmounts">חיות רכיבה רגילות</string>
+  <string name="sectionpremiumMounts">חיות רכיבה משיקויים קסומים</string>
+  <string name="sectionquestMounts">חיות רכיבה מהרפתקאות</string>
+  <string name="sectionspecialMounts">חיות רכיבה נדירות</string>
+  <string name="world_quest">הרפתקאה עולמית</string>
+  <string name="inn_description">נוחו באכסנייה כדי למנוע ממטלות יומיות לא מושלמות לפגוע בכם במהלך הלילה! (שימו לב: לא מונע מכם להפגע מאוייבים.)</string>
+  <string name="empty_items">אין לכם כל %s</string>
+  <string name="user_level">דרגה %d</string>
+  <string name="user_level_with_class">דרגה %1$d - %2$s</string>
+  <string name="warrior">לוחם</string>
+  <string name="rogue">נוכל</string>
+  <string name="mage">מכשף</string>
+  <string name="healer">מרפא</string>
+  <string name="warrior_description">לוחמים גורמים ליותר ״פגיעות קריטיות״, שבאקראיות נותנות בונוס זהב, ניסיון, וסיכוי ל״נפילה״ בהשלמה של משימה. הם גם גורמים לנזק כבד לאוייבים. שחקו לוחמים אם אתם מקבלים מוטיבציה מזכיות אקראיות בסגנון של מכונת מזל, או אם אתם רוצים לגרום לכאב בהרפתקאות אוייבים!</string>
+  <string name="mage_description">מכשפים לומדים במהירות, וזוכים בניסיון ודרגות מהר יותר ממקצועות אחרים. הם גם מקבלים מנות גדולות של מאנה שמשמשות ליכולות מיוחדות. שחקו כמכשפים אם אתם נהנים מהצדדים הטקטיים של האביט, או אם עליה בדרגות והיבטים מתקדמים של המשחק הם גורמים שמדרבנים אתכם.</string>
+  <string name="rogue_description">נוכלים אוהבים לצבור עושר, זוכים ביותר זהב מכל בעל-מקצוע אחר, ומוכוונים למציאת חפצים אקראיים. יכולת ההתגנבות המפורסמת שלהם מאפשרת להם להתחמק מההשלכות של מטלות יומיות מפוספסות. שחקו בדמות של נוכל אם מדרבן אתכם לקבל פרסים, הישגים, שלל ועיטורים!</string>
+  <string name="healer_description">מרפאים הם עמידים בפני פגיעות, וחולקים את היכולת הזו עם אחרים. מטלות יומיות מפוספסות והרגלים רעים לא מבלבלים אותם כל כך, ויש להם יכולת להתאושש מכשלונות. שחקו במקצוע המרפא אם אתם נהנים לסייע לעמיתיכם לחבורה, או אם הרעיון של התחמקות ממוות דרך עבודה קשה מעורר בכם השראה!</string>
+  <string name="select_class">בחרו מקצוע</string>
+  <string name="opt_out_class">וותרו</string>
+  <string name="opt_out_description">לא מעניינים אתכם מקצועות? רוצים לבחור מאוחר יותר? וותרו - תהיו לוחמים ללא תכונות מיוחדות. תוכלו לקראו על מערכת המקצועות מאוחר יותר בוויקי ולאפשר מקצועות בכל שעה.</string>
+  <string name="class_confirmation">האם אתם בטוחים שברצונכם להיות %s?</string>
+  <string name="choose_class">בחרו מקצוע</string>
+  <string name="dialog_go_back">חזרה</string>
+  <string name="opt_out_confirmation">האם אתם בטוחים שאתם מעוניינים לוותר?</string>
+  <string name="change_class">שנו את המקצוע שלכם</string>
+  <string name="change_class_description">החליפו מקצוע וקבלו בחזרה את נקודות התכונה תמורת 3 אבני חן. תוכלו להקצות את נקודות התכונה מחדש דרך האתר.</string>
+  <string name="enable_class">אפשרו את מערכת המקצועות</string>
+  <string name="changing_class_progress">שנו מקצוע</string>
+  <string name="by_email">באמצעות מייל</string>
+  <string name="invite_existing_users">הזמינו משתמשים קיימים</string>
+  <string name="send">שילחו</string>
+  <string name="invite">הזמינו חברים</string>
+  <string name="invite_id_description">אם יש לכם חברים שכבר משתמשים בהאביטיקה, הזמינו אותם באמצעות מזהה המשתמש כאן.</string>
+  <string name="invite_email_description">אם חברים מצטרפים להאביטיקה באמצעות מייל שלכם, הם אוטומטית יוזמנו לחבורה שלכם!</string>
+  <string name="add_invites">הוסיפו מוזמנים</string>
+  <string name="user_id">מזהה משתמש</string>
+  <string name="email">מייל</string>
+  <string name="invite_users">הזמינו לחבורה</string>
+  <string name="share_using">שתפו באמצעות</string>
+  <string name="share_hatched">הרגע הבקעתי ביצת חיית מחמד של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
+  <string name="share_raised">הרגע הרווחתי חיית רכיבה של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
+  <string name="open_in_store">פתיחה בפליי סטור</string>
+  <string name="change_class_confirmation">האם אתם בטוחים שאתם מעוניינים להחליף מקצוע? זה יעלה לכם 3 אבני חן.</string>
+  <string name="leaderMessage">הודעה מאת %1$s</string>
+  <string name="confirm">אישור</string>
+  <string name="market">שוק</string>
+  <string name="timeTravelers">נוסעים בזמן</string>
+  <string name="seasonalShop">חנות עונתית</string>
+  <string name="empty_inbox">אין לכם הודעות בדואר הנכנס. אתם יכולים לשלוח למשתמשים הודעה חדשה מהצ׳אט הפומבי שלהם!</string>
+  <string name="party_invite">שחררו על-ידי הזמנת חברים</string>
+  <string name="no_gold">אין די זהב</string>
+  <string name="no_potion">אינכם צריכים לקנות שיקוי בריאות</string>
+  <string name="successful_purchase">%1$s נרכש בהצלחה</string>
+  <string name="purchase_confirmation_title">אשרו רכישה</string>
+  <string name="confirm_purchase_text">קנו %1$s בעבור %2$s %3$s</string>
+  <string name="gem">אבן חן</string>
+  <string name="hourglass">שעון חול</string>
+  <string name="hourglasses">שעוני חול</string>
+  <string name="gold_singular">זהב</string>
+  <string name="gold_plural">זהב</string>
+  <string name="chat_message_copied">הודעה הועתקה ללוח</string>
+  <string name="copy_chat_message">העתקה ללוח</string>
+  <string name="edit_tag_title">עריכת תג</string>
+  <string name="edit_tag_btn_edit">עריכה</string>
+  <string name="edit_tag_btn_done">בוצע</string>
+  <string name="edit_tag_btn_delete">מחיקה</string>
+  <string name="confirm_delete_tag_title">האם אתם בטוחים?</string>
+  <string name="confirm_delete_tag_message">האם אתם באמת רוצים למחוק?</string>
+  <string name="filter_drawer_edit_tags">עריכת תגים</string>
+  <string name="filter_drawer_filter_tags">סינון לפי תגיות</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">תנו למישהו להזמין אתכם עם קוד ה QR הזה</string>
+  <string name="qr_save_message">קוד QR נשמר ב</string>
+  <string name="qr_dialogue_title">קוד ה QR שלכם</string>
+  <string name="download">הורדה</string>
+  <string name="send_new_message">שליחת הודעה חדשה</string>
+  <string name="choose_recipient_title">בחרו נמען להודעה</string>
+  <string name="action_continue">המשך</string>
+  <string name="scan_qr_code">סריקת קוד QR</string>
+  <!--Login Incentives-->
+  <string name="subscriptions">הרשמות</string>
+  <string name="subscribe">הרשמה</string>
+</resources>
diff --git a/Habitica/res/values-ja/strings.profile.xml b/Habitica/res/values-ja/strings.profile.xml
index 70ba83f5c..45bba0c1a 100644
--- a/Habitica/res/values-ja/strings.profile.xml
+++ b/Habitica/res/values-ja/strings.profile.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">ペットと乗騎</string>
-    <string name="profile_pets_found">種のペットを発見</string>
-    <string name="profile_mounts_tamed">種の乗騎を飼育</string>
-    <string name="profile_loading_data">メンバーデータを読み込んでいます。</string>
-    <string name="profile_send_message_to">%s にメッセージを送る</string>
-    <string name="profile_message_sent_to">%s に送ったメッセージ</string>
-    <string name="profile_level">レベル : </string>
-    <string name="profile_class_bonus">クラスボーナス : </string>
-    <string name="profile_allocated">割当済み : </string>
-    <string name="profile_boosts">勢い : </string>
-    <string name="profile_private_message">プライベートメッセージ</string>
-    <string name="profile_achievements">実績</string>
-    <string name="profile_achievement_ok">Ok</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">ペットと乗騎</string>
+    <string name="profile_pets_found">種のペットを発見</string>
+    <string name="profile_mounts_tamed">種の乗騎を飼育</string>
+    <string name="profile_loading_data">メンバーデータを読み込んでいます。</string>
+    <string name="profile_send_message_to">%s にメッセージを送る</string>
+    <string name="profile_message_sent_to">%s に送ったメッセージ</string>
+    <string name="profile_level">レベル : </string>
+    <string name="profile_class_bonus">クラスボーナス : </string>
+    <string name="profile_allocated">割当済み : </string>
+    <string name="profile_boosts">勢い : </string>
+    <string name="profile_private_message">プライベートメッセージ</string>
+    <string name="profile_achievements">実績</string>
+    <string name="profile_achievement_ok">Ok</string>
     </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ja/strings.tutorial.xml b/Habitica/res/values-ja/strings.tutorial.xml
index 40dfc9778..e99bdb311 100644
--- a/Habitica/res/values-ja/strings.tutorial.xml
+++ b/Habitica/res/values-ja/strings.tutorial.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_equipment">装備を買ったら、ここに表示されるよ。武装はアバターのステータに影響し、(有効にすれば)衣装としてアバターの見た目を変えるよ。</string>
-  <string name="tutorial_items">タスクを達成したりレベルを上げることで、アイテムを入手できるぞ。アイテムを使うにはタップしよう。</string>
-  <string name="tutorial_pets">現実世界のタスクを達成すると、「たまご」や「たまごがえしの薬」を見つけるチャンスが。組み合わせるとペットが生まれるよ。</string>
-  <string name="tutorial_skills">スキルは、特別な属性で強力な効果だ!　スキルを使うにはタップしよう。魔法を使うとマナ (青いバー) が減る。マナは、毎日アプリを使ったり、実生活のタスクを達成することで増える。詳しくは、メニューのFAQをチェック!</string>
-  <string name="tutorial_party">友達といっしょにモンスターと戦おう!　あなたと友達それぞれの目標を達成するための責任感が試されるぞ。</string>
-  <string name="tutorial_tavern">キャンプ場へようこそ!　ここは年齢なんか気にしないオープンなチャットルームです。ここでタスクの進め方について話したり、質問したりできます。楽しんでね!</string>
-  <string name="tutorial_classes">戦士、魔道士、治療師、それとも盗賊…どれになるか決めよう!　クラスにはそれぞれ専用の装備とスキルがある。詳しくは (?) をタップしてね!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_equipment">装備を買ったら、ここに表示されるよ。武装はアバターのステータに影響し、(有効にすれば)衣装としてアバターの見た目を変えるよ。</string>
+  <string name="tutorial_items">タスクを達成したりレベルを上げることで、アイテムを入手できるぞ。アイテムを使うにはタップしよう。</string>
+  <string name="tutorial_pets">現実世界のタスクを達成すると、「たまご」や「たまごがえしの薬」を見つけるチャンスが。組み合わせるとペットが生まれるよ。</string>
+  <string name="tutorial_skills">スキルは、特別な属性で強力な効果だ!　スキルを使うにはタップしよう。魔法を使うとマナ (青いバー) が減る。マナは、毎日アプリを使ったり、実生活のタスクを達成することで増える。詳しくは、メニューのFAQをチェック!</string>
+  <string name="tutorial_party">友達といっしょにモンスターと戦おう!　あなたと友達それぞれの目標を達成するための責任感が試されるぞ。</string>
+  <string name="tutorial_tavern">キャンプ場へようこそ!　ここは年齢なんか気にしないオープンなチャットルームです。ここでタスクの進め方について話したり、質問したりできます。楽しんでね!</string>
+  <string name="tutorial_classes">戦士、魔道士、治療師、それとも盗賊…どれになるか決めよう!　クラスにはそれぞれ専用の装備とスキルがある。詳しくは (?) をタップしてね!</string>
+</resources>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 538b041d0..94ab3a74f 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -1,467 +1,467 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">更新</string>
-  <string name="XP_default">経験値</string>
-  <string name="HP_default">体力</string>
-  <string name="MP_default">マナ</string>
-  <string name="ERR_pb_barcode">設定をバーコードから読み込むことができませんでした。</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">設定</string>
-  <string name="SP_address_hint">カスタムサーバー</string>
-  <string name="SP_userID_title">ユーザーID</string>
-  <string name="SP_userID_summary">あなたのユーザーID</string>
-  <string name="SP_APIToken_title">API トークン</string>
-  <string name="SP_APIToken_summary">あなたの API トークン</string>
-  <string name="Language_title">言語</string>
-  <string name="Language_summary">Habitica の言語を変更する</string>
-  <string name="SP_user_qr_code">QR コード</string>
-  <string name="PS_contact_title">開発者に連絡する</string>
-  <string name="pref_account_header">アカウント</string>
-  <string name="pref_first_day_of_the_week_title">週の最初の曜日</string>
-  <string name="pref_first_day_of_the_week_summary">すべてのカレンダーでの週の最初の曜日</string>
-  <string name="pref_reminder_header">毎日の通知</string>
-  <string name="pref_reminder_checkbox">通知を有効にする</string>
-  <string name="pref_reminder_picker">通知時間を設定</string>
-  <string name="pref_cds_header">日付更新の設定</string>
-  <string name="pref_cds_picker">日付更新の時間を設定する</string>
-  <string name="pref_push_notifications_checkbox">ユーザーへのプッシュ通知</string>
-  <string name="push_notifications">プッシュ通知</string>
-  <string name="push_notifications_sum">プッシュ通知を設定してください。</string>
-  <string name="preference_push_you_won_challenge">チャレンジで勝ちました!</string>
-  <string name="preference_push_received_a_private_message">プライベートメッセージを受信しました</string>
-  <string name="preference_push_gifted_gems">ジェムが贈られました</string>
-  <string name="preference_push_gifted_subscription">寄付会員権が贈られました</string>
-  <string name="preference_push_invited_to_party">パーティーに招待されました</string>
-  <string name="preference_push_invited_to_guild">ギルドに招待されました</string>
-  <string name="preference_push_your_quest_has_begun">クエストが始まりました</string>
-  <string name="preference_push_invited_to_quest">クエストに招待されました</string>
-  <!--Adding tasks-->
-  <string name="task_value">値</string>
-  <string name="action_edit">編集</string>
-  <string name="action_delete">削除</string>
-  <string name="action_cancel">戻る</string>
-  <string name="login_btn">ログイン</string>
-  <string name="register_btn">登録する</string>
-  <string name="username">ユーザー名</string>
-  <string name="email_username">メールアドレスまたはユーザー名</string>
-  <string name="password">パスワード</string>
-  <string name="emailAddress">メールアドレス</string>
-  <string name="confirmpassword">パスワード ( 確認 )</string>
-  <string name="logout">ログアウト</string>
-  <string name="logout_description">ログアウトする</string>
-  <string name="account_details_sum">アカウントの詳細を確認</string>
-  <string name="account_details">アカウントの詳細</string>
-  <string name="LoginActivityName">ようこそ</string>
-  <string name="string_revive">復活</string>
-  <string name="please_connect">Widget を使う前に、アプリから接続してください。</string>
-  <string name="about.title">Habitica について</string>
-  <string name="about.libraries">ライブラリー</string>
-  <string name="about.versionhistory">バージョン履歴</string>
-  <string name="about.habitica_open_source">Habitica は Github にてオープンソース・ソフトウェアとして開かれています。</string>
-  <string name="about.rate_our_app">このアプリをレビュー</string>
-  <string name="about.give_us_feedback">フィードバックを送る!</string>
-  <string name="about.bugreport">バグを報告する</string>
-  <string name="about.source_code">ソースコード</string>
-  <!--Network Errors-->
-  <string name="network_error_title">接続エラー</string>
-  <string name="network_error_no_network_body">インターネットに接続していません。</string>
-  <string name="internal_error_api">サーバーに問題があるようです。後ほど再試行してください。</string>
-  <string name="authentication_error_title">認証エラー</string>
-  <string name="authentication_error_body">入力したユーザー名とパスワードのいずれかまたは両方が誤っています。</string>
-  <string name="login_validation_error_title">確認エラー</string>
-  <string name="login_validation_error_fieldsmissing">入力欄のすべてに入力してください。</string>
-  <string name="save_changes">保存</string>
-  <string name="copy">コピー</string>
-  <string name="notes">メモ</string>
-  <string name="text">テキスト</string>
-  <string name="difficulty">難易度</string>
-  <string name="tags">タグ</string>
-  <string name="trivial">ちょちょい</string>
-  <string name="easy">かんたん</string>
-  <string name="medium">ふつう</string>
-  <string name="hard">むずかしい</string>
-  <string name="start_date">開始日</string>
-  <string name="positive_habit_form">いい ( + )</string>
-  <string name="negative_habit_form">悪い ( - )</string>
-  <string name="checklist">チェックリスト</string>
-  <string name="reminders">通知</string>
-  <string name="actions">行動</string>
-  <string name="attributes">属性</string>
-  <string name="physical">肉体</string>
-  <string name="mental">精神</string>
-  <string name="social">社会性</string>
-  <string name="other">ほか</string>
-  <string name="frequency">頻度</string>
-  <string name="frequency_weekly">決まった曜日</string>
-  <string name="frequency_daily">何日かごと</string>
-  <string name="monday">月</string>
-  <string name="tuesday">火</string>
-  <string name="wednesday">水</string>
-  <string name="thursday">木</string>
-  <string name="friday">金</string>
-  <string name="saturday">土</string>
-  <string name="sunday">日</string>
-  <string name="levelup_header">レベルが上がった!</string>
-  <string name="levelup_detail">実生活での目標を達成し、レベル %1$d に成長した!</string>
-  <string name="levelup_health">完全に傷がいえた!</string>
-  <string name="levelup_button">イエーイ!</string>
-  <string name="faint_subtitle">がっかりしないで!</string>
-  <string name="faint_penalty_body">レベルとゴールドと、いずれかの装備品を失った。だけど、がんばればすべてを取り返せるぞ！ 　あなたなら、きっとできる。幸あらんことを。</string>
-  <string name="faint_header">体力がなくなった!</string>
-  <string name="faint_button">体力を全回復してやり直す</string>
-  <string name="filter">フィルター</string>
-  <string name="profile_image">プロフィール画像</string>
-  <string name="mana_price_button">%d マナ</string>
-  <string name="used_skill">%2$dマナを消費して%1$sを唱えた。</string>
-  <string name="used_skill_without_mana">%1$s を唱えた。</string>
-  <string name="new_checklist_item">新しいチェックリスト項目</string>
-  <string name="add_checklist_item">追加</string>
-  <string name="reminder_title">日課をチェックした?</string>
-  <string name="skill_progress_title">使用中のスキル</string>
-  <string name="coming_soon">近日中</string>
-  <string name="chat_flag_confirmation">このメッセージを違反として報告します。いいですか?</string>
-  <string name="flag_confirm">メッセージに印をつける</string>
-  <string name="unlock_lvl_11">レベル11 でアンロック</string>
-  <string name="no_party_message">パーティーに参加してないよ。パーティーに参加する方法を website で確認して。</string>
-  <string name="forgot_pw_btn">パスワードがわからない</string>
-  <string name="forgot_pw_tv">パスワードを忘れた? 携帯電話用のWebsiteへアクセスしてください。</string>
-  <string name="tavern.inn.checkOut">日課を再開する</string>
-  <string name="tavern.inn.rest">日課を中断する</string>
-  <string name="reward.dialog.buy">買う</string>
-  <string name="reward.dialog.dismiss">中止</string>
-  <string name="party">パーティー</string>
-  <string name="chat">チャット</string>
-  <string name="members">メンバー</string>
-  <string name="habits">習慣</string>
-  <string name="dailies">日課</string>
-  <string name="todos">To-Do</string>
-  <string name="rewards">ごほうび</string>
-  <string name="taskform.delete.title">よろしいですか?</string>
-  <string name="taskform.delete.message">削除します。いいですか?</string>
-  <string name="yes">はい</string>
-  <string name="no">いいえ</string>
-  <string name="quest">クエスト</string>
-  <string name="avatar_body">体</string>
-  <string name="avatar_hair">髪</string>
-  <string name="avatar_shirt">シャツ</string>
-  <string name="avatar_skin">肌</string>
-  <string name="avatar_ears">動物の耳</string>
-  <string name="avatar_base">ベース</string>
-  <string name="avatar_color">色</string>
-  <string name="avatar_beard">あごひげ</string>
-  <string name="avatar_mustache">くちひげ</string>
-  <string name="avatar_flower">花</string>
-  <string name="avatar_bangs">前髪</string>
-  <string name="avatar_nothing">なし</string>
-  <string name="avatar_size">サイズ</string>
-  <string name="avatar_size_slim">スリム</string>
-  <string name="avatar_size_broad">がっしり</string>
-  <string name="avatar_background">背景</string>
-  <string name="purchase_customization">カスタマイズを購入</string>
-  <string name="purchase_set_button">%d ジェムでセットをアンロック</string>
-  <string name="purchase_button">購入</string>
-  <string name="purchase_set_title">%s セットを購入</string>
-  <string name="due_date">締切日</string>
-  <string name="quest.accept">承認</string>
-  <string name="quest.reject">拒否</string>
-  <string name="quest.begin">クエストをはじめる</string>
-  <string name="quest.cancel">招待を中止する</string>
-  <string name="quest.abort">クエストを中断する</string>
-  <string name="quest.leave">クエストを抜ける</string>
-  <string name="quest.pending">保留</string>
-  <string name="quest.accepted">承認済</string>
-  <string name="quest.rejected">拒否</string>
-  <string name="quest.participants">参加者</string>
-  <string name="version_info">バージョン : %1$s (%2$d)</string>
-  <string name="sidebar_help">ヘルプとFAQ</string>
-  <string name="complete_tutorial">わかった!</string>
-  <string name="dismiss_tutorial">もう一度通知</string>
-  <string name="intro_1_subtitle">へよこそう</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_2_subtitle">ゲームの進行</string>
-  <string name="intro_2_title">人生の進行</string>
-  <string name="intro_3_description">友達の力を借りて目標にしがみつこう。実生活とバトルでお互いに助け合い、いっしょに成長しよう!</string>
-  <string name="intro_finish_button">始めましょう!</string>
-  <string name="previous_button">戻る</string>
-  <string name="next_button">次へ</string>
-  <string name="skip_button">スキップ</string>
-  <string name="setup_welcome_description">Habitica へようこそ。ここはゲームが進むほどに、あなたの実生活が改善されるところ!　あなたが現実世界のゴールを達成すれば、装備やペット、クエストなどなど、新たな世界が広がるよ。</string>
-  <string name="setup_welcome_title">ようこそ</string>
-  <string name="setup_group_work">仕事</string>
-  <string name="setup_group_exercise">エクササイズ</string>
-  <string name="setup_group_school">学校</string>
-  <string name="setup_group_teams">チーム</string>
-  <string name="setup_group_chores">家事</string>
-  <string name="setup_group_creativity">創造性</string>
-  <string name="setup_task_work_1">メール処理</string>
-  <string name="setup_task_work_2">もっとも重要なタスク</string>
-  <string name="setup_task_work_3">仕事のプロジェクト</string>
-  <string name="setup_task_exercise_1">有酸素運動10分</string>
-  <string name="setup_task_exercise_2">ストレッチ</string>
-  <string name="setup_task_exercise_3">ワークアウトの日程調整</string>
-  <string name="setup_task_healthWellness_1">体にいいもの / ジャンクフードを食べる</string>
-  <string name="setup_task_healthWellness_2">歯のフロス</string>
-  <string name="setup_task_healthWellness_3">健康診断の日程を決める</string>
-  <string name="setup_task_school_1">勉強する / 先延ばしする</string>
-  <string name="setup_task_school_2">宿題をする</string>
-  <string name="setup_task_school_3">時間割をそろえる</string>
-  <string name="setup_task_teams_1">チームに加わる</string>
-  <string name="setup_task_teams_2">チームの進捗を確認する</string>
-  <string name="setup_task_teams_3">チームプロジェクトを完了する</string>
-  <string name="setup_task_chores_1">10分間のそうじ</string>
-  <string name="setup_task_chores_2">皿洗い</string>
-  <string name="setup_task_chores_3">クローゼットの整理</string>
-  <string name="setup_task_creativity_1">手芸を習う</string>
-  <string name="setup_task_creativity_2">創造的なプロジェクトで働く</string>
-  <string name="setup_task_creativity_3">創造的なプロジェクトを完了する</string>
-  <string name="gem.purchase.support">Habitica の運営を手伝ってくれませんか?　ジェムを買うことでアプリの開発者を支援できます!\n\nジェムはあなたのアカウントの楽しいおまけを買うことができます。おまけの例: \n\n - アバターのカッコいい衣装\n
- - すんごい背景\n - ペットのタマゴがごほうびの楽しいクエスト\n - レベル100になるまでにクラスを変更できる\n\nHabiticaが最高のものになる手助けをしてくれるとうれしいです。あなたの支援は私たちにとって多くの意味があることなんです!</string>
-  <string name="my_guilds">入っているギルド</string>
-  <string name="public_guilds">オープン ギルド</string>
-  <string name="guild">ギルド</string>
-  <string name="leave">辞める</string>
-  <string name="join">参加する</string>
-  <string name="leader">リーダー</string>
-  <string name="gems">ジェム</string>
-  <string name="send_pm">PMを送る</string>
-  <string name="flag">フラグ</string>
-  <string name="delete">削除</string>
-  <string name="name">名前</string>
-  <string name="description">詳細</string>
-  <string name="privacy">プライバシー</string>
-  <string name="write_message">メッセージを書く</string>
-  <string name="post">投稿</string>
-  <string name="guild_search_hint">ギルドを検索</string>
-  <string name="todo_due">期限 : %s</string>
-  <string name="daily_streak">現在の連続実行 : %d 回</string>
-  <string name="todo_has_duedate">期限ありタスク</string>
-  <string name="battle_gear">武装</string>
-  <string name="costume">衣装</string>
-  <string name="outfit_head">頭</string>
-  <string name="outfit_headAccessory">頭部のアクセサリー</string>
-  <string name="outfit_eyewear">アイウェア</string>
-  <string name="outfit_armor">よろい</string>
-  <string name="outfit_back">背中</string>
-  <string name="outfit_body">体</string>
-  <string name="outfit_shield">盾</string>
-  <string name="outfit_weapon">武器</string>
-  <string name="wear_costume">衣装を着る</string>
-  <string name="equipped">装備済み</string>
-  <string name="quest_cancel_message">このクエストを中止します。よろしいですか?　招待を受けたすべての参加者を失うことになります。クエストの所有者の元にクエストの巻物が戻ってきます。</string>
-  <string name="quest.invitation">クエストへの招待</string>
-  <string name="quest_begin_message">クエストをはじめます。よろしいですか?　クエストを開始すると、新たにメンバーがクエストに参加することはできません。</string>
-  <string name="quest.invitation.text">クエストへの招待状が届いた!</string>
-  <string name="ago_1day">1日前</string>
-  <string name="ago_days">%d日前</string>
-  <string name="ago_1Minute">1分前</string>
-  <string name="ago_minutes">%d分前</string>
-  <string name="ago_hours">%d時間前</string>
-  <string name="ago_1hour">1時間前</string>
-  <string name="today">今日</string>
-  <string name="sidebar_items">アイテム</string>
-  <string name="eggs">たまご</string>
-  <string name="hatching_potions">たまごがえしの薬</string>
-  <string name="food">えさ</string>
-  <string name="quests">クエスト</string>
-  <string name="pets">ペット</string>
-  <string name="mounts">乗騎</string>
-  <string name="armoireEquipment">宝箱に貴重なアイテム、 %s を見つけた!　すごい!</string>
-  <string name="armoireFood">宝箱をひっかきまわして%1$s%2$sを見つけた。何でこんなとこに?</string>
-  <string name="armoireExp">宝箱と格闘して経験値を増やした。どうぞっ!</string>
-  <string name="armoireNotesFull">宝箱を開くと、特別な装備、経験値、えさなどが手に入るよ!　残っているアイテムの数 : %d</string>
-  <string name="armoireLastItem">最後の貴重なアイテムをラッキー宝箱で発見した。</string>
-  <string name="armoireNotesEmpty">宝箱には毎月最初の週に新しいアイテムが入ります。それまでは、クリックして経験値やえさを手に入れよう!</string>
-  <string name="sell">%d ゴールドで売る</string>
-  <string name="hatch_with_potion">たまごがえしの薬を使う</string>
-  <string name="feed_to_pet">ペットにえさをやる</string>
-  <string name="hatch_egg">たまごをかえす</string>
-  <string name="invite_party">パーティーに招待する</string>
-  <string name="dialog_feeding">%1$s%2$s にえさをやる :</string>
-  <string name="use_animal">連れていく</string>
-  <string name="feed">えさをやる</string>
-  <string name="hatch_with">%s でペットをかえす</string>
-  <string name="hatched_pet_title">%1$s%2$sが生まれた!</string>
-  <string name="close">閉じる</string>
-  <string name="share">共有する</string>
-  <string name="notification_pet_fed">%1$s%2$sにえさをやった!</string>
-  <string name="notification_purchase">%s は購入済み</string>
-  <string name="sectionpets">基本のペット</string>
-  <string name="sectionpremiumPets">魔法の薬のペット</string>
-  <string name="sectionquestPets">クエスト ペット</string>
-  <string name="sectionspecialPets">貴重なペット</string>
-  <string name="sectionmounts">基本の乗騎</string>
-  <string name="sectionpremiumMounts">魔法の薬の乗騎</string>
-  <string name="sectionquestMounts">クエストの乗騎</string>
-  <string name="sectionspecialMounts">レアな乗騎</string>
-  <string name="world_quest">世界のクエスト</string>
-  <string name="inn_description">ロッジで休んでいる間は、日課をやらずに夜が明けてもダメージを受けない! ( 注 : ボスから受けるダメージは避けられない)</string>
-  <string name="empty_items">%s を持ってないよ</string>
-  <string name="user_level">レベル %d</string>
-  <string name="user_level_with_class">レベル %1$d %2$s</string>
-  <string name="warrior">戦士</string>
-  <string name="rogue">盗賊</string>
-  <string name="mage">魔道士</string>
-  <string name="healer">治療師</string>
-  <string name="warrior_description">戦士はタスクを完了したときに、「会心の一撃」が出やすく、その効果も高い。「会心の一撃」が出ると、ゴールド、経験値、アイテムドロップの確率にボーナスがつく。また、戦士はボスに大きなダメージを与えられるぞ。予測できない一攫千金の報酬でやる気が出る、もしくはボス クエストで活躍したいなら、戦士でプレーしよう!</string>
-  <string name="mage_description">魔道士は、すぐに身に着ける学習能力をもっているよ。経験値の取得とレベルアップが他のクラスより速い。また、魔道士は、スキルを使うためのマナを集めるのがうまい。Habitica の戦術的な面を楽しみたい、レベルアップや拡張機能のアンロックにすごくやる気が出るなら、魔道士でプレーしよう!</string>
-  <string name="rogue_description">盗賊は富を集めることを愛するのです。ほかのどのクラスよりもゴールドを稼ぎ、アイテムを見つける確率が高い。盗賊の特徴、忍びの術をもってすれば、日課をやらなかったとしても、性格的に傷つかない。戦利品や勲章――Habitica では、ごほうびと実績に強く心動かされるなら、盗賊でプレーしよう!</string>
-  <string name="healer_description">治療師は痛みに耐え、他人を守るのです。やらなかった日課や悪い習慣にも治療師は動揺せず、失敗から体力を回復させる能力がある。パーティーの他のメンバーを助けることに喜びを感じる、困難な仕事による死をも恐れぬ理想があるのなら、治療師でプレーしよう!</string>
-  <string name="select_class">クラスを選ぶ</string>
-  <string name="opt_out_class">選ばない</string>
-  <string name="opt_out_description">クラスなんてめんどくさい? 後で選びたい? 選ばなくても構わないよ。スキルのない戦士になります。クラスのしくみについてwiki を参照し、いつでも ユーザー -&gt; ステータス で有効にできる。</string>
-  <string name="class_confirmation">%s になります。いいですか?</string>
-  <string name="class_changed">あなたは%s に転職した！</string>
-  <string name="class_changed_description">新たな標準の武装を手に入れました。「装備」で取り換えることもできます。</string>
-  <string name="choose_class">クラスを選ぶ</string>
-  <string name="dialog_go_back">戻る</string>
-  <string name="opt_out_confirmation">選ばないでいい?</string>
-  <string name="change_class">クラスを変更する</string>
-  <string name="change_class_description">クラスを変更し、能力値を回収する。要 3 ジェム。能力値の割りあては Web 画面で行う。 </string>
-  <string name="enable_class">クラス システムを有効にする</string>
-  <string name="changing_class_progress">クラスの変更</string>
-  <string name="by_email">メールで</string>
-  <string name="invite_existing_users">登録済みのユーザー</string>
-  <string name="send">送信</string>
-  <string name="invite">友達を招待する</string>
-  <string name="invite_id_description">すでに Habitica に登録しているユーザーに友達がいるなら、その人たちをユーザーIDで招待するよ。</string>
-  <string name="invite_email_description">メールを通じて、友達が Habitica に登録したら、自動的にあなたのパーティーに招待するよ。</string>
-  <string name="add_invites">招待の追加</string>
-  <string name="user_id">ユーザーID</string>
-  <string name="email">メール</string>
-  <string name="invite_users">パーティーに招待する</string>
-  <string name="share_using">共有 ( シェア ) : </string>
-  <string name="share_levelup">生活を改善して、Habitica でのレベルが %d になった!</string>
-  <string name="share_hatched">実生活でのタスクをこなして、Habitica で %1$s%2$s のペットを飼いはじめた。</string>
-  <string name="share_raised">実生活でのタスクをこなして、%1$s%2$s のペットが乗れるほど大きな乗騎まで成長した。</string>
-  <string name="open_in_store">Play ストアで開く</string>
-  <string name="change_class_confirmation">クラスを変更します。いいですか? 3 ジェムかかります。</string>
-  <string name="change_class_equipment_warning">注意 : %s クラスの装備を買うことはできなくなります。</string>
-  <string name="leaderMessage">%1$s からのメッセージ</string>
-  <string name="leaderName">リーダー : %1$s</string>
-  <string name="confirm">確認</string>
-  <string name="market">市場</string>
-  <string name="timeTravelers">タイムトラベラー</string>
-  <string name="seasonalShop">期間限定ショップ</string>
-  <string name="empty_inbox">受信箱にメッセージがありません。Habitica ユーザーあてにメッセージを送ることができます。公開チャットに投稿しているユーザーにメッセージを送ってみてはどうですか?</string>
-  <string name="party_invite">友達を招待するとアンロック</string>
-  <string name="no_gold">ゴールドが足りません</string>
-  <string name="no_potion">体力回復の薬を買う必要がありません</string>
-  <string name="successful_purchase">%1$s を買いました</string>
-  <string name="purchase_confirmation_title">購入の確認</string>
-  <string name="confirm_purchase_text">%2$s %3$s で %1$s  を買う</string>
-  <string name="gem">ジェム</string>
-  <string name="hourglass">砂時計</string>
-  <string name="hourglasses">砂時計</string>
-  <string name="gold_singular">ゴールド</string>
-  <string name="gold_plural">ゴールド</string>
-  <string name="chat_message_copied">クリップボードにコピーされたメッセージ</string>
-  <string name="copy_chat_message">クリップボードにコピー</string>
-  <string name="edit_tag_title">タグを編集</string>
-  <string name="edit_tag_btn_edit">編集</string>
-  <string name="edit_tag_btn_done">完了</string>
-  <string name="edit_tag_btn_delete">削除</string>
-  <string name="confirm_delete_tag_title">よろしいですか?</string>
-  <string name="confirm_delete_tag_message">削除します。いいですか?</string>
-  <string name="filter_drawer_edit_tags">タグを編集</string>
-  <string name="filter_drawer_filter_tags">タグでしぼる</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">この QR コードで招待を受けます。</string>
-  <string name="qr_save_message">QR コードの保存先</string>
-  <string name="qr_dialogue_title">QR コード</string>
-  <string name="download">ダウンロード</string>
-  <string name="send_new_message">メッセージを送信</string>
-  <string name="choose_recipient_title">メッセージの送信先を選択</string>
-  <string name="action_continue">続行</string>
-  <string name="scan_qr_code">QR コードを読み取る</string>
-  <string name="enter_recipient_uuid">送信先の ユーザー ID を入力</string>
-  <string name="invited_to_party">パーティーに招待されました!</string>
-  <string name="stats_widget_label">Habitica ステータス</string>
-  <string name="add_task">タスクを追加</string>
-  <string name="add_habit">習慣を追加</string>
-  <string name="add_daily">日課を追加</string>
-  <string name="add_todo">To-Do を追加</string>
-  <string name="add_reward">ごほうびを追加</string>
-  <string name="all_dailies_completed">日課をすべて完了した。お見事!</string>
-  <string name="widget_habit_button">Habitica の習慣</string>
-  <string name="widget_dailies">Habitica の日課</string>
-  <string name="widget_add_task">Habitica のタスク追加</string>
-  <string name="google_services_missing">Google Play サービスが見つかりません。</string>
-  <string name="gem.purchase.toolbartitle">購入</string>
-  <string name="gem.purchase.title">ジェムの購入で、開発者を支援し、Habitica の運営に協力します。</string>
-  <string name="gem.purchase.subtitle">ジェムで、楽しいおまけを買うことができます : </string>
-  <string name="gem.purchase.listitem1">アバター用のクールなファッション</string>
-  <string name="gem.purchase.listitem2">すんごい背景</string>
-  <string name="gem.purchase.listitem3">ペットのたまごを獲得できるクエスト</string>
-  <string name="gem.purchase.listitem4">レベル 100 以前でのクラス変更</string>
-  <string name="support_habitica">Habitica の支援</string>
-  <string name="skill_transformation_use">唱える</string>
-  <string name="hatching_market_info">ほしい落とし物が見つからない?　市場をチェックしてみよう!</string>
-  <string name="feeding_market_info">違うえさがほしい?　市場で買いましょう!</string>
-  <string name="open_market">市場を開く</string>
-  <string name="cds_description">あなたの日課が次に更新されるのは %1$s です。この時間までに日課を片付けておきましょう!</string>
-  <string name="AudioTheme_title">サウンド テーマ</string>
-  <string name="AudioTheme_summary">Habitica のサウンド テーマを変更する</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">また明日！</string>
-  <string name="belongs_to_challenge">チャレンジに参加中</string>
-  <string name="has_reminder">通知あり</string>
-  <string name="has_tag">タグあり</string>
-  <string name="subscribe.title">寄付することで、開発者を支援し、Habitica の運営に協力します。</string>
-  <string name="subscribe_prompt">寄付すれば、こんな便利な特典がもらえます：</string>
-  <string name="subscribe.listitem1">ゴールドでジェムを購入</string>
-  <string name="subscribe.listitem2">毎月の限定アイテム</string>
-  <string name="subscribe.listitem3">詳細な履歴の保存</string>
-  <string name="subscribe.listitem4">毎日の落とし物の定数が2倍</string>
-  <string name="subscriptions">寄付</string>
-  <string name="subscribe.listitem1.description">商人・アレクサンダーが、ジェム1個を20ゴールドで売ってくれます！\n\nアレクサンダーと1ヵ月の間に取り引きできるジェムの数は、最初は25個に限定されていますが、寄付期間によって増えます。\n\n寄付の継続3カ月ごとにその数が5個ずつ増えていき、最大で月に50個を買うことができます。</string>
-  <string name="subscribe.listitem2.description">毎月、アバターを個性的にメークアップするアイテムが手に入ります！\n\nさらに寄付の継続3カ月ごとに、謎のタイムトラベラーによって、歴史的（そして未来的！）なメークアップ アイテムへのアクセスが許されます。</string>
-  <string name="subscribe.listitem3.description">完了した To-Do やタスクの履歴を、より長期間閲覧可能になります。</string>
-  <string name="subscribe1month.gemcap">最初は25ジェムまで購入できます</string>
-  <string name="subscribe3month.gemcap">ジェムの制限値を30個に引き上げ</string>
-  <string name="subscribe6month.gemcap">ジェムの制限値を35個に引き上げ</string>
-  <string name="subscribe12month.gemcap">ジェムの制限値を45個に引き上げ</string>
-  <string name="subscription_hourglasses">+%d個の神秘の砂時計</string>
-  <string name="payment_method">支払方法</string>
-  <string name="subscription">寄付</string>
-  <string name="one_month">1ヶ月</string>
-  <string name="months">%dヶ月</string>
-  <string name="month">月</string>
-  <string name="three_months">3ヶ月</string>
-  <string name="six_months">6ヶ月</string>
-  <string name="twelve_months">12ヶ月</string>
-  <string name="subscribe_prompt_thanks">寄付のお礼として、こんな便利な特典をもらっています：</string>
-  <string name="challenge_details">チャレンジの概要</string>
-  <string name="challenge_leave_title">チャレンジから抜ける</string>
-  <string name="challenge_leave_text">本当にチャレンジ「%s」を抜けますか？</string>
-  <string name="my_challenges">参加しているチャレンジ</string>
-  <string name="public_challenges">みんなのチャレンジ</string>
-  <string name="challenges">チャレンジ</string>
-  <string name="daily">日課</string>
-  <string name="habit">習慣</string>
-  <string name="reward">ごほうび</string>
-  <string name="todo">To-Do</string>
-  <string name="official">Habitica公式</string>
-  <string name="participating">参加済み</string>
-  <string name="challenge">チャレンジ</string>
-  <string name="go_to_challenge">チャレンジに参加する</string>
-  <string name="not_part_of_a_challenge">今参加しているチャレンジはありません！</string>
-  <string name="join_a_challenge">チャレンジに参加してタスクのセットをあなたのタスクリストに追加し、他のHabiticianと達成度を競いましょう。優勝すれば実績メダルと、副賞としてジェムを手に入れられることもあります！</string>
-  <string name="check_the_public_challenge_tab">”みんなのチャレンジ”タブをタップして、ユーザーが作ったチャレンジの中からあなたにしっくりくるものを見つけましょう！</string>
-  <string name="add_reminder">リマインダーを追加する</string>
-  <string name="warning">注意</string>
-  <string name="open_settings">設定を開く</string>
-  <string name="inbox">受信箱</string>
-  <string name="FAQ">よくある質問</string>
-  <string name="special">スペシャル</string>
-  <string name="gem_for_gold_description">Habiticaへの寄付のお礼として、あなたは毎月一定数のジェムをゲーム内のゴールドで購入することができます。</string>
-  <string name="limited_count">あと%d個</string>
-  <string name="gem_shop">ジェム</string>
-  <string name="mystery_item">ミステリーアイテム</string>
-  <string name="myster_item_notes">寄付会員は、毎月ミステリーアイテムを受け取ることができます。ミステリーアイテムは通常、月の終わりの週に新たなものがリリースされます。</string>
-  <string name="open">開く</string>
-  <string name="notification_mystery_item">プレゼントボックスを開いて%sを手に入れました！</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">あと%1$d日のログインで、新たな賞品が手に入ります！</string>
-  <string name="all">全部</string>
-  <string name="none">なし</string>
-  <string name="action_back">戻る</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">更新</string>
+  <string name="XP_default">経験値</string>
+  <string name="HP_default">体力</string>
+  <string name="MP_default">マナ</string>
+  <string name="ERR_pb_barcode">設定をバーコードから読み込むことができませんでした。</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">設定</string>
+  <string name="SP_address_hint">カスタムサーバー</string>
+  <string name="SP_userID_title">ユーザーID</string>
+  <string name="SP_userID_summary">あなたのユーザーID</string>
+  <string name="SP_APIToken_title">API トークン</string>
+  <string name="SP_APIToken_summary">あなたの API トークン</string>
+  <string name="Language_title">言語</string>
+  <string name="Language_summary">Habitica の言語を変更する</string>
+  <string name="SP_user_qr_code">QR コード</string>
+  <string name="PS_contact_title">開発者に連絡する</string>
+  <string name="pref_account_header">アカウント</string>
+  <string name="pref_first_day_of_the_week_title">週の最初の曜日</string>
+  <string name="pref_first_day_of_the_week_summary">すべてのカレンダーでの週の最初の曜日</string>
+  <string name="pref_reminder_header">毎日の通知</string>
+  <string name="pref_reminder_checkbox">通知を有効にする</string>
+  <string name="pref_reminder_picker">通知時間を設定</string>
+  <string name="pref_cds_header">日付更新の設定</string>
+  <string name="pref_cds_picker">日付更新の時間を設定する</string>
+  <string name="pref_push_notifications_checkbox">ユーザーへのプッシュ通知</string>
+  <string name="push_notifications">プッシュ通知</string>
+  <string name="push_notifications_sum">プッシュ通知を設定してください。</string>
+  <string name="preference_push_you_won_challenge">チャレンジで勝ちました!</string>
+  <string name="preference_push_received_a_private_message">プライベートメッセージを受信しました</string>
+  <string name="preference_push_gifted_gems">ジェムが贈られました</string>
+  <string name="preference_push_gifted_subscription">寄付会員権が贈られました</string>
+  <string name="preference_push_invited_to_party">パーティーに招待されました</string>
+  <string name="preference_push_invited_to_guild">ギルドに招待されました</string>
+  <string name="preference_push_your_quest_has_begun">クエストが始まりました</string>
+  <string name="preference_push_invited_to_quest">クエストに招待されました</string>
+  <!--Adding tasks-->
+  <string name="task_value">値</string>
+  <string name="action_edit">編集</string>
+  <string name="action_delete">削除</string>
+  <string name="action_cancel">戻る</string>
+  <string name="login_btn">ログイン</string>
+  <string name="register_btn">登録する</string>
+  <string name="username">ユーザー名</string>
+  <string name="email_username">メールアドレスまたはユーザー名</string>
+  <string name="password">パスワード</string>
+  <string name="emailAddress">メールアドレス</string>
+  <string name="confirmpassword">パスワード ( 確認 )</string>
+  <string name="logout">ログアウト</string>
+  <string name="logout_description">ログアウトする</string>
+  <string name="account_details_sum">アカウントの詳細を確認</string>
+  <string name="account_details">アカウントの詳細</string>
+  <string name="LoginActivityName">ようこそ</string>
+  <string name="string_revive">復活</string>
+  <string name="please_connect">Widget を使う前に、アプリから接続してください。</string>
+  <string name="about.title">Habitica について</string>
+  <string name="about.libraries">ライブラリー</string>
+  <string name="about.versionhistory">バージョン履歴</string>
+  <string name="about.habitica_open_source">Habitica は Github にてオープンソース・ソフトウェアとして開かれています。</string>
+  <string name="about.rate_our_app">このアプリをレビュー</string>
+  <string name="about.give_us_feedback">フィードバックを送る!</string>
+  <string name="about.bugreport">バグを報告する</string>
+  <string name="about.source_code">ソースコード</string>
+  <!--Network Errors-->
+  <string name="network_error_title">接続エラー</string>
+  <string name="network_error_no_network_body">インターネットに接続していません。</string>
+  <string name="internal_error_api">サーバーに問題があるようです。後ほど再試行してください。</string>
+  <string name="authentication_error_title">認証エラー</string>
+  <string name="authentication_error_body">入力したユーザー名とパスワードのいずれかまたは両方が誤っています。</string>
+  <string name="login_validation_error_title">確認エラー</string>
+  <string name="login_validation_error_fieldsmissing">入力欄のすべてに入力してください。</string>
+  <string name="save_changes">保存</string>
+  <string name="copy">コピー</string>
+  <string name="notes">メモ</string>
+  <string name="text">テキスト</string>
+  <string name="difficulty">難易度</string>
+  <string name="tags">タグ</string>
+  <string name="trivial">ちょちょい</string>
+  <string name="easy">かんたん</string>
+  <string name="medium">ふつう</string>
+  <string name="hard">むずかしい</string>
+  <string name="start_date">開始日</string>
+  <string name="positive_habit_form">いい ( + )</string>
+  <string name="negative_habit_form">悪い ( - )</string>
+  <string name="checklist">チェックリスト</string>
+  <string name="reminders">通知</string>
+  <string name="actions">行動</string>
+  <string name="attributes">属性</string>
+  <string name="physical">肉体</string>
+  <string name="mental">精神</string>
+  <string name="social">社会性</string>
+  <string name="other">ほか</string>
+  <string name="frequency">頻度</string>
+  <string name="frequency_weekly">決まった曜日</string>
+  <string name="frequency_daily">何日かごと</string>
+  <string name="monday">月</string>
+  <string name="tuesday">火</string>
+  <string name="wednesday">水</string>
+  <string name="thursday">木</string>
+  <string name="friday">金</string>
+  <string name="saturday">土</string>
+  <string name="sunday">日</string>
+  <string name="levelup_header">レベルが上がった!</string>
+  <string name="levelup_detail">実生活での目標を達成し、レベル %1$d に成長した!</string>
+  <string name="levelup_health">完全に傷がいえた!</string>
+  <string name="levelup_button">イエーイ!</string>
+  <string name="faint_subtitle">がっかりしないで!</string>
+  <string name="faint_penalty_body">レベルとゴールドと、いずれかの装備品を失った。だけど、がんばればすべてを取り返せるぞ！ 　あなたなら、きっとできる。幸あらんことを。</string>
+  <string name="faint_header">体力がなくなった!</string>
+  <string name="faint_button">体力を全回復してやり直す</string>
+  <string name="filter">フィルター</string>
+  <string name="profile_image">プロフィール画像</string>
+  <string name="mana_price_button">%d マナ</string>
+  <string name="used_skill">%2$dマナを消費して%1$sを唱えた。</string>
+  <string name="used_skill_without_mana">%1$s を唱えた。</string>
+  <string name="new_checklist_item">新しいチェックリスト項目</string>
+  <string name="add_checklist_item">追加</string>
+  <string name="reminder_title">日課をチェックした?</string>
+  <string name="skill_progress_title">使用中のスキル</string>
+  <string name="coming_soon">近日中</string>
+  <string name="chat_flag_confirmation">このメッセージを違反として報告します。いいですか?</string>
+  <string name="flag_confirm">メッセージに印をつける</string>
+  <string name="unlock_lvl_11">レベル11 でアンロック</string>
+  <string name="no_party_message">パーティーに参加してないよ。パーティーに参加する方法を website で確認して。</string>
+  <string name="forgot_pw_btn">パスワードがわからない</string>
+  <string name="forgot_pw_tv">パスワードを忘れた? 携帯電話用のWebsiteへアクセスしてください。</string>
+  <string name="tavern.inn.checkOut">日課を再開する</string>
+  <string name="tavern.inn.rest">日課を中断する</string>
+  <string name="reward.dialog.buy">買う</string>
+  <string name="reward.dialog.dismiss">中止</string>
+  <string name="party">パーティー</string>
+  <string name="chat">チャット</string>
+  <string name="members">メンバー</string>
+  <string name="habits">習慣</string>
+  <string name="dailies">日課</string>
+  <string name="todos">To-Do</string>
+  <string name="rewards">ごほうび</string>
+  <string name="taskform.delete.title">よろしいですか?</string>
+  <string name="taskform.delete.message">削除します。いいですか?</string>
+  <string name="yes">はい</string>
+  <string name="no">いいえ</string>
+  <string name="quest">クエスト</string>
+  <string name="avatar_body">体</string>
+  <string name="avatar_hair">髪</string>
+  <string name="avatar_shirt">シャツ</string>
+  <string name="avatar_skin">肌</string>
+  <string name="avatar_ears">動物の耳</string>
+  <string name="avatar_base">ベース</string>
+  <string name="avatar_color">色</string>
+  <string name="avatar_beard">あごひげ</string>
+  <string name="avatar_mustache">くちひげ</string>
+  <string name="avatar_flower">花</string>
+  <string name="avatar_bangs">前髪</string>
+  <string name="avatar_nothing">なし</string>
+  <string name="avatar_size">サイズ</string>
+  <string name="avatar_size_slim">スリム</string>
+  <string name="avatar_size_broad">がっしり</string>
+  <string name="avatar_background">背景</string>
+  <string name="purchase_customization">カスタマイズを購入</string>
+  <string name="purchase_set_button">%d ジェムでセットをアンロック</string>
+  <string name="purchase_button">購入</string>
+  <string name="purchase_set_title">%s セットを購入</string>
+  <string name="due_date">締切日</string>
+  <string name="quest.accept">承認</string>
+  <string name="quest.reject">拒否</string>
+  <string name="quest.begin">クエストをはじめる</string>
+  <string name="quest.cancel">招待を中止する</string>
+  <string name="quest.abort">クエストを中断する</string>
+  <string name="quest.leave">クエストを抜ける</string>
+  <string name="quest.pending">保留</string>
+  <string name="quest.accepted">承認済</string>
+  <string name="quest.rejected">拒否</string>
+  <string name="quest.participants">参加者</string>
+  <string name="version_info">バージョン : %1$s (%2$d)</string>
+  <string name="sidebar_help">ヘルプとFAQ</string>
+  <string name="complete_tutorial">わかった!</string>
+  <string name="dismiss_tutorial">もう一度通知</string>
+  <string name="intro_1_subtitle">へよこそう</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_2_subtitle">ゲームの進行</string>
+  <string name="intro_2_title">人生の進行</string>
+  <string name="intro_3_description">友達の力を借りて目標にしがみつこう。実生活とバトルでお互いに助け合い、いっしょに成長しよう!</string>
+  <string name="intro_finish_button">始めましょう!</string>
+  <string name="previous_button">戻る</string>
+  <string name="next_button">次へ</string>
+  <string name="skip_button">スキップ</string>
+  <string name="setup_welcome_description">Habitica へようこそ。ここはゲームが進むほどに、あなたの実生活が改善されるところ!　あなたが現実世界のゴールを達成すれば、装備やペット、クエストなどなど、新たな世界が広がるよ。</string>
+  <string name="setup_welcome_title">ようこそ</string>
+  <string name="setup_group_work">仕事</string>
+  <string name="setup_group_exercise">エクササイズ</string>
+  <string name="setup_group_school">学校</string>
+  <string name="setup_group_teams">チーム</string>
+  <string name="setup_group_chores">家事</string>
+  <string name="setup_group_creativity">創造性</string>
+  <string name="setup_task_work_1">メール処理</string>
+  <string name="setup_task_work_2">もっとも重要なタスク</string>
+  <string name="setup_task_work_3">仕事のプロジェクト</string>
+  <string name="setup_task_exercise_1">有酸素運動10分</string>
+  <string name="setup_task_exercise_2">ストレッチ</string>
+  <string name="setup_task_exercise_3">ワークアウトの日程調整</string>
+  <string name="setup_task_healthWellness_1">体にいいもの / ジャンクフードを食べる</string>
+  <string name="setup_task_healthWellness_2">歯のフロス</string>
+  <string name="setup_task_healthWellness_3">健康診断の日程を決める</string>
+  <string name="setup_task_school_1">勉強する / 先延ばしする</string>
+  <string name="setup_task_school_2">宿題をする</string>
+  <string name="setup_task_school_3">時間割をそろえる</string>
+  <string name="setup_task_teams_1">チームに加わる</string>
+  <string name="setup_task_teams_2">チームの進捗を確認する</string>
+  <string name="setup_task_teams_3">チームプロジェクトを完了する</string>
+  <string name="setup_task_chores_1">10分間のそうじ</string>
+  <string name="setup_task_chores_2">皿洗い</string>
+  <string name="setup_task_chores_3">クローゼットの整理</string>
+  <string name="setup_task_creativity_1">手芸を習う</string>
+  <string name="setup_task_creativity_2">創造的なプロジェクトで働く</string>
+  <string name="setup_task_creativity_3">創造的なプロジェクトを完了する</string>
+  <string name="gem.purchase.support">Habitica の運営を手伝ってくれませんか?　ジェムを買うことでアプリの開発者を支援できます!\n\nジェムはあなたのアカウントの楽しいおまけを買うことができます。おまけの例: \n\n - アバターのカッコいい衣装\n
+ - すんごい背景\n - ペットのタマゴがごほうびの楽しいクエスト\n - レベル100になるまでにクラスを変更できる\n\nHabiticaが最高のものになる手助けをしてくれるとうれしいです。あなたの支援は私たちにとって多くの意味があることなんです!</string>
+  <string name="my_guilds">入っているギルド</string>
+  <string name="public_guilds">オープン ギルド</string>
+  <string name="guild">ギルド</string>
+  <string name="leave">辞める</string>
+  <string name="join">参加する</string>
+  <string name="leader">リーダー</string>
+  <string name="gems">ジェム</string>
+  <string name="send_pm">PMを送る</string>
+  <string name="flag">フラグ</string>
+  <string name="delete">削除</string>
+  <string name="name">名前</string>
+  <string name="description">詳細</string>
+  <string name="privacy">プライバシー</string>
+  <string name="write_message">メッセージを書く</string>
+  <string name="post">投稿</string>
+  <string name="guild_search_hint">ギルドを検索</string>
+  <string name="todo_due">期限 : %s</string>
+  <string name="daily_streak">現在の連続実行 : %d 回</string>
+  <string name="todo_has_duedate">期限ありタスク</string>
+  <string name="battle_gear">武装</string>
+  <string name="costume">衣装</string>
+  <string name="outfit_head">頭</string>
+  <string name="outfit_headAccessory">頭部のアクセサリー</string>
+  <string name="outfit_eyewear">アイウェア</string>
+  <string name="outfit_armor">よろい</string>
+  <string name="outfit_back">背中</string>
+  <string name="outfit_body">体</string>
+  <string name="outfit_shield">盾</string>
+  <string name="outfit_weapon">武器</string>
+  <string name="wear_costume">衣装を着る</string>
+  <string name="equipped">装備済み</string>
+  <string name="quest_cancel_message">このクエストを中止します。よろしいですか?　招待を受けたすべての参加者を失うことになります。クエストの所有者の元にクエストの巻物が戻ってきます。</string>
+  <string name="quest.invitation">クエストへの招待</string>
+  <string name="quest_begin_message">クエストをはじめます。よろしいですか?　クエストを開始すると、新たにメンバーがクエストに参加することはできません。</string>
+  <string name="quest.invitation.text">クエストへの招待状が届いた!</string>
+  <string name="ago_1day">1日前</string>
+  <string name="ago_days">%d日前</string>
+  <string name="ago_1Minute">1分前</string>
+  <string name="ago_minutes">%d分前</string>
+  <string name="ago_hours">%d時間前</string>
+  <string name="ago_1hour">1時間前</string>
+  <string name="today">今日</string>
+  <string name="sidebar_items">アイテム</string>
+  <string name="eggs">たまご</string>
+  <string name="hatching_potions">たまごがえしの薬</string>
+  <string name="food">えさ</string>
+  <string name="quests">クエスト</string>
+  <string name="pets">ペット</string>
+  <string name="mounts">乗騎</string>
+  <string name="armoireEquipment">宝箱に貴重なアイテム、 %s を見つけた!　すごい!</string>
+  <string name="armoireFood">宝箱をひっかきまわして%1$s%2$sを見つけた。何でこんなとこに?</string>
+  <string name="armoireExp">宝箱と格闘して経験値を増やした。どうぞっ!</string>
+  <string name="armoireNotesFull">宝箱を開くと、特別な装備、経験値、えさなどが手に入るよ!　残っているアイテムの数 : %d</string>
+  <string name="armoireLastItem">最後の貴重なアイテムをラッキー宝箱で発見した。</string>
+  <string name="armoireNotesEmpty">宝箱には毎月最初の週に新しいアイテムが入ります。それまでは、クリックして経験値やえさを手に入れよう!</string>
+  <string name="sell">%d ゴールドで売る</string>
+  <string name="hatch_with_potion">たまごがえしの薬を使う</string>
+  <string name="feed_to_pet">ペットにえさをやる</string>
+  <string name="hatch_egg">たまごをかえす</string>
+  <string name="invite_party">パーティーに招待する</string>
+  <string name="dialog_feeding">%1$s%2$s にえさをやる :</string>
+  <string name="use_animal">連れていく</string>
+  <string name="feed">えさをやる</string>
+  <string name="hatch_with">%s でペットをかえす</string>
+  <string name="hatched_pet_title">%1$s%2$sが生まれた!</string>
+  <string name="close">閉じる</string>
+  <string name="share">共有する</string>
+  <string name="notification_pet_fed">%1$s%2$sにえさをやった!</string>
+  <string name="notification_purchase">%s は購入済み</string>
+  <string name="sectionpets">基本のペット</string>
+  <string name="sectionpremiumPets">魔法の薬のペット</string>
+  <string name="sectionquestPets">クエスト ペット</string>
+  <string name="sectionspecialPets">貴重なペット</string>
+  <string name="sectionmounts">基本の乗騎</string>
+  <string name="sectionpremiumMounts">魔法の薬の乗騎</string>
+  <string name="sectionquestMounts">クエストの乗騎</string>
+  <string name="sectionspecialMounts">レアな乗騎</string>
+  <string name="world_quest">世界のクエスト</string>
+  <string name="inn_description">ロッジで休んでいる間は、日課をやらずに夜が明けてもダメージを受けない! ( 注 : ボスから受けるダメージは避けられない)</string>
+  <string name="empty_items">%s を持ってないよ</string>
+  <string name="user_level">レベル %d</string>
+  <string name="user_level_with_class">レベル %1$d %2$s</string>
+  <string name="warrior">戦士</string>
+  <string name="rogue">盗賊</string>
+  <string name="mage">魔道士</string>
+  <string name="healer">治療師</string>
+  <string name="warrior_description">戦士はタスクを完了したときに、「会心の一撃」が出やすく、その効果も高い。「会心の一撃」が出ると、ゴールド、経験値、アイテムドロップの確率にボーナスがつく。また、戦士はボスに大きなダメージを与えられるぞ。予測できない一攫千金の報酬でやる気が出る、もしくはボス クエストで活躍したいなら、戦士でプレーしよう!</string>
+  <string name="mage_description">魔道士は、すぐに身に着ける学習能力をもっているよ。経験値の取得とレベルアップが他のクラスより速い。また、魔道士は、スキルを使うためのマナを集めるのがうまい。Habitica の戦術的な面を楽しみたい、レベルアップや拡張機能のアンロックにすごくやる気が出るなら、魔道士でプレーしよう!</string>
+  <string name="rogue_description">盗賊は富を集めることを愛するのです。ほかのどのクラスよりもゴールドを稼ぎ、アイテムを見つける確率が高い。盗賊の特徴、忍びの術をもってすれば、日課をやらなかったとしても、性格的に傷つかない。戦利品や勲章――Habitica では、ごほうびと実績に強く心動かされるなら、盗賊でプレーしよう!</string>
+  <string name="healer_description">治療師は痛みに耐え、他人を守るのです。やらなかった日課や悪い習慣にも治療師は動揺せず、失敗から体力を回復させる能力がある。パーティーの他のメンバーを助けることに喜びを感じる、困難な仕事による死をも恐れぬ理想があるのなら、治療師でプレーしよう!</string>
+  <string name="select_class">クラスを選ぶ</string>
+  <string name="opt_out_class">選ばない</string>
+  <string name="opt_out_description">クラスなんてめんどくさい? 後で選びたい? 選ばなくても構わないよ。スキルのない戦士になります。クラスのしくみについてwiki を参照し、いつでも ユーザー -&gt; ステータス で有効にできる。</string>
+  <string name="class_confirmation">%s になります。いいですか?</string>
+  <string name="class_changed">あなたは%s に転職した！</string>
+  <string name="class_changed_description">新たな標準の武装を手に入れました。「装備」で取り換えることもできます。</string>
+  <string name="choose_class">クラスを選ぶ</string>
+  <string name="dialog_go_back">戻る</string>
+  <string name="opt_out_confirmation">選ばないでいい?</string>
+  <string name="change_class">クラスを変更する</string>
+  <string name="change_class_description">クラスを変更し、能力値を回収する。要 3 ジェム。能力値の割りあては Web 画面で行う。 </string>
+  <string name="enable_class">クラス システムを有効にする</string>
+  <string name="changing_class_progress">クラスの変更</string>
+  <string name="by_email">メールで</string>
+  <string name="invite_existing_users">登録済みのユーザー</string>
+  <string name="send">送信</string>
+  <string name="invite">友達を招待する</string>
+  <string name="invite_id_description">すでに Habitica に登録しているユーザーに友達がいるなら、その人たちをユーザーIDで招待するよ。</string>
+  <string name="invite_email_description">メールを通じて、友達が Habitica に登録したら、自動的にあなたのパーティーに招待するよ。</string>
+  <string name="add_invites">招待の追加</string>
+  <string name="user_id">ユーザーID</string>
+  <string name="email">メール</string>
+  <string name="invite_users">パーティーに招待する</string>
+  <string name="share_using">共有 ( シェア ) : </string>
+  <string name="share_levelup">生活を改善して、Habitica でのレベルが %d になった!</string>
+  <string name="share_hatched">実生活でのタスクをこなして、Habitica で %1$s%2$s のペットを飼いはじめた。</string>
+  <string name="share_raised">実生活でのタスクをこなして、%1$s%2$s のペットが乗れるほど大きな乗騎まで成長した。</string>
+  <string name="open_in_store">Play ストアで開く</string>
+  <string name="change_class_confirmation">クラスを変更します。いいですか? 3 ジェムかかります。</string>
+  <string name="change_class_equipment_warning">注意 : %s クラスの装備を買うことはできなくなります。</string>
+  <string name="leaderMessage">%1$s からのメッセージ</string>
+  <string name="leaderName">リーダー : %1$s</string>
+  <string name="confirm">確認</string>
+  <string name="market">市場</string>
+  <string name="timeTravelers">タイムトラベラー</string>
+  <string name="seasonalShop">期間限定ショップ</string>
+  <string name="empty_inbox">受信箱にメッセージがありません。Habitica ユーザーあてにメッセージを送ることができます。公開チャットに投稿しているユーザーにメッセージを送ってみてはどうですか?</string>
+  <string name="party_invite">友達を招待するとアンロック</string>
+  <string name="no_gold">ゴールドが足りません</string>
+  <string name="no_potion">体力回復の薬を買う必要がありません</string>
+  <string name="successful_purchase">%1$s を買いました</string>
+  <string name="purchase_confirmation_title">購入の確認</string>
+  <string name="confirm_purchase_text">%2$s %3$s で %1$s  を買う</string>
+  <string name="gem">ジェム</string>
+  <string name="hourglass">砂時計</string>
+  <string name="hourglasses">砂時計</string>
+  <string name="gold_singular">ゴールド</string>
+  <string name="gold_plural">ゴールド</string>
+  <string name="chat_message_copied">クリップボードにコピーされたメッセージ</string>
+  <string name="copy_chat_message">クリップボードにコピー</string>
+  <string name="edit_tag_title">タグを編集</string>
+  <string name="edit_tag_btn_edit">編集</string>
+  <string name="edit_tag_btn_done">完了</string>
+  <string name="edit_tag_btn_delete">削除</string>
+  <string name="confirm_delete_tag_title">よろしいですか?</string>
+  <string name="confirm_delete_tag_message">削除します。いいですか?</string>
+  <string name="filter_drawer_edit_tags">タグを編集</string>
+  <string name="filter_drawer_filter_tags">タグでしぼる</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">この QR コードで招待を受けます。</string>
+  <string name="qr_save_message">QR コードの保存先</string>
+  <string name="qr_dialogue_title">QR コード</string>
+  <string name="download">ダウンロード</string>
+  <string name="send_new_message">メッセージを送信</string>
+  <string name="choose_recipient_title">メッセージの送信先を選択</string>
+  <string name="action_continue">続行</string>
+  <string name="scan_qr_code">QR コードを読み取る</string>
+  <string name="enter_recipient_uuid">送信先の ユーザー ID を入力</string>
+  <string name="invited_to_party">パーティーに招待されました!</string>
+  <string name="stats_widget_label">Habitica ステータス</string>
+  <string name="add_task">タスクを追加</string>
+  <string name="add_habit">習慣を追加</string>
+  <string name="add_daily">日課を追加</string>
+  <string name="add_todo">To-Do を追加</string>
+  <string name="add_reward">ごほうびを追加</string>
+  <string name="all_dailies_completed">日課をすべて完了した。お見事!</string>
+  <string name="widget_habit_button">Habitica の習慣</string>
+  <string name="widget_dailies">Habitica の日課</string>
+  <string name="widget_add_task">Habitica のタスク追加</string>
+  <string name="google_services_missing">Google Play サービスが見つかりません。</string>
+  <string name="gem.purchase.toolbartitle">購入</string>
+  <string name="gem.purchase.title">ジェムの購入で、開発者を支援し、Habitica の運営に協力します。</string>
+  <string name="gem.purchase.subtitle">ジェムで、楽しいおまけを買うことができます : </string>
+  <string name="gem.purchase.listitem1">アバター用のクールなファッション</string>
+  <string name="gem.purchase.listitem2">すんごい背景</string>
+  <string name="gem.purchase.listitem3">ペットのたまごを獲得できるクエスト</string>
+  <string name="gem.purchase.listitem4">レベル 100 以前でのクラス変更</string>
+  <string name="support_habitica">Habitica の支援</string>
+  <string name="skill_transformation_use">唱える</string>
+  <string name="hatching_market_info">ほしい落とし物が見つからない?　市場をチェックしてみよう!</string>
+  <string name="feeding_market_info">違うえさがほしい?　市場で買いましょう!</string>
+  <string name="open_market">市場を開く</string>
+  <string name="cds_description">あなたの日課が次に更新されるのは %1$s です。この時間までに日課を片付けておきましょう!</string>
+  <string name="AudioTheme_title">サウンド テーマ</string>
+  <string name="AudioTheme_summary">Habitica のサウンド テーマを変更する</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">また明日！</string>
+  <string name="belongs_to_challenge">チャレンジに参加中</string>
+  <string name="has_reminder">通知あり</string>
+  <string name="has_tag">タグあり</string>
+  <string name="subscribe.title">寄付することで、開発者を支援し、Habitica の運営に協力します。</string>
+  <string name="subscribe_prompt">寄付すれば、こんな便利な特典がもらえます：</string>
+  <string name="subscribe.listitem1">ゴールドでジェムを購入</string>
+  <string name="subscribe.listitem2">毎月の限定アイテム</string>
+  <string name="subscribe.listitem3">詳細な履歴の保存</string>
+  <string name="subscribe.listitem4">毎日の落とし物の定数が2倍</string>
+  <string name="subscriptions">寄付</string>
+  <string name="subscribe.listitem1.description">商人・アレクサンダーが、ジェム1個を20ゴールドで売ってくれます！\n\nアレクサンダーと1ヵ月の間に取り引きできるジェムの数は、最初は25個に限定されていますが、寄付期間によって増えます。\n\n寄付の継続3カ月ごとにその数が5個ずつ増えていき、最大で月に50個を買うことができます。</string>
+  <string name="subscribe.listitem2.description">毎月、アバターを個性的にメークアップするアイテムが手に入ります！\n\nさらに寄付の継続3カ月ごとに、謎のタイムトラベラーによって、歴史的（そして未来的！）なメークアップ アイテムへのアクセスが許されます。</string>
+  <string name="subscribe.listitem3.description">完了した To-Do やタスクの履歴を、より長期間閲覧可能になります。</string>
+  <string name="subscribe1month.gemcap">最初は25ジェムまで購入できます</string>
+  <string name="subscribe3month.gemcap">ジェムの制限値を30個に引き上げ</string>
+  <string name="subscribe6month.gemcap">ジェムの制限値を35個に引き上げ</string>
+  <string name="subscribe12month.gemcap">ジェムの制限値を45個に引き上げ</string>
+  <string name="subscription_hourglasses">+%d個の神秘の砂時計</string>
+  <string name="payment_method">支払方法</string>
+  <string name="subscription">寄付</string>
+  <string name="one_month">1ヶ月</string>
+  <string name="months">%dヶ月</string>
+  <string name="month">月</string>
+  <string name="three_months">3ヶ月</string>
+  <string name="six_months">6ヶ月</string>
+  <string name="twelve_months">12ヶ月</string>
+  <string name="subscribe_prompt_thanks">寄付のお礼として、こんな便利な特典をもらっています：</string>
+  <string name="challenge_details">チャレンジの概要</string>
+  <string name="challenge_leave_title">チャレンジから抜ける</string>
+  <string name="challenge_leave_text">本当にチャレンジ「%s」を抜けますか？</string>
+  <string name="my_challenges">参加しているチャレンジ</string>
+  <string name="public_challenges">みんなのチャレンジ</string>
+  <string name="challenges">チャレンジ</string>
+  <string name="daily">日課</string>
+  <string name="habit">習慣</string>
+  <string name="reward">ごほうび</string>
+  <string name="todo">To-Do</string>
+  <string name="official">Habitica公式</string>
+  <string name="participating">参加済み</string>
+  <string name="challenge">チャレンジ</string>
+  <string name="go_to_challenge">チャレンジに参加する</string>
+  <string name="not_part_of_a_challenge">今参加しているチャレンジはありません！</string>
+  <string name="join_a_challenge">チャレンジに参加してタスクのセットをあなたのタスクリストに追加し、他のHabiticianと達成度を競いましょう。優勝すれば実績メダルと、副賞としてジェムを手に入れられることもあります！</string>
+  <string name="check_the_public_challenge_tab">”みんなのチャレンジ”タブをタップして、ユーザーが作ったチャレンジの中からあなたにしっくりくるものを見つけましょう！</string>
+  <string name="add_reminder">リマインダーを追加する</string>
+  <string name="warning">注意</string>
+  <string name="open_settings">設定を開く</string>
+  <string name="inbox">受信箱</string>
+  <string name="FAQ">よくある質問</string>
+  <string name="special">スペシャル</string>
+  <string name="gem_for_gold_description">Habiticaへの寄付のお礼として、あなたは毎月一定数のジェムをゲーム内のゴールドで購入することができます。</string>
+  <string name="limited_count">あと%d個</string>
+  <string name="gem_shop">ジェム</string>
+  <string name="mystery_item">ミステリーアイテム</string>
+  <string name="myster_item_notes">寄付会員は、毎月ミステリーアイテムを受け取ることができます。ミステリーアイテムは通常、月の終わりの週に新たなものがリリースされます。</string>
+  <string name="open">開く</string>
+  <string name="notification_mystery_item">プレゼントボックスを開いて%sを手に入れました！</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">あと%1$d日のログインで、新たな賞品が手に入ります！</string>
+  <string name="all">全部</string>
+  <string name="none">なし</string>
+  <string name="action_back">戻る</string>
+</resources>
diff --git a/Habitica/res/values-ko/strings.profile.xml b/Habitica/res/values-ko/strings.profile.xml
index 6142193db..94b56ac61 100644
--- a/Habitica/res/values-ko/strings.profile.xml
+++ b/Habitica/res/values-ko/strings.profile.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">펫 &amp; 탑승펫</string>
-    <string name="profile_pets_found">발견한 펫</string>
-    <string name="profile_mounts_tamed">길들여진 탑승펫</string>
-    <string name="profile_loading_data">회원 데이터 가져오는 중.</string>
-    <string name="profile_send_message_to">%s에게 메세지 보내기</string>
-    <string name="profile_message_sent_to">%s에게 메세지가 전송되었습니다.</string>
-    <string name="profile_level">레벨:</string>
-    <string name="profile_class_bonus">직업 보너스:</string>
-    <string name="profile_allocated">할당된 포인트:</string>
-    <string name="profile_boosts">부스트:</string>
-    <string name="profile_private_message">개인 메시지</string>
-    <string name="profile_achievements">업적</string>
-    <string name="profile_achievement_ok">확인</string>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">펫 &amp; 탑승펫</string>
+    <string name="profile_pets_found">발견한 펫</string>
+    <string name="profile_mounts_tamed">길들여진 탑승펫</string>
+    <string name="profile_loading_data">회원 데이터 가져오는 중.</string>
+    <string name="profile_send_message_to">%s에게 메세지 보내기</string>
+    <string name="profile_message_sent_to">%s에게 메세지가 전송되었습니다.</string>
+    <string name="profile_level">레벨:</string>
+    <string name="profile_class_bonus">직업 보너스:</string>
+    <string name="profile_allocated">할당된 포인트:</string>
+    <string name="profile_boosts">부스트:</string>
+    <string name="profile_private_message">개인 메시지</string>
+    <string name="profile_achievements">업적</string>
+    <string name="profile_achievement_ok">확인</string>
     </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ko/strings.tutorial.xml b/Habitica/res/values-ko/strings.tutorial.xml
index e5a4ad094..d6cd92ba0 100644
--- a/Habitica/res/values-ko/strings.tutorial.xml
+++ b/Habitica/res/values-ko/strings.tutorial.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_equipment">장비를 구입하면 여기에 보입니다. 전투장비는 당신의 스탯에 영향을 주고, 당신의 의상은 (활성화 했다면) 아바타의 모습을 바꿔줍니다.</string>
-  <string name="tutorial_items">과제와 레벨업을 달성하면 아이템을 받을 수 있습니다. 아이템을 터치해서 사용하세요!</string>
-  <string name="tutorial_pets">일상생활의 과제들을 해결해 나아가면, 랜덤으로 알이나 포션을 발견할 수 있습니다. 둘을 섞어서 알을 부화시키면 펫을 얻을 수 있어요.</string>
-  <string name="tutorial_skills">스킬은 강력한 효과를 가진 능력입니다! 사용하고자 하는 스킬은 터치하면 됩니다. 스킬은 마나 (파란색 바)를 사용하는데, 마나는 매일 출석하고 일상생활의 과제들을 달성하면 채워집니다. 궁금한 점은 FAQ를 참고하세요!</string>
-  <string name="tutorial_party">여기서 당신과 당신의 친구들은 서로의 목표를 체크해주고 과제를 달성하면서 함께 몬스터를 무찌를꺼에요!</string>
-  <string name="tutorial_tavern">주막에 오신 것을 환영합니다! 여기는 누구나 채팅할수있는 채팅방입니다. 묻고싶은 것이 있으면 여기서 물어보세요. 좋은 시간 보내시길 바랍니다!</string>
-  <string name="tutorial_classes">전사, 마법사, 치료사나 도적중에서 직업을 정하세요! 각 직업마다 독특한 장비와 능력들이 있습니다. 더 알고싶으면 (?)을 누르세요!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_equipment">장비를 구입하면 여기에 보입니다. 전투장비는 당신의 스탯에 영향을 주고, 당신의 의상은 (활성화 했다면) 아바타의 모습을 바꿔줍니다.</string>
+  <string name="tutorial_items">과제와 레벨업을 달성하면 아이템을 받을 수 있습니다. 아이템을 터치해서 사용하세요!</string>
+  <string name="tutorial_pets">일상생활의 과제들을 해결해 나아가면, 랜덤으로 알이나 포션을 발견할 수 있습니다. 둘을 섞어서 알을 부화시키면 펫을 얻을 수 있어요.</string>
+  <string name="tutorial_skills">스킬은 강력한 효과를 가진 능력입니다! 사용하고자 하는 스킬은 터치하면 됩니다. 스킬은 마나 (파란색 바)를 사용하는데, 마나는 매일 출석하고 일상생활의 과제들을 달성하면 채워집니다. 궁금한 점은 FAQ를 참고하세요!</string>
+  <string name="tutorial_party">여기서 당신과 당신의 친구들은 서로의 목표를 체크해주고 과제를 달성하면서 함께 몬스터를 무찌를꺼에요!</string>
+  <string name="tutorial_tavern">주막에 오신 것을 환영합니다! 여기는 누구나 채팅할수있는 채팅방입니다. 묻고싶은 것이 있으면 여기서 물어보세요. 좋은 시간 보내시길 바랍니다!</string>
+  <string name="tutorial_classes">전사, 마법사, 치료사나 도적중에서 직업을 정하세요! 각 직업마다 독특한 장비와 능력들이 있습니다. 더 알고싶으면 (?)을 누르세요!</string>
+</resources>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index f612b59d0..7ad68e016 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -1,495 +1,495 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">새로고침</string>
-  <string name="XP_default">경험치</string>
-  <string name="HP_default">체력</string>
-  <string name="MP_default">마나</string>
-  <string name="ERR_pb_barcode">바코드에서 데이터를 가져오지 못했습니다</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">설정</string>
-  <string name="SP_address_hint">사용자 지정 서버</string>
-  <string name="SP_userID_title">유저 ID</string>
-  <string name="SP_userID_summary">본인의 유저 ID</string>
-  <string name="SP_APIToken_title">API 토큰</string>
-  <string name="SP_APIToken_summary">본인의 API 토큰</string>
-  <string name="Language_title">언어</string>
-  <string name="Language_summary">Habitica의 언어 바꾸기</string>
-  <string name="SP_user_qr_code">당신의 QR코드</string>
-  <string name="PS_contact_title">연락처</string>
-  <string name="pref_account_header">계정</string>
-  <string name="pref_first_day_of_the_week_title">일주일의 첫날</string>
-  <string name="pref_first_day_of_the_week_summary">모든 달력에서 일주일의 첫날</string>
-  <string name="pref_reminder_header">매일 알림</string>
-  <string name="pref_reminder_checkbox">알림 활성화 하기</string>
-  <string name="pref_reminder_picker">알림 시간 설정</string>
-  <string name="pref_cds_header">하루 시작 시간</string>
-  <string name="pref_cds_picker">하루 시작 시간 설정</string>
-  <string name="pref_push_notifications_checkbox">사용자 알림</string>
-  <string name="push_notifications">푸쉬 알림</string>
-  <string name="push_notifications_sum">푸쉬 알림 설정</string>
-  <string name="preference_push_you_won_challenge">도전 과제에서 우승하였습니다!</string>
-  <string name="preference_push_received_a_private_message">개인 메시지를 받았습니다.</string>
-  <string name="preference_push_gifted_gems">선물받은 보석</string>
-  <string name="preference_push_gifted_subscription">선물 받은 구독</string>
-  <string name="preference_push_invited_to_party">파티에 초대 받음</string>
-  <string name="preference_push_invited_to_guild">길드에 초대 받음</string>
-  <string name="preference_push_your_quest_has_begun">퀘스트가 시작되었음</string>
-  <string name="preference_push_invited_to_quest">퀘스트에 초대를 받았음</string>
-  <!--Adding tasks-->
-  <string name="task_value">값</string>
-  <string name="action_edit">수정</string>
-  <string name="action_delete">삭제</string>
-  <string name="action_cancel">취소</string>
-  <string name="login_btn">로그인</string>
-  <string name="register_btn">등록</string>
-  <string name="username">유저이름</string>
-  <string name="email_username">이메일 혹은 유저이름</string>
-  <string name="password">암호</string>
-  <string name="emailAddress">이메일 주소</string>
-  <string name="confirmpassword">암호 확인</string>
-  <string name="logout">로그아웃</string>
-  <string name="logout_description">계정 로그아웃</string>
-  <string name="account_details_sum">계정 정보를 확인하세요</string>
-  <string name="account_details">계정 정보</string>
-  <string name="LoginActivityName">환영합니다</string>
-  <string name="string_revive">되살리기</string>
-  <string name="please_connect">위젯을 사용하기 전 앱을 연결해 주세요</string>
-  <string name="about.title">소개</string>
-  <string name="about.libraries">도서관</string>
-  <string name="about.versionhistory">버젼 내력</string>
-  <string name="about.habitica_open_source">Habitica는 Github를 통해 오픈소스로 공개되어 있습니다</string>
-  <string name="about.rate_our_app">앱 평가</string>
-  <string name="about.give_us_feedback">피드백을 보내주세요!</string>
-  <string name="about.bugreport">버그 신고</string>
-  <string name="about.source_code">소스코드</string>
-  <!--Network Errors-->
-  <string name="network_error_title">연결 오류</string>
-  <string name="network_error_no_network_body">인터넷에 연결되어 있지 않습니다.</string>
-  <string name="internal_error_api">서버에 문제가 발생한 것 같습니다. 다시 시도해 주세요.</string>
-  <string name="authentication_error_title">인증 오류</string>
-  <string name="authentication_error_body">당신의 유저이름 혹은 암호가 틀렸습니다.</string>
-  <string name="login_validation_error_title">검증 오류</string>
-  <string name="login_validation_error_fieldsmissing">모든 항목을 채워주셔야 합니다.</string>
-  <string name="save_changes">저장</string>
-  <string name="copy">복사</string>
-  <string name="notes">노트</string>
-  <string name="text">내용</string>
-  <string name="difficulty">난이도</string>
-  <string name="tags">태그</string>
-  <string name="trivial">사소함</string>
-  <string name="easy">쉬움</string>
-  <string name="medium">보통</string>
-  <string name="hard">어려움</string>
-  <string name="start_date">시작 날짜</string>
-  <string name="positive_habit_form">긍정적 (+)</string>
-  <string name="negative_habit_form">부정적 (-)</string>
-  <string name="checklist">체크리스트</string>
-  <string name="reminders">알림</string>
-  <string name="actions">행동</string>
-  <string name="attributes">속성</string>
-  <string name="physical">신체</string>
-  <string name="mental">정신</string>
-  <string name="social">사회성</string>
-  <string name="other">기타</string>
-  <string name="frequency">빈도</string>
-  <string name="frequency_weekly">특정 요일에만</string>
-  <string name="frequency_daily">X일 마다</string>
-  <string name="monday">월요일</string>
-  <string name="tuesday">화요일</string>
-  <string name="wednesday">수요일</string>
-  <string name="thursday">목요일</string>
-  <string name="friday">금요일</string>
-  <string name="saturday">토요일</string>
-  <string name="sunday">일요일</string>
-  <string name="levelup_header">레벨이 올랐습니다!</string>
-  <string name="levelup_detail">일상생활의 목표들을 달성함으로써 레벨 %1$d가 되었어요!</string>
-  <string name="levelup_health">체력이 완전히 회복되었습니다!</string>
-  <string name="levelup_button">만세!</string>
-  <string name="faint_subtitle">좌절하지 말아요!</string>
-  <string name="faint_penalty_body">당신은 레벨, 골드, 장비 한개를 잃었지만, 열심히 일하면 곧 되찾을 수 있을꺼에요! 행운을 빌어요--분명 잘 해낼꺼에요.</string>
-  <string name="faint_header">체력이 모두 떨어졌어요!</string>
-  <string name="faint_button">체력을 채우고 다시 도전하세요.</string>
-  <string name="filter">필터</string>
-  <string name="profile_image">프로필 사진</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">당신은 %1$s을 사용해 %2$d 마나를 얻었습니다.</string>
-  <string name="used_skill_without_mana">%1$s을(를) 사용했습니다.</string>
-  <string name="new_checklist_item">새로운 체크리스트 항목</string>
-  <string name="add_checklist_item">더하기</string>
-  <string name="reminder_title">일일과제 체크하는 것을 잊지마세요!</string>
-  <string name="skill_progress_title">스킬 사용</string>
-  <string name="coming_soon">곧 찾아옵니다</string>
-  <string name="chat_flag_confirmation">정말 이 메세지를 신고하시겠습니까?</string>
-  <string name="flag_confirm">메세지 신고하기</string>
-  <string name="unlock_lvl_11">레벨 11에 열림</string>
-  <string name="no_party_message">파티에 소속되어 있지 않습니다. 파티에 가입하려면 저희 홈페이지를 방문해주세요.</string>
-  <string name="forgot_pw_btn">암호 찾기</string>
-  <string name="forgot_pw_tv">암호를 잊어버리셨나요? 모바일 홈페이지를 이용해주세요.</string>
-  <string name="tavern.inn.checkOut">일일과제 활성화</string>
-  <string name="tavern.inn.rest">일일과제 일시중지</string>
-  <string name="reward.dialog.buy">구매</string>
-  <string name="reward.dialog.dismiss">닫기</string>
-  <string name="party">파티</string>
-  <string name="chat">채팅</string>
-  <string name="members">멤버</string>
-  <string name="habits">습관</string>
-  <string name="dailies">일일과제</string>
-  <string name="todos">해야 할 일</string>
-  <string name="rewards">보상</string>
-  <string name="taskform.delete.title">확실합니까?</string>
-  <string name="taskform.delete.message">삭제하시겠습니까?</string>
-  <string name="yes">예</string>
-  <string name="no">아니요</string>
-  <string name="quest">퀘스트</string>
-  <string name="avatar_body">몸</string>
-  <string name="avatar_hair">머리</string>
-  <string name="avatar_shirt">상의</string>
-  <string name="avatar_skin">피부</string>
-  <string name="avatar_ears">동물 귀</string>
-  <string name="avatar_base">기본</string>
-  <string name="avatar_color">색</string>
-  <string name="avatar_beard">턱수염</string>
-  <string name="avatar_mustache">콧수염</string>
-  <string name="avatar_flower">꽃</string>
-  <string name="avatar_bangs">앞머리</string>
-  <string name="avatar_nothing">세팅되지 않음</string>
-  <string name="avatar_size">체형</string>
-  <string name="avatar_size_slim">날씬하게</string>
-  <string name="avatar_size_broad">통통하게</string>
-  <string name="avatar_background">배경</string>
-  <string name="purchase_customization"> 구매</string>
-  <string name="purchase_set_button">%d개의 보석으로 전체 세트 열기</string>
-  <string name="purchase_button">구매</string>
-  <string name="purchase_set_title">%s 세트 구매</string>
-  <string name="due_date">만기일</string>
-  <string name="quest.accept">승인</string>
-  <string name="quest.reject">거부</string>
-  <string name="quest.begin">퀘스트 시작</string>
-  <string name="quest.cancel">초대 취소</string>
-  <string name="quest.abort">퀘스트 포기</string>
-  <string name="quest.leave">퀘스트 나가기</string>
-  <string name="quest.pending">미결</string>
-  <string name="quest.accepted">승인됨</string>
-  <string name="quest.rejected">거부됨</string>
-  <string name="quest.participants">참가자</string>
-  <string name="version_info">버젼 %1$s (%2$d)</string>
-  <string name="sidebar_help">도움말 &amp; FAQ</string>
-  <string name="complete_tutorial">네, 알겠어요!</string>
-  <string name="dismiss_tutorial">나중에 알려주세요</string>
-  <string name="intro_1_subtitle">오신 것을 환영합니다</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_2_subtitle">게임의 진전</string>
-  <string name="intro_2_title">삶의 진전</string>
-  <string name="intro_2_description">실제 삶에서의 일을 처리하는 것으로 게임의 특색들을 잠금해제 하세요. 목표를 달성해 갑옷, 펫, 그리고 더 많은 것들을 얻으세요.</string>
-  <string name="intro_3_description">친구들의 도움으로 당신의 목표를 유지시키세요. 일상 생활과 전투에서 서로를 도와가며 함께 성장하세요!</string>
-  <string name="intro_finish_button">시작합시다!</string>
-  <string name="previous_button">이전</string>
-  <string name="next_button">다음</string>
-  <string name="skip_button">스킵</string>
-  <string name="setup_welcome_description">Habitica에 오신걸 환영합니다. 게임에서의 진행도는 당신 일상에서의 진행도를 의미하죠! 과제를 달성할수록 새로운 장비, 펫, 퀘스트 등을 열 수 있어요.</string>
-  <string name="setup_welcome_title">환영합니다</string>
-  <string name="setup_group_work">일</string>
-  <string name="setup_group_exercise">운동</string>
-  <string name="setup_group_school">학교</string>
-  <string name="setup_group_teams">팀</string>
-  <string name="setup_group_chores">집안일</string>
-  <string name="setup_group_creativity">창의력</string>
-  <string name="setup_task_work_1">이메일 정리</string>
-  <string name="setup_task_work_2">가장 중요한 과제</string>
-  <string name="setup_task_work_3">업무 프로젝트</string>
-  <string name="setup_task_exercise_1">10분 동안 유산소 운동</string>
-  <string name="setup_task_exercise_2">스트레칭</string>
-  <string name="setup_task_exercise_3">운동 계획 짜기</string>
-  <string name="setup_task_healthWellness_1">건강한 음식 섭취 / 군것질</string>
-  <string name="setup_task_healthWellness_2">치실 하기</string>
-  <string name="setup_task_healthWellness_3">건강검진 예약</string>
-  <string name="setup_task_school_1">공부/미루기</string>
-  <string name="setup_task_school_2">숙제하기</string>
-  <string name="setup_task_school_3">수업 과제 끝내기</string>
-  <string name="setup_task_teams_1">팀에게 연락하기</string>
-  <string name="setup_task_teams_2">팀에게 진행상황 보고하기</string>
-  <string name="setup_task_teams_3">그룹 과제 완성하기</string>
-  <string name="setup_task_chores_1">10분간 청소</string>
-  <string name="setup_task_chores_2">설겆이</string>
-  <string name="setup_task_chores_3">옷장 정리</string>
-  <string name="setup_task_creativity_1">공예 배우기</string>
-  <string name="setup_task_creativity_2">창의적인 활동 하기</string>
-  <string name="setup_task_creativity_3">창의적인 과제 끝내기</string>
-  <string name="gem.purchase.support">Habitica가 계속되었으면 좋겠나요? 보석을 구매하여 개발자들을 지원해주세요. 보석들은 당신의 계정에 다양한 요소를 추가해줍니다. 예를들어:
-
-- 아바타를 위한 멋진 의상
-- 환상적인 배경들
-- 펫 알을 얻을 수 있는 재미있는 퀘스트들
-- 레벨 100 이전에 직업 변경 가능
-
-더 나은 Habitica를 만들 수 있도록 도와주셔서 감사합니다. 당신의 지원은 큰 의미로 다가옵니다!</string>
-  <string name="my_guilds">나의 길드</string>
-  <string name="public_guilds">열린 길드</string>
-  <string name="guild">길드</string>
-  <string name="leave">나가기</string>
-  <string name="join">가입하기</string>
-  <string name="leader">리더</string>
-  <string name="gems">보석</string>
-  <string name="send_pm">개인 메시지 보내기</string>
-  <string name="flag">신고</string>
-  <string name="delete">삭제</string>
-  <string name="name">이름</string>
-  <string name="description">설명</string>
-  <string name="privacy">개인정보 보호</string>
-  <string name="write_message">메세지 작성</string>
-  <string name="post">게시</string>
-  <string name="guild_search_hint">길드 검색</string>
-  <string name="todo_due">만기: %s</string>
-  <string name="daily_streak">연속 달성: %d</string>
-  <string name="todo_has_duedate">과제가 만기일이 있습니다</string>
-  <string name="battle_gear">전투 장비</string>
-  <string name="costume">의상</string>
-  <string name="outfit_head">머리</string>
-  <string name="outfit_headAccessory">머리 장식</string>
-  <string name="outfit_eyewear">안경</string>
-  <string name="outfit_armor">갑옷</string>
-  <string name="outfit_back">등</string>
-  <string name="outfit_body">몸</string>
-  <string name="outfit_shield">방패</string>
-  <string name="outfit_weapon">무기</string>
-  <string name="wear_costume">의상 입기</string>
-  <string name="equipped">착용됨</string>
-  <string name="quest_cancel_message">정말 이 퀘스트를 취소하시겠습니까? 모든 초대장과 승인들을 잃을 것입니다. 퀘스트 스크롤은 주인에게 돌아갑니다.</string>
-  <string name="quest.invitation">퀘스트 초대장</string>
-  <string name="quest_begin_message">정말 이 퀘스트를 시작하시겠습니까? 시작 후 더이상 새로운 파티 멤버가 참여할 수 없습니다.</string>
-  <string name="quest.invitation.text">퀘스트에 초대받았습니다!</string>
-  <string name="ago_1day">하루 전</string>
-  <string name="ago_days">%d 일 전</string>
-  <string name="ago_1Minute">1분 전</string>
-  <string name="ago_minutes">%d 분 전</string>
-  <string name="ago_hours">%d 시간 전</string>
-  <string name="ago_1hour">1시간 전</string>
-  <string name="today">오늘</string>
-  <string name="sidebar_items">아이템</string>
-  <string name="eggs">알</string>
-  <string name="hatching_potions">부화 물약</string>
-  <string name="food">먹이</string>
-  <string name="quests">퀘스트</string>
-  <string name="pets">펫</string>
-  <string name="mounts">탑승펫</string>
-  <string name="armoireEquipment">옷장에서 귀한 장비를 찾았습니다: %s! 대단해요!</string>
-  <string name="armoireFood">당신은 옷장안에서  %1$s %2$s 를 발견합니다. 왜 이것들이 여기 들어있지?</string>
-  <string name="armoireExp">당신은 옷장과 씨름하여 경험치를 얻었습니다. 맛 좀 봐라!</string>
-  <string name="armoireNotesFull">옷장을 열어 무작위로 장비, 경험치, 혹은 음식을 얻으세요! 남은 장비 부품: %d</string>
-  <string name="armoireLastItem">당신은 마지막 귀한 장비를 마법의 옷장에서 찾았습니다.</string>
-  <string name="armoireNotesEmpty">옷장에는 매달 첫째주에 새로운 장비가 들어있을 것입니다. 그때까지는 계속 클릭하여 경험치와 음식을 얻으세요!</string>
-  <string name="sell">팔기 (%d 골드)</string>
-  <string name="hatch_with_potion">물약으로 알 부화</string>
-  <string name="feed_to_pet">펫 먹이주기</string>
-  <string name="hatch_egg">알 부화</string>
-  <string name="invite_party">파티에 초대</string>
-  <string name="dialog_feeding">%1$s %2$s 에게 다음의 먹이 주기:</string>
-  <string name="use_animal">사용</string>
-  <string name="feed">먹이주기</string>
-  <string name="hatch_with">%s 으로 펫 부화</string>
-  <string name="hatched_pet_title">당신은 %1$s %2$s 를 부화시켰습니다!</string>
-  <string name="close">닫기</string>
-  <string name="share">나누기</string>
-  <string name="notification_pet_fed">%1$s %2$s 에게 먹이를 줬습니다!</string>
-  <string name="notification_purchase">%s 를 구매했습니다</string>
-  <string name="sectionpets">기본 펫</string>
-  <string name="sectionpremiumPets">마법 물약의 펫</string>
-  <string name="sectionquestPets">퀘스트 펫</string>
-  <string name="sectionspecialPets">희귀 펫</string>
-  <string name="sectionmounts">기본 탑승펫</string>
-  <string name="sectionpremiumMounts">마법 물약의 탑승펫</string>
-  <string name="sectionquestMounts">퀘스트 탑승펫</string>
-  <string name="sectionspecialMounts">희귀 탑승펫</string>
-  <string name="world_quest">세계 퀘스트</string>
-  <string name="inn_description">여관에서 쉬면 완료하지 못한 일일과제가 당신을 다치게 하는 것을 막을 수 있습니다. (주의: 보스로부터 받는 데미지는 피하지 못합니다.)</string>
-  <string name="empty_items">%s 가 하나도 없습니다</string>
-  <string name="user_level">Lvl %d</string>
-  <string name="user_level_with_class">Lvl %1$d %2$s</string>
-  <string name="warrior">전사</string>
-  <string name="rogue">도적</string>
-  <string name="mage">마법사</string>
-  <string name="healer">힐러</string>
-  <string name="warrior_description">전사들은 보너스 골드, 경험치를 주고 아이템 드롭 확률을 증가시키는 \"치명타\"를 더 강하게, 자주 발생시킬 수 있습니다. 또, 보스몬스터에 강한 피해를 입힐 수 있습니다. 예측 불가능한 대박을 터트리거나 보스 공격에서 활약하는 것을 원한다면 전사를 추천합니다!</string>
-  <string name="mage_description">마법사는 경험치와 레벨이 다른 클래스에 비해 빠르게 성장합니다. 또, 특수 능력을 사용하기 위한 마나도 훨씬 많습니다. 계획적인 과제달성 게임을 하시고 싶거나 빠른 레벨업으로 다양한 기능들을 체험하시고 싶으시다면 마법사를 추천합니다!</string>
-  <string name="rogue_description">도적은 다른 클래스에 비해 골드를 더 많이 받고 랜덤한 아이템들을 잘 찾아냅니다. 그들의 민첩 능력은 일일과제를 놓쳐서 발생하는 위험을 잘 피할 수 있도록 합니다. 보상과 업적, 아이템과 뱃지 모으기를 좋아하신다면 도적을 추천합니다!</string>
-  <string name="healer_description">힐러는 공격에 휘둘리지 않고 동료들을 보호해 줍니다. 놓친 일일과제와 나쁜 습관들은 그들에게 큰 피해를 입히지 못하고, 설령 실패를 하더라도 치료가 가능합니다. 파티원들을 도와주길 좋아하고 노력으로 죽음을 이겨내는 것이 매력적이라면 힐러를 추천합니다!</string>
-  <string name="select_class">직업 고르기</string>
-  <string name="opt_out_class">선택 유예</string>
-  <string name="opt_out_description">직업을 신경쓰고 싶지 않으신가요? 나중에 고르고 싶으시다고요? 선택유예 하세요 - 당신은 아무런 능력이 없는 전사가 되어있을 꺼에요. wiki를 방문하면 직업시스템에 대해서 자세히 알 수 있고, 이후에 언제라도 직업을 선택할 수 있습니다.</string>
-  <string name="class_confirmation">%s 가 되고싶은 것이 확실한가요?</string>
-  <string name="class_changed">%s가 되었습니다!</string>
-  <string name="class_changed_description">장비 메뉴에서 교체할 수 있는 새로운 기본 전투 장비를 얻었습니다!</string>
-  <string name="choose_class">직업 선택</string>
-  <string name="dialog_go_back">뒤로 가기</string>
-  <string name="opt_out_confirmation">선택을 유예하고 싶은 것이 확실한가요?</string>
-  <string name="change_class">직업 바꾸기</string>
-  <string name="change_class_description">보석 3개를 사용하여 직업을 바꾸고 능력치를 초기화 하세요. 웹사이트에서 능력치를 배분할 수 있습니다. </string>
-  <string name="enable_class">직업시스템 활성화</string>
-  <string name="changing_class_progress">직업 바꾸기</string>
-  <string name="by_email">이메일로</string>
-  <string name="invite_existing_users">등록된 사용자 초대</string>
-  <string name="send">보내기</string>
-  <string name="invite">친구 초대</string>
-  <string name="invite_id_description">Habitica를 이용하는 친구가 있다면, 유저 아이디를 입력하여 초대하세요.</string>
-  <string name="invite_email_description">친구가 당신이 보낸 이메일로 Habitica에 가입하면, 자동으로 당신의 파티에 초대됩니다!</string>
-  <string name="add_invites">초대 더하기</string>
-  <string name="user_id">유저 ID</string>
-  <string name="email">이메일</string>
-  <string name="invite_users">파티 초대</string>
-  <string name="share_using">올리기</string>
-  <string name="share_levelup">일상생활의 습관을 개선하여 Habitica에서 레벨 %d가 되었어요!</string>
-  <string name="share_hatched">일상생활의 과제들을 달성하여 Habitica에서 %1$s %2$s 펫을 깨웠어요!</string>
-  <string name="share_raised">일상생활의 과제들을 달성하여 %1$s %2$s 탈것을 얻었어요!</string>
-  <string name="open_in_store">플레이스토어로 열기</string>
-  <string name="change_class_confirmation">보석 3개를 사용하여 직업을 바꾸시겠습니까? </string>
-  <string name="change_class_equipment_warning">주의: 더 이상 %s 직업의 장비를 구입할 수 없게됩니다.</string>
-  <string name="leaderMessage">%1$s로부터 온 메세지</string>
-  <string name="leaderName">리더: %1$s</string>
-  <string name="confirm">확인</string>
-  <string name="market">시장</string>
-  <string name="timeTravelers">시간 여행자들</string>
-  <string name="seasonalShop">계절 상점</string>
-  <string name="empty_inbox">받은 편지함 메시지가 없습니다. 공개 채팅 메시지를 통해 사용자에게 새 메시지를 보낼 수 있습니다!</string>
-  <string name="party_invite">친구를 초대하여 잠금 해제하기</string>
-  <string name="no_gold">골드가 충분하지 않음</string>
-  <string name="no_potion">체력 물약을 살 필요가 없음</string>
-  <string name="successful_purchase">%1$s을(를) 성공적으로 구매했음</string>
-  <string name="purchase_confirmation_title">구매 확인</string>
-  <string name="confirm_purchase_text">%1$s을(를) %2$s %3$s(으)로 구매함</string>
-  <string name="gem">보석</string>
-  <string name="hourglass">모래시계</string>
-  <string name="hourglasses">모래시계</string>
-  <string name="gold_singular">골드</string>
-  <string name="gold_plural">골드</string>
-  <string name="chat_message_copied">메시지를 클립보드에 복사했음</string>
-  <string name="copy_chat_message">클립보드로 복사함</string>
-  <string name="edit_tag_title">태그 편집</string>
-  <string name="edit_tag_btn_edit">편집</string>
-  <string name="edit_tag_btn_done">완료</string>
-  <string name="edit_tag_btn_delete">삭제</string>
-  <string name="confirm_delete_tag_title">정말이요?</string>
-  <string name="confirm_delete_tag_message">정말 삭제할까요?</string>
-  <string name="filter_drawer_edit_tags">태그 편집</string>
-  <string name="filter_drawer_filter_tags">태그로 정렬</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">이 QR 코드로 다른 사람이 초대할 수 있게 하세요</string>
-  <string name="qr_save_message">QR 코드 저장:</string>
-  <string name="qr_dialogue_title">나의 QR 코드</string>
-  <string name="download">다운로드</string>
-  <string name="send_new_message">새 메시지 보내기</string>
-  <string name="choose_recipient_title">메시지 받는 사람 선택</string>
-  <string name="action_continue">계속</string>
-  <string name="scan_qr_code">QR 코드 스캔</string>
-  <string name="enter_recipient_uuid">받는 사람의 사용자 ID 입력</string>
-  <string name="invited_to_party">파티에 참가를 초대 받았습니다!</string>
-  <string name="stats_widget_label">Habitica 통계</string>
-  <string name="add_task">과제 추가</string>
-  <string name="add_habit">습관 추가</string>
-  <string name="add_daily">일일과제 추가</string>
-  <string name="add_todo">할 일 추가</string>
-  <string name="add_reward">보상 추가</string>
-  <string name="all_dailies_completed">오늘의 모든 일일과제를 달성하셨습니다. 잘 했어요!</string>
-  <string name="widget_habit_button">Habitica 습관</string>
-  <string name="widget_dailies">Habitica 일일과제</string>
-  <string name="widget_add_task">Habitica 과제 추가</string>
-  <string name="google_services_missing">구글 플레이 서비스를 찾을 수 없습니다.</string>
-  <string name="gem.purchase.toolbartitle">구매</string>
-  <string name="gem.purchase.title">보석을 구매하시면 개발자를 지원하고 Habitica가 계속될 수 있도록 도울 수 있습니다.</string>
-  <string name="gem.purchase.subtitle">보석들은 당신의 계정에 다양한 요소를 추가해줍니다. 예를들어:</string>
-  <string name="gem.purchase.listitem1">아바타를 위한 멋진 의상</string>
-  <string name="gem.purchase.listitem2">환상적인 배경들</string>
-  <string name="gem.purchase.listitem3">펫알을 얻을 수 있는 재미있는 퀘스트들</string>
-  <string name="gem.purchase.listitem4">레벨 100 이전에도 직업 변경 가능</string>
-  <string name="support_habitica">Habitica 지원하기</string>
-  <string name="skill_transformation_use">사용</string>
-  <string name="hatching_market_info">필요한 아이템이 드롭되지 않나요? 시장으로 가보세요!</string>
-  <string name="feeding_market_info">다른 종류의 음식이 필요한가요? 시장에서 음식을 구매해보세요!</string>
-  <string name="open_market">시장으로</string>
-  <string name="cds_description">일일과제는 %1$s 후에 처음 해비티카를 사용할 때 리셋됩니다. 꼭 이 시간 전에 일일과제들을 완료하세요!</string>
-  <string name="AudioTheme_title">오디오 테마</string>
-  <string name="AudioTheme_summary">Habitica 오디오 바꾸기</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">내일 봐요!</string>
-  <string name="belongs_to_challenge">도전과제에 속함</string>
-  <string name="has_reminder">알림 있음</string>
-  <string name="has_tag">태그 있음</string>
-  <string name="subscribe.title">정기구독은 개발자를 후원하고 Habitica를 유지하는 데 도움이 됩니다</string>
-  <string name="subscribe_prompt">정기구독자가 되면 다음과 같은 혜택을 얻을 수 있습니다:</string>
-  <string name="subscribe.listitem1">골드로 보석 구매</string>
-  <string name="subscribe.listitem2">월별 한정 아이템</string>
-  <string name="subscribe.listitem3">더 많은 기록 보관</string>
-  <string name="subscribe.listitem4">일일 획득 가능한 아이템 개수 두 배</string>
-  <string name="subscriptions">구독</string>
-  <string name="subscription_duration">자동이체: 매 %s</string>
-  <string name="subscribe">구독하기</string>
-  <string name="subscribe.listitem1.description">이제부터 상인 알렉산더가 보석을 개당 20골드에 판매합니다!\n\n처음에는 매달 구비량이 한 달에 25개로 제한되어 있지만, 후원 기간에 따라 올라갈 수 있습니다.\n\n연속 정기후원 3개월마다 보석 제한개수가 5개씩, 최대 월 50개까지 올라갑니다.</string>
-  <string name="subscribe.listitem2.description">매달 당신의 아바타를 위한 독특한 의상 아이템을 드립니다!\n\n더불어, 정기 후원을 해주시는 매 3달마다 미스터리 시간 여행자가 전통적인 (그리고 미래지향적인!) 꾸미기 아이템을 소개해 줄 겁니다.</string>
-  <string name="subscribe.listitem3.description">완료한 할 일과 과제 기록이 더 오래 남습니다.</string>
-  <string name="subscribe.listitem4.description">드롭 제한 두 배로 인하여 매일 과제를 수행하며 펫 컬렉션 완성을 도울 더 많은 아이템을 얻을 수 있습니다.</string>
-  <string name="subscribe1month.gemcap">최대 보석 구매량은 25 부터입니다.</string>
-  <string name="subscribe3month.gemcap">최대 보석 구매량이 30으로 늘었습니다.</string>
-  <string name="subscribe6month.gemcap">최대 보석 구매량이 35로 늘었습니다.</string>
-  <string name="subscribe12month.gemcap">최대 보석 구매량이 45로 늘었습니다.</string>
-  <string name="subscription_hourglasses">신비한 모래시계 +%d</string>
-  <string name="payment_method">지급방법</string>
-  <string name="subscription">정기구독</string>
-  <string name="active">활성중</string>
-  <string name="cancel_subscription">구독 취소하기</string>
-  <string name="cancel_subscription_google.description">탈퇴하고 싶으신가요? 구글 플레이 스토어의 \"My Apps\"에 탈퇴 옵션이 있습니다.</string>
-  <string name="visit_habitica_website">Habitica 웹사이트 가기</string>
-  <string name="current_bonuses">현재 발동중인 보너스</string>
-  <string name="months_subscribed">구독한 기간</string>
-  <string name="current_hourclasses">보유중인 신비한 모래시계</string>
-  <string name="monthly_gem_cap">월별 보석 제한수량</string>
-  <string name="inactive">비활성중</string>
-  <string name="one_month">1개월</string>
-  <string name="months">%d개월</string>
-  <string name="month">달마다</string>
-  <string name="three_months">3개월</string>
-  <string name="six_months">6개월</string>
-  <string name="twelve_months">12개월</string>
-  <string name="subscribe_prompt_thanks">정기구독을 함으로써 다음과 같은 혜택을 받고 있습니다:</string>
-  <string name="subscription_status">구독상황</string>
-  <string name="byLeader">%s 소유</string>
-  <string name="challenge_details">도전 내용</string>
-  <string name="challenge_leave_title">도전 그만두기</string>
-  <string name="challenge_leave_text">정말로 “%s” 도전을 그만 두시겠습니까?</string>
-  <string name="challenge_remove_tasks_title">할일 제거</string>
-  <string name="challenge_remove_tasks_text">할일을 제거하고 싶으신가요?</string>
-  <string name="remove_tasks">제거하기</string>
-  <string name="keep_tasks">놔두기</string>
-  <string name="my_challenges">나의 도전들</string>
-  <string name="public_challenges">공개</string>
-  <string name="challenges">도전과제들</string>
-  <string name="daily">일일과제</string>
-  <string name="habit">습관</string>
-  <string name="reward">보상</string>
-  <string name="todo">해야 할 일</string>
-  <string name="official">공식</string>
-  <string name="participating">참여중</string>
-  <string name="challenge">도전</string>
-  <string name="go_to_challenge">도전 과제로 가기</string>
-  <string name="not_part_of_a_challenge">현재 아무 도전에도 참여하지 않고 있습니다!</string>
-  <string name="join_a_challenge">도전에 참여해서 잘 짜여진 과제 목록을 더하고, 다른 해비티칸들과 함께 경쟁해서 업적 달성도 하고 보석도 받을 수 있는 기회를 얻으세요!</string>
-  <string name="check_the_public_challenge_tab">\"공개\" 탭을 터치하시면 본인에게 맞는 다른 유저들이 만든 도전들을 찾을 수 있습니다!</string>
-  <string name="add_reminder">미리 알림 설정하기</string>
-  <string name="warning">주의</string>
-  <string name="open_settings">설정 열기</string>
-  <string name="inbox">받은 편지함</string>
-  <string name="FAQ">자주 묻는 질문</string>
-  <string name="special">스페셜</string>
-  <string name="gem_for_gold_description">당신은 Habitica를 정기 후원하시므로, 매달 골드를 이용해 특정량의 보석을 구입할 수 있습니다.</string>
-  <string name="limited_count">%d 남음</string>
-  <string name="gem_shop">보석</string>
-  <string name="mystery_item">미스터리 아이템</string>
-  <string name="myster_item_notes">매달, 정기후원자는 미스터리 아이템을 제공받습니다. 아이템은 달이 끝나기 한 주전쯤 출시됩니다.</string>
-  <string name="open">열기</string>
-  <string name="notification_mystery_item">상자를 열어 %s을/를 찾았습니다!</string>
-  <string name="checkInRewardEarned">삶을 증진시키려는 노력의 대가로 %1$s를 얻었습니다.</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">다음 보상은 %1$d번 출석 후에 풀립니다.</string>
-  <string name="done">완료</string>
-  <string name="group_tasks_edit_description">그룹 할일은 편집할 수 없습니다.</string>
-  <string name="group_tasks_edit_title">이 할일을 편집할 수 없습니다.</string>
-  <string name="groups">그룹</string>
-  <string name="all">모든</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">새로고침</string>
+  <string name="XP_default">경험치</string>
+  <string name="HP_default">체력</string>
+  <string name="MP_default">마나</string>
+  <string name="ERR_pb_barcode">바코드에서 데이터를 가져오지 못했습니다</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">설정</string>
+  <string name="SP_address_hint">사용자 지정 서버</string>
+  <string name="SP_userID_title">유저 ID</string>
+  <string name="SP_userID_summary">본인의 유저 ID</string>
+  <string name="SP_APIToken_title">API 토큰</string>
+  <string name="SP_APIToken_summary">본인의 API 토큰</string>
+  <string name="Language_title">언어</string>
+  <string name="Language_summary">Habitica의 언어 바꾸기</string>
+  <string name="SP_user_qr_code">당신의 QR코드</string>
+  <string name="PS_contact_title">연락처</string>
+  <string name="pref_account_header">계정</string>
+  <string name="pref_first_day_of_the_week_title">일주일의 첫날</string>
+  <string name="pref_first_day_of_the_week_summary">모든 달력에서 일주일의 첫날</string>
+  <string name="pref_reminder_header">매일 알림</string>
+  <string name="pref_reminder_checkbox">알림 활성화 하기</string>
+  <string name="pref_reminder_picker">알림 시간 설정</string>
+  <string name="pref_cds_header">하루 시작 시간</string>
+  <string name="pref_cds_picker">하루 시작 시간 설정</string>
+  <string name="pref_push_notifications_checkbox">사용자 알림</string>
+  <string name="push_notifications">푸쉬 알림</string>
+  <string name="push_notifications_sum">푸쉬 알림 설정</string>
+  <string name="preference_push_you_won_challenge">도전 과제에서 우승하였습니다!</string>
+  <string name="preference_push_received_a_private_message">개인 메시지를 받았습니다.</string>
+  <string name="preference_push_gifted_gems">선물받은 보석</string>
+  <string name="preference_push_gifted_subscription">선물 받은 구독</string>
+  <string name="preference_push_invited_to_party">파티에 초대 받음</string>
+  <string name="preference_push_invited_to_guild">길드에 초대 받음</string>
+  <string name="preference_push_your_quest_has_begun">퀘스트가 시작되었음</string>
+  <string name="preference_push_invited_to_quest">퀘스트에 초대를 받았음</string>
+  <!--Adding tasks-->
+  <string name="task_value">값</string>
+  <string name="action_edit">수정</string>
+  <string name="action_delete">삭제</string>
+  <string name="action_cancel">취소</string>
+  <string name="login_btn">로그인</string>
+  <string name="register_btn">등록</string>
+  <string name="username">유저이름</string>
+  <string name="email_username">이메일 혹은 유저이름</string>
+  <string name="password">암호</string>
+  <string name="emailAddress">이메일 주소</string>
+  <string name="confirmpassword">암호 확인</string>
+  <string name="logout">로그아웃</string>
+  <string name="logout_description">계정 로그아웃</string>
+  <string name="account_details_sum">계정 정보를 확인하세요</string>
+  <string name="account_details">계정 정보</string>
+  <string name="LoginActivityName">환영합니다</string>
+  <string name="string_revive">되살리기</string>
+  <string name="please_connect">위젯을 사용하기 전 앱을 연결해 주세요</string>
+  <string name="about.title">소개</string>
+  <string name="about.libraries">도서관</string>
+  <string name="about.versionhistory">버젼 내력</string>
+  <string name="about.habitica_open_source">Habitica는 Github를 통해 오픈소스로 공개되어 있습니다</string>
+  <string name="about.rate_our_app">앱 평가</string>
+  <string name="about.give_us_feedback">피드백을 보내주세요!</string>
+  <string name="about.bugreport">버그 신고</string>
+  <string name="about.source_code">소스코드</string>
+  <!--Network Errors-->
+  <string name="network_error_title">연결 오류</string>
+  <string name="network_error_no_network_body">인터넷에 연결되어 있지 않습니다.</string>
+  <string name="internal_error_api">서버에 문제가 발생한 것 같습니다. 다시 시도해 주세요.</string>
+  <string name="authentication_error_title">인증 오류</string>
+  <string name="authentication_error_body">당신의 유저이름 혹은 암호가 틀렸습니다.</string>
+  <string name="login_validation_error_title">검증 오류</string>
+  <string name="login_validation_error_fieldsmissing">모든 항목을 채워주셔야 합니다.</string>
+  <string name="save_changes">저장</string>
+  <string name="copy">복사</string>
+  <string name="notes">노트</string>
+  <string name="text">내용</string>
+  <string name="difficulty">난이도</string>
+  <string name="tags">태그</string>
+  <string name="trivial">사소함</string>
+  <string name="easy">쉬움</string>
+  <string name="medium">보통</string>
+  <string name="hard">어려움</string>
+  <string name="start_date">시작 날짜</string>
+  <string name="positive_habit_form">긍정적 (+)</string>
+  <string name="negative_habit_form">부정적 (-)</string>
+  <string name="checklist">체크리스트</string>
+  <string name="reminders">알림</string>
+  <string name="actions">행동</string>
+  <string name="attributes">속성</string>
+  <string name="physical">신체</string>
+  <string name="mental">정신</string>
+  <string name="social">사회성</string>
+  <string name="other">기타</string>
+  <string name="frequency">빈도</string>
+  <string name="frequency_weekly">특정 요일에만</string>
+  <string name="frequency_daily">X일 마다</string>
+  <string name="monday">월요일</string>
+  <string name="tuesday">화요일</string>
+  <string name="wednesday">수요일</string>
+  <string name="thursday">목요일</string>
+  <string name="friday">금요일</string>
+  <string name="saturday">토요일</string>
+  <string name="sunday">일요일</string>
+  <string name="levelup_header">레벨이 올랐습니다!</string>
+  <string name="levelup_detail">일상생활의 목표들을 달성함으로써 레벨 %1$d가 되었어요!</string>
+  <string name="levelup_health">체력이 완전히 회복되었습니다!</string>
+  <string name="levelup_button">만세!</string>
+  <string name="faint_subtitle">좌절하지 말아요!</string>
+  <string name="faint_penalty_body">당신은 레벨, 골드, 장비 한개를 잃었지만, 열심히 일하면 곧 되찾을 수 있을꺼에요! 행운을 빌어요--분명 잘 해낼꺼에요.</string>
+  <string name="faint_header">체력이 모두 떨어졌어요!</string>
+  <string name="faint_button">체력을 채우고 다시 도전하세요.</string>
+  <string name="filter">필터</string>
+  <string name="profile_image">프로필 사진</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">당신은 %1$s을 사용해 %2$d 마나를 얻었습니다.</string>
+  <string name="used_skill_without_mana">%1$s을(를) 사용했습니다.</string>
+  <string name="new_checklist_item">새로운 체크리스트 항목</string>
+  <string name="add_checklist_item">더하기</string>
+  <string name="reminder_title">일일과제 체크하는 것을 잊지마세요!</string>
+  <string name="skill_progress_title">스킬 사용</string>
+  <string name="coming_soon">곧 찾아옵니다</string>
+  <string name="chat_flag_confirmation">정말 이 메세지를 신고하시겠습니까?</string>
+  <string name="flag_confirm">메세지 신고하기</string>
+  <string name="unlock_lvl_11">레벨 11에 열림</string>
+  <string name="no_party_message">파티에 소속되어 있지 않습니다. 파티에 가입하려면 저희 홈페이지를 방문해주세요.</string>
+  <string name="forgot_pw_btn">암호 찾기</string>
+  <string name="forgot_pw_tv">암호를 잊어버리셨나요? 모바일 홈페이지를 이용해주세요.</string>
+  <string name="tavern.inn.checkOut">일일과제 활성화</string>
+  <string name="tavern.inn.rest">일일과제 일시중지</string>
+  <string name="reward.dialog.buy">구매</string>
+  <string name="reward.dialog.dismiss">닫기</string>
+  <string name="party">파티</string>
+  <string name="chat">채팅</string>
+  <string name="members">멤버</string>
+  <string name="habits">습관</string>
+  <string name="dailies">일일과제</string>
+  <string name="todos">해야 할 일</string>
+  <string name="rewards">보상</string>
+  <string name="taskform.delete.title">확실합니까?</string>
+  <string name="taskform.delete.message">삭제하시겠습니까?</string>
+  <string name="yes">예</string>
+  <string name="no">아니요</string>
+  <string name="quest">퀘스트</string>
+  <string name="avatar_body">몸</string>
+  <string name="avatar_hair">머리</string>
+  <string name="avatar_shirt">상의</string>
+  <string name="avatar_skin">피부</string>
+  <string name="avatar_ears">동물 귀</string>
+  <string name="avatar_base">기본</string>
+  <string name="avatar_color">색</string>
+  <string name="avatar_beard">턱수염</string>
+  <string name="avatar_mustache">콧수염</string>
+  <string name="avatar_flower">꽃</string>
+  <string name="avatar_bangs">앞머리</string>
+  <string name="avatar_nothing">세팅되지 않음</string>
+  <string name="avatar_size">체형</string>
+  <string name="avatar_size_slim">날씬하게</string>
+  <string name="avatar_size_broad">통통하게</string>
+  <string name="avatar_background">배경</string>
+  <string name="purchase_customization"> 구매</string>
+  <string name="purchase_set_button">%d개의 보석으로 전체 세트 열기</string>
+  <string name="purchase_button">구매</string>
+  <string name="purchase_set_title">%s 세트 구매</string>
+  <string name="due_date">만기일</string>
+  <string name="quest.accept">승인</string>
+  <string name="quest.reject">거부</string>
+  <string name="quest.begin">퀘스트 시작</string>
+  <string name="quest.cancel">초대 취소</string>
+  <string name="quest.abort">퀘스트 포기</string>
+  <string name="quest.leave">퀘스트 나가기</string>
+  <string name="quest.pending">미결</string>
+  <string name="quest.accepted">승인됨</string>
+  <string name="quest.rejected">거부됨</string>
+  <string name="quest.participants">참가자</string>
+  <string name="version_info">버젼 %1$s (%2$d)</string>
+  <string name="sidebar_help">도움말 &amp; FAQ</string>
+  <string name="complete_tutorial">네, 알겠어요!</string>
+  <string name="dismiss_tutorial">나중에 알려주세요</string>
+  <string name="intro_1_subtitle">오신 것을 환영합니다</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_2_subtitle">게임의 진전</string>
+  <string name="intro_2_title">삶의 진전</string>
+  <string name="intro_2_description">실제 삶에서의 일을 처리하는 것으로 게임의 특색들을 잠금해제 하세요. 목표를 달성해 갑옷, 펫, 그리고 더 많은 것들을 얻으세요.</string>
+  <string name="intro_3_description">친구들의 도움으로 당신의 목표를 유지시키세요. 일상 생활과 전투에서 서로를 도와가며 함께 성장하세요!</string>
+  <string name="intro_finish_button">시작합시다!</string>
+  <string name="previous_button">이전</string>
+  <string name="next_button">다음</string>
+  <string name="skip_button">스킵</string>
+  <string name="setup_welcome_description">Habitica에 오신걸 환영합니다. 게임에서의 진행도는 당신 일상에서의 진행도를 의미하죠! 과제를 달성할수록 새로운 장비, 펫, 퀘스트 등을 열 수 있어요.</string>
+  <string name="setup_welcome_title">환영합니다</string>
+  <string name="setup_group_work">일</string>
+  <string name="setup_group_exercise">운동</string>
+  <string name="setup_group_school">학교</string>
+  <string name="setup_group_teams">팀</string>
+  <string name="setup_group_chores">집안일</string>
+  <string name="setup_group_creativity">창의력</string>
+  <string name="setup_task_work_1">이메일 정리</string>
+  <string name="setup_task_work_2">가장 중요한 과제</string>
+  <string name="setup_task_work_3">업무 프로젝트</string>
+  <string name="setup_task_exercise_1">10분 동안 유산소 운동</string>
+  <string name="setup_task_exercise_2">스트레칭</string>
+  <string name="setup_task_exercise_3">운동 계획 짜기</string>
+  <string name="setup_task_healthWellness_1">건강한 음식 섭취 / 군것질</string>
+  <string name="setup_task_healthWellness_2">치실 하기</string>
+  <string name="setup_task_healthWellness_3">건강검진 예약</string>
+  <string name="setup_task_school_1">공부/미루기</string>
+  <string name="setup_task_school_2">숙제하기</string>
+  <string name="setup_task_school_3">수업 과제 끝내기</string>
+  <string name="setup_task_teams_1">팀에게 연락하기</string>
+  <string name="setup_task_teams_2">팀에게 진행상황 보고하기</string>
+  <string name="setup_task_teams_3">그룹 과제 완성하기</string>
+  <string name="setup_task_chores_1">10분간 청소</string>
+  <string name="setup_task_chores_2">설겆이</string>
+  <string name="setup_task_chores_3">옷장 정리</string>
+  <string name="setup_task_creativity_1">공예 배우기</string>
+  <string name="setup_task_creativity_2">창의적인 활동 하기</string>
+  <string name="setup_task_creativity_3">창의적인 과제 끝내기</string>
+  <string name="gem.purchase.support">Habitica가 계속되었으면 좋겠나요? 보석을 구매하여 개발자들을 지원해주세요. 보석들은 당신의 계정에 다양한 요소를 추가해줍니다. 예를들어:
+
+- 아바타를 위한 멋진 의상
+- 환상적인 배경들
+- 펫 알을 얻을 수 있는 재미있는 퀘스트들
+- 레벨 100 이전에 직업 변경 가능
+
+더 나은 Habitica를 만들 수 있도록 도와주셔서 감사합니다. 당신의 지원은 큰 의미로 다가옵니다!</string>
+  <string name="my_guilds">나의 길드</string>
+  <string name="public_guilds">열린 길드</string>
+  <string name="guild">길드</string>
+  <string name="leave">나가기</string>
+  <string name="join">가입하기</string>
+  <string name="leader">리더</string>
+  <string name="gems">보석</string>
+  <string name="send_pm">개인 메시지 보내기</string>
+  <string name="flag">신고</string>
+  <string name="delete">삭제</string>
+  <string name="name">이름</string>
+  <string name="description">설명</string>
+  <string name="privacy">개인정보 보호</string>
+  <string name="write_message">메세지 작성</string>
+  <string name="post">게시</string>
+  <string name="guild_search_hint">길드 검색</string>
+  <string name="todo_due">만기: %s</string>
+  <string name="daily_streak">연속 달성: %d</string>
+  <string name="todo_has_duedate">과제가 만기일이 있습니다</string>
+  <string name="battle_gear">전투 장비</string>
+  <string name="costume">의상</string>
+  <string name="outfit_head">머리</string>
+  <string name="outfit_headAccessory">머리 장식</string>
+  <string name="outfit_eyewear">안경</string>
+  <string name="outfit_armor">갑옷</string>
+  <string name="outfit_back">등</string>
+  <string name="outfit_body">몸</string>
+  <string name="outfit_shield">방패</string>
+  <string name="outfit_weapon">무기</string>
+  <string name="wear_costume">의상 입기</string>
+  <string name="equipped">착용됨</string>
+  <string name="quest_cancel_message">정말 이 퀘스트를 취소하시겠습니까? 모든 초대장과 승인들을 잃을 것입니다. 퀘스트 스크롤은 주인에게 돌아갑니다.</string>
+  <string name="quest.invitation">퀘스트 초대장</string>
+  <string name="quest_begin_message">정말 이 퀘스트를 시작하시겠습니까? 시작 후 더이상 새로운 파티 멤버가 참여할 수 없습니다.</string>
+  <string name="quest.invitation.text">퀘스트에 초대받았습니다!</string>
+  <string name="ago_1day">하루 전</string>
+  <string name="ago_days">%d 일 전</string>
+  <string name="ago_1Minute">1분 전</string>
+  <string name="ago_minutes">%d 분 전</string>
+  <string name="ago_hours">%d 시간 전</string>
+  <string name="ago_1hour">1시간 전</string>
+  <string name="today">오늘</string>
+  <string name="sidebar_items">아이템</string>
+  <string name="eggs">알</string>
+  <string name="hatching_potions">부화 물약</string>
+  <string name="food">먹이</string>
+  <string name="quests">퀘스트</string>
+  <string name="pets">펫</string>
+  <string name="mounts">탑승펫</string>
+  <string name="armoireEquipment">옷장에서 귀한 장비를 찾았습니다: %s! 대단해요!</string>
+  <string name="armoireFood">당신은 옷장안에서  %1$s %2$s 를 발견합니다. 왜 이것들이 여기 들어있지?</string>
+  <string name="armoireExp">당신은 옷장과 씨름하여 경험치를 얻었습니다. 맛 좀 봐라!</string>
+  <string name="armoireNotesFull">옷장을 열어 무작위로 장비, 경험치, 혹은 음식을 얻으세요! 남은 장비 부품: %d</string>
+  <string name="armoireLastItem">당신은 마지막 귀한 장비를 마법의 옷장에서 찾았습니다.</string>
+  <string name="armoireNotesEmpty">옷장에는 매달 첫째주에 새로운 장비가 들어있을 것입니다. 그때까지는 계속 클릭하여 경험치와 음식을 얻으세요!</string>
+  <string name="sell">팔기 (%d 골드)</string>
+  <string name="hatch_with_potion">물약으로 알 부화</string>
+  <string name="feed_to_pet">펫 먹이주기</string>
+  <string name="hatch_egg">알 부화</string>
+  <string name="invite_party">파티에 초대</string>
+  <string name="dialog_feeding">%1$s %2$s 에게 다음의 먹이 주기:</string>
+  <string name="use_animal">사용</string>
+  <string name="feed">먹이주기</string>
+  <string name="hatch_with">%s 으로 펫 부화</string>
+  <string name="hatched_pet_title">당신은 %1$s %2$s 를 부화시켰습니다!</string>
+  <string name="close">닫기</string>
+  <string name="share">나누기</string>
+  <string name="notification_pet_fed">%1$s %2$s 에게 먹이를 줬습니다!</string>
+  <string name="notification_purchase">%s 를 구매했습니다</string>
+  <string name="sectionpets">기본 펫</string>
+  <string name="sectionpremiumPets">마법 물약의 펫</string>
+  <string name="sectionquestPets">퀘스트 펫</string>
+  <string name="sectionspecialPets">희귀 펫</string>
+  <string name="sectionmounts">기본 탑승펫</string>
+  <string name="sectionpremiumMounts">마법 물약의 탑승펫</string>
+  <string name="sectionquestMounts">퀘스트 탑승펫</string>
+  <string name="sectionspecialMounts">희귀 탑승펫</string>
+  <string name="world_quest">세계 퀘스트</string>
+  <string name="inn_description">여관에서 쉬면 완료하지 못한 일일과제가 당신을 다치게 하는 것을 막을 수 있습니다. (주의: 보스로부터 받는 데미지는 피하지 못합니다.)</string>
+  <string name="empty_items">%s 가 하나도 없습니다</string>
+  <string name="user_level">Lvl %d</string>
+  <string name="user_level_with_class">Lvl %1$d %2$s</string>
+  <string name="warrior">전사</string>
+  <string name="rogue">도적</string>
+  <string name="mage">마법사</string>
+  <string name="healer">힐러</string>
+  <string name="warrior_description">전사들은 보너스 골드, 경험치를 주고 아이템 드롭 확률을 증가시키는 \"치명타\"를 더 강하게, 자주 발생시킬 수 있습니다. 또, 보스몬스터에 강한 피해를 입힐 수 있습니다. 예측 불가능한 대박을 터트리거나 보스 공격에서 활약하는 것을 원한다면 전사를 추천합니다!</string>
+  <string name="mage_description">마법사는 경험치와 레벨이 다른 클래스에 비해 빠르게 성장합니다. 또, 특수 능력을 사용하기 위한 마나도 훨씬 많습니다. 계획적인 과제달성 게임을 하시고 싶거나 빠른 레벨업으로 다양한 기능들을 체험하시고 싶으시다면 마법사를 추천합니다!</string>
+  <string name="rogue_description">도적은 다른 클래스에 비해 골드를 더 많이 받고 랜덤한 아이템들을 잘 찾아냅니다. 그들의 민첩 능력은 일일과제를 놓쳐서 발생하는 위험을 잘 피할 수 있도록 합니다. 보상과 업적, 아이템과 뱃지 모으기를 좋아하신다면 도적을 추천합니다!</string>
+  <string name="healer_description">힐러는 공격에 휘둘리지 않고 동료들을 보호해 줍니다. 놓친 일일과제와 나쁜 습관들은 그들에게 큰 피해를 입히지 못하고, 설령 실패를 하더라도 치료가 가능합니다. 파티원들을 도와주길 좋아하고 노력으로 죽음을 이겨내는 것이 매력적이라면 힐러를 추천합니다!</string>
+  <string name="select_class">직업 고르기</string>
+  <string name="opt_out_class">선택 유예</string>
+  <string name="opt_out_description">직업을 신경쓰고 싶지 않으신가요? 나중에 고르고 싶으시다고요? 선택유예 하세요 - 당신은 아무런 능력이 없는 전사가 되어있을 꺼에요. wiki를 방문하면 직업시스템에 대해서 자세히 알 수 있고, 이후에 언제라도 직업을 선택할 수 있습니다.</string>
+  <string name="class_confirmation">%s 가 되고싶은 것이 확실한가요?</string>
+  <string name="class_changed">%s가 되었습니다!</string>
+  <string name="class_changed_description">장비 메뉴에서 교체할 수 있는 새로운 기본 전투 장비를 얻었습니다!</string>
+  <string name="choose_class">직업 선택</string>
+  <string name="dialog_go_back">뒤로 가기</string>
+  <string name="opt_out_confirmation">선택을 유예하고 싶은 것이 확실한가요?</string>
+  <string name="change_class">직업 바꾸기</string>
+  <string name="change_class_description">보석 3개를 사용하여 직업을 바꾸고 능력치를 초기화 하세요. 웹사이트에서 능력치를 배분할 수 있습니다. </string>
+  <string name="enable_class">직업시스템 활성화</string>
+  <string name="changing_class_progress">직업 바꾸기</string>
+  <string name="by_email">이메일로</string>
+  <string name="invite_existing_users">등록된 사용자 초대</string>
+  <string name="send">보내기</string>
+  <string name="invite">친구 초대</string>
+  <string name="invite_id_description">Habitica를 이용하는 친구가 있다면, 유저 아이디를 입력하여 초대하세요.</string>
+  <string name="invite_email_description">친구가 당신이 보낸 이메일로 Habitica에 가입하면, 자동으로 당신의 파티에 초대됩니다!</string>
+  <string name="add_invites">초대 더하기</string>
+  <string name="user_id">유저 ID</string>
+  <string name="email">이메일</string>
+  <string name="invite_users">파티 초대</string>
+  <string name="share_using">올리기</string>
+  <string name="share_levelup">일상생활의 습관을 개선하여 Habitica에서 레벨 %d가 되었어요!</string>
+  <string name="share_hatched">일상생활의 과제들을 달성하여 Habitica에서 %1$s %2$s 펫을 깨웠어요!</string>
+  <string name="share_raised">일상생활의 과제들을 달성하여 %1$s %2$s 탈것을 얻었어요!</string>
+  <string name="open_in_store">플레이스토어로 열기</string>
+  <string name="change_class_confirmation">보석 3개를 사용하여 직업을 바꾸시겠습니까? </string>
+  <string name="change_class_equipment_warning">주의: 더 이상 %s 직업의 장비를 구입할 수 없게됩니다.</string>
+  <string name="leaderMessage">%1$s로부터 온 메세지</string>
+  <string name="leaderName">리더: %1$s</string>
+  <string name="confirm">확인</string>
+  <string name="market">시장</string>
+  <string name="timeTravelers">시간 여행자들</string>
+  <string name="seasonalShop">계절 상점</string>
+  <string name="empty_inbox">받은 편지함 메시지가 없습니다. 공개 채팅 메시지를 통해 사용자에게 새 메시지를 보낼 수 있습니다!</string>
+  <string name="party_invite">친구를 초대하여 잠금 해제하기</string>
+  <string name="no_gold">골드가 충분하지 않음</string>
+  <string name="no_potion">체력 물약을 살 필요가 없음</string>
+  <string name="successful_purchase">%1$s을(를) 성공적으로 구매했음</string>
+  <string name="purchase_confirmation_title">구매 확인</string>
+  <string name="confirm_purchase_text">%1$s을(를) %2$s %3$s(으)로 구매함</string>
+  <string name="gem">보석</string>
+  <string name="hourglass">모래시계</string>
+  <string name="hourglasses">모래시계</string>
+  <string name="gold_singular">골드</string>
+  <string name="gold_plural">골드</string>
+  <string name="chat_message_copied">메시지를 클립보드에 복사했음</string>
+  <string name="copy_chat_message">클립보드로 복사함</string>
+  <string name="edit_tag_title">태그 편집</string>
+  <string name="edit_tag_btn_edit">편집</string>
+  <string name="edit_tag_btn_done">완료</string>
+  <string name="edit_tag_btn_delete">삭제</string>
+  <string name="confirm_delete_tag_title">정말이요?</string>
+  <string name="confirm_delete_tag_message">정말 삭제할까요?</string>
+  <string name="filter_drawer_edit_tags">태그 편집</string>
+  <string name="filter_drawer_filter_tags">태그로 정렬</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">이 QR 코드로 다른 사람이 초대할 수 있게 하세요</string>
+  <string name="qr_save_message">QR 코드 저장:</string>
+  <string name="qr_dialogue_title">나의 QR 코드</string>
+  <string name="download">다운로드</string>
+  <string name="send_new_message">새 메시지 보내기</string>
+  <string name="choose_recipient_title">메시지 받는 사람 선택</string>
+  <string name="action_continue">계속</string>
+  <string name="scan_qr_code">QR 코드 스캔</string>
+  <string name="enter_recipient_uuid">받는 사람의 사용자 ID 입력</string>
+  <string name="invited_to_party">파티에 참가를 초대 받았습니다!</string>
+  <string name="stats_widget_label">Habitica 통계</string>
+  <string name="add_task">과제 추가</string>
+  <string name="add_habit">습관 추가</string>
+  <string name="add_daily">일일과제 추가</string>
+  <string name="add_todo">할 일 추가</string>
+  <string name="add_reward">보상 추가</string>
+  <string name="all_dailies_completed">오늘의 모든 일일과제를 달성하셨습니다. 잘 했어요!</string>
+  <string name="widget_habit_button">Habitica 습관</string>
+  <string name="widget_dailies">Habitica 일일과제</string>
+  <string name="widget_add_task">Habitica 과제 추가</string>
+  <string name="google_services_missing">구글 플레이 서비스를 찾을 수 없습니다.</string>
+  <string name="gem.purchase.toolbartitle">구매</string>
+  <string name="gem.purchase.title">보석을 구매하시면 개발자를 지원하고 Habitica가 계속될 수 있도록 도울 수 있습니다.</string>
+  <string name="gem.purchase.subtitle">보석들은 당신의 계정에 다양한 요소를 추가해줍니다. 예를들어:</string>
+  <string name="gem.purchase.listitem1">아바타를 위한 멋진 의상</string>
+  <string name="gem.purchase.listitem2">환상적인 배경들</string>
+  <string name="gem.purchase.listitem3">펫알을 얻을 수 있는 재미있는 퀘스트들</string>
+  <string name="gem.purchase.listitem4">레벨 100 이전에도 직업 변경 가능</string>
+  <string name="support_habitica">Habitica 지원하기</string>
+  <string name="skill_transformation_use">사용</string>
+  <string name="hatching_market_info">필요한 아이템이 드롭되지 않나요? 시장으로 가보세요!</string>
+  <string name="feeding_market_info">다른 종류의 음식이 필요한가요? 시장에서 음식을 구매해보세요!</string>
+  <string name="open_market">시장으로</string>
+  <string name="cds_description">일일과제는 %1$s 후에 처음 해비티카를 사용할 때 리셋됩니다. 꼭 이 시간 전에 일일과제들을 완료하세요!</string>
+  <string name="AudioTheme_title">오디오 테마</string>
+  <string name="AudioTheme_summary">Habitica 오디오 바꾸기</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">내일 봐요!</string>
+  <string name="belongs_to_challenge">도전과제에 속함</string>
+  <string name="has_reminder">알림 있음</string>
+  <string name="has_tag">태그 있음</string>
+  <string name="subscribe.title">정기구독은 개발자를 후원하고 Habitica를 유지하는 데 도움이 됩니다</string>
+  <string name="subscribe_prompt">정기구독자가 되면 다음과 같은 혜택을 얻을 수 있습니다:</string>
+  <string name="subscribe.listitem1">골드로 보석 구매</string>
+  <string name="subscribe.listitem2">월별 한정 아이템</string>
+  <string name="subscribe.listitem3">더 많은 기록 보관</string>
+  <string name="subscribe.listitem4">일일 획득 가능한 아이템 개수 두 배</string>
+  <string name="subscriptions">구독</string>
+  <string name="subscription_duration">자동이체: 매 %s</string>
+  <string name="subscribe">구독하기</string>
+  <string name="subscribe.listitem1.description">이제부터 상인 알렉산더가 보석을 개당 20골드에 판매합니다!\n\n처음에는 매달 구비량이 한 달에 25개로 제한되어 있지만, 후원 기간에 따라 올라갈 수 있습니다.\n\n연속 정기후원 3개월마다 보석 제한개수가 5개씩, 최대 월 50개까지 올라갑니다.</string>
+  <string name="subscribe.listitem2.description">매달 당신의 아바타를 위한 독특한 의상 아이템을 드립니다!\n\n더불어, 정기 후원을 해주시는 매 3달마다 미스터리 시간 여행자가 전통적인 (그리고 미래지향적인!) 꾸미기 아이템을 소개해 줄 겁니다.</string>
+  <string name="subscribe.listitem3.description">완료한 할 일과 과제 기록이 더 오래 남습니다.</string>
+  <string name="subscribe.listitem4.description">드롭 제한 두 배로 인하여 매일 과제를 수행하며 펫 컬렉션 완성을 도울 더 많은 아이템을 얻을 수 있습니다.</string>
+  <string name="subscribe1month.gemcap">최대 보석 구매량은 25 부터입니다.</string>
+  <string name="subscribe3month.gemcap">최대 보석 구매량이 30으로 늘었습니다.</string>
+  <string name="subscribe6month.gemcap">최대 보석 구매량이 35로 늘었습니다.</string>
+  <string name="subscribe12month.gemcap">최대 보석 구매량이 45로 늘었습니다.</string>
+  <string name="subscription_hourglasses">신비한 모래시계 +%d</string>
+  <string name="payment_method">지급방법</string>
+  <string name="subscription">정기구독</string>
+  <string name="active">활성중</string>
+  <string name="cancel_subscription">구독 취소하기</string>
+  <string name="cancel_subscription_google.description">탈퇴하고 싶으신가요? 구글 플레이 스토어의 \"My Apps\"에 탈퇴 옵션이 있습니다.</string>
+  <string name="visit_habitica_website">Habitica 웹사이트 가기</string>
+  <string name="current_bonuses">현재 발동중인 보너스</string>
+  <string name="months_subscribed">구독한 기간</string>
+  <string name="current_hourclasses">보유중인 신비한 모래시계</string>
+  <string name="monthly_gem_cap">월별 보석 제한수량</string>
+  <string name="inactive">비활성중</string>
+  <string name="one_month">1개월</string>
+  <string name="months">%d개월</string>
+  <string name="month">달마다</string>
+  <string name="three_months">3개월</string>
+  <string name="six_months">6개월</string>
+  <string name="twelve_months">12개월</string>
+  <string name="subscribe_prompt_thanks">정기구독을 함으로써 다음과 같은 혜택을 받고 있습니다:</string>
+  <string name="subscription_status">구독상황</string>
+  <string name="byLeader">%s 소유</string>
+  <string name="challenge_details">도전 내용</string>
+  <string name="challenge_leave_title">도전 그만두기</string>
+  <string name="challenge_leave_text">정말로 “%s” 도전을 그만 두시겠습니까?</string>
+  <string name="challenge_remove_tasks_title">할일 제거</string>
+  <string name="challenge_remove_tasks_text">할일을 제거하고 싶으신가요?</string>
+  <string name="remove_tasks">제거하기</string>
+  <string name="keep_tasks">놔두기</string>
+  <string name="my_challenges">나의 도전들</string>
+  <string name="public_challenges">공개</string>
+  <string name="challenges">도전과제들</string>
+  <string name="daily">일일과제</string>
+  <string name="habit">습관</string>
+  <string name="reward">보상</string>
+  <string name="todo">해야 할 일</string>
+  <string name="official">공식</string>
+  <string name="participating">참여중</string>
+  <string name="challenge">도전</string>
+  <string name="go_to_challenge">도전 과제로 가기</string>
+  <string name="not_part_of_a_challenge">현재 아무 도전에도 참여하지 않고 있습니다!</string>
+  <string name="join_a_challenge">도전에 참여해서 잘 짜여진 과제 목록을 더하고, 다른 해비티칸들과 함께 경쟁해서 업적 달성도 하고 보석도 받을 수 있는 기회를 얻으세요!</string>
+  <string name="check_the_public_challenge_tab">\"공개\" 탭을 터치하시면 본인에게 맞는 다른 유저들이 만든 도전들을 찾을 수 있습니다!</string>
+  <string name="add_reminder">미리 알림 설정하기</string>
+  <string name="warning">주의</string>
+  <string name="open_settings">설정 열기</string>
+  <string name="inbox">받은 편지함</string>
+  <string name="FAQ">자주 묻는 질문</string>
+  <string name="special">스페셜</string>
+  <string name="gem_for_gold_description">당신은 Habitica를 정기 후원하시므로, 매달 골드를 이용해 특정량의 보석을 구입할 수 있습니다.</string>
+  <string name="limited_count">%d 남음</string>
+  <string name="gem_shop">보석</string>
+  <string name="mystery_item">미스터리 아이템</string>
+  <string name="myster_item_notes">매달, 정기후원자는 미스터리 아이템을 제공받습니다. 아이템은 달이 끝나기 한 주전쯤 출시됩니다.</string>
+  <string name="open">열기</string>
+  <string name="notification_mystery_item">상자를 열어 %s을/를 찾았습니다!</string>
+  <string name="checkInRewardEarned">삶을 증진시키려는 노력의 대가로 %1$s를 얻었습니다.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">다음 보상은 %1$d번 출석 후에 풀립니다.</string>
+  <string name="done">완료</string>
+  <string name="group_tasks_edit_description">그룹 할일은 편집할 수 없습니다.</string>
+  <string name="group_tasks_edit_title">이 할일을 편집할 수 없습니다.</string>
+  <string name="groups">그룹</string>
+  <string name="all">모든</string>
+</resources>
diff --git a/Habitica/res/values-lt/strings.tutorial.xml b/Habitica/res/values-lt/strings.tutorial.xml
index 1529bf298..1b3e724a1 100644
--- a/Habitica/res/values-lt/strings.tutorial.xml
+++ b/Habitica/res/values-lt/strings.tutorial.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_equipment">Tavo perkami įrankiai atsiras čia. Tavo Kovinė Apranga keičia tavo statistiką, ir tavo Kostiumas (jei įjungtas) keičia tavo veikėjo išvaizdą.</string>
-  <string name="tutorial_items">Rask lobius atliekant užduotis ir keliant veikėjo lygį. Paspausk ant lobio, kad jį panaudoti!</string>
-  <string name="tutorial_pets">Darant savo gyvenimo užduotis, turi šansą rasti kiaušinius ir eliksyrus. Maišant juos gali išauginti gyvūnėlius.</string>
-  <string name="tutorial_skills">Sugebėjimai turi stiprius efektus! Paspausk ant sugebėjimo ir tavo veikėjas jį panaudos. Tai kainos Magijos taškų (mėlyna juosta), kuriuos užsidirbi prisijungęs kiekvieną dieną ir atliekant savo užduotis. DUK meniu gali rasti daugiau informacijos!</string>
-  <string name="tutorial_party">Tai yra vieta, kur tu ir tavo draugai galite vienas kitą palaikyti ir taip atsakingai siekti savo tikslų kovodami su pabaisomis ir savo užduotimis!</string>
-  <string name="tutorial_tavern">Sveiki atvykę į Smuklę, viešą, visiem amžiams tinkantį pokalbių kambarį! Čia galite šnekėti apie produktyvumą ir užduoti klausimus vieni kitiems. Sėkmės!</string>
-  <string name="tutorial_classes">Pasirink ar nori tapti Kariu, Magu, Gydytoju ar Sukčiumi! Kiekviena klasė turi savo aprangą ir sugebėjimus. Paspausk (?), kad sužinoti daugiau!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_equipment">Tavo perkami įrankiai atsiras čia. Tavo Kovinė Apranga keičia tavo statistiką, ir tavo Kostiumas (jei įjungtas) keičia tavo veikėjo išvaizdą.</string>
+  <string name="tutorial_items">Rask lobius atliekant užduotis ir keliant veikėjo lygį. Paspausk ant lobio, kad jį panaudoti!</string>
+  <string name="tutorial_pets">Darant savo gyvenimo užduotis, turi šansą rasti kiaušinius ir eliksyrus. Maišant juos gali išauginti gyvūnėlius.</string>
+  <string name="tutorial_skills">Sugebėjimai turi stiprius efektus! Paspausk ant sugebėjimo ir tavo veikėjas jį panaudos. Tai kainos Magijos taškų (mėlyna juosta), kuriuos užsidirbi prisijungęs kiekvieną dieną ir atliekant savo užduotis. DUK meniu gali rasti daugiau informacijos!</string>
+  <string name="tutorial_party">Tai yra vieta, kur tu ir tavo draugai galite vienas kitą palaikyti ir taip atsakingai siekti savo tikslų kovodami su pabaisomis ir savo užduotimis!</string>
+  <string name="tutorial_tavern">Sveiki atvykę į Smuklę, viešą, visiem amžiams tinkantį pokalbių kambarį! Čia galite šnekėti apie produktyvumą ir užduoti klausimus vieni kitiems. Sėkmės!</string>
+  <string name="tutorial_classes">Pasirink ar nori tapti Kariu, Magu, Gydytoju ar Sukčiumi! Kiekviena klasė turi savo aprangą ir sugebėjimus. Paspausk (?), kad sužinoti daugiau!</string>
+</resources>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index 211847db5..e8697ec0e 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -1,392 +1,392 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Atnaujinti</string>
-  <string name="XP_default">Partirtis</string>
-  <string name="HP_default">Gyvybingumas</string>
-  <string name="MP_default">Magijos Taškai</string>
-  <string name="ERR_pb_barcode">Nepavyko nuskaityti nustatymų iš brūkšninio kodo</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Nustatymai</string>
-  <string name="SP_address_hint">Tavo nuosavas serveris</string>
-  <string name="SP_userID_title">Vartotojo ID</string>
-  <string name="SP_userID_summary">Tavo Vartotojo Identifikacijos Kodas</string>
-  <string name="SP_APIToken_title">API Token</string>
-  <string name="SP_APIToken_summary">Tavo API Token</string>
-  <string name="Language_title">Kalba</string>
-  <string name="Language_summary">Pakeisti Habitica kalbą</string>
-  <string name="SP_user_qr_code">Tavo QR Kodas</string>
-  <string name="PS_contact_title">Susisiekti</string>
-  <string name="pref_account_header">Paskyra</string>
-  <string name="pref_first_day_of_the_week_title">Pirma Savaitės Diena</string>
-  <string name="pref_first_day_of_the_week_summary">Pirma savaitės diena visuose kalendoriuose</string>
-  <string name="pref_reminder_header">Kasdienis Priminimas</string>
-  <string name="pref_reminder_checkbox">Įjungti Priminimą</string>
-  <string name="pref_reminder_picker">Nustatyti Priminimo Laiką</string>
-  <string name="pref_cds_header">Tinkinta dienos pradžia</string>
-  <string name="pref_cds_picker">Nustatyti tinkintą dienos pradžios laiką</string>
-  <string name="pref_push_notifications_checkbox">Aktyvūs Vartotojo Pranešimai</string>
-  <string name="push_notifications">Aktyvūs Pranšimai</string>
-  <string name="push_notifications_sum">Iškylančių pranešimų nustatymai</string>
-  <string name="preference_push_you_won_challenge">Laimėjai Iššūkį!</string>
-  <string name="preference_push_received_a_private_message">Gavai Privačią Žinutę</string>
-  <string name="preference_push_gifted_gems">Padovanoti Brangakmeniai</string>
-  <string name="preference_push_gifted_subscription">Padovanota Prenumerata</string>
-  <string name="preference_push_invited_to_party">Pakvietimas į Grupę</string>
-  <string name="preference_push_invited_to_guild">Pakvietimas į Gildiją</string>
-  <string name="preference_push_your_quest_has_begun">Tavo Misija Prasidėjo</string>
-  <string name="preference_push_invited_to_quest">Pakvietimas į Misiją</string>
-  <!--Adding tasks-->
-  <string name="task_value">Reikšmė</string>
-  <string name="action_edit">Keisti</string>
-  <string name="action_delete">Ištrinti</string>
-  <string name="action_cancel">Atšaukti</string>
-  <string name="login_btn">Prisijungti</string>
-  <string name="register_btn">Registruotis</string>
-  <string name="username">Vartotojo Vardas</string>
-  <string name="email_username">El. Paštas arba Vartotojo Vardas</string>
-  <string name="password">Slaptažodis</string>
-  <string name="emailAddress">El. pašto adresas</string>
-  <string name="confirmpassword">Patvirtinti slaptažodį</string>
-  <string name="logout">Atsijungti</string>
-  <string name="logout_description">Atsijungti nuo paskyros</string>
-  <string name="account_details_sum">Patikrinkite Jūsų paskyros detales</string>
-  <string name="account_details">Paskyros Duomenys</string>
-  <string name="LoginActivityName">Sveiki</string>
-  <string name="string_revive">Prisikelti</string>
-  <string name="please_connect">Prašome prisijungti su programa prieš naudojant valdiklį</string>
-  <string name="about.title">Apie</string>
-  <string name="about.libraries">Bibliotekos</string>
-  <string name="about.versionhistory">Versijos istorija</string>
-  <string name="about.habitica_open_source">Habitica pasiekiam kaip atviro kodo programa Github\'e</string>
-  <string name="about.rate_our_app">Įvertink Programėlę</string>
-  <string name="about.give_us_feedback">Siųsk Atsiliepimus!</string>
-  <string name="about.bugreport">Pranešk apie Klaidą</string>
-  <string name="about.source_code">Pirminis Kodas</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Prisijungimo Klaida</string>
-  <string name="network_error_no_network_body">Tu nesi prisijungęs(us) prie interneto.</string>
-  <string name="internal_error_api">Kažkas negerai su serveriu. Bandykite vėliau.</string>
-  <string name="authentication_error_title">Prisijungimo Klaida</string>
-  <string name="authentication_error_body">Tavo Vartotojo Vardas ir/ar Slaptažodis neteisingas(i).</string>
-  <string name="login_validation_error_title">Patvirtinimo Klaida</string>
-  <string name="login_validation_error_fieldsmissing">Turi užpildyti visus laukelius.</string>
-  <string name="save_changes">Išsaugoti</string>
-  <string name="copy">Kopijuoti</string>
-  <string name="notes">Užrašai</string>
-  <string name="text">Tekstas</string>
-  <string name="difficulty">Sunkumas</string>
-  <string name="tags">Žymės</string>
-  <string name="trivial">Labai Lengva</string>
-  <string name="easy">Lengva</string>
-  <string name="medium">Vidutiniška</string>
-  <string name="hard">Sunku</string>
-  <string name="start_date">Prasideda Nuo</string>
-  <string name="positive_habit_form">Teigiamas ( + )</string>
-  <string name="negative_habit_form">Neigiamas ( - )</string>
-  <string name="checklist">Sąrašas</string>
-  <string name="reminders">Priminimai</string>
-  <string name="actions">Veiksmai</string>
-  <string name="attributes">Savybės</string>
-  <string name="physical">Fizinė</string>
-  <string name="mental">Protinė</string>
-  <string name="social">Socialinė</string>
-  <string name="other">Kita</string>
-  <string name="frequency">Dažnumas</string>
-  <string name="frequency_weekly">Specifinėmis Savaitės Dienomis</string>
-  <string name="frequency_daily">Kas X Dienų</string>
-  <string name="monday">Pirmadienis</string>
-  <string name="tuesday">Antradienis</string>
-  <string name="wednesday">Trečiadienis</string>
-  <string name="thursday">Ketvirtadienis</string>
-  <string name="friday">Penktadienis</string>
-  <string name="saturday">Šeštadienis</string>
-  <string name="sunday">Sekmadienis</string>
-  <string name="levelup_header">Pasiekei naują Lygį!</string>
-  <string name="levelup_detail">Siekdamas savo gyvenimo tikslų, pasiekei %1$d Lygį!</string>
-  <string name="levelup_health">Tavo gyvybingumas atstatytas!</string>
-  <string name="levelup_button">Valio!</string>
-  <string name="faint_subtitle">Nepergyvenk!</string>
-  <string name="faint_penalty_body">Praradai Lygį, Auksą, ir dalį savo Aprangos, bet gali juos visus atgauti labiau pasistengęs(us)! Sėkmės - tau tikrai pasiseks.</string>
-  <string name="faint_header">Tavo gyvybingumas išseko!</string>
-  <string name="faint_button">Atstatyti Gyvybes ir bandyti dar kartą</string>
-  <string name="filter">FIltras</string>
-  <string name="profile_image">Profilis Paveikslėlis</string>
-  <string name="mana_price_button">%d Magijos Taškai</string>
-  <string name="used_skill">Panaudojai [%1$s] už %2$d magijos taškus.</string>
-  <string name="used_skill_without_mana">Panaudojai %1$s.</string>
-  <string name="new_checklist_item">naujas sąrašo punktas</string>
-  <string name="add_checklist_item">Pridėti</string>
-  <string name="reminder_title">Nepamiršk pažymėti savo Užduočių!</string>
-  <string name="skill_progress_title">Sugebėjimas Naudojamas</string>
-  <string name="coming_soon">Jau Greitai</string>
-  <string name="chat_flag_confirmation">Ar tikrai norite pranešti apie šią žinutę dėl pažeidimo?</string>
-  <string name="flag_confirm">Žymėti Žinutę</string>
-  <string name="unlock_lvl_11">Atsidengia pasiekus 11 lygį</string>
-  <string name="no_party_message">Tu nesi grupėje. Norėdama(s) prisidėti prie grupės, apsilankyk svetainėje.</string>
-  <string name="forgot_pw_btn">Pamiršau Slaptažodį</string>
-  <string name="forgot_pw_tv">Pamiršote Slaptažodį? Naudokite mobilią Svetainę.</string>
-  <string name="tavern.inn.checkOut">Atnaujinti Kasdienes Užduotis</string>
-  <string name="tavern.inn.rest">Sustabdyti Kasdienes Užduotis</string>
-  <string name="reward.dialog.buy">Pirkti</string>
-  <string name="reward.dialog.dismiss">Atšaukti</string>
-  <string name="party">Grupė</string>
-  <string name="chat">Pokalbiai</string>
-  <string name="members">Nariai</string>
-  <string name="habits">Įpročiai</string>
-  <string name="dailies">Kasdienės</string>
-  <string name="rewards">Atlygiai</string>
-  <string name="taskform.delete.title">Ar esi įsitikinęs(us)?</string>
-  <string name="taskform.delete.message">Ar tikrai nori ištrinti?</string>
-  <string name="yes">Taip</string>
-  <string name="no">Ne</string>
-  <string name="quest">Misija</string>
-  <string name="avatar_body">Kūnas</string>
-  <string name="avatar_hair">Plaukai</string>
-  <string name="avatar_shirt">Marškinėliai</string>
-  <string name="avatar_skin">Oda</string>
-  <string name="avatar_ears">Gyvūnų Ausys</string>
-  <string name="avatar_base">Pagrindas</string>
-  <string name="avatar_color">Spalva</string>
-  <string name="avatar_beard">Barzda</string>
-  <string name="avatar_mustache">Ūsai</string>
-  <string name="avatar_flower">Gėlytė</string>
-  <string name="avatar_bangs">Kirpčiukai</string>
-  <string name="avatar_nothing">Nenustatyta</string>
-  <string name="avatar_size">Dydis</string>
-  <string name="avatar_size_slim">Plonas</string>
-  <string name="avatar_size_broad">Stambus</string>
-  <string name="avatar_background">Fonas</string>
-  <string name="purchase_customization">Pirkti Pakeitimus</string>
-  <string name="purchase_set_button">Atidengti už %d brangakmenių</string>
-  <string name="purchase_button">Pirkti</string>
-  <string name="purchase_set_title">Pirkti rinkinį %s</string>
-  <string name="due_date">Baigimo Terminas</string>
-  <string name="quest.accept">Sutikti</string>
-  <string name="quest.reject">Atmesti</string>
-  <string name="quest.begin">Pradėti Misiją</string>
-  <string name="quest.cancel">Atšaukti Pakvietimą</string>
-  <string name="quest.abort">Atšaukti Misiją</string>
-  <string name="quest.leave">Palikti Misiją</string>
-  <string name="quest.pending">Laukiama</string>
-  <string name="quest.accepted">Sutiko</string>
-  <string name="quest.rejected">Atsisakė</string>
-  <string name="quest.participants">Dalyviai</string>
-  <string name="version_info">Versija: %1$s (%2$d)</string>
-  <string name="sidebar_help">Pagalba &amp; DUK</string>
-  <string name="complete_tutorial">Supratau!</string>
-  <string name="dismiss_tutorial">Priminti man vėliau</string>
-  <string name="intro_3_description">Sek savo tikslus pasitelkęs draugų pagalbą. Padėkit vienas kitam gyvenime kartu kovodami su pabaisomis!</string>
-  <string name="previous_button">Praeitas</string>
-  <string name="next_button">Kitas</string>
-  <string name="skip_button">Praleisti</string>
-  <string name="setup_welcome_description">Sveiki užsukę į Habitica, kur tobulėjimas žaidime padės jums tobulėti gyvenime! Kai siekiate gyvenimo tikslų, gausite aprangos, įrankių, augintinių, misijų ir daugiau.</string>
-  <string name="setup_welcome_title">Sveiki</string>
-  <string name="setup_group_work">Darbas</string>
-  <string name="setup_group_exercise">Sportas</string>
-  <string name="setup_group_school">Mokslai</string>
-  <string name="setup_group_teams">Komandos</string>
-  <string name="setup_group_chores">Ruošos Darbai</string>
-  <string name="setup_group_creativity">Kūrybingumas</string>
-  <string name="setup_task_work_1">Peržiūrėti el.laiškus</string>
-  <string name="setup_task_work_2">Svarbiausia užduotis</string>
-  <string name="setup_task_work_3">Darbo Projektas</string>
-  <string name="setup_task_exercise_1">10 min mankštos</string>
-  <string name="setup_task_exercise_2">Tempimo Pratimai</string>
-  <string name="setup_task_exercise_3">Susikurti mankštos planą</string>
-  <string name="setup_task_healthWellness_1">Valgyti sveiką / greitą maistą</string>
-  <string name="setup_task_healthWellness_2">Dantų Valymas</string>
-  <string name="setup_task_healthWellness_3">Užsirašyti patikrinimui</string>
-  <string name="setup_task_school_1">Mokytis/Tinginiauti</string>
-  <string name="setup_task_school_2">Daryti namų darbus</string>
-  <string name="setup_task_school_3">Baigti praktinį darbą</string>
-  <string name="setup_task_teams_1">Susitik su savo komanda</string>
-  <string name="setup_task_teams_2">Atnaujinti komandos statusą</string>
-  <string name="setup_task_teams_3">Baigti komandos projektą</string>
-  <string name="setup_task_chores_1">10 minučių tvarkymosi</string>
-  <string name="setup_task_chores_2">Plauti Indus</string>
-  <string name="setup_task_chores_3">Tvarkyti spintą</string>
-  <string name="setup_task_creativity_1">Mokytis amato</string>
-  <string name="setup_task_creativity_2">Dirbti prie kūrybinio projekto</string>
-  <string name="setup_task_creativity_3">Baigti kūrybinį projektą</string>
-  <string name="gem.purchase.support">Nori padėti Habitica gyvuoti? Gali paremti programuotojus perkant brangakmenius!\n\nBrangakmeniai leidžia pirkti smagius priedus savo paskyrai, pvz: \n\n - Smagūs kostiumai tavo veikėjui\n - Nepakartojami fonai\n - Smagios misijos, kuriose galima rasti kiaušinių\n - Galimybė pasikeisti klasę nepasiekus 100 lygio\n\nDėkojame, kad padedate Habitica klestėti. Jūsų parama mums tikrai daug reiškia!</string>
-  <string name="my_guilds">Mano Gildijos</string>
-  <string name="public_guilds">Viešos Gildijos</string>
-  <string name="guild">Gildija</string>
-  <string name="leave">Palikti</string>
-  <string name="join">Prisijungti</string>
-  <string name="leader">Vadas</string>
-  <string name="gems">Brangakmeniai</string>
-  <string name="send_pm">Siųsti Žinutę</string>
-  <string name="flag">Žymėti</string>
-  <string name="delete">Trinti</string>
-  <string name="name">Pavadinimas</string>
-  <string name="description">Aprašymas</string>
-  <string name="privacy">Privatumas</string>
-  <string name="write_message">Rašyti Žinutę</string>
-  <string name="post">Siųsti</string>
-  <string name="guild_search_hint">Ieškoti gildijų</string>
-  <string name="todo_due">Terminas: %s</string>
-  <string name="daily_streak">dabartinė serija: %d</string>
-  <string name="todo_has_duedate">Užduotis turi Terminą</string>
-  <string name="battle_gear">Kovinė Apranga</string>
-  <string name="costume">Kostiumas</string>
-  <string name="outfit_head">Galva</string>
-  <string name="outfit_headAccessory">Galvos Aksesuaras</string>
-  <string name="outfit_eyewear">Akiniai</string>
-  <string name="outfit_armor">Šarvai</string>
-  <string name="outfit_back">Nugara</string>
-  <string name="outfit_body">Kūnas</string>
-  <string name="outfit_shield">Skydas</string>
-  <string name="outfit_weapon">Ginklas</string>
-  <string name="wear_costume">Užsidėti Kostiumą</string>
-  <string name="equipped">Užsidėta</string>
-  <string name="quest_cancel_message">Ar tikrai nori atšaukti misiją? Visi pakvietimai bus nutraukti. Misijos savininkas atgaus misijos rankraštį.</string>
-  <string name="quest.invitation">Misijos Pakvietimas</string>
-  <string name="quest_begin_message">Ar tikrai nori pradėti misiją? Kai ji prasidės, kiti grupės nariai nebegalės prisijungti.</string>
-  <string name="quest.invitation.text">Tave pakvietė dalyvauti misijoje!</string>
-  <string name="ago_1day">Liko 1 diena</string>
-  <string name="ago_days">prieš %d dieną(as)</string>
-  <string name="ago_1Minute">prieš 1 minutę</string>
-  <string name="ago_minutes">prieš %d minutę(es)</string>
-  <string name="ago_hours">prieš %d valandą(as)</string>
-  <string name="ago_1hour">prieš 1 valandą</string>
-  <string name="today">Šiandien</string>
-  <string name="sidebar_items">Daiktai</string>
-  <string name="eggs">Kiaušiniai</string>
-  <string name="hatching_potions">Perėjimosi Eliksyrai</string>
-  <string name="food">Maistas</string>
-  <string name="quests">Misijos</string>
-  <string name="pets">Maži Augintiniai</string>
-  <string name="mounts">Suaugę Augintiniai</string>
-  <string name="armoireEquipment">Radai retos aprangos dalį Drabužinėje: %s! Nuostabu!</string>
-  <string name="armoireFood">Betyrinėjant Drabužinę randi %1$s %2$s. Ką tai čia veikia?</string>
-  <string name="armoireExp">Besigrumiant su Drabužine, gauni patirties!</string>
-  <string name="armoireNotesFull">Atidaryk Drabužinę ir gauk retos Aprangos dalį, Patirties ar maisto! Nerasto aprangos dalys: %d</string>
-  <string name="armoireLastItem">Radai paskutinę retos aprangos dalį Užburtoje Drabužinėje.</string>
-  <string name="armoireNotesEmpty">Drabužinėje atsiranda naujų daiktų pirmą kiekvieno mėnesio savaitę. Iki tol, gali toliau joje ieškoti Patirties ir Maisto!</string>
-  <string name="sell">Parduoti (%d Augso)</string>
-  <string name="hatch_with_potion">Užauginti su eliksyru</string>
-  <string name="feed_to_pet">Maitinti gyvūnui</string>
-  <string name="hatch_egg">Išperėti kiaušinį</string>
-  <string name="invite_party">Pakviesti grupę</string>
-  <string name="dialog_feeding">Pašerti %1$s %2$s su:</string>
-  <string name="use_animal">Naudoti</string>
-  <string name="feed">Maitinti</string>
-  <string name="hatch_with">Užauginti gyvūną su %s</string>
-  <string name="hatched_pet_title">Užauginai %1$s %2$s!</string>
-  <string name="close">Uždaryti</string>
-  <string name="share">Dalintis</string>
-  <string name="notification_pet_fed">Pašėrei savo %1$s %2$s!</string>
-  <string name="notification_purchase">%s nupirkta</string>
-  <string name="sectionpets">Paprasti Augintiniai</string>
-  <string name="sectionpremiumPets">Stebuklingų Eliksyrų Augintiniai</string>
-  <string name="sectionquestPets">Misijų Augintiniai</string>
-  <string name="sectionspecialPets">Reti Augintiniai</string>
-  <string name="sectionmounts">Paprasti Augintiniai</string>
-  <string name="sectionpremiumMounts">Stebuklingų Eliksyrų Augintiniai</string>
-  <string name="sectionquestMounts">Misijų Augintiniai</string>
-  <string name="sectionspecialMounts">Reti Augintiniai</string>
-  <string name="world_quest">Pasaulinė Misija</string>
-  <string name="inn_description">Pailsėk Smuklėje, kad tavo nepabaigtos Kasdienės Užduotys nepadarytų tau žalos nakties metu! (Pastaba: pabaisos vistiek padarys tau žalos.)</string>
-  <string name="empty_items">Nebeturi %s</string>
-  <string name="warrior">Karys</string>
-  <string name="rogue">Sukčius</string>
-  <string name="mage">Magas</string>
-  <string name="healer">Gydytojas</string>
-  <string name="warrior_description">Kariai dažniau sugeba smogti \"kritinius\" smūgius, kas duoda papildomo Aukso, Patirties ir padidina lobio gavimo šansą. Jie taip pat daro daug žalos pabaisoms. Pasirink karį, jei tave motyvuoja nenuspėjami atlygiai ar nori pasižymėti pabaisų medžiojimo Misijose!</string>
-  <string name="mage_description">Magai greitaisi mokosi ir greičiau renka Patirtį ir Lygius nei kitos klasės. Jie taip pat turi daugiausia magijos taškų specialiems sugebėjimams. Pasirink Magą, jei tau patinka taktinė Habitica pusė arba jei tave labiausiai motyvuoja veikėjo lygio kilimas!</string>
-  <string name="rogue_description">Sukčiai mėgsta kaupti turtus gaunami daugiausia Aukso ir rasdami daugiausia lobių. Jie taip pat gali pasislėpti nuo praleistų kasdienių Užduočių. Pasirink sukčių, jei tave labiausiai motyvuoja Atlygiai ir Pasiekimai ir nori kuo greičiau užpildyti savo kolekcijas!</string>
-  <string name="healer_description">Gydytojai yra labai sunkiai sužeidžiami - savybė kuria jie dalinasis su aplinkiniais. Praleistos užduotys ir blogi įpročiai jų taip stipriai neveikia ir jie sugeba atstayti savo gyvybes po nesėkmių. Pasirink Gydytoją, jei nori padėti kitiems savo grupėje ir jei tave įkvepia Mirties apgaudinėjimas.</string>
-  <string name="select_class">Pasirinkti Klasę</string>
-  <string name="opt_out_class">Atsisakyti</string>
-  <string name="opt_out_description">Tingi gilintis į klases? Nori pasirinkti vėliau? Atsisakyk. Liksi kariu be specialių sugebėjimų. Galėsi vėliau lengvai ją įjungti, kai pasiskaitysi daugiau apie klases wiki puslapyje.</string>
-  <string name="class_confirmation">Ar tikrai nori būti %s?</string>
-  <string name="choose_class">Pasirink Klasę</string>
-  <string name="dialog_go_back">Grįžti</string>
-  <string name="opt_out_confirmation">Ar tikrai nori atsisakyti?</string>
-  <string name="change_class">Pakeisk klasę</string>
-  <string name="change_class_description">Pakeisk savo klasę ir atgauk išleistus savybių taškus už 3 brangakmenius. Šiuos taškus galėsi priskirti atsidarius interneto puslapį naršyklėje</string>
-  <string name="enable_class">Įjungti Klasių Sistemą</string>
-  <string name="changing_class_progress">Klasės Keitimas</string>
-  <string name="by_email">El. Paštu</string>
-  <string name="invite_existing_users">Pakviesti Esamus Vartotojus</string>
-  <string name="send">Siųsti</string>
-  <string name="invite">Pakviesk Draugus</string>
-  <string name="invite_id_description">Jei tavo draugai jau naudojasi Habitica, pakviesk juos įrašant jų Vartotojo ID čia.</string>
-  <string name="invite_email_description">Jei tavo draugai prisijungs prie Habitica per tavo el. pašto nuorodą, jie bus iš karto pakviesti į tavo grupę!</string>
-  <string name="add_invites">Pridėti Pakvietimų</string>
-  <string name="user_id">Vartotojo ID</string>
-  <string name="email">El. paštas</string>
-  <string name="invite_users">Pakviesk į Grupę</string>
-  <string name="share_using">Pasidalinti su</string>
-  <string name="share_hatched">Kątik gavau %1$s %2$s Habitica augintinį atliekant kasdienes užduotis!</string>
-  <string name="share_raised">Kątik užauginau %1$s %2$s Habitica augintinį atliekant kasdienes užduotis!</string>
-  <string name="open_in_store">Atidaryti play parduotuvėje</string>
-  <string name="change_class_confirmation">Ar tikrai nori pasikeisti savo klasę? Tai kainuos 3 brangakmenius.</string>
-  <string name="leaderMessage">Žinutė nuo %1$s</string>
-  <string name="confirm">Patvirtinti</string>
-  <string name="market">Turgus</string>
-  <string name="timeTravelers">Keliautojai Laiku</string>
-  <string name="seasonalShop">Sezoninė Parduotuvė</string>
-  <string name="empty_inbox">Tavo Pašo dėžutėje žinučių nėra. Kitiems vartotojams galima siųsti pranešimus paspaudus ant jų viešų pranešimų!</string>
-  <string name="party_invite">Atidenk pakviečiant draugus</string>
-  <string name="no_gold">Nepakanka Aukso</string>
-  <string name="no_potion">Tau nereikia gyvybių eliksyro</string>
-  <string name="successful_purchase">%1$s nupirktas</string>
-  <string name="purchase_confirmation_title">Patvirtinti pirkinį</string>
-  <string name="confirm_purchase_text">Pirkti %1$s už %2$s %3$s</string>
-  <string name="gem">brangakmenis</string>
-  <string name="hourglass">smėlio laikrodis</string>
-  <string name="hourglasses">smėlio laikrodžiai</string>
-  <string name="gold_singular">aukso</string>
-  <string name="gold_plural">aukso</string>
-  <string name="chat_message_copied">Žinutė nukopijuota į Iškarpinę</string>
-  <string name="copy_chat_message">Kopijuoti į Iškarpinę</string>
-  <string name="edit_tag_title">Keisti Žymę</string>
-  <string name="edit_tag_btn_edit">Keisti</string>
-  <string name="edit_tag_btn_done">Atlikta</string>
-  <string name="edit_tag_btn_delete">Trinti</string>
-  <string name="confirm_delete_tag_title">Ar esi įsitikinęs(us)?</string>
-  <string name="confirm_delete_tag_message">Ar tikrai nori ištrinti?</string>
-  <string name="filter_drawer_edit_tags">Keisti Žymes</string>
-  <string name="filter_drawer_filter_tags">Filtruoti pagal Žymes</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Leisk kitus tave pakviesti su šiuo QR Kodu</string>
-  <string name="qr_save_message">QR kodas išsaugotas</string>
-  <string name="qr_dialogue_title">Tavo QR Kodas</string>
-  <string name="download">Atsisiųsti</string>
-  <string name="send_new_message">Siųsti žinutę</string>
-  <string name="choose_recipient_title">PasirinkŽinutės Gavėją</string>
-  <string name="action_continue">Tęsti</string>
-  <string name="scan_qr_code">Nuskanuok QR Kodą</string>
-  <string name="enter_recipient_uuid">Įvesti adresato Vartotojo ID</string>
-  <string name="invited_to_party">Tave pakvietė į grupę!</string>
-  <string name="stats_widget_label">Habitica Statistika</string>
-  <string name="add_task">Pridėti Užduotį</string>
-  <string name="add_habit">Pridėti Įprotį</string>
-  <string name="add_daily">Pridėti Kasdienė Užduotį</string>
-  <string name="add_todo">Pridėti Vienkartinę Užduotį</string>
-  <string name="add_reward">Pridėti Atlygį</string>
-  <string name="all_dailies_completed">Atlikai visas savo dienos užduotis. Puiku!</string>
-  <string name="widget_habit_button">Habitica Pažymėti Įprotį</string>
-  <string name="widget_dailies">Habitica Kasdienės Užduotys</string>
-  <string name="widget_add_task">Habitica Prodėti Užduotį</string>
-  <string name="google_services_missing">Nepavyko rasti Google play paslaugos.</string>
-  <string name="gem.purchase.toolbartitle">Pirkti</string>
-  <string name="gem.purchase.title">Brangakmenių pirkimas remia kūrėjus ir padeda išlaikiti Habitica</string>
-  <string name="gem.purchase.subtitle">Brangakmeniai tau leidžia pirkti įdomus paskyros priedus, įskaitant:</string>
-  <string name="gem.purchase.listitem1">Gražūs veikėjo kostiumai</string>
-  <string name="gem.purchase.listitem2">Nuostabūs fonai</string>
-  <string name="gem.purchase.listitem3">Misijos kuriose gali rasti augintinių kiaušinių</string>
-  <string name="gem.purchase.listitem4">Galimybė pakeisti savo klasę nepasiekus 100 lygio</string>
-  <string name="support_habitica">Paremti Habitica</string>
-  <string name="skill_transformation_use">naudoti</string>
-  <string name="hatching_market_info">Negaunate reikiamų lašiukų? Patikrinkite turguje!</string>
-  <string name="feeding_market_info">Reikia kitokio maisto? Nusipirkite daugiau iš turgaus!</string>
-  <string name="open_market">Atviras turgus</string>
-  <string name="cds_description">Jūsų kasdienės užduotys iš naujo nusistatys po %1$s. Įsitikinkite, kad atlikote savo kasdienes užduotis iki šio laiko.</string>
-  <string name="AudioTheme_title">Garsinė tema</string>
-  <string name="AudioTheme_summary">Pakeiskite Habitica garsinę temą</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">Pasimatysime rytoj!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Atnaujinti</string>
+  <string name="XP_default">Partirtis</string>
+  <string name="HP_default">Gyvybingumas</string>
+  <string name="MP_default">Magijos Taškai</string>
+  <string name="ERR_pb_barcode">Nepavyko nuskaityti nustatymų iš brūkšninio kodo</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Nustatymai</string>
+  <string name="SP_address_hint">Tavo nuosavas serveris</string>
+  <string name="SP_userID_title">Vartotojo ID</string>
+  <string name="SP_userID_summary">Tavo Vartotojo Identifikacijos Kodas</string>
+  <string name="SP_APIToken_title">API Token</string>
+  <string name="SP_APIToken_summary">Tavo API Token</string>
+  <string name="Language_title">Kalba</string>
+  <string name="Language_summary">Pakeisti Habitica kalbą</string>
+  <string name="SP_user_qr_code">Tavo QR Kodas</string>
+  <string name="PS_contact_title">Susisiekti</string>
+  <string name="pref_account_header">Paskyra</string>
+  <string name="pref_first_day_of_the_week_title">Pirma Savaitės Diena</string>
+  <string name="pref_first_day_of_the_week_summary">Pirma savaitės diena visuose kalendoriuose</string>
+  <string name="pref_reminder_header">Kasdienis Priminimas</string>
+  <string name="pref_reminder_checkbox">Įjungti Priminimą</string>
+  <string name="pref_reminder_picker">Nustatyti Priminimo Laiką</string>
+  <string name="pref_cds_header">Tinkinta dienos pradžia</string>
+  <string name="pref_cds_picker">Nustatyti tinkintą dienos pradžios laiką</string>
+  <string name="pref_push_notifications_checkbox">Aktyvūs Vartotojo Pranešimai</string>
+  <string name="push_notifications">Aktyvūs Pranšimai</string>
+  <string name="push_notifications_sum">Iškylančių pranešimų nustatymai</string>
+  <string name="preference_push_you_won_challenge">Laimėjai Iššūkį!</string>
+  <string name="preference_push_received_a_private_message">Gavai Privačią Žinutę</string>
+  <string name="preference_push_gifted_gems">Padovanoti Brangakmeniai</string>
+  <string name="preference_push_gifted_subscription">Padovanota Prenumerata</string>
+  <string name="preference_push_invited_to_party">Pakvietimas į Grupę</string>
+  <string name="preference_push_invited_to_guild">Pakvietimas į Gildiją</string>
+  <string name="preference_push_your_quest_has_begun">Tavo Misija Prasidėjo</string>
+  <string name="preference_push_invited_to_quest">Pakvietimas į Misiją</string>
+  <!--Adding tasks-->
+  <string name="task_value">Reikšmė</string>
+  <string name="action_edit">Keisti</string>
+  <string name="action_delete">Ištrinti</string>
+  <string name="action_cancel">Atšaukti</string>
+  <string name="login_btn">Prisijungti</string>
+  <string name="register_btn">Registruotis</string>
+  <string name="username">Vartotojo Vardas</string>
+  <string name="email_username">El. Paštas arba Vartotojo Vardas</string>
+  <string name="password">Slaptažodis</string>
+  <string name="emailAddress">El. pašto adresas</string>
+  <string name="confirmpassword">Patvirtinti slaptažodį</string>
+  <string name="logout">Atsijungti</string>
+  <string name="logout_description">Atsijungti nuo paskyros</string>
+  <string name="account_details_sum">Patikrinkite Jūsų paskyros detales</string>
+  <string name="account_details">Paskyros Duomenys</string>
+  <string name="LoginActivityName">Sveiki</string>
+  <string name="string_revive">Prisikelti</string>
+  <string name="please_connect">Prašome prisijungti su programa prieš naudojant valdiklį</string>
+  <string name="about.title">Apie</string>
+  <string name="about.libraries">Bibliotekos</string>
+  <string name="about.versionhistory">Versijos istorija</string>
+  <string name="about.habitica_open_source">Habitica pasiekiam kaip atviro kodo programa Github\'e</string>
+  <string name="about.rate_our_app">Įvertink Programėlę</string>
+  <string name="about.give_us_feedback">Siųsk Atsiliepimus!</string>
+  <string name="about.bugreport">Pranešk apie Klaidą</string>
+  <string name="about.source_code">Pirminis Kodas</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Prisijungimo Klaida</string>
+  <string name="network_error_no_network_body">Tu nesi prisijungęs(us) prie interneto.</string>
+  <string name="internal_error_api">Kažkas negerai su serveriu. Bandykite vėliau.</string>
+  <string name="authentication_error_title">Prisijungimo Klaida</string>
+  <string name="authentication_error_body">Tavo Vartotojo Vardas ir/ar Slaptažodis neteisingas(i).</string>
+  <string name="login_validation_error_title">Patvirtinimo Klaida</string>
+  <string name="login_validation_error_fieldsmissing">Turi užpildyti visus laukelius.</string>
+  <string name="save_changes">Išsaugoti</string>
+  <string name="copy">Kopijuoti</string>
+  <string name="notes">Užrašai</string>
+  <string name="text">Tekstas</string>
+  <string name="difficulty">Sunkumas</string>
+  <string name="tags">Žymės</string>
+  <string name="trivial">Labai Lengva</string>
+  <string name="easy">Lengva</string>
+  <string name="medium">Vidutiniška</string>
+  <string name="hard">Sunku</string>
+  <string name="start_date">Prasideda Nuo</string>
+  <string name="positive_habit_form">Teigiamas ( + )</string>
+  <string name="negative_habit_form">Neigiamas ( - )</string>
+  <string name="checklist">Sąrašas</string>
+  <string name="reminders">Priminimai</string>
+  <string name="actions">Veiksmai</string>
+  <string name="attributes">Savybės</string>
+  <string name="physical">Fizinė</string>
+  <string name="mental">Protinė</string>
+  <string name="social">Socialinė</string>
+  <string name="other">Kita</string>
+  <string name="frequency">Dažnumas</string>
+  <string name="frequency_weekly">Specifinėmis Savaitės Dienomis</string>
+  <string name="frequency_daily">Kas X Dienų</string>
+  <string name="monday">Pirmadienis</string>
+  <string name="tuesday">Antradienis</string>
+  <string name="wednesday">Trečiadienis</string>
+  <string name="thursday">Ketvirtadienis</string>
+  <string name="friday">Penktadienis</string>
+  <string name="saturday">Šeštadienis</string>
+  <string name="sunday">Sekmadienis</string>
+  <string name="levelup_header">Pasiekei naują Lygį!</string>
+  <string name="levelup_detail">Siekdamas savo gyvenimo tikslų, pasiekei %1$d Lygį!</string>
+  <string name="levelup_health">Tavo gyvybingumas atstatytas!</string>
+  <string name="levelup_button">Valio!</string>
+  <string name="faint_subtitle">Nepergyvenk!</string>
+  <string name="faint_penalty_body">Praradai Lygį, Auksą, ir dalį savo Aprangos, bet gali juos visus atgauti labiau pasistengęs(us)! Sėkmės - tau tikrai pasiseks.</string>
+  <string name="faint_header">Tavo gyvybingumas išseko!</string>
+  <string name="faint_button">Atstatyti Gyvybes ir bandyti dar kartą</string>
+  <string name="filter">FIltras</string>
+  <string name="profile_image">Profilis Paveikslėlis</string>
+  <string name="mana_price_button">%d Magijos Taškai</string>
+  <string name="used_skill">Panaudojai [%1$s] už %2$d magijos taškus.</string>
+  <string name="used_skill_without_mana">Panaudojai %1$s.</string>
+  <string name="new_checklist_item">naujas sąrašo punktas</string>
+  <string name="add_checklist_item">Pridėti</string>
+  <string name="reminder_title">Nepamiršk pažymėti savo Užduočių!</string>
+  <string name="skill_progress_title">Sugebėjimas Naudojamas</string>
+  <string name="coming_soon">Jau Greitai</string>
+  <string name="chat_flag_confirmation">Ar tikrai norite pranešti apie šią žinutę dėl pažeidimo?</string>
+  <string name="flag_confirm">Žymėti Žinutę</string>
+  <string name="unlock_lvl_11">Atsidengia pasiekus 11 lygį</string>
+  <string name="no_party_message">Tu nesi grupėje. Norėdama(s) prisidėti prie grupės, apsilankyk svetainėje.</string>
+  <string name="forgot_pw_btn">Pamiršau Slaptažodį</string>
+  <string name="forgot_pw_tv">Pamiršote Slaptažodį? Naudokite mobilią Svetainę.</string>
+  <string name="tavern.inn.checkOut">Atnaujinti Kasdienes Užduotis</string>
+  <string name="tavern.inn.rest">Sustabdyti Kasdienes Užduotis</string>
+  <string name="reward.dialog.buy">Pirkti</string>
+  <string name="reward.dialog.dismiss">Atšaukti</string>
+  <string name="party">Grupė</string>
+  <string name="chat">Pokalbiai</string>
+  <string name="members">Nariai</string>
+  <string name="habits">Įpročiai</string>
+  <string name="dailies">Kasdienės</string>
+  <string name="rewards">Atlygiai</string>
+  <string name="taskform.delete.title">Ar esi įsitikinęs(us)?</string>
+  <string name="taskform.delete.message">Ar tikrai nori ištrinti?</string>
+  <string name="yes">Taip</string>
+  <string name="no">Ne</string>
+  <string name="quest">Misija</string>
+  <string name="avatar_body">Kūnas</string>
+  <string name="avatar_hair">Plaukai</string>
+  <string name="avatar_shirt">Marškinėliai</string>
+  <string name="avatar_skin">Oda</string>
+  <string name="avatar_ears">Gyvūnų Ausys</string>
+  <string name="avatar_base">Pagrindas</string>
+  <string name="avatar_color">Spalva</string>
+  <string name="avatar_beard">Barzda</string>
+  <string name="avatar_mustache">Ūsai</string>
+  <string name="avatar_flower">Gėlytė</string>
+  <string name="avatar_bangs">Kirpčiukai</string>
+  <string name="avatar_nothing">Nenustatyta</string>
+  <string name="avatar_size">Dydis</string>
+  <string name="avatar_size_slim">Plonas</string>
+  <string name="avatar_size_broad">Stambus</string>
+  <string name="avatar_background">Fonas</string>
+  <string name="purchase_customization">Pirkti Pakeitimus</string>
+  <string name="purchase_set_button">Atidengti už %d brangakmenių</string>
+  <string name="purchase_button">Pirkti</string>
+  <string name="purchase_set_title">Pirkti rinkinį %s</string>
+  <string name="due_date">Baigimo Terminas</string>
+  <string name="quest.accept">Sutikti</string>
+  <string name="quest.reject">Atmesti</string>
+  <string name="quest.begin">Pradėti Misiją</string>
+  <string name="quest.cancel">Atšaukti Pakvietimą</string>
+  <string name="quest.abort">Atšaukti Misiją</string>
+  <string name="quest.leave">Palikti Misiją</string>
+  <string name="quest.pending">Laukiama</string>
+  <string name="quest.accepted">Sutiko</string>
+  <string name="quest.rejected">Atsisakė</string>
+  <string name="quest.participants">Dalyviai</string>
+  <string name="version_info">Versija: %1$s (%2$d)</string>
+  <string name="sidebar_help">Pagalba &amp; DUK</string>
+  <string name="complete_tutorial">Supratau!</string>
+  <string name="dismiss_tutorial">Priminti man vėliau</string>
+  <string name="intro_3_description">Sek savo tikslus pasitelkęs draugų pagalbą. Padėkit vienas kitam gyvenime kartu kovodami su pabaisomis!</string>
+  <string name="previous_button">Praeitas</string>
+  <string name="next_button">Kitas</string>
+  <string name="skip_button">Praleisti</string>
+  <string name="setup_welcome_description">Sveiki užsukę į Habitica, kur tobulėjimas žaidime padės jums tobulėti gyvenime! Kai siekiate gyvenimo tikslų, gausite aprangos, įrankių, augintinių, misijų ir daugiau.</string>
+  <string name="setup_welcome_title">Sveiki</string>
+  <string name="setup_group_work">Darbas</string>
+  <string name="setup_group_exercise">Sportas</string>
+  <string name="setup_group_school">Mokslai</string>
+  <string name="setup_group_teams">Komandos</string>
+  <string name="setup_group_chores">Ruošos Darbai</string>
+  <string name="setup_group_creativity">Kūrybingumas</string>
+  <string name="setup_task_work_1">Peržiūrėti el.laiškus</string>
+  <string name="setup_task_work_2">Svarbiausia užduotis</string>
+  <string name="setup_task_work_3">Darbo Projektas</string>
+  <string name="setup_task_exercise_1">10 min mankštos</string>
+  <string name="setup_task_exercise_2">Tempimo Pratimai</string>
+  <string name="setup_task_exercise_3">Susikurti mankštos planą</string>
+  <string name="setup_task_healthWellness_1">Valgyti sveiką / greitą maistą</string>
+  <string name="setup_task_healthWellness_2">Dantų Valymas</string>
+  <string name="setup_task_healthWellness_3">Užsirašyti patikrinimui</string>
+  <string name="setup_task_school_1">Mokytis/Tinginiauti</string>
+  <string name="setup_task_school_2">Daryti namų darbus</string>
+  <string name="setup_task_school_3">Baigti praktinį darbą</string>
+  <string name="setup_task_teams_1">Susitik su savo komanda</string>
+  <string name="setup_task_teams_2">Atnaujinti komandos statusą</string>
+  <string name="setup_task_teams_3">Baigti komandos projektą</string>
+  <string name="setup_task_chores_1">10 minučių tvarkymosi</string>
+  <string name="setup_task_chores_2">Plauti Indus</string>
+  <string name="setup_task_chores_3">Tvarkyti spintą</string>
+  <string name="setup_task_creativity_1">Mokytis amato</string>
+  <string name="setup_task_creativity_2">Dirbti prie kūrybinio projekto</string>
+  <string name="setup_task_creativity_3">Baigti kūrybinį projektą</string>
+  <string name="gem.purchase.support">Nori padėti Habitica gyvuoti? Gali paremti programuotojus perkant brangakmenius!\n\nBrangakmeniai leidžia pirkti smagius priedus savo paskyrai, pvz: \n\n - Smagūs kostiumai tavo veikėjui\n - Nepakartojami fonai\n - Smagios misijos, kuriose galima rasti kiaušinių\n - Galimybė pasikeisti klasę nepasiekus 100 lygio\n\nDėkojame, kad padedate Habitica klestėti. Jūsų parama mums tikrai daug reiškia!</string>
+  <string name="my_guilds">Mano Gildijos</string>
+  <string name="public_guilds">Viešos Gildijos</string>
+  <string name="guild">Gildija</string>
+  <string name="leave">Palikti</string>
+  <string name="join">Prisijungti</string>
+  <string name="leader">Vadas</string>
+  <string name="gems">Brangakmeniai</string>
+  <string name="send_pm">Siųsti Žinutę</string>
+  <string name="flag">Žymėti</string>
+  <string name="delete">Trinti</string>
+  <string name="name">Pavadinimas</string>
+  <string name="description">Aprašymas</string>
+  <string name="privacy">Privatumas</string>
+  <string name="write_message">Rašyti Žinutę</string>
+  <string name="post">Siųsti</string>
+  <string name="guild_search_hint">Ieškoti gildijų</string>
+  <string name="todo_due">Terminas: %s</string>
+  <string name="daily_streak">dabartinė serija: %d</string>
+  <string name="todo_has_duedate">Užduotis turi Terminą</string>
+  <string name="battle_gear">Kovinė Apranga</string>
+  <string name="costume">Kostiumas</string>
+  <string name="outfit_head">Galva</string>
+  <string name="outfit_headAccessory">Galvos Aksesuaras</string>
+  <string name="outfit_eyewear">Akiniai</string>
+  <string name="outfit_armor">Šarvai</string>
+  <string name="outfit_back">Nugara</string>
+  <string name="outfit_body">Kūnas</string>
+  <string name="outfit_shield">Skydas</string>
+  <string name="outfit_weapon">Ginklas</string>
+  <string name="wear_costume">Užsidėti Kostiumą</string>
+  <string name="equipped">Užsidėta</string>
+  <string name="quest_cancel_message">Ar tikrai nori atšaukti misiją? Visi pakvietimai bus nutraukti. Misijos savininkas atgaus misijos rankraštį.</string>
+  <string name="quest.invitation">Misijos Pakvietimas</string>
+  <string name="quest_begin_message">Ar tikrai nori pradėti misiją? Kai ji prasidės, kiti grupės nariai nebegalės prisijungti.</string>
+  <string name="quest.invitation.text">Tave pakvietė dalyvauti misijoje!</string>
+  <string name="ago_1day">Liko 1 diena</string>
+  <string name="ago_days">prieš %d dieną(as)</string>
+  <string name="ago_1Minute">prieš 1 minutę</string>
+  <string name="ago_minutes">prieš %d minutę(es)</string>
+  <string name="ago_hours">prieš %d valandą(as)</string>
+  <string name="ago_1hour">prieš 1 valandą</string>
+  <string name="today">Šiandien</string>
+  <string name="sidebar_items">Daiktai</string>
+  <string name="eggs">Kiaušiniai</string>
+  <string name="hatching_potions">Perėjimosi Eliksyrai</string>
+  <string name="food">Maistas</string>
+  <string name="quests">Misijos</string>
+  <string name="pets">Maži Augintiniai</string>
+  <string name="mounts">Suaugę Augintiniai</string>
+  <string name="armoireEquipment">Radai retos aprangos dalį Drabužinėje: %s! Nuostabu!</string>
+  <string name="armoireFood">Betyrinėjant Drabužinę randi %1$s %2$s. Ką tai čia veikia?</string>
+  <string name="armoireExp">Besigrumiant su Drabužine, gauni patirties!</string>
+  <string name="armoireNotesFull">Atidaryk Drabužinę ir gauk retos Aprangos dalį, Patirties ar maisto! Nerasto aprangos dalys: %d</string>
+  <string name="armoireLastItem">Radai paskutinę retos aprangos dalį Užburtoje Drabužinėje.</string>
+  <string name="armoireNotesEmpty">Drabužinėje atsiranda naujų daiktų pirmą kiekvieno mėnesio savaitę. Iki tol, gali toliau joje ieškoti Patirties ir Maisto!</string>
+  <string name="sell">Parduoti (%d Augso)</string>
+  <string name="hatch_with_potion">Užauginti su eliksyru</string>
+  <string name="feed_to_pet">Maitinti gyvūnui</string>
+  <string name="hatch_egg">Išperėti kiaušinį</string>
+  <string name="invite_party">Pakviesti grupę</string>
+  <string name="dialog_feeding">Pašerti %1$s %2$s su:</string>
+  <string name="use_animal">Naudoti</string>
+  <string name="feed">Maitinti</string>
+  <string name="hatch_with">Užauginti gyvūną su %s</string>
+  <string name="hatched_pet_title">Užauginai %1$s %2$s!</string>
+  <string name="close">Uždaryti</string>
+  <string name="share">Dalintis</string>
+  <string name="notification_pet_fed">Pašėrei savo %1$s %2$s!</string>
+  <string name="notification_purchase">%s nupirkta</string>
+  <string name="sectionpets">Paprasti Augintiniai</string>
+  <string name="sectionpremiumPets">Stebuklingų Eliksyrų Augintiniai</string>
+  <string name="sectionquestPets">Misijų Augintiniai</string>
+  <string name="sectionspecialPets">Reti Augintiniai</string>
+  <string name="sectionmounts">Paprasti Augintiniai</string>
+  <string name="sectionpremiumMounts">Stebuklingų Eliksyrų Augintiniai</string>
+  <string name="sectionquestMounts">Misijų Augintiniai</string>
+  <string name="sectionspecialMounts">Reti Augintiniai</string>
+  <string name="world_quest">Pasaulinė Misija</string>
+  <string name="inn_description">Pailsėk Smuklėje, kad tavo nepabaigtos Kasdienės Užduotys nepadarytų tau žalos nakties metu! (Pastaba: pabaisos vistiek padarys tau žalos.)</string>
+  <string name="empty_items">Nebeturi %s</string>
+  <string name="warrior">Karys</string>
+  <string name="rogue">Sukčius</string>
+  <string name="mage">Magas</string>
+  <string name="healer">Gydytojas</string>
+  <string name="warrior_description">Kariai dažniau sugeba smogti \"kritinius\" smūgius, kas duoda papildomo Aukso, Patirties ir padidina lobio gavimo šansą. Jie taip pat daro daug žalos pabaisoms. Pasirink karį, jei tave motyvuoja nenuspėjami atlygiai ar nori pasižymėti pabaisų medžiojimo Misijose!</string>
+  <string name="mage_description">Magai greitaisi mokosi ir greičiau renka Patirtį ir Lygius nei kitos klasės. Jie taip pat turi daugiausia magijos taškų specialiems sugebėjimams. Pasirink Magą, jei tau patinka taktinė Habitica pusė arba jei tave labiausiai motyvuoja veikėjo lygio kilimas!</string>
+  <string name="rogue_description">Sukčiai mėgsta kaupti turtus gaunami daugiausia Aukso ir rasdami daugiausia lobių. Jie taip pat gali pasislėpti nuo praleistų kasdienių Užduočių. Pasirink sukčių, jei tave labiausiai motyvuoja Atlygiai ir Pasiekimai ir nori kuo greičiau užpildyti savo kolekcijas!</string>
+  <string name="healer_description">Gydytojai yra labai sunkiai sužeidžiami - savybė kuria jie dalinasis su aplinkiniais. Praleistos užduotys ir blogi įpročiai jų taip stipriai neveikia ir jie sugeba atstayti savo gyvybes po nesėkmių. Pasirink Gydytoją, jei nori padėti kitiems savo grupėje ir jei tave įkvepia Mirties apgaudinėjimas.</string>
+  <string name="select_class">Pasirinkti Klasę</string>
+  <string name="opt_out_class">Atsisakyti</string>
+  <string name="opt_out_description">Tingi gilintis į klases? Nori pasirinkti vėliau? Atsisakyk. Liksi kariu be specialių sugebėjimų. Galėsi vėliau lengvai ją įjungti, kai pasiskaitysi daugiau apie klases wiki puslapyje.</string>
+  <string name="class_confirmation">Ar tikrai nori būti %s?</string>
+  <string name="choose_class">Pasirink Klasę</string>
+  <string name="dialog_go_back">Grįžti</string>
+  <string name="opt_out_confirmation">Ar tikrai nori atsisakyti?</string>
+  <string name="change_class">Pakeisk klasę</string>
+  <string name="change_class_description">Pakeisk savo klasę ir atgauk išleistus savybių taškus už 3 brangakmenius. Šiuos taškus galėsi priskirti atsidarius interneto puslapį naršyklėje</string>
+  <string name="enable_class">Įjungti Klasių Sistemą</string>
+  <string name="changing_class_progress">Klasės Keitimas</string>
+  <string name="by_email">El. Paštu</string>
+  <string name="invite_existing_users">Pakviesti Esamus Vartotojus</string>
+  <string name="send">Siųsti</string>
+  <string name="invite">Pakviesk Draugus</string>
+  <string name="invite_id_description">Jei tavo draugai jau naudojasi Habitica, pakviesk juos įrašant jų Vartotojo ID čia.</string>
+  <string name="invite_email_description">Jei tavo draugai prisijungs prie Habitica per tavo el. pašto nuorodą, jie bus iš karto pakviesti į tavo grupę!</string>
+  <string name="add_invites">Pridėti Pakvietimų</string>
+  <string name="user_id">Vartotojo ID</string>
+  <string name="email">El. paštas</string>
+  <string name="invite_users">Pakviesk į Grupę</string>
+  <string name="share_using">Pasidalinti su</string>
+  <string name="share_hatched">Kątik gavau %1$s %2$s Habitica augintinį atliekant kasdienes užduotis!</string>
+  <string name="share_raised">Kątik užauginau %1$s %2$s Habitica augintinį atliekant kasdienes užduotis!</string>
+  <string name="open_in_store">Atidaryti play parduotuvėje</string>
+  <string name="change_class_confirmation">Ar tikrai nori pasikeisti savo klasę? Tai kainuos 3 brangakmenius.</string>
+  <string name="leaderMessage">Žinutė nuo %1$s</string>
+  <string name="confirm">Patvirtinti</string>
+  <string name="market">Turgus</string>
+  <string name="timeTravelers">Keliautojai Laiku</string>
+  <string name="seasonalShop">Sezoninė Parduotuvė</string>
+  <string name="empty_inbox">Tavo Pašo dėžutėje žinučių nėra. Kitiems vartotojams galima siųsti pranešimus paspaudus ant jų viešų pranešimų!</string>
+  <string name="party_invite">Atidenk pakviečiant draugus</string>
+  <string name="no_gold">Nepakanka Aukso</string>
+  <string name="no_potion">Tau nereikia gyvybių eliksyro</string>
+  <string name="successful_purchase">%1$s nupirktas</string>
+  <string name="purchase_confirmation_title">Patvirtinti pirkinį</string>
+  <string name="confirm_purchase_text">Pirkti %1$s už %2$s %3$s</string>
+  <string name="gem">brangakmenis</string>
+  <string name="hourglass">smėlio laikrodis</string>
+  <string name="hourglasses">smėlio laikrodžiai</string>
+  <string name="gold_singular">aukso</string>
+  <string name="gold_plural">aukso</string>
+  <string name="chat_message_copied">Žinutė nukopijuota į Iškarpinę</string>
+  <string name="copy_chat_message">Kopijuoti į Iškarpinę</string>
+  <string name="edit_tag_title">Keisti Žymę</string>
+  <string name="edit_tag_btn_edit">Keisti</string>
+  <string name="edit_tag_btn_done">Atlikta</string>
+  <string name="edit_tag_btn_delete">Trinti</string>
+  <string name="confirm_delete_tag_title">Ar esi įsitikinęs(us)?</string>
+  <string name="confirm_delete_tag_message">Ar tikrai nori ištrinti?</string>
+  <string name="filter_drawer_edit_tags">Keisti Žymes</string>
+  <string name="filter_drawer_filter_tags">Filtruoti pagal Žymes</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Leisk kitus tave pakviesti su šiuo QR Kodu</string>
+  <string name="qr_save_message">QR kodas išsaugotas</string>
+  <string name="qr_dialogue_title">Tavo QR Kodas</string>
+  <string name="download">Atsisiųsti</string>
+  <string name="send_new_message">Siųsti žinutę</string>
+  <string name="choose_recipient_title">PasirinkŽinutės Gavėją</string>
+  <string name="action_continue">Tęsti</string>
+  <string name="scan_qr_code">Nuskanuok QR Kodą</string>
+  <string name="enter_recipient_uuid">Įvesti adresato Vartotojo ID</string>
+  <string name="invited_to_party">Tave pakvietė į grupę!</string>
+  <string name="stats_widget_label">Habitica Statistika</string>
+  <string name="add_task">Pridėti Užduotį</string>
+  <string name="add_habit">Pridėti Įprotį</string>
+  <string name="add_daily">Pridėti Kasdienė Užduotį</string>
+  <string name="add_todo">Pridėti Vienkartinę Užduotį</string>
+  <string name="add_reward">Pridėti Atlygį</string>
+  <string name="all_dailies_completed">Atlikai visas savo dienos užduotis. Puiku!</string>
+  <string name="widget_habit_button">Habitica Pažymėti Įprotį</string>
+  <string name="widget_dailies">Habitica Kasdienės Užduotys</string>
+  <string name="widget_add_task">Habitica Prodėti Užduotį</string>
+  <string name="google_services_missing">Nepavyko rasti Google play paslaugos.</string>
+  <string name="gem.purchase.toolbartitle">Pirkti</string>
+  <string name="gem.purchase.title">Brangakmenių pirkimas remia kūrėjus ir padeda išlaikiti Habitica</string>
+  <string name="gem.purchase.subtitle">Brangakmeniai tau leidžia pirkti įdomus paskyros priedus, įskaitant:</string>
+  <string name="gem.purchase.listitem1">Gražūs veikėjo kostiumai</string>
+  <string name="gem.purchase.listitem2">Nuostabūs fonai</string>
+  <string name="gem.purchase.listitem3">Misijos kuriose gali rasti augintinių kiaušinių</string>
+  <string name="gem.purchase.listitem4">Galimybė pakeisti savo klasę nepasiekus 100 lygio</string>
+  <string name="support_habitica">Paremti Habitica</string>
+  <string name="skill_transformation_use">naudoti</string>
+  <string name="hatching_market_info">Negaunate reikiamų lašiukų? Patikrinkite turguje!</string>
+  <string name="feeding_market_info">Reikia kitokio maisto? Nusipirkite daugiau iš turgaus!</string>
+  <string name="open_market">Atviras turgus</string>
+  <string name="cds_description">Jūsų kasdienės užduotys iš naujo nusistatys po %1$s. Įsitikinkite, kad atlikote savo kasdienes užduotis iki šio laiko.</string>
+  <string name="AudioTheme_title">Garsinė tema</string>
+  <string name="AudioTheme_summary">Pakeiskite Habitica garsinę temą</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Pasimatysime rytoj!</string>
+</resources>
diff --git a/Habitica/res/values-nl/strings.profile.xml b/Habitica/res/values-nl/strings.profile.xml
index a481be4c6..7b3e50df5 100644
--- a/Habitica/res/values-nl/strings.profile.xml
+++ b/Habitica/res/values-nl/strings.profile.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">Huis- &amp; rijdieren</string>
-    <string name="profile_pets_found">Gevonden huisdieren</string>
-    <string name="profile_mounts_tamed">Getemde rijdieren</string>
-    <string name="profile_loading_data">gebruikersdata laden.</string>
-    <string name="profile_send_message_to">Stuur bericht naar %s</string>
-    <string name="profile_message_sent_to">Bericht verzonden naar %s</string>
-    <string name="profile_level">Niveau:</string>
-    <string name="profile_class_bonus">Klassebonus:</string>
-    <string name="profile_allocated">Toegewezen:</string>
-    <string name="profile_boosts">Versterkingen:</string>
-    <string name="profile_private_message">Privébericht</string>
-    <string name="profile_achievements">Prestaties</string>
-    <string name="profile_achievement_ok">Oké</string>
-    <string name="profile_qrcode_close">Sluiten</string>
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Huis- &amp; rijdieren</string>
+    <string name="profile_pets_found">Gevonden huisdieren</string>
+    <string name="profile_mounts_tamed">Getemde rijdieren</string>
+    <string name="profile_loading_data">gebruikersdata laden.</string>
+    <string name="profile_send_message_to">Stuur bericht naar %s</string>
+    <string name="profile_message_sent_to">Bericht verzonden naar %s</string>
+    <string name="profile_level">Niveau:</string>
+    <string name="profile_class_bonus">Klassebonus:</string>
+    <string name="profile_allocated">Toegewezen:</string>
+    <string name="profile_boosts">Versterkingen:</string>
+    <string name="profile_private_message">Privébericht</string>
+    <string name="profile_achievements">Prestaties</string>
+    <string name="profile_achievement_ok">Oké</string>
+    <string name="profile_qrcode_close">Sluiten</string>
+
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-nl/strings.tutorial.xml b/Habitica/res/values-nl/strings.tutorial.xml
index 93512db34..6e275c771 100644
--- a/Habitica/res/values-nl/strings.tutorial.xml
+++ b/Habitica/res/values-nl/strings.tutorial.xml
@@ -1,22 +1,22 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_overview">Daar zijn we dan! Ik heb enkele taken voor je ingevuld op basis van je interesses. Probeer er zelf enkele aan toe te voegen. Je kan elke taak bewerken door op de titel te tikken.</string>
-  <string name="tutorial_habits_1">Als eerste de gewoontes. Dit kunnen goede gewoontes zijn die je wilt verbeteren of slechte gewoontes die je wilt afleren.</string>
-  <string name="tutorial_habits_2">Iedere keer dat je een goede gewoonte doet, tik je op de + om ervaring en goud te krijgen!</string>
-  <string name="tutorial_habits_3">Als je toegeeft en een slechte gewoonte doet, tik je op de - en verliest je avatar gezondheid, dus neem verantwoordelijkheid en voorkom slechte gewoontes.</string>
-  <string name="tutorial_habits_4">Probeer het maar! Je kan de andere soorten taken doornemen met de onderstaande navigatie.</string>
-  <string name="tutorial_dailies_1">Maak dagelijkse taken voor tijdgevoelige taken die volgens een vast schema gedaan moeten worden.</string>
-  <string name="tutorial_dailies_2">Wees voorzichtig - als je er een mist, verliest je avatar gezondheid de volgende dag. Vink ze regelmatig af voor grootse beloningen!</string>
-  <string name="tutorial_todos_1">Gebruik to-do\'s om taken bij te houden die je slechts één keer moet doen.</string>
-  <string name="tutorial_todos_2">Als je to-do tegen een bepaalde dag afgewerkt moet zijn, voer dan een einddatum in. Je kan er precies een afvinken - doe maar!</string>
-  <string name="tutorial_rewards_1">Koop uitrusting voor je avatar met het goud dat je verdient!</string>
-  <string name="tutorial_rewards_2">Je kan ook zelf beloningen maken voor in de echte wereld, gebaseerd op wat je motiveert.</string>
-  <string name="tutorial_tasks_complete">Dat was het voorlopig. Als je iets vergeet, kijk dan in de FAQ sectie.</string>
-  <string name="tutorial_equipment">Als je uitrustingsstukken koopt verschijnen die hier. Jouw gevechtsuitrusting beïnvloedt je statistieken en je kostuum (als het aan staat) beïnvloedt wat je avatar aan heeft.</string>
-  <string name="tutorial_items">Verdien voorwerpen door taken te voltooien en niveaus omhoog te gaan. Tik op een voorwerp om het te gebruiken!</string>
-  <string name="tutorial_pets">Terwijl je taken uit de echte wereld voltooit, heb je een kans om eieren en drankjes te vinden. Combineer ze om je huisdier te laten uitkomen.</string>
-  <string name="tutorial_skills">Vaardigheiden zijn speciale talenten die krachtige effecten hebben! Tik op een vaardigheid om ze te gebruiken. Het kost je Mana (de blauwe balk), dat je kan verdienen door elke dag in te checken en je taken in de echte wereld te voltooien. Kijk in de FAQ in het menu voor meer informatie!</string>
-  <string name="tutorial_party">Dit is waar jij en je vrienden elkaar verantwoordelijk kunnen houden voor het bereiken van je doelen en je samen monsters kan bevechten met je taken!</string>
-  <string name="tutorial_tavern">Welkom in de Herberg, een openbare chatroom voor alle leeftijden! Hier kan je praten over productiviteit en vragen stellen. Veel plezier!</string>
-  <string name="tutorial_classes">Kies hier of je Krijger, Magiër, Heler of Dief wilt worden! Elke klasse heeft unieke uitrustingen en vaardigheden. Tik op de (?) om meer te weten te komen!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_overview">Daar zijn we dan! Ik heb enkele taken voor je ingevuld op basis van je interesses. Probeer er zelf enkele aan toe te voegen. Je kan elke taak bewerken door op de titel te tikken.</string>
+  <string name="tutorial_habits_1">Als eerste de gewoontes. Dit kunnen goede gewoontes zijn die je wilt verbeteren of slechte gewoontes die je wilt afleren.</string>
+  <string name="tutorial_habits_2">Iedere keer dat je een goede gewoonte doet, tik je op de + om ervaring en goud te krijgen!</string>
+  <string name="tutorial_habits_3">Als je toegeeft en een slechte gewoonte doet, tik je op de - en verliest je avatar gezondheid, dus neem verantwoordelijkheid en voorkom slechte gewoontes.</string>
+  <string name="tutorial_habits_4">Probeer het maar! Je kan de andere soorten taken doornemen met de onderstaande navigatie.</string>
+  <string name="tutorial_dailies_1">Maak dagelijkse taken voor tijdgevoelige taken die volgens een vast schema gedaan moeten worden.</string>
+  <string name="tutorial_dailies_2">Wees voorzichtig - als je er een mist, verliest je avatar gezondheid de volgende dag. Vink ze regelmatig af voor grootse beloningen!</string>
+  <string name="tutorial_todos_1">Gebruik to-do\'s om taken bij te houden die je slechts één keer moet doen.</string>
+  <string name="tutorial_todos_2">Als je to-do tegen een bepaalde dag afgewerkt moet zijn, voer dan een einddatum in. Je kan er precies een afvinken - doe maar!</string>
+  <string name="tutorial_rewards_1">Koop uitrusting voor je avatar met het goud dat je verdient!</string>
+  <string name="tutorial_rewards_2">Je kan ook zelf beloningen maken voor in de echte wereld, gebaseerd op wat je motiveert.</string>
+  <string name="tutorial_tasks_complete">Dat was het voorlopig. Als je iets vergeet, kijk dan in de FAQ sectie.</string>
+  <string name="tutorial_equipment">Als je uitrustingsstukken koopt verschijnen die hier. Jouw gevechtsuitrusting beïnvloedt je statistieken en je kostuum (als het aan staat) beïnvloedt wat je avatar aan heeft.</string>
+  <string name="tutorial_items">Verdien voorwerpen door taken te voltooien en niveaus omhoog te gaan. Tik op een voorwerp om het te gebruiken!</string>
+  <string name="tutorial_pets">Terwijl je taken uit de echte wereld voltooit, heb je een kans om eieren en drankjes te vinden. Combineer ze om je huisdier te laten uitkomen.</string>
+  <string name="tutorial_skills">Vaardigheiden zijn speciale talenten die krachtige effecten hebben! Tik op een vaardigheid om ze te gebruiken. Het kost je Mana (de blauwe balk), dat je kan verdienen door elke dag in te checken en je taken in de echte wereld te voltooien. Kijk in de FAQ in het menu voor meer informatie!</string>
+  <string name="tutorial_party">Dit is waar jij en je vrienden elkaar verantwoordelijk kunnen houden voor het bereiken van je doelen en je samen monsters kan bevechten met je taken!</string>
+  <string name="tutorial_tavern">Welkom in de Herberg, een openbare chatroom voor alle leeftijden! Hier kan je praten over productiviteit en vragen stellen. Veel plezier!</string>
+  <string name="tutorial_classes">Kies hier of je Krijger, Magiër, Heler of Dief wilt worden! Elke klasse heeft unieke uitrustingen en vaardigheden. Tik op de (?) om meer te weten te komen!</string>
+</resources>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index 2e4221f31..04dd39b00 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -1,542 +1,542 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Verversen</string>
-  <string name="XP_default">Ervaring</string>
-  <string name="HP_default">Gezondheid</string>
-  <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Voorkeuren konden niet uit de barcode worden geladen</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Instellingen</string>
-  <string name="SP_address_hint">Jouw persoonlijke server</string>
-  <string name="SP_userID_title">Gebruikers-ID</string>
-  <string name="SP_userID_summary">Jouw gebruikers-ID</string>
-  <string name="SP_APIToken_title">API-token</string>
-  <string name="SP_APIToken_summary">Jouw API-token</string>
-  <string name="Language_title">Taal</string>
-  <string name="Language_summary">Verander Habitica\'s taal</string>
-  <string name="SP_user_qr_code">Je QR code</string>
-  <string name="PS_contact_title">Contact</string>
-  <string name="unknown_error">Een fout is opgetreden...</string>
-  <string name="pref_account_header">Account</string>
-  <string name="pref_first_day_of_the_week_title">Eerste dag van de week</string>
-  <string name="pref_first_day_of_the_week_summary">Eerste dag van de week op alle kalenders</string>
-  <string name="pref_reminder_header">Dagelijkse herinnering</string>
-  <string name="pref_reminder_checkbox">Activeer herinnering</string>
-  <string name="pref_reminder_picker">Stel tijd van herinnering in</string>
-  <string name="pref_cds_header">Aangepast begin van de dag</string>
-  <string name="pref_cds_picker">Begin van de dag instellen</string>
-  <string name="pref_push_notifications_checkbox">Pushnotificaties</string>
-  <string name="push_notifications">Pushnotificaties</string>
-  <string name="push_notifications_sum">Stel je push-notificaties in</string>
-  <string name="preference_push_you_won_challenge">Je hebt een uitdaging gewonnen!</string>
-  <string name="preference_push_received_a_private_message">Privébericht ontvangen</string>
-  <string name="preference_push_gifted_gems">Edelstenen geschonken</string>
-  <string name="preference_push_gifted_subscription">Abonnement geschonken</string>
-  <string name="preference_push_invited_to_party">Uitgenodigd voor groep</string>
-  <string name="preference_push_invited_to_guild">Uitgenodigd voor gilde</string>
-  <string name="preference_push_your_quest_has_begun">Je queeste is begonnen</string>
-  <string name="preference_push_invited_to_quest">Uitgenodigd voor queeste</string>
-  <!--Adding tasks-->
-  <string name="task_value">Waarde</string>
-  <string name="new_todo">Nieuwe to-do</string>
-  <string name="new_reward">Nieuwe beloning</string>
-  <string name="new_daily">Nieuwe dagelijkse taak</string>
-  <string name="new_habit">Nieuwe gewoonte</string>
-  <string name="action_edit">Aanpassen</string>
-  <string name="action_delete">Verwijderen</string>
-  <string name="action_cancel">Annuleren</string>
-  <string name="login_btn">Inloggen</string>
-  <string name="register_btn">Registreren</string>
-  <string name="username">Gebruikersnaam</string>
-  <string name="email_username">E-mail of gebruikersnaam</string>
-  <string name="password">Wachtwoord</string>
-  <string name="emailAddress">E-mailadres</string>
-  <string name="confirmpassword">Bevestig wachtwoord</string>
-  <string name="logout">Uitloggen</string>
-  <string name="logout_description">Uitloggen</string>
-  <string name="account_details_sum">Kijk je account gegevens na</string>
-  <string name="account_details">Accountgegevens</string>
-  <string name="LoginActivityName">Welkom</string>
-  <string name="string_revive">Herleven</string>
-  <string name="please_connect">Maak verbinding via de app voor het gebruik van een widget</string>
-  <string name="about.title">Over</string>
-  <string name="about.libraries">Bibliotheken</string>
-  <string name="about.versionhistory">Versiegeschiedenis</string>
-  <string name="about.habitica_open_source">Habitica is beschikbaar als open source software op Github</string>
-  <string name="about.rate_our_app">Beoordeel onze App</string>
-  <string name="about.give_us_feedback">Stuur ons feedback!</string>
-  <string name="about.bugreport">Fout melden</string>
-  <string name="about.source_code">Broncode</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Verbindingsfout</string>
-  <string name="network_error_no_network_body">Je bent niet verbonden met het internet.</string>
-  <string name="internal_error_api">Het lijkt erop dat er een probleem is met de server. Probeer het later opnieuw.</string>
-  <string name="authentication_error_title">Authenticatiefout</string>
-  <string name="authentication_error_body">Je Gebruikersnaam en/of Wachtwoord is onjuist.</string>
-  <string name="login_validation_error_title">Validatiefout</string>
-  <string name="login_validation_error_fieldsmissing">Je moet alle velden invullen.</string>
-  <string name="save_changes">Opslaan</string>
-  <string name="copy">Kopie</string>
-  <string name="notes">Notities</string>
-  <string name="text">Tekst</string>
-  <string name="difficulty">Moeilijkheidsgraad</string>
-  <string name="tags">Labels</string>
-  <string name="trivial">Triviaal</string>
-  <string name="easy">Gemakkelijk</string>
-  <string name="medium">Gemiddeld</string>
-  <string name="hard">Moeilijk</string>
-  <string name="start_date">Begindatum</string>
-  <string name="positive_habit_form">Positief ( + )</string>
-  <string name="negative_habit_form">Negatief ( - )</string>
-  <string name="checklist">Checklijst</string>
-  <string name="reminders">Herinneringen</string>
-  <string name="actions">Acties</string>
-  <string name="attributes">Eigenschappen</string>
-  <string name="physical">Fysiek</string>
-  <string name="mental">Mentaal</string>
-  <string name="social">Sociaal</string>
-  <string name="other">Overige</string>
-  <string name="frequency">Frequentie</string>
-  <string name="frequency_weekly">Op Bepaalde Dagen van de Week</string>
-  <string name="frequency_daily">Iedere X Dagen</string>
-  <string name="monday">Maandag</string>
-  <string name="tuesday">Dinsdag</string>
-  <string name="wednesday">Woensdag</string>
-  <string name="thursday">Donderdag</string>
-  <string name="friday">Vrijdag</string>
-  <string name="saturday">Zaterdag</string>
-  <string name="sunday">Zondag</string>
-  <string name="levelup_header">Je bent een niveau omhoog gegaan!</string>
-  <string name="levelup_detail">Door het behalen van je doelen in het echte leven ben je uitgegroeid tot Niveau %1$d!</string>
-  <string name="levelup_health">Je bent volledig genezen!</string>
-  <string name="levelup_button">Hoera!</string>
-  <string name="faint_subtitle">Wanhoop niet!</string>
-  <string name="faint_penalty_body">Je verliest een niveau, je goud en een stuk uitrusting, maar je kunt ze allemaal terug krijgen door hard te werken! Succes--je zult het geweldig doen.</string>
-  <string name="faint_header">Je hebt geen Levenspunten meer!</string>
-  <string name="faint_button">Herstel Gezondheid &amp; probeer opnieuw</string>
-  <string name="filter">Filter</string>
-  <string name="profile_image">Profielfoto</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Je hebt %1$s voor %2$d mana gebruikt.</string>
-  <string name="used_skill_without_mana">Je hebt %1$s gebruikt.</string>
-  <string name="new_checklist_item">nieuw checklijstpunt</string>
-  <string name="add_checklist_item">Toevoegen</string>
-  <string name="reminder_title">Vergeet niet om je Dagelijkse taken af te vinken!</string>
-  <string name="skill_progress_title">Vaardigheid gebruiken</string>
-  <string name="coming_soon">Binnenkort beschikbaar</string>
-  <string name="chat_flag_confirmation">Weet je zeker dat je dit bericht wilt melden wegens overtreding?</string>
-  <string name="flag_confirm">Markeer bericht</string>
-  <string name="unlock_lvl_11">Beschikbaar vanaf niveau 11</string>
-  <string name="no_party_message">Je zit niet in een groep. Bezoek de website als je je bij een groep wilt aansluiten.</string>
-  <string name="forgot_pw_btn">Wachtwoord vergeten</string>
-  <string name="forgot_pw_tv">Wachtwoord vergeten? Gebruik dan de mobiele website.</string>
-  <string name="tavern.inn.checkOut">Heractiveer je Dagelijkse taken</string>
-  <string name="tavern.inn.rest">Pauzeer je Dagelijkse Taken</string>
-  <string name="reward.dialog.buy">Kopen</string>
-  <string name="reward.dialog.dismiss">Verwijderen</string>
-  <string name="party">Groep</string>
-  <string name="chat">Chat</string>
-  <string name="members">Leden</string>
-  <string name="habits">Gewoontes</string>
-  <string name="dailies">Dagelijkse taken</string>
-  <string name="todos">To-do\'s</string>
-  <string name="rewards">Beloningen</string>
-  <string name="taskform.delete.title">Weet je het zeker?</string>
-  <string name="taskform.delete.message">Wil je het echt verwijderen?</string>
-  <string name="yes">Ja</string>
-  <string name="no">Nee</string>
-  <string name="quest">Queeste</string>
-  <string name="avatar_body">Lichaam</string>
-  <string name="avatar_hair">Haar</string>
-  <string name="avatar_shirt">T-Shirt</string>
-  <string name="avatar_skin">Huid</string>
-  <string name="avatar_ears">Dierenoren</string>
-  <string name="avatar_base">Basis</string>
-  <string name="avatar_color">Kleur</string>
-  <string name="avatar_beard">Baard</string>
-  <string name="avatar_mustache">Snor</string>
-  <string name="avatar_flower">Bloem</string>
-  <string name="avatar_bangs">Pony</string>
-  <string name="avatar_nothing">Niets ingesteld</string>
-  <string name="avatar_size">Grootte</string>
-  <string name="avatar_size_slim">Slank</string>
-  <string name="avatar_size_broad">Breed</string>
-  <string name="avatar_background">Achtergrond</string>
-  <string name="purchase_customization">Koop aanpassingen</string>
-  <string name="purchase_set_button">Ontgrendel set voor %d edelstenen</string>
-  <string name="purchase_button">Koop</string>
-  <string name="purchase_set_title">Koop set %s</string>
-  <string name="due_date">Einddatum</string>
-  <string name="quest.accept">Accepteren</string>
-  <string name="quest.reject">Afwijzen</string>
-  <string name="quest.begin">Begin Queeste</string>
-  <string name="quest.cancel">Annuleer Uitnodiging</string>
-  <string name="quest.abort">Queeste afbreken</string>
-  <string name="quest.leave">Verlaat Queeste</string>
-  <string name="quest.pending">in afwachting van</string>
-  <string name="quest.accepted">Aanvaard</string>
-  <string name="quest.rejected">Afgewezen</string>
-  <string name="quest.participants">Deelnemers</string>
-  <string name="version_info">Versie %1$s (%2$d)</string>
-  <string name="sidebar_help">Help &amp; FAQ</string>
-  <string name="complete_tutorial">Begrepen!</string>
-  <string name="dismiss_tutorial">Herinner me opnieuw</string>
-  <string name="intro_1_subtitle">Welkom bij</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Het is tijd om plezier te maken terwijl je dingen gedaan krijgt. Doe mee met %s andere mensen die hun leven met iedere taak beteren.</string>
-  <string name="intro_2_subtitle">Vooruitgang in het spel</string>
-  <string name="intro_2_title">Vooruitgang in je leven</string>
-  <string name="intro_2_description">Ontgrendel functies in het spel door taken in je echte leven af te vinken. Verdien uitrusting, huisdieren en meer als beloning voor het bereiken van je doelen.</string>
-  <string name="intro_3_subtitle">Vecht tegen monsters</string>
-  <string name="intro_3_title">Wordt sociaal</string>
-  <string name="intro_3_description">Houd je doelen op peil met hulp van je vrienden. Ondersteun elkaar in het leven en vecht samen terwijl je steeds beter wordt.</string>
-  <string name="intro_finish_button">Laten we beginnen!</string>
-  <string name="previous_button">Vorige</string>
-  <string name="next_button">Volgende</string>
-  <string name="skip_button">Sla over</string>
-  <string name="setup_welcome_description">Welkom in Habitica, waar vooruitgang in het spel je leven zal verbeteren! Terwijl je echte doelen bereikt, verdien je uitrusting, huisdieren, queestes en meer.</string>
-  <string name="setup_welcome_title">Welkom</string>
-  <string name="avatar_setup_description">Dus, hoe wil jij er uit zien? Geen zorgen, je kan dit later veranderen.</string>
-  <string name="task_setup_description">Geweldig! Nu, waar zou je graag aan willen werken doorheen deze reis?</string>
-  <string name="setup_group_work">Werk</string>
-  <string name="setup_group_exercise">Sport</string>
-  <string name="setup_group_health">Gezondheid</string>
-  <string name="setup_group_school">School</string>
-  <string name="setup_group_teams">Teams</string>
-  <string name="setup_group_chores">Klusjes</string>
-  <string name="setup_group_creativity">Creativiteit</string>
-  <string name="setup_task_work_1">E-mail verwerken</string>
-  <string name="setup_task_work_2">Belangrijkste taak</string>
-  <string name="setup_task_work_3">Werkproject</string>
-  <string name="setup_task_exercise_1">10 min cardio</string>
-  <string name="setup_task_exercise_2">Uitstrekken</string>
-  <string name="setup_task_exercise_3">Maak een trainingsschema</string>
-  <string name="setup_task_healthWellness_1">Eet gezond / junk food</string>
-  <string name="setup_task_healthWellness_2">Flossen</string>
-  <string name="setup_task_healthWellness_3">Maak een afspraak bij de dokter</string>
-  <string name="setup_task_school_1">Studeren / Uitstellen</string>
-  <string name="setup_task_school_2">Huiswerk maken</string>
-  <string name="setup_task_school_3">Maak een schoolopdracht af</string>
-  <string name="setup_task_teams_1">Controleer hoe het met je team gaat</string>
-  <string name="setup_task_teams_2">Breng je team op de hoogte van de stand van zaken</string>
-  <string name="setup_task_teams_3">Maak een teamproject af</string>
-  <string name="setup_task_chores_1">10 minuten schoonmaken</string>
-  <string name="setup_task_chores_2">De afwas doen</string>
-  <string name="setup_task_chores_3">Ruim je kast op</string>
-  <string name="setup_task_creativity_1">Studeer een meester van het ambacht</string>
-  <string name="setup_task_creativity_2">Aan een creatief project werken</string>
-  <string name="setup_task_creativity_3">Een creatief project afronden</string>
-  <string name="gem.purchase.support">Wil je helpen om Habitica draaiende te houden? Je kan de ontwikkelaars ondersteunen door edelstenen te kopen!\n\nMet edelstenen kun je leuke extra\'s voor je account kopen, zoals: \n\n - Geweldige kostuums voor je avatar\n - Adembenemende achtergronden\n - Leuke queestes met huisdiereieren als beloning\n - De mogelijkheid om je klasse te veranderen voor je niveau 100 bent\n\nOntzettend bedankt voor je hulp om Habitica het beste te maken wat het kan zijn. Jouw steun betekent heel veel voor ons!</string>
-  <string name="my_guilds">Mijn Gilden</string>
-  <string name="public_guilds">Publieke Gilden</string>
-  <string name="guild">Gilde</string>
-  <string name="leave">Verlaten</string>
-  <string name="join">Toetreden</string>
-  <string name="leader">Leider</string>
-  <string name="gems">Edelstenen</string>
-  <string name="copy_as_todo">Kopiëren als to-do</string>
-  <string name="send_pm">PB verzenden</string>
-  <string name="flag">Aanduiden</string>
-  <string name="delete">Verwijderen</string>
-  <string name="name">Naam</string>
-  <string name="description">Beschrijving</string>
-  <string name="add_tag">Nieuwe label toevoegen</string>
-  <string name="privacy">Privacy</string>
-  <string name="write_message">Bericht schrijven</string>
-  <string name="post">Post</string>
-  <string name="guild_search_hint">Zoek naar gilden</string>
-  <string name="todo_due">Tegen: %s</string>
-  <string name="daily_streak">huidige serie: %d</string>
-  <string name="todo_has_duedate">Taak heeft een einddatum</string>
-  <string name="battle_gear">Gevechtsuitrusting</string>
-  <string name="costume">Kostuum</string>
-  <string name="outfit_head">Hoofd</string>
-  <string name="outfit_headAccessory">Hoofdaccessoire</string>
-  <string name="outfit_eyewear">Oogaccessoire</string>
-  <string name="outfit_armor">Harnas</string>
-  <string name="outfit_back">Rug</string>
-  <string name="outfit_body">Lichaam</string>
-  <string name="outfit_shield">Schild</string>
-  <string name="outfit_weapon">Wapen</string>
-  <string name="wear_costume">Kostuum Aantrekken</string>
-  <string name="equipped">In gebruik</string>
-  <string name="quest_cancel_message">Ben je zeker dat je deze queeste wilt beëindigen? Alle aangenomen uitnodigingen zullen verloren gaan. De eigenaar van de queeste zal de queesterol terug krijgen.</string>
-  <string name="quest.invitation">Queeste uitnodiging</string>
-  <string name="quest_begin_message">Ben je zeker dat je de queeste wilt beginnen? Zodra het actief is, kunnen er geen andere spelers zich bij de queeste aansluiten.</string>
-  <string name="quest.invitation.text">Je bent uitgenodigd om deel te nemen aan een queeste!</string>
-  <string name="ago_1day">1 dag geleden</string>
-  <string name="ago_days">%d dagen geleden</string>
-  <string name="ago_1Minute">1 minuut geleden</string>
-  <string name="ago_minutes">%d minuten geleden</string>
-  <string name="ago_hours">%d uren geleden</string>
-  <string name="ago_1hour">1 uur geleden</string>
-  <string name="today">Vandaag</string>
-  <string name="sidebar_items">Voorwerpen</string>
-  <string name="eggs">Eieren</string>
-  <string name="hatching_potions">Uitbroeddranken</string>
-  <string name="food">Voedsel</string>
-  <string name="quests">Queesten</string>
-  <string name="pets">Huisdieren</string>
-  <string name="mounts">Rijdieren</string>
-  <string name="armoireEquipment">Je hebt een zeldzaam stuk van een uitrusting gevonden in het Kabinet: %s! Geweldig!</string>
-  <string name="armoireFood">Je rommelt wat rond in het Kabinet en vindt %1$s %2$s. Wat doet dat hier?</string>
-  <string name="armoireExp">Je worstelt met het Kabinet en verdient Ervaring. Pak aan!</string>
-  <string name="armoireNotesFull">Open het Kabinet om willekeurig speciale uitrustingen, ervaring of voedsel te vinden! Stukken uitrusting die nog over zijn: %d</string>
-  <string name="armoireLastItem">Je hebt het laatste stuk zeldzame uitrusting gevonden in het Betoverde Kabinet.</string>
-  <string name="armoireNotesEmpty">Het Kabinet zal nieuwe stukken uitrusting hebben tijdens de eerste week van elke maand. Blijf tot die tijd klikken voor ervaring en voedsel!</string>
-  <string name="sell">Verkoop (%d Goud)</string>
-  <string name="hatch_with_potion">Broed uit met toverdrank</string>
-  <string name="feed_to_pet">Aan huisdier voederen</string>
-  <string name="hatch_egg">Laten uitkomen met ei</string>
-  <string name="invite_party">Nodig groep uit</string>
-  <string name="dialog_feeding">Voeder %1$s %2$s met:</string>
-  <string name="use_animal">Gebruik</string>
-  <string name="feed">Voeder</string>
-  <string name="hatch_with">Laat huisdier uitkomen met %s</string>
-  <string name="hatched_pet_title">Je hebt een %1$s %2$s laten uitkomen!</string>
-  <string name="close">Sluiten</string>
-  <string name="share">Delen</string>
-  <string name="notification_pet_fed">Je hebt je %1$s %2$s gevoederd!</string>
-  <string name="notification_purchase">%s werd gekocht</string>
-  <string name="sectionpets">Normale huisdieren</string>
-  <string name="sectionpremiumPets">Huisdieren uit magische drankjes</string>
-  <string name="sectionquestPets">Queeste Huisdieren</string>
-  <string name="sectionspecialPets">Zeldzame Huisdieren</string>
-  <string name="sectionmounts">Normale rijdieren</string>
-  <string name="sectionpremiumMounts">Rijdieren uit magische drankjes</string>
-  <string name="sectionquestMounts">Queeste Rijdieren</string>
-  <string name="sectionspecialMounts">Zeldzame Rijdieren</string>
-  <string name="world_quest">Wereldqueeste</string>
-  <string name="inn_description">Rust uit in de Herberg om ervoor te zorgen dat je ongedane Dagelijkse Taken je niet kunnen schaden in de nacht! (Let wel: je ontvangt nog wel schade van een Baas.)</string>
-  <string name="empty_items">Je hebt geen %s</string>
-  <string name="user_level">NIV %d</string>
-  <string name="user_level_with_class">NIV %1$d %2$s</string>
-  <string name="warrior">Krijger</string>
-  <string name="rogue">Dief</string>
-  <string name="mage">Magiër</string>
-  <string name="healer">Heler</string>
-  <string name="warrior_description">Krijgers scoren meer en betere \"voltreffers\", die willekeurig extra Goud, Ervaring en kans op een voorwerp geven wanneer je een taak afvinkt. Ze doen ook veel schade aan bazen. Speel een Krijger wanneer je motivatie vindt in onvoorspelbare jackpot-stijl beloningen, of wanneer je de echte schade wilt uitdelen tijdens Baasqueestes!</string>
-  <string name="mage_description">Magiërs leren snel, en krijgen sneller ervaringspunten en niveaus dan andere klassen. Ze krijgen ook veel Mana door speciale talenten te gebruiken. Speel een magiër wanneer je de tactiek van Gewoontes leuk vindt of als je sterk gemotiveerd wordt door niveaus omhoog te gaan en speciale dingen te ontgrendelen!</string>
-  <string name="rogue_description">Dieven vinden het geweldig om rijkdom te verwerven, en krijgen dus ook meer Goud dan de rest. Ook zijn ze goed in willekeurig voorwerpen vinden. Hun iconische Heimelijkheid laat hen zich verschuilen voor gemiste Dagelijkse Taken. Speel een Dief als je veel motivatie vindt in beloningen en prestaties, strevend voor de buit en de badges!</string>
-  <string name="healer_description">Helers staan onaangedaan tegenover schade en kunnen die bescherming tot anderen uitstrekken. Gemiste Dagelijkse Taken en slechte Gewoontes doen hen niet veel, en ze hebben hun manieren om er terug bovenop te raken na pech. Speel een Heler als je het leuk vindt om anderen in je Groep te helpen of als het idee om de Dood door hard werk te slim af te zijn jou inspireert!</string>
-  <string name="select_class">Selecteer Klasse</string>
-  <string name="opt_out_class">Afmelden</string>
-  <string name="opt_out_description">Vind je het klassesysteem te ingewikkeld voor nu? Wil je later pas kiezen? Trek je terug - je zal een krijger zijn zonder speciale talenten. Je kan later nog over het klassesysteem lezen op de wiki en op eender welk moment klassen inschakelen.</string>
-  <string name="class_confirmation">Weet je zeker dat je een %s wilt zijn?</string>
-  <string name="class_changed">Je bent nu een %s!</string>
-  <string name="class_changed_description">Je hebt nieuw standaard gevechtsuitrusting dat je kan veranderen onder Uitrusting!</string>
-  <string name="choose_class">Kies een Klasse</string>
-  <string name="dialog_go_back">Ga terug</string>
-  <string name="opt_out_confirmation">Weet je zeker dat je je wil afmelden?</string>
-  <string name="change_class">Verander je klasse</string>
-  <string name="change_class_description">Verander je klasse en krijg je eigenschapspunten terug voor 3 edelstenen. Je kunt eigenschapspunten toewijzen via de website</string>
-  <string name="enable_class">Klassesysteem aanzetten</string>
-  <string name="changing_class_progress">Van klasse veranderen</string>
-  <string name="by_email">Via Email</string>
-  <string name="invite_existing_users">Bestaande Gebruikers Uitnodigen</string>
-  <string name="send">Versturen</string>
-  <string name="invite">Vrienden uitnodigen</string>
-  <string name="invite_id_description">Als je vrienden hebt die al Habitica spelen, nodig hen dan hier uit met hun Gebruikers-ID.</string>
-  <string name="invite_email_description">Als een vriend zich inschrijft op Habitica via jouw email, zullen ze automatisch uitgenodigd worden voor jouw groep!</string>
-  <string name="add_invites">Uitnodigingen toevoegen</string>
-  <string name="user_id">Gebruikers ID</string>
-  <string name="email">Email</string>
-  <string name="invite_users">Nodig uit voor groep</string>
-  <string name="share_using">Deel door</string>
-  <string name="share_levelup">Ik ben in Habitica tot niveau %d gekomen door mijn echte gewoontes te verbeteren!</string>
-  <string name="share_hatched">Ik heb net een %1$s %2$s huisdier in Habitica laten uitkomen door mijn echte taken uit te voeren!</string>
-  <string name="share_raised">Ik heb net een %1$s %2$s rijdier gekregen in Habitica door mijn echte taken uit te voeren!</string>
-  <string name="open_in_store">Open in de play store</string>
-  <string name="change_class_confirmation">Weet je zeker dat je van klasse wilt veranderen? Dit kost 3 edelstenen.</string>
-  <string name="change_class_equipment_warning">Waarschuwing: Je zult niet langer in staat zijn om uitrusting te kopen van de %s klasse.</string>
-  <string name="leaderMessage">Bericht van %1$s</string>
-  <string name="leaderName">Leider: %1$s</string>
-  <string name="confirm">Bevestig</string>
-  <string name="market">Markt</string>
-  <string name="timeTravelers">Tijdreizigers</string>
-  <string name="seasonalShop">Seizoenswinkel</string>
-  <string name="empty_inbox">Je hebt geen inboxberichten. Je kan een gebruiker een nieuw bericht sturen vanuit hun openbare chatberichten.</string>
-  <string name="party_invite">Ontgrendel door vrienden uit te nodigen</string>
-  <string name="no_gold">Niet genoeg goud</string>
-  <string name="no_potion">Je hoeft geen gezondheidsdrankje te kopen</string>
-  <string name="successful_purchase">%1$s succesvol gekocht</string>
-  <string name="purchase_confirmation_title">Bevestig aankoop</string>
-  <string name="confirm_purchase_text">Koop %1$s voor %2$s %3$s</string>
-  <string name="gem">edelsteen</string>
-  <string name="hourglass">zandloper</string>
-  <string name="hourglasses">zandlopers</string>
-  <string name="gold_singular">goud</string>
-  <string name="gold_plural">goud</string>
-  <string name="chat_message_copied">Bericht gekopieerd naar klembord</string>
-  <string name="copy_chat_message">Kopieer naar klembord</string>
-  <string name="edit_tag_title">Bewerk label</string>
-  <string name="edit_tag_btn_edit">Bewerk</string>
-  <string name="edit_tag_btn_done">Klaar</string>
-  <string name="edit_tag_btn_delete">Verwijder</string>
-  <string name="confirm_delete_tag_title">Weet je het zeker?</string>
-  <string name="confirm_delete_tag_message">Wil je het echt verwijderen?</string>
-  <string name="filter_drawer_edit_tags">Bewerk labels</string>
-  <string name="filter_drawer_filter_tags">Filter op labels</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Laat iemand je uitnodigen met deze QR code</string>
-  <string name="qr_save_message">QR-code opgeslagen in</string>
-  <string name="qr_dialogue_title">Je QR-code</string>
-  <string name="download">Installeer</string>
-  <string name="send_new_message">Stuur nieuw bericht</string>
-  <string name="choose_recipient_title">Kies een ontvanger voor het bericht</string>
-  <string name="action_continue">Ga verder</string>
-  <string name="scan_qr_code">Scan QR code</string>
-  <string name="enter_recipient_uuid">Voer Gebruikers-ID van ontvanger in</string>
-  <string name="invited_to_party">Je bent uitgenodigd voor een groep!</string>
-  <string name="stats_widget_label">Habitica-statistieken</string>
-  <string name="add_task">Voeg taak toe</string>
-  <string name="add_habit">Voeg Gewoonte toe</string>
-  <string name="add_daily">Voeg Dagelijkse taak toe</string>
-  <string name="add_todo">Voeg To-do toe</string>
-  <string name="add_reward">Voeg Beloning toe</string>
-  <string name="all_dailies_completed">Je hebt al je Dagelijkse taken voltooid. Goed gedaan!</string>
-  <string name="widget_habit_button">Habitica Doe Gewoonte</string>
-  <string name="widget_dailies">Habitica Dagelijkse taken</string>
-  <string name="widget_todo_list">Habitica to-do lijst</string>
-  <string name="widget_add_task">Habitica Voeg taak toe</string>
-  <string name="google_services_missing">Google play diensten niet gevonden.</string>
-  <string name="gem.purchase.toolbartitle">Kopen</string>
-  <string name="gem.purchase.title">Door het kopen van edelstenen steun je de ontwikkelaars en help je Habitica online te houden</string>
-  <string name="gem.purchase.subtitle">Met edelstenen kun je leuke extra\'s voor je account kopen, inclusief:</string>
-  <string name="gem.purchase.listitem1">Gave kostuums voor je avatar</string>
-  <string name="gem.purchase.listitem2">Gave achtergronden</string>
-  <string name="gem.purchase.listitem3">Queesten die je belonen met huisdiereieren</string>
-  <string name="gem.purchase.listitem4">De mogelijkheid om je klasse te veranderen voor niveau 100</string>
-  <string name="support_habitica">Steun Habitica</string>
-  <string name="skill_transformation_use">gebruik</string>
-  <string name="hatching_market_info">Krijg je niet de goede drops? Neem een kijkje op de Markt!</string>
-  <string name="feeding_market_info">Ander voedsel nodig? Koop meer op de markt!</string>
-  <string name="open_market">Open Markt</string>
-  <string name="cds_description">Je dagelijkse taken zullen worden gereset wanneer je Habitica voor het eerst gebruikt na %1$s. Zorg er voor dat je je dagelijkse taken voor dit tijdstip voltooit!</string>
-  <string name="AudioTheme_title">Audiothema</string>
-  <string name="AudioTheme_summary">Verander Habitica\'s audiothema</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">Tot morgen!</string>
-  <string name="belongs_to_challenge">Hoort bij een Uitdaging</string>
-  <string name="has_reminder">Heeft herinnering</string>
-  <string name="has_tag">Heeft label</string>
-  <string name="subscribe.title">Met abonneren steun je de ontwikkelaars en help je Habitica online te houden</string>
-  <string name="subscribe_prompt">Wordt een abonnee en ontvang deze nuttige voordelen:</string>
-  <string name="subscribe.listitem1">Koop edelstenen met goud</string>
-  <string name="subscribe.listitem2">Exclusieve maandelijkse voorwerpen</string>
-  <string name="subscribe.listitem3">Achterhaal extra geschiedenis</string>
-  <string name="subscribe.listitem4">Dagelijkse vondst limiet verdubbeld</string>
-  <string name="subscriptions">Abonnementen</string>
-  <string name="subscription_duration">Keert iedere %s terug</string>
-  <string name="subscribe">Abonneer</string>
-  <string name="subscribe.listitem1.description">Alexander de Koopman zal nu edelstenen aan je verkopen voor 20 goud per edelsteen!\n\nZijn maandelijkse levering is initieel beperkt tot 25 edelstenen per maand, maar stijgt afhankelijk van de duur van je abonnement.\n\nDit limiet verhoogt met 5 edelstenen voor elke 3 maanden van opeenvolgende abonnement periodes, tot een maximum van 50 edelstenen per maand!</string>
-  <string name="subscribe.listitem2.description">Iedere maand ontvang je een uniek cosmetisch voorwerp voor je avatar!\n\nEn voor iedere 3 maanden van opeenvolgende abonnement periodes, geven de mysterieuze tijdreizigers je toegang to historische (en futuristische!) cosmetische voorwerpen.</string>
-  <string name="subscribe.listitem3.description">Maakt voltooide To-do\'s en taakgeschiedenis langer beschikbaar.</string>
-  <string name="subscribe.listitem4.description">Dubbele vondst limieten laten je dagelijks meer voorwerpen verdienen van je voltooide taken, waardoor je je stal sneller kan voltooien!</string>
-  <string name="subscribe1month.gemcap">Edelsteenlimiet begint bij 25</string>
-  <string name="subscribe3month.gemcap">Edelsteenlimiet verhoogt naar 30</string>
-  <string name="subscribe6month.gemcap">Edelsteenlimiet verhoogt naar 35</string>
-  <string name="subscribe12month.gemcap">Edelsteenlimiet verhoogt naar 45</string>
-  <string name="subscription_hourglasses">+%d Mystieke Zandloper</string>
-  <string name="payment_method">Betaalmethode</string>
-  <string name="subscription">Abonnement</string>
-  <string name="active">Actief</string>
-  <string name="cancel_subscription">Annuleer Abonnement</string>
-  <string name="cancel_subscription_google.description">Wil je niet langer abonneren? Je kan de optie om je abonnement stop te zetten vinden in de \"Mijn apps\" sectie van de Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Wil je niet langer abonneren? Vanwege je betaalmethode kan je enkel via de website je abonnement stop zetten. Klik op de knop hieronder om de site in je browser te openen!</string>
-  <string name="visit_habitica_website">Bezoek Habitica Website</string>
-  <string name="current_bonuses">Huidige bonussen</string>
-  <string name="months_subscribed">Maanden geabonneerd</string>
-  <string name="current_hourclasses">Huidige Mystieke Zandlopers</string>
-  <string name="monthly_gem_cap">Maandelijks edelsteenlimiet</string>
-  <string name="inactive">inactief</string>
-  <string name="one_month">1 maand</string>
-  <string name="months">%d maanden</string>
-  <string name="month">maand</string>
-  <string name="three_months">3 maanden</string>
-  <string name="six_months">6 maanden</string>
-  <string name="twelve_months">12 maanden</string>
-  <string name="subscribe_prompt_thanks">Voor het abonneren ontvang je deze nuttige voordelen:</string>
-  <string name="subscription_status">Abonnement status</string>
-  <string name="byLeader">door %s</string>
-  <string name="challenge_details">Uitdaging details</string>
-  <string name="challenge_leave_title">Verlaat uitdaging</string>
-  <string name="challenge_leave_text">Weet zeker dat je de uitdaging \"%s\" wilt verlaten?</string>
-  <string name="challenge_remove_tasks_title">Verwijder taken</string>
-  <string name="challenge_remove_tasks_text">Wil je de taken verwijderen?</string>
-  <string name="remove_tasks">Verwijder</string>
-  <string name="keep_tasks">Houden</string>
-  <string name="my_challenges">Mijn uitdagingen</string>
-  <string name="public_challenges">Publiek</string>
-  <string name="challenges">Uitdagingen</string>
-  <string name="daily">Dagelijkse taak</string>
-  <string name="habit">Gewoonte</string>
-  <string name="reward">Beloning</string>
-  <string name="todo">To-do</string>
-  <string name="official">Officieel</string>
-  <string name="participating">Deelnemende</string>
-  <string name="challenge">Uitdaging</string>
-  <string name="go_to_challenge">Ga naar uitdaging</string>
-  <string name="not_part_of_a_challenge">Je maakt geen deel uit van uitdagingen op dit moment!</string>
-  <string name="join_a_challenge">Doe mee aan een uitdaging om een samengestelde set van taken aan je list toe te voegen en neem het op tegen andere Habiticanen om prestaties en zelfs edelstenen te winnen!</string>
-  <string name="check_the_public_challenge_tab">Tik op de \"Publiek\" tab om speler-gemaakte uitdagingen te vinden die het best bij jou passen!</string>
-  <string name="add_reminder">Voeg herinnering toe</string>
-  <string name="warning">Waarschuwing</string>
-  <string name="open_settings">Open instellingen</string>
-  <string name="dont_keep_activities_warning">Het lijkt erop dat je de Ontwikkelaar optie \\"Hou geen activiteiten bij\\" aan hebt staan. Momenteel zorgt deze optie voor problemen met de habitica app, dus raden we je aan het uit te zetten.</string>
-  <string name="inbox">Postvak in</string>
-  <string name="FAQ">Veel gestelde vragen</string>
-  <string name="special">Speciaal</string>
-  <string name="gem_for_gold_description">Omdat je geabonneerd bent voor Habitica kan je iedere maand een aantal edelstenen  kopen met goud.</string>
-  <string name="limited_count">%d over</string>
-  <string name="gem_shop">Edelsteen</string>
-  <string name="mystery_item">Mysterieus voorwerp</string>
-  <string name="myster_item_notes">Iedere maand ontvangen abonnees een mysterieus voorwerp. Dit wordt meestal een week voor het einde van de maand uitgebracht.</string>
-  <string name="open">Open</string>
-  <string name="notification_mystery_item">Je opent de doos en vind %s!</string>
-  <string name="checkInRewardEarned">Je ontvangt een %1$s als beloning voor je toewijding bij het beteren van je leven.</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Je volgende prijs wordt vrijgespeeld na %1$d check-ins.</string>
-  <string name="pending_approval">afwachten op goedkeuring</string>
-  <string name="filters">Filters</string>
-  <string name="done">Klaar</string>
-  <string name="group_tasks_edit_description">Groepstaken konden niet bewerkt worden.</string>
-  <string name="group_tasks_edit_title">Kan deze taak niet bewerken</string>
-  <string name="groups">Groepen</string>
-  <string name="all">Alle</string>
-  <string name="none">Geen</string>
-  <string name="owned">Van jou</string>
-  <string name="not_owned">Niet van jou</string>
-  <string name="new_game">Nieuw\nSpel</string>
-  <string name="login_btn_fb">Aanmelden met Facebook</string>
-  <string name="login_btn_google">Aanmelden met Google</string>
-  <string name="action_back">Terug</string>
-  <string name="welcome_text">Oh, jij bent vast nieuw hier. Ik ben Justin, ik zal je gids zijn in Habitica.\n\nOm te beginnen zul je een avatar moeten maken.</string>
-  <string name="randomize">Willekeurig</string>
-  <string name="avatar_extras">Extra\'s</string>
-  <string name="avatar_skin_color">Huidskleur</string>
-  <string name="avatar_hair_color">Haarkleur</string>
-  <string name="avatar_hair_bangs">Pony</string>
-  <string name="avatar_hair_ponytail">Paardenstaart</string>
-  <string name="avatar_glasses">Bril</string>
-  <string name="avatar_wheelchair">Rolstoel</string>
-  <string name="weak">Zwak</string>
-  <string name="strong">Sterk</string>
-  <string name="gray">Grijd</string>
-  <string name="dated">Gedateerd</string>
-  <string name="completed">Voltooid</string>
-  <string name="setuP_group_other">Andere</string>
-  <string name="clear">Wissen</string>
-  <string name="empty_title_habits">Je hebt geen gewoontes</string>
-  <string name="empty_description_habits">Gewoontes zijn taken die geen vast schema hebben. Je kan ze meerdere keren per dag afvinken of helemaal niet.</string>
-  <string name="empty_title_dailies">Je hebt geen dagelijkse taken</string>
-  <string name="empty_description_dailies">Dagelijkse taken zijn taken die op een vast schema herhalen. Kies de routine die voor jou werkt!</string>
-  <string name="empty_title_todos">Je hebt geen to-do\'s</string>
-  <string name="empty_description_todos">To-do\'s zijn taken die slechts een keer voltooid moeten worden. Voeg checklijsten aan je to-do\'s toe om hun waarde te verhogen.</string>
-  <string name="empty_title_rewards">Je hebt geen beloningen</string>
-  <string name="reset_walkthrough">Herstart Justin\'s inleiding</string>
-  <string name="read_community_guidelines">Lees alsjeblieft onze gemeenschapsrichtlijnen voordat je berichten plaatst</string>
-  <string name="maintenance">Onderhoud</string>
-  <string name="reload_content">Inhoud herladen</string>
-  <string name="dailyDueDefaultView">Standaard de \'Onvoltooid\' tab laten zien in Dagelijkse Taken</string>
-  <string name="dailyDueDefaultViewDescription">Als deze optie aan staat, wordt standaard de \'onvoltooid\' tab getoond in plaats van \'alle\'</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Verversen</string>
+  <string name="XP_default">Ervaring</string>
+  <string name="HP_default">Gezondheid</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Voorkeuren konden niet uit de barcode worden geladen</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Instellingen</string>
+  <string name="SP_address_hint">Jouw persoonlijke server</string>
+  <string name="SP_userID_title">Gebruikers-ID</string>
+  <string name="SP_userID_summary">Jouw gebruikers-ID</string>
+  <string name="SP_APIToken_title">API-token</string>
+  <string name="SP_APIToken_summary">Jouw API-token</string>
+  <string name="Language_title">Taal</string>
+  <string name="Language_summary">Verander Habitica\'s taal</string>
+  <string name="SP_user_qr_code">Je QR code</string>
+  <string name="PS_contact_title">Contact</string>
+  <string name="unknown_error">Een fout is opgetreden...</string>
+  <string name="pref_account_header">Account</string>
+  <string name="pref_first_day_of_the_week_title">Eerste dag van de week</string>
+  <string name="pref_first_day_of_the_week_summary">Eerste dag van de week op alle kalenders</string>
+  <string name="pref_reminder_header">Dagelijkse herinnering</string>
+  <string name="pref_reminder_checkbox">Activeer herinnering</string>
+  <string name="pref_reminder_picker">Stel tijd van herinnering in</string>
+  <string name="pref_cds_header">Aangepast begin van de dag</string>
+  <string name="pref_cds_picker">Begin van de dag instellen</string>
+  <string name="pref_push_notifications_checkbox">Pushnotificaties</string>
+  <string name="push_notifications">Pushnotificaties</string>
+  <string name="push_notifications_sum">Stel je push-notificaties in</string>
+  <string name="preference_push_you_won_challenge">Je hebt een uitdaging gewonnen!</string>
+  <string name="preference_push_received_a_private_message">Privébericht ontvangen</string>
+  <string name="preference_push_gifted_gems">Edelstenen geschonken</string>
+  <string name="preference_push_gifted_subscription">Abonnement geschonken</string>
+  <string name="preference_push_invited_to_party">Uitgenodigd voor groep</string>
+  <string name="preference_push_invited_to_guild">Uitgenodigd voor gilde</string>
+  <string name="preference_push_your_quest_has_begun">Je queeste is begonnen</string>
+  <string name="preference_push_invited_to_quest">Uitgenodigd voor queeste</string>
+  <!--Adding tasks-->
+  <string name="task_value">Waarde</string>
+  <string name="new_todo">Nieuwe to-do</string>
+  <string name="new_reward">Nieuwe beloning</string>
+  <string name="new_daily">Nieuwe dagelijkse taak</string>
+  <string name="new_habit">Nieuwe gewoonte</string>
+  <string name="action_edit">Aanpassen</string>
+  <string name="action_delete">Verwijderen</string>
+  <string name="action_cancel">Annuleren</string>
+  <string name="login_btn">Inloggen</string>
+  <string name="register_btn">Registreren</string>
+  <string name="username">Gebruikersnaam</string>
+  <string name="email_username">E-mail of gebruikersnaam</string>
+  <string name="password">Wachtwoord</string>
+  <string name="emailAddress">E-mailadres</string>
+  <string name="confirmpassword">Bevestig wachtwoord</string>
+  <string name="logout">Uitloggen</string>
+  <string name="logout_description">Uitloggen</string>
+  <string name="account_details_sum">Kijk je account gegevens na</string>
+  <string name="account_details">Accountgegevens</string>
+  <string name="LoginActivityName">Welkom</string>
+  <string name="string_revive">Herleven</string>
+  <string name="please_connect">Maak verbinding via de app voor het gebruik van een widget</string>
+  <string name="about.title">Over</string>
+  <string name="about.libraries">Bibliotheken</string>
+  <string name="about.versionhistory">Versiegeschiedenis</string>
+  <string name="about.habitica_open_source">Habitica is beschikbaar als open source software op Github</string>
+  <string name="about.rate_our_app">Beoordeel onze App</string>
+  <string name="about.give_us_feedback">Stuur ons feedback!</string>
+  <string name="about.bugreport">Fout melden</string>
+  <string name="about.source_code">Broncode</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Verbindingsfout</string>
+  <string name="network_error_no_network_body">Je bent niet verbonden met het internet.</string>
+  <string name="internal_error_api">Het lijkt erop dat er een probleem is met de server. Probeer het later opnieuw.</string>
+  <string name="authentication_error_title">Authenticatiefout</string>
+  <string name="authentication_error_body">Je Gebruikersnaam en/of Wachtwoord is onjuist.</string>
+  <string name="login_validation_error_title">Validatiefout</string>
+  <string name="login_validation_error_fieldsmissing">Je moet alle velden invullen.</string>
+  <string name="save_changes">Opslaan</string>
+  <string name="copy">Kopie</string>
+  <string name="notes">Notities</string>
+  <string name="text">Tekst</string>
+  <string name="difficulty">Moeilijkheidsgraad</string>
+  <string name="tags">Labels</string>
+  <string name="trivial">Triviaal</string>
+  <string name="easy">Gemakkelijk</string>
+  <string name="medium">Gemiddeld</string>
+  <string name="hard">Moeilijk</string>
+  <string name="start_date">Begindatum</string>
+  <string name="positive_habit_form">Positief ( + )</string>
+  <string name="negative_habit_form">Negatief ( - )</string>
+  <string name="checklist">Checklijst</string>
+  <string name="reminders">Herinneringen</string>
+  <string name="actions">Acties</string>
+  <string name="attributes">Eigenschappen</string>
+  <string name="physical">Fysiek</string>
+  <string name="mental">Mentaal</string>
+  <string name="social">Sociaal</string>
+  <string name="other">Overige</string>
+  <string name="frequency">Frequentie</string>
+  <string name="frequency_weekly">Op Bepaalde Dagen van de Week</string>
+  <string name="frequency_daily">Iedere X Dagen</string>
+  <string name="monday">Maandag</string>
+  <string name="tuesday">Dinsdag</string>
+  <string name="wednesday">Woensdag</string>
+  <string name="thursday">Donderdag</string>
+  <string name="friday">Vrijdag</string>
+  <string name="saturday">Zaterdag</string>
+  <string name="sunday">Zondag</string>
+  <string name="levelup_header">Je bent een niveau omhoog gegaan!</string>
+  <string name="levelup_detail">Door het behalen van je doelen in het echte leven ben je uitgegroeid tot Niveau %1$d!</string>
+  <string name="levelup_health">Je bent volledig genezen!</string>
+  <string name="levelup_button">Hoera!</string>
+  <string name="faint_subtitle">Wanhoop niet!</string>
+  <string name="faint_penalty_body">Je verliest een niveau, je goud en een stuk uitrusting, maar je kunt ze allemaal terug krijgen door hard te werken! Succes--je zult het geweldig doen.</string>
+  <string name="faint_header">Je hebt geen Levenspunten meer!</string>
+  <string name="faint_button">Herstel Gezondheid &amp; probeer opnieuw</string>
+  <string name="filter">Filter</string>
+  <string name="profile_image">Profielfoto</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Je hebt %1$s voor %2$d mana gebruikt.</string>
+  <string name="used_skill_without_mana">Je hebt %1$s gebruikt.</string>
+  <string name="new_checklist_item">nieuw checklijstpunt</string>
+  <string name="add_checklist_item">Toevoegen</string>
+  <string name="reminder_title">Vergeet niet om je Dagelijkse taken af te vinken!</string>
+  <string name="skill_progress_title">Vaardigheid gebruiken</string>
+  <string name="coming_soon">Binnenkort beschikbaar</string>
+  <string name="chat_flag_confirmation">Weet je zeker dat je dit bericht wilt melden wegens overtreding?</string>
+  <string name="flag_confirm">Markeer bericht</string>
+  <string name="unlock_lvl_11">Beschikbaar vanaf niveau 11</string>
+  <string name="no_party_message">Je zit niet in een groep. Bezoek de website als je je bij een groep wilt aansluiten.</string>
+  <string name="forgot_pw_btn">Wachtwoord vergeten</string>
+  <string name="forgot_pw_tv">Wachtwoord vergeten? Gebruik dan de mobiele website.</string>
+  <string name="tavern.inn.checkOut">Heractiveer je Dagelijkse taken</string>
+  <string name="tavern.inn.rest">Pauzeer je Dagelijkse Taken</string>
+  <string name="reward.dialog.buy">Kopen</string>
+  <string name="reward.dialog.dismiss">Verwijderen</string>
+  <string name="party">Groep</string>
+  <string name="chat">Chat</string>
+  <string name="members">Leden</string>
+  <string name="habits">Gewoontes</string>
+  <string name="dailies">Dagelijkse taken</string>
+  <string name="todos">To-do\'s</string>
+  <string name="rewards">Beloningen</string>
+  <string name="taskform.delete.title">Weet je het zeker?</string>
+  <string name="taskform.delete.message">Wil je het echt verwijderen?</string>
+  <string name="yes">Ja</string>
+  <string name="no">Nee</string>
+  <string name="quest">Queeste</string>
+  <string name="avatar_body">Lichaam</string>
+  <string name="avatar_hair">Haar</string>
+  <string name="avatar_shirt">T-Shirt</string>
+  <string name="avatar_skin">Huid</string>
+  <string name="avatar_ears">Dierenoren</string>
+  <string name="avatar_base">Basis</string>
+  <string name="avatar_color">Kleur</string>
+  <string name="avatar_beard">Baard</string>
+  <string name="avatar_mustache">Snor</string>
+  <string name="avatar_flower">Bloem</string>
+  <string name="avatar_bangs">Pony</string>
+  <string name="avatar_nothing">Niets ingesteld</string>
+  <string name="avatar_size">Grootte</string>
+  <string name="avatar_size_slim">Slank</string>
+  <string name="avatar_size_broad">Breed</string>
+  <string name="avatar_background">Achtergrond</string>
+  <string name="purchase_customization">Koop aanpassingen</string>
+  <string name="purchase_set_button">Ontgrendel set voor %d edelstenen</string>
+  <string name="purchase_button">Koop</string>
+  <string name="purchase_set_title">Koop set %s</string>
+  <string name="due_date">Einddatum</string>
+  <string name="quest.accept">Accepteren</string>
+  <string name="quest.reject">Afwijzen</string>
+  <string name="quest.begin">Begin Queeste</string>
+  <string name="quest.cancel">Annuleer Uitnodiging</string>
+  <string name="quest.abort">Queeste afbreken</string>
+  <string name="quest.leave">Verlaat Queeste</string>
+  <string name="quest.pending">in afwachting van</string>
+  <string name="quest.accepted">Aanvaard</string>
+  <string name="quest.rejected">Afgewezen</string>
+  <string name="quest.participants">Deelnemers</string>
+  <string name="version_info">Versie %1$s (%2$d)</string>
+  <string name="sidebar_help">Help &amp; FAQ</string>
+  <string name="complete_tutorial">Begrepen!</string>
+  <string name="dismiss_tutorial">Herinner me opnieuw</string>
+  <string name="intro_1_subtitle">Welkom bij</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Het is tijd om plezier te maken terwijl je dingen gedaan krijgt. Doe mee met %s andere mensen die hun leven met iedere taak beteren.</string>
+  <string name="intro_2_subtitle">Vooruitgang in het spel</string>
+  <string name="intro_2_title">Vooruitgang in je leven</string>
+  <string name="intro_2_description">Ontgrendel functies in het spel door taken in je echte leven af te vinken. Verdien uitrusting, huisdieren en meer als beloning voor het bereiken van je doelen.</string>
+  <string name="intro_3_subtitle">Vecht tegen monsters</string>
+  <string name="intro_3_title">Wordt sociaal</string>
+  <string name="intro_3_description">Houd je doelen op peil met hulp van je vrienden. Ondersteun elkaar in het leven en vecht samen terwijl je steeds beter wordt.</string>
+  <string name="intro_finish_button">Laten we beginnen!</string>
+  <string name="previous_button">Vorige</string>
+  <string name="next_button">Volgende</string>
+  <string name="skip_button">Sla over</string>
+  <string name="setup_welcome_description">Welkom in Habitica, waar vooruitgang in het spel je leven zal verbeteren! Terwijl je echte doelen bereikt, verdien je uitrusting, huisdieren, queestes en meer.</string>
+  <string name="setup_welcome_title">Welkom</string>
+  <string name="avatar_setup_description">Dus, hoe wil jij er uit zien? Geen zorgen, je kan dit later veranderen.</string>
+  <string name="task_setup_description">Geweldig! Nu, waar zou je graag aan willen werken doorheen deze reis?</string>
+  <string name="setup_group_work">Werk</string>
+  <string name="setup_group_exercise">Sport</string>
+  <string name="setup_group_health">Gezondheid</string>
+  <string name="setup_group_school">School</string>
+  <string name="setup_group_teams">Teams</string>
+  <string name="setup_group_chores">Klusjes</string>
+  <string name="setup_group_creativity">Creativiteit</string>
+  <string name="setup_task_work_1">E-mail verwerken</string>
+  <string name="setup_task_work_2">Belangrijkste taak</string>
+  <string name="setup_task_work_3">Werkproject</string>
+  <string name="setup_task_exercise_1">10 min cardio</string>
+  <string name="setup_task_exercise_2">Uitstrekken</string>
+  <string name="setup_task_exercise_3">Maak een trainingsschema</string>
+  <string name="setup_task_healthWellness_1">Eet gezond / junk food</string>
+  <string name="setup_task_healthWellness_2">Flossen</string>
+  <string name="setup_task_healthWellness_3">Maak een afspraak bij de dokter</string>
+  <string name="setup_task_school_1">Studeren / Uitstellen</string>
+  <string name="setup_task_school_2">Huiswerk maken</string>
+  <string name="setup_task_school_3">Maak een schoolopdracht af</string>
+  <string name="setup_task_teams_1">Controleer hoe het met je team gaat</string>
+  <string name="setup_task_teams_2">Breng je team op de hoogte van de stand van zaken</string>
+  <string name="setup_task_teams_3">Maak een teamproject af</string>
+  <string name="setup_task_chores_1">10 minuten schoonmaken</string>
+  <string name="setup_task_chores_2">De afwas doen</string>
+  <string name="setup_task_chores_3">Ruim je kast op</string>
+  <string name="setup_task_creativity_1">Studeer een meester van het ambacht</string>
+  <string name="setup_task_creativity_2">Aan een creatief project werken</string>
+  <string name="setup_task_creativity_3">Een creatief project afronden</string>
+  <string name="gem.purchase.support">Wil je helpen om Habitica draaiende te houden? Je kan de ontwikkelaars ondersteunen door edelstenen te kopen!\n\nMet edelstenen kun je leuke extra\'s voor je account kopen, zoals: \n\n - Geweldige kostuums voor je avatar\n - Adembenemende achtergronden\n - Leuke queestes met huisdiereieren als beloning\n - De mogelijkheid om je klasse te veranderen voor je niveau 100 bent\n\nOntzettend bedankt voor je hulp om Habitica het beste te maken wat het kan zijn. Jouw steun betekent heel veel voor ons!</string>
+  <string name="my_guilds">Mijn Gilden</string>
+  <string name="public_guilds">Publieke Gilden</string>
+  <string name="guild">Gilde</string>
+  <string name="leave">Verlaten</string>
+  <string name="join">Toetreden</string>
+  <string name="leader">Leider</string>
+  <string name="gems">Edelstenen</string>
+  <string name="copy_as_todo">Kopiëren als to-do</string>
+  <string name="send_pm">PB verzenden</string>
+  <string name="flag">Aanduiden</string>
+  <string name="delete">Verwijderen</string>
+  <string name="name">Naam</string>
+  <string name="description">Beschrijving</string>
+  <string name="add_tag">Nieuwe label toevoegen</string>
+  <string name="privacy">Privacy</string>
+  <string name="write_message">Bericht schrijven</string>
+  <string name="post">Post</string>
+  <string name="guild_search_hint">Zoek naar gilden</string>
+  <string name="todo_due">Tegen: %s</string>
+  <string name="daily_streak">huidige serie: %d</string>
+  <string name="todo_has_duedate">Taak heeft een einddatum</string>
+  <string name="battle_gear">Gevechtsuitrusting</string>
+  <string name="costume">Kostuum</string>
+  <string name="outfit_head">Hoofd</string>
+  <string name="outfit_headAccessory">Hoofdaccessoire</string>
+  <string name="outfit_eyewear">Oogaccessoire</string>
+  <string name="outfit_armor">Harnas</string>
+  <string name="outfit_back">Rug</string>
+  <string name="outfit_body">Lichaam</string>
+  <string name="outfit_shield">Schild</string>
+  <string name="outfit_weapon">Wapen</string>
+  <string name="wear_costume">Kostuum Aantrekken</string>
+  <string name="equipped">In gebruik</string>
+  <string name="quest_cancel_message">Ben je zeker dat je deze queeste wilt beëindigen? Alle aangenomen uitnodigingen zullen verloren gaan. De eigenaar van de queeste zal de queesterol terug krijgen.</string>
+  <string name="quest.invitation">Queeste uitnodiging</string>
+  <string name="quest_begin_message">Ben je zeker dat je de queeste wilt beginnen? Zodra het actief is, kunnen er geen andere spelers zich bij de queeste aansluiten.</string>
+  <string name="quest.invitation.text">Je bent uitgenodigd om deel te nemen aan een queeste!</string>
+  <string name="ago_1day">1 dag geleden</string>
+  <string name="ago_days">%d dagen geleden</string>
+  <string name="ago_1Minute">1 minuut geleden</string>
+  <string name="ago_minutes">%d minuten geleden</string>
+  <string name="ago_hours">%d uren geleden</string>
+  <string name="ago_1hour">1 uur geleden</string>
+  <string name="today">Vandaag</string>
+  <string name="sidebar_items">Voorwerpen</string>
+  <string name="eggs">Eieren</string>
+  <string name="hatching_potions">Uitbroeddranken</string>
+  <string name="food">Voedsel</string>
+  <string name="quests">Queesten</string>
+  <string name="pets">Huisdieren</string>
+  <string name="mounts">Rijdieren</string>
+  <string name="armoireEquipment">Je hebt een zeldzaam stuk van een uitrusting gevonden in het Kabinet: %s! Geweldig!</string>
+  <string name="armoireFood">Je rommelt wat rond in het Kabinet en vindt %1$s %2$s. Wat doet dat hier?</string>
+  <string name="armoireExp">Je worstelt met het Kabinet en verdient Ervaring. Pak aan!</string>
+  <string name="armoireNotesFull">Open het Kabinet om willekeurig speciale uitrustingen, ervaring of voedsel te vinden! Stukken uitrusting die nog over zijn: %d</string>
+  <string name="armoireLastItem">Je hebt het laatste stuk zeldzame uitrusting gevonden in het Betoverde Kabinet.</string>
+  <string name="armoireNotesEmpty">Het Kabinet zal nieuwe stukken uitrusting hebben tijdens de eerste week van elke maand. Blijf tot die tijd klikken voor ervaring en voedsel!</string>
+  <string name="sell">Verkoop (%d Goud)</string>
+  <string name="hatch_with_potion">Broed uit met toverdrank</string>
+  <string name="feed_to_pet">Aan huisdier voederen</string>
+  <string name="hatch_egg">Laten uitkomen met ei</string>
+  <string name="invite_party">Nodig groep uit</string>
+  <string name="dialog_feeding">Voeder %1$s %2$s met:</string>
+  <string name="use_animal">Gebruik</string>
+  <string name="feed">Voeder</string>
+  <string name="hatch_with">Laat huisdier uitkomen met %s</string>
+  <string name="hatched_pet_title">Je hebt een %1$s %2$s laten uitkomen!</string>
+  <string name="close">Sluiten</string>
+  <string name="share">Delen</string>
+  <string name="notification_pet_fed">Je hebt je %1$s %2$s gevoederd!</string>
+  <string name="notification_purchase">%s werd gekocht</string>
+  <string name="sectionpets">Normale huisdieren</string>
+  <string name="sectionpremiumPets">Huisdieren uit magische drankjes</string>
+  <string name="sectionquestPets">Queeste Huisdieren</string>
+  <string name="sectionspecialPets">Zeldzame Huisdieren</string>
+  <string name="sectionmounts">Normale rijdieren</string>
+  <string name="sectionpremiumMounts">Rijdieren uit magische drankjes</string>
+  <string name="sectionquestMounts">Queeste Rijdieren</string>
+  <string name="sectionspecialMounts">Zeldzame Rijdieren</string>
+  <string name="world_quest">Wereldqueeste</string>
+  <string name="inn_description">Rust uit in de Herberg om ervoor te zorgen dat je ongedane Dagelijkse Taken je niet kunnen schaden in de nacht! (Let wel: je ontvangt nog wel schade van een Baas.)</string>
+  <string name="empty_items">Je hebt geen %s</string>
+  <string name="user_level">NIV %d</string>
+  <string name="user_level_with_class">NIV %1$d %2$s</string>
+  <string name="warrior">Krijger</string>
+  <string name="rogue">Dief</string>
+  <string name="mage">Magiër</string>
+  <string name="healer">Heler</string>
+  <string name="warrior_description">Krijgers scoren meer en betere \"voltreffers\", die willekeurig extra Goud, Ervaring en kans op een voorwerp geven wanneer je een taak afvinkt. Ze doen ook veel schade aan bazen. Speel een Krijger wanneer je motivatie vindt in onvoorspelbare jackpot-stijl beloningen, of wanneer je de echte schade wilt uitdelen tijdens Baasqueestes!</string>
+  <string name="mage_description">Magiërs leren snel, en krijgen sneller ervaringspunten en niveaus dan andere klassen. Ze krijgen ook veel Mana door speciale talenten te gebruiken. Speel een magiër wanneer je de tactiek van Gewoontes leuk vindt of als je sterk gemotiveerd wordt door niveaus omhoog te gaan en speciale dingen te ontgrendelen!</string>
+  <string name="rogue_description">Dieven vinden het geweldig om rijkdom te verwerven, en krijgen dus ook meer Goud dan de rest. Ook zijn ze goed in willekeurig voorwerpen vinden. Hun iconische Heimelijkheid laat hen zich verschuilen voor gemiste Dagelijkse Taken. Speel een Dief als je veel motivatie vindt in beloningen en prestaties, strevend voor de buit en de badges!</string>
+  <string name="healer_description">Helers staan onaangedaan tegenover schade en kunnen die bescherming tot anderen uitstrekken. Gemiste Dagelijkse Taken en slechte Gewoontes doen hen niet veel, en ze hebben hun manieren om er terug bovenop te raken na pech. Speel een Heler als je het leuk vindt om anderen in je Groep te helpen of als het idee om de Dood door hard werk te slim af te zijn jou inspireert!</string>
+  <string name="select_class">Selecteer Klasse</string>
+  <string name="opt_out_class">Afmelden</string>
+  <string name="opt_out_description">Vind je het klassesysteem te ingewikkeld voor nu? Wil je later pas kiezen? Trek je terug - je zal een krijger zijn zonder speciale talenten. Je kan later nog over het klassesysteem lezen op de wiki en op eender welk moment klassen inschakelen.</string>
+  <string name="class_confirmation">Weet je zeker dat je een %s wilt zijn?</string>
+  <string name="class_changed">Je bent nu een %s!</string>
+  <string name="class_changed_description">Je hebt nieuw standaard gevechtsuitrusting dat je kan veranderen onder Uitrusting!</string>
+  <string name="choose_class">Kies een Klasse</string>
+  <string name="dialog_go_back">Ga terug</string>
+  <string name="opt_out_confirmation">Weet je zeker dat je je wil afmelden?</string>
+  <string name="change_class">Verander je klasse</string>
+  <string name="change_class_description">Verander je klasse en krijg je eigenschapspunten terug voor 3 edelstenen. Je kunt eigenschapspunten toewijzen via de website</string>
+  <string name="enable_class">Klassesysteem aanzetten</string>
+  <string name="changing_class_progress">Van klasse veranderen</string>
+  <string name="by_email">Via Email</string>
+  <string name="invite_existing_users">Bestaande Gebruikers Uitnodigen</string>
+  <string name="send">Versturen</string>
+  <string name="invite">Vrienden uitnodigen</string>
+  <string name="invite_id_description">Als je vrienden hebt die al Habitica spelen, nodig hen dan hier uit met hun Gebruikers-ID.</string>
+  <string name="invite_email_description">Als een vriend zich inschrijft op Habitica via jouw email, zullen ze automatisch uitgenodigd worden voor jouw groep!</string>
+  <string name="add_invites">Uitnodigingen toevoegen</string>
+  <string name="user_id">Gebruikers ID</string>
+  <string name="email">Email</string>
+  <string name="invite_users">Nodig uit voor groep</string>
+  <string name="share_using">Deel door</string>
+  <string name="share_levelup">Ik ben in Habitica tot niveau %d gekomen door mijn echte gewoontes te verbeteren!</string>
+  <string name="share_hatched">Ik heb net een %1$s %2$s huisdier in Habitica laten uitkomen door mijn echte taken uit te voeren!</string>
+  <string name="share_raised">Ik heb net een %1$s %2$s rijdier gekregen in Habitica door mijn echte taken uit te voeren!</string>
+  <string name="open_in_store">Open in de play store</string>
+  <string name="change_class_confirmation">Weet je zeker dat je van klasse wilt veranderen? Dit kost 3 edelstenen.</string>
+  <string name="change_class_equipment_warning">Waarschuwing: Je zult niet langer in staat zijn om uitrusting te kopen van de %s klasse.</string>
+  <string name="leaderMessage">Bericht van %1$s</string>
+  <string name="leaderName">Leider: %1$s</string>
+  <string name="confirm">Bevestig</string>
+  <string name="market">Markt</string>
+  <string name="timeTravelers">Tijdreizigers</string>
+  <string name="seasonalShop">Seizoenswinkel</string>
+  <string name="empty_inbox">Je hebt geen inboxberichten. Je kan een gebruiker een nieuw bericht sturen vanuit hun openbare chatberichten.</string>
+  <string name="party_invite">Ontgrendel door vrienden uit te nodigen</string>
+  <string name="no_gold">Niet genoeg goud</string>
+  <string name="no_potion">Je hoeft geen gezondheidsdrankje te kopen</string>
+  <string name="successful_purchase">%1$s succesvol gekocht</string>
+  <string name="purchase_confirmation_title">Bevestig aankoop</string>
+  <string name="confirm_purchase_text">Koop %1$s voor %2$s %3$s</string>
+  <string name="gem">edelsteen</string>
+  <string name="hourglass">zandloper</string>
+  <string name="hourglasses">zandlopers</string>
+  <string name="gold_singular">goud</string>
+  <string name="gold_plural">goud</string>
+  <string name="chat_message_copied">Bericht gekopieerd naar klembord</string>
+  <string name="copy_chat_message">Kopieer naar klembord</string>
+  <string name="edit_tag_title">Bewerk label</string>
+  <string name="edit_tag_btn_edit">Bewerk</string>
+  <string name="edit_tag_btn_done">Klaar</string>
+  <string name="edit_tag_btn_delete">Verwijder</string>
+  <string name="confirm_delete_tag_title">Weet je het zeker?</string>
+  <string name="confirm_delete_tag_message">Wil je het echt verwijderen?</string>
+  <string name="filter_drawer_edit_tags">Bewerk labels</string>
+  <string name="filter_drawer_filter_tags">Filter op labels</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Laat iemand je uitnodigen met deze QR code</string>
+  <string name="qr_save_message">QR-code opgeslagen in</string>
+  <string name="qr_dialogue_title">Je QR-code</string>
+  <string name="download">Installeer</string>
+  <string name="send_new_message">Stuur nieuw bericht</string>
+  <string name="choose_recipient_title">Kies een ontvanger voor het bericht</string>
+  <string name="action_continue">Ga verder</string>
+  <string name="scan_qr_code">Scan QR code</string>
+  <string name="enter_recipient_uuid">Voer Gebruikers-ID van ontvanger in</string>
+  <string name="invited_to_party">Je bent uitgenodigd voor een groep!</string>
+  <string name="stats_widget_label">Habitica-statistieken</string>
+  <string name="add_task">Voeg taak toe</string>
+  <string name="add_habit">Voeg Gewoonte toe</string>
+  <string name="add_daily">Voeg Dagelijkse taak toe</string>
+  <string name="add_todo">Voeg To-do toe</string>
+  <string name="add_reward">Voeg Beloning toe</string>
+  <string name="all_dailies_completed">Je hebt al je Dagelijkse taken voltooid. Goed gedaan!</string>
+  <string name="widget_habit_button">Habitica Doe Gewoonte</string>
+  <string name="widget_dailies">Habitica Dagelijkse taken</string>
+  <string name="widget_todo_list">Habitica to-do lijst</string>
+  <string name="widget_add_task">Habitica Voeg taak toe</string>
+  <string name="google_services_missing">Google play diensten niet gevonden.</string>
+  <string name="gem.purchase.toolbartitle">Kopen</string>
+  <string name="gem.purchase.title">Door het kopen van edelstenen steun je de ontwikkelaars en help je Habitica online te houden</string>
+  <string name="gem.purchase.subtitle">Met edelstenen kun je leuke extra\'s voor je account kopen, inclusief:</string>
+  <string name="gem.purchase.listitem1">Gave kostuums voor je avatar</string>
+  <string name="gem.purchase.listitem2">Gave achtergronden</string>
+  <string name="gem.purchase.listitem3">Queesten die je belonen met huisdiereieren</string>
+  <string name="gem.purchase.listitem4">De mogelijkheid om je klasse te veranderen voor niveau 100</string>
+  <string name="support_habitica">Steun Habitica</string>
+  <string name="skill_transformation_use">gebruik</string>
+  <string name="hatching_market_info">Krijg je niet de goede drops? Neem een kijkje op de Markt!</string>
+  <string name="feeding_market_info">Ander voedsel nodig? Koop meer op de markt!</string>
+  <string name="open_market">Open Markt</string>
+  <string name="cds_description">Je dagelijkse taken zullen worden gereset wanneer je Habitica voor het eerst gebruikt na %1$s. Zorg er voor dat je je dagelijkse taken voor dit tijdstip voltooit!</string>
+  <string name="AudioTheme_title">Audiothema</string>
+  <string name="AudioTheme_summary">Verander Habitica\'s audiothema</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Tot morgen!</string>
+  <string name="belongs_to_challenge">Hoort bij een Uitdaging</string>
+  <string name="has_reminder">Heeft herinnering</string>
+  <string name="has_tag">Heeft label</string>
+  <string name="subscribe.title">Met abonneren steun je de ontwikkelaars en help je Habitica online te houden</string>
+  <string name="subscribe_prompt">Wordt een abonnee en ontvang deze nuttige voordelen:</string>
+  <string name="subscribe.listitem1">Koop edelstenen met goud</string>
+  <string name="subscribe.listitem2">Exclusieve maandelijkse voorwerpen</string>
+  <string name="subscribe.listitem3">Achterhaal extra geschiedenis</string>
+  <string name="subscribe.listitem4">Dagelijkse vondst limiet verdubbeld</string>
+  <string name="subscriptions">Abonnementen</string>
+  <string name="subscription_duration">Keert iedere %s terug</string>
+  <string name="subscribe">Abonneer</string>
+  <string name="subscribe.listitem1.description">Alexander de Koopman zal nu edelstenen aan je verkopen voor 20 goud per edelsteen!\n\nZijn maandelijkse levering is initieel beperkt tot 25 edelstenen per maand, maar stijgt afhankelijk van de duur van je abonnement.\n\nDit limiet verhoogt met 5 edelstenen voor elke 3 maanden van opeenvolgende abonnement periodes, tot een maximum van 50 edelstenen per maand!</string>
+  <string name="subscribe.listitem2.description">Iedere maand ontvang je een uniek cosmetisch voorwerp voor je avatar!\n\nEn voor iedere 3 maanden van opeenvolgende abonnement periodes, geven de mysterieuze tijdreizigers je toegang to historische (en futuristische!) cosmetische voorwerpen.</string>
+  <string name="subscribe.listitem3.description">Maakt voltooide To-do\'s en taakgeschiedenis langer beschikbaar.</string>
+  <string name="subscribe.listitem4.description">Dubbele vondst limieten laten je dagelijks meer voorwerpen verdienen van je voltooide taken, waardoor je je stal sneller kan voltooien!</string>
+  <string name="subscribe1month.gemcap">Edelsteenlimiet begint bij 25</string>
+  <string name="subscribe3month.gemcap">Edelsteenlimiet verhoogt naar 30</string>
+  <string name="subscribe6month.gemcap">Edelsteenlimiet verhoogt naar 35</string>
+  <string name="subscribe12month.gemcap">Edelsteenlimiet verhoogt naar 45</string>
+  <string name="subscription_hourglasses">+%d Mystieke Zandloper</string>
+  <string name="payment_method">Betaalmethode</string>
+  <string name="subscription">Abonnement</string>
+  <string name="active">Actief</string>
+  <string name="cancel_subscription">Annuleer Abonnement</string>
+  <string name="cancel_subscription_google.description">Wil je niet langer abonneren? Je kan de optie om je abonnement stop te zetten vinden in de \"Mijn apps\" sectie van de Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle.description">Wil je niet langer abonneren? Vanwege je betaalmethode kan je enkel via de website je abonnement stop zetten. Klik op de knop hieronder om de site in je browser te openen!</string>
+  <string name="visit_habitica_website">Bezoek Habitica Website</string>
+  <string name="current_bonuses">Huidige bonussen</string>
+  <string name="months_subscribed">Maanden geabonneerd</string>
+  <string name="current_hourclasses">Huidige Mystieke Zandlopers</string>
+  <string name="monthly_gem_cap">Maandelijks edelsteenlimiet</string>
+  <string name="inactive">inactief</string>
+  <string name="one_month">1 maand</string>
+  <string name="months">%d maanden</string>
+  <string name="month">maand</string>
+  <string name="three_months">3 maanden</string>
+  <string name="six_months">6 maanden</string>
+  <string name="twelve_months">12 maanden</string>
+  <string name="subscribe_prompt_thanks">Voor het abonneren ontvang je deze nuttige voordelen:</string>
+  <string name="subscription_status">Abonnement status</string>
+  <string name="byLeader">door %s</string>
+  <string name="challenge_details">Uitdaging details</string>
+  <string name="challenge_leave_title">Verlaat uitdaging</string>
+  <string name="challenge_leave_text">Weet zeker dat je de uitdaging \"%s\" wilt verlaten?</string>
+  <string name="challenge_remove_tasks_title">Verwijder taken</string>
+  <string name="challenge_remove_tasks_text">Wil je de taken verwijderen?</string>
+  <string name="remove_tasks">Verwijder</string>
+  <string name="keep_tasks">Houden</string>
+  <string name="my_challenges">Mijn uitdagingen</string>
+  <string name="public_challenges">Publiek</string>
+  <string name="challenges">Uitdagingen</string>
+  <string name="daily">Dagelijkse taak</string>
+  <string name="habit">Gewoonte</string>
+  <string name="reward">Beloning</string>
+  <string name="todo">To-do</string>
+  <string name="official">Officieel</string>
+  <string name="participating">Deelnemende</string>
+  <string name="challenge">Uitdaging</string>
+  <string name="go_to_challenge">Ga naar uitdaging</string>
+  <string name="not_part_of_a_challenge">Je maakt geen deel uit van uitdagingen op dit moment!</string>
+  <string name="join_a_challenge">Doe mee aan een uitdaging om een samengestelde set van taken aan je list toe te voegen en neem het op tegen andere Habiticanen om prestaties en zelfs edelstenen te winnen!</string>
+  <string name="check_the_public_challenge_tab">Tik op de \"Publiek\" tab om speler-gemaakte uitdagingen te vinden die het best bij jou passen!</string>
+  <string name="add_reminder">Voeg herinnering toe</string>
+  <string name="warning">Waarschuwing</string>
+  <string name="open_settings">Open instellingen</string>
+  <string name="dont_keep_activities_warning">Het lijkt erop dat je de Ontwikkelaar optie \\"Hou geen activiteiten bij\\" aan hebt staan. Momenteel zorgt deze optie voor problemen met de habitica app, dus raden we je aan het uit te zetten.</string>
+  <string name="inbox">Postvak in</string>
+  <string name="FAQ">Veel gestelde vragen</string>
+  <string name="special">Speciaal</string>
+  <string name="gem_for_gold_description">Omdat je geabonneerd bent voor Habitica kan je iedere maand een aantal edelstenen  kopen met goud.</string>
+  <string name="limited_count">%d over</string>
+  <string name="gem_shop">Edelsteen</string>
+  <string name="mystery_item">Mysterieus voorwerp</string>
+  <string name="myster_item_notes">Iedere maand ontvangen abonnees een mysterieus voorwerp. Dit wordt meestal een week voor het einde van de maand uitgebracht.</string>
+  <string name="open">Open</string>
+  <string name="notification_mystery_item">Je opent de doos en vind %s!</string>
+  <string name="checkInRewardEarned">Je ontvangt een %1$s als beloning voor je toewijding bij het beteren van je leven.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Je volgende prijs wordt vrijgespeeld na %1$d check-ins.</string>
+  <string name="pending_approval">afwachten op goedkeuring</string>
+  <string name="filters">Filters</string>
+  <string name="done">Klaar</string>
+  <string name="group_tasks_edit_description">Groepstaken konden niet bewerkt worden.</string>
+  <string name="group_tasks_edit_title">Kan deze taak niet bewerken</string>
+  <string name="groups">Groepen</string>
+  <string name="all">Alle</string>
+  <string name="none">Geen</string>
+  <string name="owned">Van jou</string>
+  <string name="not_owned">Niet van jou</string>
+  <string name="new_game">Nieuw\nSpel</string>
+  <string name="login_btn_fb">Aanmelden met Facebook</string>
+  <string name="login_btn_google">Aanmelden met Google</string>
+  <string name="action_back">Terug</string>
+  <string name="welcome_text">Oh, jij bent vast nieuw hier. Ik ben Justin, ik zal je gids zijn in Habitica.\n\nOm te beginnen zul je een avatar moeten maken.</string>
+  <string name="randomize">Willekeurig</string>
+  <string name="avatar_extras">Extra\'s</string>
+  <string name="avatar_skin_color">Huidskleur</string>
+  <string name="avatar_hair_color">Haarkleur</string>
+  <string name="avatar_hair_bangs">Pony</string>
+  <string name="avatar_hair_ponytail">Paardenstaart</string>
+  <string name="avatar_glasses">Bril</string>
+  <string name="avatar_wheelchair">Rolstoel</string>
+  <string name="weak">Zwak</string>
+  <string name="strong">Sterk</string>
+  <string name="gray">Grijd</string>
+  <string name="dated">Gedateerd</string>
+  <string name="completed">Voltooid</string>
+  <string name="setuP_group_other">Andere</string>
+  <string name="clear">Wissen</string>
+  <string name="empty_title_habits">Je hebt geen gewoontes</string>
+  <string name="empty_description_habits">Gewoontes zijn taken die geen vast schema hebben. Je kan ze meerdere keren per dag afvinken of helemaal niet.</string>
+  <string name="empty_title_dailies">Je hebt geen dagelijkse taken</string>
+  <string name="empty_description_dailies">Dagelijkse taken zijn taken die op een vast schema herhalen. Kies de routine die voor jou werkt!</string>
+  <string name="empty_title_todos">Je hebt geen to-do\'s</string>
+  <string name="empty_description_todos">To-do\'s zijn taken die slechts een keer voltooid moeten worden. Voeg checklijsten aan je to-do\'s toe om hun waarde te verhogen.</string>
+  <string name="empty_title_rewards">Je hebt geen beloningen</string>
+  <string name="reset_walkthrough">Herstart Justin\'s inleiding</string>
+  <string name="read_community_guidelines">Lees alsjeblieft onze gemeenschapsrichtlijnen voordat je berichten plaatst</string>
+  <string name="maintenance">Onderhoud</string>
+  <string name="reload_content">Inhoud herladen</string>
+  <string name="dailyDueDefaultView">Standaard de \'Onvoltooid\' tab laten zien in Dagelijkse Taken</string>
+  <string name="dailyDueDefaultViewDescription">Als deze optie aan staat, wordt standaard de \'onvoltooid\' tab getoond in plaats van \'alle\'</string>
+</resources>
diff --git a/Habitica/res/values-pl/strings.profile.xml b/Habitica/res/values-pl/strings.profile.xml
index 0206d9948..00c938e40 100644
--- a/Habitica/res/values-pl/strings.profile.xml
+++ b/Habitica/res/values-pl/strings.profile.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">Chowańce i Wierzchowce</string>
-    <string name="profile_pets_found">Znalezione chowańce</string>
-    <string name="profile_mounts_tamed">Okiełznane wierzchowce</string>
-    <string name="profile_loading_data">ładowanie danych uczestnika.</string>
-    <string name="profile_send_message_to">Wyślij wiadomość do %s</string>
-    <string name="profile_message_sent_to">Wiadomość wysłana do %s</string>
-    <string name="profile_level">Poziom:</string>
-    <string name="profile_class_bonus">Premia klasowa:</string>
-    <string name="profile_allocated">Umieszczone:</string>
-    <string name="profile_boosts">Doładowania:</string>
-    <string name="profile_private_message">Wiadomość prywatna</string>
-    <string name="profile_achievements">Osiągnięcia</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">Zamknij</string>
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Chowańce i Wierzchowce</string>
+    <string name="profile_pets_found">Znalezione chowańce</string>
+    <string name="profile_mounts_tamed">Okiełznane wierzchowce</string>
+    <string name="profile_loading_data">ładowanie danych uczestnika.</string>
+    <string name="profile_send_message_to">Wyślij wiadomość do %s</string>
+    <string name="profile_message_sent_to">Wiadomość wysłana do %s</string>
+    <string name="profile_level">Poziom:</string>
+    <string name="profile_class_bonus">Premia klasowa:</string>
+    <string name="profile_allocated">Umieszczone:</string>
+    <string name="profile_boosts">Doładowania:</string>
+    <string name="profile_private_message">Wiadomość prywatna</string>
+    <string name="profile_achievements">Osiągnięcia</string>
+    <string name="profile_achievement_ok">OK</string>
+    <string name="profile_qrcode_close">Zamknij</string>
+
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-pl/strings.tutorial.xml b/Habitica/res/values-pl/strings.tutorial.xml
index 4ccc6adaf..3c1ca50f0 100644
--- a/Habitica/res/values-pl/strings.tutorial.xml
+++ b/Habitica/res/values-pl/strings.tutorial.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_tasks_complete">To wszystko na razie. Jeżeli potrzebujesz przypomnienia, sprawdź sekcję FAQ.</string>
-  <string name="tutorial_equipment">Tu pojawia się zakupiony ekwipunek. Wyposażenie Bojowe wpływa na Twoje statystyki, a Kostium (o ile włączony) na wygląd Twojego awatara.</string>
-  <string name="tutorial_items">Zbieraj przedmioty kończąc zadania i zdobywając poziomy. Stuknij przedmiot, żeby go użyć!</string>
-  <string name="tutorial_pets">Kończąc zadania w prawdziwym świecie, masz szansę znalezienia losowych jaj i eliksirów. Połącz je, aby wykluć chowańce.</string>
-  <string name="tutorial_skills">Umiejętności to specjalne zdolności, które mają potężne efekty! Stuknij umiejętność, aby jej użyć. To kosztuje Mana (niebieski pasek), którą zyskujesz zaglądając tu codziennie i kończąc zadania w prawdziwym świecie. Aby dowiedzieć się więcej, zaglądnij do FAQ w menu!</string>
-  <string name="tutorial_party">Tutaj Ty i Twoi przyjaciele pilnujecie wzajemnie swoich celów i walczycie z potworami poprzez swoje zadania!</string>
-  <string name="tutorial_tavern">Witaj w Karczmie - publicznym czacie dla wszystkich grup wiekowych! Możecie tu rozmawiać o produktywności i zadawać pytania. Miłej zabawy!</string>
-  <string name="tutorial_classes">Wybierz, czy zostać Wojownikiem, Magiem, Uzdrowicielem, czy Łotrzykiem! Każda klasa ma unikalny zestaw wyposażenia i umiejętności. By dowiedzieć się więcej, stuknij (?) !</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_tasks_complete">To wszystko na razie. Jeżeli potrzebujesz przypomnienia, sprawdź sekcję FAQ.</string>
+  <string name="tutorial_equipment">Tu pojawia się zakupiony ekwipunek. Wyposażenie Bojowe wpływa na Twoje statystyki, a Kostium (o ile włączony) na wygląd Twojego awatara.</string>
+  <string name="tutorial_items">Zbieraj przedmioty kończąc zadania i zdobywając poziomy. Stuknij przedmiot, żeby go użyć!</string>
+  <string name="tutorial_pets">Kończąc zadania w prawdziwym świecie, masz szansę znalezienia losowych jaj i eliksirów. Połącz je, aby wykluć chowańce.</string>
+  <string name="tutorial_skills">Umiejętności to specjalne zdolności, które mają potężne efekty! Stuknij umiejętność, aby jej użyć. To kosztuje Mana (niebieski pasek), którą zyskujesz zaglądając tu codziennie i kończąc zadania w prawdziwym świecie. Aby dowiedzieć się więcej, zaglądnij do FAQ w menu!</string>
+  <string name="tutorial_party">Tutaj Ty i Twoi przyjaciele pilnujecie wzajemnie swoich celów i walczycie z potworami poprzez swoje zadania!</string>
+  <string name="tutorial_tavern">Witaj w Karczmie - publicznym czacie dla wszystkich grup wiekowych! Możecie tu rozmawiać o produktywności i zadawać pytania. Miłej zabawy!</string>
+  <string name="tutorial_classes">Wybierz, czy zostać Wojownikiem, Magiem, Uzdrowicielem, czy Łotrzykiem! Każda klasa ma unikalny zestaw wyposażenia i umiejętności. By dowiedzieć się więcej, stuknij (?) !</string>
+</resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 358271d13..8d4e74492 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -1,514 +1,514 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Odśwież</string>
-  <string name="XP_default">Doświadczenie</string>
-  <string name="HP_default">Zdrowie</string>
-  <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Preferencje nie mogą być wczytane z kodu kreskowego</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Ustawienia</string>
-  <string name="SP_address_hint">Domyślny serwer</string>
-  <string name="SP_userID_title">Identyfikator użytkownika</string>
-  <string name="SP_userID_summary">Twój identyfikator</string>
-  <string name="SP_APIToken_title">Token API</string>
-  <string name="SP_APIToken_summary">Twój Token API</string>
-  <string name="Language_title">Język</string>
-  <string name="Language_summary">Zmień język Habitici</string>
-  <string name="SP_user_qr_code">Twój kod QR</string>
-  <string name="PS_contact_title">Skontaktuj się ze mną</string>
-  <string name="unknown_error">Wystąpił błąd...</string>
-  <string name="pref_account_header">Konto</string>
-  <string name="pref_first_day_of_the_week_title">Pierwszy Dzień Tygodnia</string>
-  <string name="pref_first_day_of_the_week_summary">Pierwszy dzień tygodnia we wszystkich kalendarzach</string>
-  <string name="pref_reminder_header">Przypominienie</string>
-  <string name="pref_reminder_checkbox">Aktywuj przypomnienie</string>
-  <string name="pref_reminder_picker">Ustaw czas przypomnienia</string>
-  <string name="pref_cds_header">Własny początek dnia</string>
-  <string name="pref_cds_picker">Ustaw czas własnego początku dnia</string>
-  <string name="pref_push_notifications_checkbox">Powiadomienia użytkownika</string>
-  <string name="push_notifications">Powiadomienia</string>
-  <string name="push_notifications_sum">Ustaw swoje ustawienia powiadomień push</string>
-  <string name="preference_push_you_won_challenge">Ukończono wyzwanie!</string>
-  <string name="preference_push_received_a_private_message">Otrzymano prywatną wiadomość</string>
-  <string name="preference_push_gifted_gems">Otrzymałeś diamenty</string>
-  <string name="preference_push_gifted_subscription">Otrzymałeś subskrypcję</string>
-  <string name="preference_push_invited_to_party">Otrzymano zaproszenie do drużyny</string>
-  <string name="preference_push_invited_to_guild">Otrzymano zaproszenie do gildii</string>
-  <string name="preference_push_your_quest_has_begun">Twoja misja się rozpoczęła</string>
-  <string name="preference_push_invited_to_quest">Zaproszono Cię na misję</string>
-  <!--Adding tasks-->
-  <string name="task_value">Wartość</string>
-  <string name="new_todo">Nowe Do-Zrobienia</string>
-  <string name="new_reward">Nowa nagroda</string>
-  <string name="new_daily">Nowe codzienne</string>
-  <string name="new_habit">Nowy nawyk</string>
-  <string name="action_edit">Edytuj</string>
-  <string name="action_delete">Usuń</string>
-  <string name="action_cancel">Anuluj</string>
-  <string name="login_btn">Logowanie</string>
-  <string name="register_btn">Rejestracja</string>
-  <string name="username">Nazwa użytkownika</string>
-  <string name="email_username">E-mail lub nazwa użytkownika</string>
-  <string name="password">Hasło</string>
-  <string name="emailAddress">Adres e-mail</string>
-  <string name="confirmpassword">Potwierdź hasło</string>
-  <string name="logout">Wyloguj</string>
-  <string name="logout_description">Wyloguj się</string>
-  <string name="account_details_sum">Sprawdź szczegóły swojego konta</string>
-  <string name="account_details">Szczegóły konta</string>
-  <string name="LoginActivityName">Witaj</string>
-  <string name="string_revive">Odrodzenie</string>
-  <string name="please_connect">Proszę zaloguj się przez aplikację przed użyciem widgetu</string>
-  <string name="about.title">O programie</string>
-  <string name="about.libraries">Biblioteki</string>
-  <string name="about.versionhistory">Historia wersji</string>
-  <string name="about.habitica_open_source">Habitica jest dostępna jako otwarte oprogramowanie na platformie Github</string>
-  <string name="about.rate_our_app">Oceń aplikację</string>
-  <string name="about.give_us_feedback">Prześlij nam opinię!</string>
-  <string name="about.bugreport">Zgłoś błąd</string>
-  <string name="about.source_code">Kod źródłowy</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Błąd połączenia</string>
-  <string name="network_error_no_network_body">Nie masz połączenia z internetem.</string>
-  <string name="internal_error_api">Wygląda na to, że mamy problem z serwerem. Spróbuj później.</string>
-  <string name="authentication_error_title">Błąd autentykacji</string>
-  <string name="authentication_error_body">Twoja nazwa użytkownika lub hasło są niepoprawne.</string>
-  <string name="login_validation_error_title">Błąd walidacji</string>
-  <string name="login_validation_error_fieldsmissing">Musisz wypełnić wszystkie pola.</string>
-  <string name="save_changes">Zapisz</string>
-  <string name="copy">Kopiuj</string>
-  <string name="notes">Notatki</string>
-  <string name="text">Tekst</string>
-  <string name="difficulty">Trudność</string>
-  <string name="tags">Tagi</string>
-  <string name="trivial">Trywialny</string>
-  <string name="easy">Łatwy</string>
-  <string name="medium">Średni</string>
-  <string name="hard">Trudny</string>
-  <string name="start_date">Data rozpoczęcia</string>
-  <string name="positive_habit_form">Pozytywne ( + )</string>
-  <string name="negative_habit_form">Negatywne ( - )</string>
-  <string name="checklist">Lista</string>
-  <string name="reminders">Przypomnienia</string>
-  <string name="actions">Akcje</string>
-  <string name="attributes">Atrybuty</string>
-  <string name="physical">Fizyczne</string>
-  <string name="mental">Umysłowe</string>
-  <string name="social">Społeczne</string>
-  <string name="other">Pozostałe</string>
-  <string name="frequency">Częstotliwość</string>
-  <string name="frequency_weekly">W konkretne dni tygodnia</string>
-  <string name="frequency_daily">Co X dni</string>
-  <string name="monday">Poniedziałek</string>
-  <string name="tuesday">Wtorek</string>
-  <string name="wednesday">Środa</string>
-  <string name="thursday">Czwartek</string>
-  <string name="friday">Piątek</string>
-  <string name="saturday">Sobota</string>
-  <string name="sunday">Niedziela</string>
-  <string name="levelup_header">Zyskałeś Poziom!</string>
-  <string name="levelup_detail">Wypełniając życiowe cele, zyskałeś Poziom %1$d!</string>
-  <string name="levelup_health">Zostałeś w pełni uzdrowiony!</string>
-  <string name="levelup_button">Hurra!</string>
-  <string name="faint_subtitle">Nie rozpaczaj!</string>
-  <string name="faint_penalty_body">Straciłeś Poziom, Złoto i jedną część Wyposażenia, ale możesz je odzyskać dzięki ciężkiej pracy! Powodzenia - dasz radę.</string>
-  <string name="faint_header">Możesz stracić całe Zdrowie!</string>
-  <string name="faint_button">Uzupełnij Zdrowie &amp; Spróbuj jeszcze raz</string>
-  <string name="filter">Filtr</string>
-  <string name="profile_image">Obrazek profilowy</string>
-  <string name="mana_price_button">%d PM</string>
-  <string name="used_skill">Użyłeś %1$s za %2$d pkt. many.</string>
-  <string name="used_skill_without_mana">Użyto %1$s.</string>
-  <string name="new_checklist_item">nowa część zadania</string>
-  <string name="add_checklist_item">Dodaj</string>
-  <string name="reminder_title">Pamiętaj o odhaczaniu Codziennych!</string>
-  <string name="skill_progress_title">Użycie umiejętności</string>
-  <string name="coming_soon">Wkrótce dostępne</string>
-  <string name="chat_flag_confirmation">Jesteś pewny że chcesz zgłosić tą wiadomość z powodu naruszeń?</string>
-  <string name="flag_confirm">Oznacz wiadomość</string>
-  <string name="unlock_lvl_11">Odblokuj na poziomie 11</string>
-  <string name="no_party_message">Nie jesteś w drużynie. Żeby dołączyć do drużyny odwiedź stronę internetową.</string>
-  <string name="forgot_pw_btn">Zapomniane hasło</string>
-  <string name="forgot_pw_tv">Zapomniane hasło? Użyj mobilnej strony internetowej.</string>
-  <string name="tavern.inn.checkOut">Reaktywuj swoje codzienne</string>
-  <string name="tavern.inn.rest">Zapauzuj swoje codzienne</string>
-  <string name="reward.dialog.buy">Kup</string>
-  <string name="reward.dialog.dismiss">Anuluj</string>
-  <string name="party">Drużyna</string>
-  <string name="chat">Czat</string>
-  <string name="members">Członkowie</string>
-  <string name="habits">Nawyki</string>
-  <string name="dailies">Codzienne</string>
-  <string name="todos">Do zrobienia</string>
-  <string name="rewards">Nagrody</string>
-  <string name="taskform.delete.title">Jesteś pewien?</string>
-  <string name="taskform.delete.message">Czy na pewno chcesz usunąć?</string>
-  <string name="yes">Tak</string>
-  <string name="no">Nie</string>
-  <string name="quest">Misja</string>
-  <string name="avatar_body">Postura</string>
-  <string name="avatar_hair">Włosy</string>
-  <string name="avatar_shirt">Koszulka</string>
-  <string name="avatar_skin">Skóra</string>
-  <string name="avatar_ears">Zwierzęce uszy</string>
-  <string name="avatar_base">Spód</string>
-  <string name="avatar_color">Kolor</string>
-  <string name="avatar_beard">Broda</string>
-  <string name="avatar_mustache">Wąsy</string>
-  <string name="avatar_flower">Kwiatek</string>
-  <string name="avatar_bangs">Grzywka</string>
-  <string name="avatar_nothing">Niewybrano</string>
-  <string name="avatar_size">Rozmiar</string>
-  <string name="avatar_size_slim">Szczupła</string>
-  <string name="avatar_size_broad">Krzepka</string>
-  <string name="avatar_background">Obrazek</string>
-  <string name="purchase_customization">Ustawienia zakupów</string>
-  <string name="purchase_set_button">Odblokuj zestaw za %d gemów</string>
-  <string name="purchase_button">Kup</string>
-  <string name="purchase_set_title">Kup zestaw %s</string>
-  <string name="due_date">Termin</string>
-  <string name="quest.accept">Akceptuj</string>
-  <string name="quest.reject">Odrzuć</string>
-  <string name="quest.begin">Rozpocznij Quest</string>
-  <string name="quest.cancel">Anuluj Zaproszenie</string>
-  <string name="quest.abort">Przerwij Quest</string>
-  <string name="quest.leave">Opuść Misję</string>
-  <string name="quest.pending">Oczekujące</string>
-  <string name="quest.accepted">Zaakceptowane</string>
-  <string name="quest.rejected">Odrzucone</string>
-  <string name="quest.participants">Uczestnicy</string>
-  <string name="version_info">Wersja %1$s (%2$d)</string>
-  <string name="sidebar_help">Pomoc i FAQ</string>
-  <string name="complete_tutorial">Jasne!</string>
-  <string name="dismiss_tutorial">Przypomnij mi później</string>
-  <string name="intro_1_subtitle">Witaj w</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_2_subtitle">Postęp w grze</string>
-  <string name="intro_2_title">Postęp w życiu</string>
-  <string name="intro_2_description">Odblokuj cechy w grze przez wykonywanie twoich zadań z realnego życia. Zdobywaj broń, chowańce i znacznie więcej za realizacje swoich celów.</string>
-  <string name="intro_3_description">Zmierzaj do swoich celów z pomocą przyjaciół. Wspierajcie się wzajemnie w życiu i w walce, aby wspólnie się udoskonalać!</string>
-  <string name="intro_finish_button">Zaczynajmy!</string>
-  <string name="previous_button">Poprzedni</string>
-  <string name="next_button">Następny</string>
-  <string name="skip_button">Pomiń</string>
-  <string name="setup_welcome_description">Witaj w Habitice, gdzie postęp w grze ulepszy Twoje życie! Osiągając cele w prawdziwym świecie, odblokowujesz ekwipunek, chowańce, misje i wiele więcej.</string>
-  <string name="setup_welcome_title">Witaj</string>
-  <string name="avatar_setup_description">Więc, jak chciałbyś wyglądać. Nie obawiaj się, możesz to później zmienić.</string>
-  <string name="setup_group_work">Praca</string>
-  <string name="setup_group_exercise">Ćwiczenia</string>
-  <string name="setup_group_health">Zdrowie</string>
-  <string name="setup_group_school">Szkoła</string>
-  <string name="setup_group_teams">Zespoły</string>
-  <string name="setup_group_chores">Obowiązki domowe</string>
-  <string name="setup_group_creativity">Twórczość</string>
-  <string name="setup_task_work_1">Przeglądnąć e-maile</string>
-  <string name="setup_task_work_2">Najważniejsze zadanie</string>
-  <string name="setup_task_work_3">Projekt zawodowy</string>
-  <string name="setup_task_exercise_1">10 min cardio</string>
-  <string name="setup_task_exercise_2">Rozciągnąć się</string>
-  <string name="setup_task_exercise_3">Ustalić plan ćwiczeń</string>
-  <string name="setup_task_healthWellness_1">Jeść zdrowe / śmieciowe jedzenie</string>
-  <string name="setup_task_healthWellness_2">Używać nitki dentystycznej</string>
-  <string name="setup_task_healthWellness_3">Umówić się na wizytę u lekarza</string>
-  <string name="setup_task_school_1">Uczyć się / odkładać naukę</string>
-  <string name="setup_task_school_2">Odrobić zadanie domowe</string>
-  <string name="setup_task_school_3">Skończyć projekt szkolny</string>
-  <string name="setup_task_teams_1">Sprawdzić, co z zespółem</string>
-  <string name="setup_task_teams_2">Przekazać najnowsze informacje</string>
-  <string name="setup_task_teams_3">Ukończyć projekt zespołowy</string>
-  <string name="setup_task_chores_1">10 minut sprzątania</string>
-  <string name="setup_task_chores_2">Umyć naczynia</string>
-  <string name="setup_task_chores_3">Posprzątać w szafie</string>
-  <string name="setup_task_creativity_1">Studiować mistrzostwo rzemiosła</string>
-  <string name="setup_task_creativity_2">Pracować nad twórczym projektem</string>
-  <string name="setup_task_creativity_3">Ukończyć twórczy projekt</string>
-  <string name="gem.purchase.support">Chcesz nam pomóc w utrzymaniu Habitiki? Możesz wesprzeć deweloperów kupując Klejnoty!\n\nZa Klejnoty można kupować zabawne dodatki do konta, takie jak:\n\n - Fajne kostiumy dla Twojego awatara\n - Fantastyczne tła\n - Ciekawe misje, w których nagrodą są jaja chowańców\n - Możliwość zmiany klasy przed osiągnięciem poziomu 100\n\nStukrotne dzięki za pomaganie nam w czynieniu Habitiki najlepszą, jaka może być. Twoja pomoc wiele dla nas znaczy!</string>
-  <string name="my_guilds">Moje Gildie</string>
-  <string name="public_guilds">Publiczne Gildie</string>
-  <string name="guild">Gildia</string>
-  <string name="leave">Opuść</string>
-  <string name="join">Dołącz</string>
-  <string name="leader">Lider</string>
-  <string name="gems">Klejnoty</string>
-  <string name="copy_as_todo">Kopiuj jako Do-Zrobienia</string>
-  <string name="send_pm">Wyślij wiadomość</string>
-  <string name="flag">Oznacz</string>
-  <string name="delete">Usuń</string>
-  <string name="name">Nazwa</string>
-  <string name="description">Opis</string>
-  <string name="privacy">Prywatność</string>
-  <string name="write_message">Napisz wiadomość</string>
-  <string name="post">Wyślij</string>
-  <string name="guild_search_hint">Szukaj gildii</string>
-  <string name="todo_due">Termin: %s</string>
-  <string name="daily_streak">licznik serii: %d</string>
-  <string name="todo_has_duedate">Zdania mają termin wykonania</string>
-  <string name="battle_gear">Sprzęt Bojowy</string>
-  <string name="costume">Kostium</string>
-  <string name="outfit_head">Głowa</string>
-  <string name="outfit_headAccessory">Nakrycie Głowy</string>
-  <string name="outfit_eyewear">Na oczy</string>
-  <string name="outfit_armor">Zbroja</string>
-  <string name="outfit_back">Plecy</string>
-  <string name="outfit_body">Postura</string>
-  <string name="outfit_shield">Tarcza</string>
-  <string name="outfit_weapon">Broń</string>
-  <string name="wear_costume">Użyj kostiumu</string>
-  <string name="equipped">W użyciu</string>
-  <string name="quest_cancel_message">Jesteś pewien że chcesz przerwać quest? Quest zostanie przerwany dla wszystkich uczestników. Zwołujący quest odzyska skrypt (quest scroll).</string>
-  <string name="quest.invitation">Zaproszenie do questa.</string>
-  <string name="quest_begin_message">Czy jesteś pewien, ze chcesz zacząć misję? Gdy zostanie aktywowana, żaden dodatkowy członek drużyny nie będzie mógł do niej dołączyc.</string>
-  <string name="quest.invitation.text">Zostałeś zaproszony do udziału w misji!</string>
-  <string name="ago_1day">1 dzień temu</string>
-  <string name="ago_days">%d dni temu</string>
-  <string name="ago_1Minute">1 minutę temu</string>
-  <string name="ago_minutes">%d minut temu</string>
-  <string name="ago_hours">%d godzin temu</string>
-  <string name="ago_1hour">1 godzinę temu</string>
-  <string name="today">Dzisiaj</string>
-  <string name="sidebar_items">Przedmioty</string>
-  <string name="eggs">Jaja</string>
-  <string name="hatching_potions">Eliksiry wyklucia</string>
-  <string name="food">Jedzonko</string>
-  <string name="quests">Misje</string>
-  <string name="pets">Zwierzaki</string>
-  <string name="mounts">Wierzchowce</string>
-  <string name="armoireEquipment">Znalazłeś element rzadkiego Ekwipunku w Skrzyni: %s! Super!</string>
-  <string name="armoireFood">Przeszukujesz Skrzynię i znajdujesz %1$s %2$s. Co to tam robi?</string>
-  <string name="armoireExp">Mocujesz się ze Skrzynią i zyskujesz Doświadczenie. A masz!</string>
-  <string name="armoireNotesFull">Otwórz Skrzynię żeby losowo otrzymać specjalne Wyposażenie, Doświadczenie lub jedzenie! Pozostało elementów : %d</string>
-  <string name="armoireLastItem">Znalazłeś ostatni element rzadkiego Wyposażenia w Zaklętej Skrzyni.</string>
-  <string name="armoireNotesEmpty">Skrzynia otrzyma nowe Wyposażenie w pierwszym tygodniu każdego miesiąca. Do tego czasu klikaj aby otrzymać Doświadczenie i Jedzenie!</string>
-  <string name="sell">Sprzedaj (%d Złoto)</string>
-  <string name="hatch_with_potion">Wykluj za pomocą mikstury</string>
-  <string name="feed_to_pet">Nakarm chowańca</string>
-  <string name="hatch_egg">Wykluj za pomocą jaja</string>
-  <string name="invite_party">Zaproś drużynę</string>
-  <string name="dialog_feeding">Nakarm %1$s %2$s</string>
-  <string name="use_animal">Użyj</string>
-  <string name="feed">Nakarm</string>
-  <string name="hatch_with">Wykluj za pomocą %s</string>
-  <string name="hatched_pet_title">Wyklułeś/as %1$s %2$s!</string>
-  <string name="close">Zamknij</string>
-  <string name="share">Podziel się</string>
-  <string name="notification_pet_fed">Nakarmiłeś/aś %1$s %2$s!</string>
-  <string name="notification_purchase">%s zakupiony</string>
-  <string name="sectionpets">Podstawowe chowańce</string>
-  <string name="sectionpremiumPets">Magiczne chowańce</string>
-  <string name="sectionquestPets">Chowańce z misji</string>
-  <string name="sectionspecialPets">Rzadkie chowańce</string>
-  <string name="sectionmounts">Podstawowe wierzchowce</string>
-  <string name="sectionpremiumMounts">Magiczne wierzchowce</string>
-  <string name="sectionquestMounts">Wierzchowce z misji</string>
-  <string name="sectionspecialMounts">Rzadkie wierzchowce</string>
-  <string name="world_quest">Zadanie ogólnoświatowe</string>
-  <string name="inn_description">Odpoczywaj w Karczmie aby zapobiec obrażeniu z niewykonanych zadań codziennych w ciągu nocy! (Notatka: nie zapobiega przed obrażeniami otrzymanymi od Bossa ogólnoświatowego.)</string>
-  <string name="empty_items">Nie posiadasz %s</string>
-  <string name="user_level">poz %d</string>
-  <string name="user_level_with_class">poz %1$d %2$s</string>
-  <string name="warrior">Wojownik</string>
-  <string name="rogue">Łotrzyk</string>
-  <string name="mage">Mag</string>
-  <string name="healer">Uzdrowiciel</string>
-  <string name="warrior_description">Wojownicy mają częstsze i lepsze \"trafienia krytyczne\", które losowo dają Złoto, Doświadczenie, i szansę na zdobycz za odznaczenie zadania. Zadają także ciężkie obrażenia bossom. Graj jako Wojownik jeśli motywują Cię nieprzewidywalne nagrody, lub jeśli chcesz niszczyć bossów w Misjach!</string>
-  <string name="mage_description">Magowie uczą się sprawnie, zyskując Doświadczenie i Poziomy szybciej niż inne klasy. Dostają także dużo Many na specjalne umiejętności. Graj jako Mag jeśli lubisz elementy gry taktycznej w Habit, lub jeśli jesteś silnie motywowany przez zdobywanie poziomów i odblokowywanie zaawansowanych aspektów gry!</string>
-  <string name="rogue_description">Łotrzyki uwielbiają gromadzić bogactwa, zyskując więcej Złota niż inni, oraz są adeptami w znajdowaniu losowych rzeczy. Ich umiejętność skradania pozwala im uniknąć konsekwencji pominięcia Codziennych. Graj jako Łotrzyk jeśli motywują Cię Nagrody i Osiągnięcia, walczenie o skarby i odznaki!</string>
-  <string name="healer_description">Medycy są odporni na obrażenia, i przedłużają tą ochronę na innych. Pominięte Codzienne i złe Nawyki nie robią na nich wrażenia, mają także sposoby na odzyskanie Zdrowia po porażce. Graj jako Medyk jeśli lubisz pomagać innym w Drużynie, lub jeśli koncepcja oszukania Śmierci dzięki ciężkiej pracy jest dla ciebie inspirująca!</string>
-  <string name="select_class">Wybierz klasę postaci</string>
-  <string name="opt_out_class">Wycofaj się</string>
-  <string name="opt_out_description">Nie zależy ci na klasach? Chcesz wybrać później? Wycofaj się - będziesz wojownikiem bez specjalnych umiejętności. Możesz przeczytać o systemie klas później na wiki i włączyć klasy w każdej chwili.</string>
-  <string name="class_confirmation">Jesteś pewien, że chcesz być %s?</string>
-  <string name="class_changed">Jesteś teraz %s!</string>
-  <string name="class_changed_description">Masz nowe domyślne wyposażenie bojowe, które możesz zmienić pod Wyposażeniem!</string>
-  <string name="choose_class">Wybierz klasę postaci</string>
-  <string name="dialog_go_back">Wróć</string>
-  <string name="opt_out_confirmation">Czy na pewno chcesz wyjść?</string>
-  <string name="change_class">Zmień swoją klasę</string>
-  <string name="change_class_description">Zmień klasę i odzyskaj punkty atrybutów za 3 kryształy. Możesz przedzielić punkty atrybutów poprzez stronę internetową.</string>
-  <string name="enable_class">Odblokuj System Klas</string>
-  <string name="changing_class_progress">Zmiana Klasy</string>
-  <string name="by_email">Przez e-mail</string>
-  <string name="invite_existing_users">Zaproś istniejących użytkowników</string>
-  <string name="send">Wyślij</string>
-  <string name="invite">Zaproś znajomych</string>
-  <string name="invite_id_description">Jeśli Twoi znajomi używają już Habitiki, zaproś ich za pomocą ID Użytkownika tutaj.</string>
-  <string name="invite_email_description">Jeśli przyjaciel dołączył do Habitiki przez Twojego maila, zostanie automatycznie dodany do Twojej drużyny!</string>
-  <string name="add_invites">Dodaj zaproszenia</string>
-  <string name="user_id">ID Użytkownika</string>
-  <string name="email">Email</string>
-  <string name="invite_users">Zaproś do drużyny</string>
-  <string name="share_using">Udostępnij używanie</string>
-  <string name="share_levelup">Uzyskałem poziom %d w Habitice dzięki poprawie moich życiowych nawyków!</string>
-  <string name="share_hatched">Właśnie wyklułem chowańca %1$s %2$s w Habitice dzięki wypełnianiu życiowych zadań!</string>
-  <string name="share_raised">Właśnie zyskałem wierzchowca %1$s %2$s w Habitice dzięki wypełnianiu życiowych zadań!</string>
-  <string name="open_in_store">Otwórz w sklepie Google Play</string>
-  <string name="change_class_confirmation">Jesteś pewien, że chcesz zmienić klasę? Będzie to kosztować 3 kryształy.</string>
-  <string name="change_class_equipment_warning">Ostrzeżenie: Nie będziesz nie będziesz mógł kupić wyposażenia dla klasy: %s</string>
-  <string name="leaderMessage">Wiadomość od %1$s</string>
-  <string name="leaderName">Lider: %1$s</string>
-  <string name="confirm">Potwierdź</string>
-  <string name="market">Sklep</string>
-  <string name="timeTravelers">Podróżnicy w czasie</string>
-  <string name="seasonalShop">Sklep sezonowy</string>
-  <string name="empty_inbox">Nie masz żadnych wiadomości. Możesz wysłać użytkownikowi nową wiadomość za pomocą ich publicznych wiadomości!</string>
-  <string name="party_invite">Odblokuj poprzez zapraszanie przyjaciół</string>
-  <string name="no_gold">Niewystarczająca ilość złota</string>
-  <string name="no_potion">Nie potrzebujesz kupować eliksiru uzdrawiającego</string>
-  <string name="successful_purchase">%1$s jest w Twoim posiadaniu</string>
-  <string name="purchase_confirmation_title">Potwierdź zakup</string>
-  <string name="confirm_purchase_text">Zakup %1$s za %2$s %3$s</string>
-  <string name="gem">diament</string>
-  <string name="hourglass">klepsydra</string>
-  <string name="hourglasses">klepsydry</string>
-  <string name="gold_singular">złoto</string>
-  <string name="gold_plural">złoto</string>
-  <string name="chat_message_copied">Wiadomość skopiowana do schowka</string>
-  <string name="copy_chat_message">Kopiuj do schowka</string>
-  <string name="edit_tag_title">Edytuj tag</string>
-  <string name="edit_tag_btn_edit">Edytuj</string>
-  <string name="edit_tag_btn_done">Zrobione</string>
-  <string name="edit_tag_btn_delete">Usuń</string>
-  <string name="confirm_delete_tag_title">Jesteś pewien?</string>
-  <string name="confirm_delete_tag_message">Czy na pewno chcesz usunąć?</string>
-  <string name="filter_drawer_edit_tags">Edytuj tagi</string>
-  <string name="filter_drawer_filter_tags">Filtruj po tagach</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Czy ktoś zaprosił Cię przy pomocy tego kodu QR?</string>
-  <string name="qr_save_message">Kod QR zapisany w</string>
-  <string name="qr_dialogue_title">Twój kod QR</string>
-  <string name="download">Pobierz</string>
-  <string name="send_new_message">Wyślij nową wiadomość</string>
-  <string name="choose_recipient_title">Wybierz odbiorcę wiadomości</string>
-  <string name="action_continue">Kontynuuj</string>
-  <string name="scan_qr_code">Przeskanuj kod QR</string>
-  <string name="enter_recipient_uuid">Wpisz ID odbiorcy</string>
-  <string name="invited_to_party">Zostałeś zaproszony do drużyny!</string>
-  <string name="stats_widget_label">Statystyki Habitiki</string>
-  <string name="add_task">Dodaj Zadanie</string>
-  <string name="add_habit">Dodaj Nawyk</string>
-  <string name="add_daily">Dodaj Codzienne</string>
-  <string name="add_todo">Dodaj Do-Zrobienia</string>
-  <string name="add_reward">Dodaj Nagrodę</string>
-  <string name="all_dailies_completed">Wykonałeś wszystkie codzienne. Brawo!</string>
-  <string name="widget_habit_button">Nawyk Habitiki</string>
-  <string name="widget_dailies">Codzienne Habitiki</string>
-  <string name="widget_todo_list">Lista Do-Zrobienia Habitiki</string>
-  <string name="widget_add_task">Dodaj zadanie do Habitiki</string>
-  <string name="google_services_missing">Nie znaleziono usługi Google Play.</string>
-  <string name="gem.purchase.toolbartitle">Zamów</string>
-  <string name="gem.purchase.title">Kupując klejnoty, wspierasz deweloperów Habitiki i pozwalasz projektowi istnieć</string>
-  <string name="gem.purchase.subtitle">Klejnoty pozwalają dokupić ekstra dodatki do konta, na przykład:</string>
-  <string name="gem.purchase.listitem1">Świetne kostiumy dla awatara</string>
-  <string name="gem.purchase.listitem2">Genialne tła</string>
-  <string name="gem.purchase.listitem3">Zadania, w których nagrodą są jaja</string>
-  <string name="gem.purchase.listitem4">Możliwość zmiany klasy przed osiągnięciem 100. poziomu</string>
-  <string name="support_habitica">Wesprzyj Habitikę</string>
-  <string name="skill_transformation_use">użyj</string>
-  <string name="hatching_market_info">Nie znajdujesz poszukiwanych prezentów? Sprawdź na Targu!</string>
-  <string name="feeding_market_info">Szukasz innego pokarmu? Kup je na Targu!</string>
-  <string name="open_market">Otwórz Targ</string>
-  <string name="cds_description">Twoje codzienne zostaną zresotowane, podczas pierwszego uruchomienia Habitica po %1$s. Upewnij się, że ukończyłeś swoje codzienne przed upływem tego czasu.</string>
-  <string name="AudioTheme_title">Temat dźwiękowy</string>
-  <string name="AudioTheme_summary">Zmień temat dźwiękowy Habitiki</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">Do zobaczenia jutro </string>
-  <string name="belongs_to_challenge">Należy do wyzwania</string>
-  <string name="has_reminder">Ma powiadomienie</string>
-  <string name="has_tag">Ma tag</string>
-  <string name="subscribe.title">Subskrypcja wspiera deweloperów i pozwala utrzymać Habitikę.</string>
-  <string name="subscribe_prompt">Zostań abonentem i uzyskuj te użyteczne korzyści:</string>
-  <string name="subscribe.listitem1">Kup klejnoty za złoto</string>
-  <string name="subscribe.listitem2">Ekskluzywne przedmioty miesiąca </string>
-  <string name="subscriptions">Subskrypcje</string>
-  <string name="subscription_duration">Powtarzaj co %s</string>
-  <string name="subscribe">Subskrybuj</string>
-  <string name="subscription_hourglasses">+%d Mistycznej Klepsydry</string>
-  <string name="payment_method">Metoda płatności</string>
-  <string name="subscription">Subskrypcja</string>
-  <string name="active">Aktywne</string>
-  <string name="cancel_subscription">Anuluj Subskrypcję</string>
-  <string name="cancel_subscription_google.description">Nie chcesz dłużej subskrypcji? Możesz z niej zrezygnować w sekcji \"Moje Aplikacje\" Google Play Store.</string>
-  <string name="visit_habitica_website">Odwiedź Stronę Habitiki</string>
-  <string name="current_bonuses">Obecne Dodatki</string>
-  <string name="months_subscribed">Miesięcy subskrypcji</string>
-  <string name="inactive">Nieaktywne</string>
-  <string name="one_month">1 Miesiąc</string>
-  <string name="months">%d Miesięcy</string>
-  <string name="month">miesiąc</string>
-  <string name="three_months">3 miesiące</string>
-  <string name="six_months">6 miesięcy</string>
-  <string name="twelve_months">12 miesięcy</string>
-  <string name="subscription_status">Status Subskrypcji</string>
-  <string name="byLeader">przez %s</string>
-  <string name="challenge_details">Szczegóły wyzwania</string>
-  <string name="challenge_leave_title">Opuść wyzwanie.</string>
-  <string name="challenge_leave_text">Jesteś pewien, że chcesz opuścić wyzwanie “%s”?</string>
-  <string name="challenge_remove_tasks_title">Usuń zadania</string>
-  <string name="challenge_remove_tasks_text">Czy chcesz usunąć zadania</string>
-  <string name="remove_tasks">Usuń</string>
-  <string name="keep_tasks">Zachowaj</string>
-  <string name="my_challenges">Moje wyzwania</string>
-  <string name="public_challenges">Publiczne</string>
-  <string name="challenges">Wyzwania</string>
-  <string name="daily">Codzienny </string>
-  <string name="habit">Nawyk</string>
-  <string name="reward">Nagroda</string>
-  <string name="todo">Do-Zrobienia</string>
-  <string name="official">Oficjalne</string>
-  <string name="participating">Uczestnictwo </string>
-  <string name="challenge">Wyzwanie</string>
-  <string name="go_to_challenge">Idź do wyzwania </string>
-  <string name="not_part_of_a_challenge">Obecnie nie uczestniczysz w żadnym wyzwaniu!</string>
-  <string name="check_the_public_challenge_tab">Puknij zakładkę \"Publiczne\", aby znaleźć wyzwania stworzone przez innych użytkowników, które najlepiej pasują do ciebie!</string>
-  <string name="add_reminder">Dodaj przypomnienie</string>
-  <string name="warning">Uwaga</string>
-  <string name="open_settings">Otwórz ustawienia</string>
-  <string name="dont_keep_activities_warning">Wygląda, że masz aktywną opcję deweloperską \\"\"Don\'t keep Activities\"\. Obecnie powoduje ona problemy z Habitiką, dlatego też sugerujemy jej wyłączenie.</string>
-  <string name="inbox">Skrzynka odbiorcza</string>
-  <string name="FAQ">Najczęściej Zadawane Pytania</string>
-  <string name="special">Specjalne</string>
-  <string name="gem_for_gold_description">Ponieważ jesteś abonentem Habitiki, możesz co miesiąc kupić, za złoto, pewną ilość klejnotów.</string>
-  <string name="limited_count">%d zostało</string>
-  <string name="gem_shop">Diament</string>
-  <string name="mystery_item">Mistyczny Przedmiot</string>
-  <string name="open">Otwórz</string>
-  <string name="notification_mystery_item">Otwórz pudełko i znajdź %s!</string>
-  <string name="checkInRewardEarned">Zdobyłeś %1$s jako nagrodę za poświęcenie w poprawie swojego życia.</string>
-  <string name="pending_approval">oczekująca aprobata</string>
-  <string name="filters">Filtry</string>
-  <string name="done">Zrobione</string>
-  <string name="group_tasks_edit_description">Grupowe zadanie nie mogą być edytowane.</string>
-  <string name="group_tasks_edit_title">Nie możesz edytować tego zadania</string>
-  <string name="groups">Grupy</string>
-  <string name="all">Wszystkie</string>
-  <string name="none">Żadne</string>
-  <string name="owned">Posiadane</string>
-  <string name="not_owned">Nieposiadane</string>
-  <string name="new_game">Nowa\nGra</string>
-  <string name="login_btn_fb">Zaloguj z Facebookiem</string>
-  <string name="login_btn_google">Zaloguj z Google</string>
-  <string name="action_back">Wróć</string>
-  <string name="randomize">Losowy</string>
-  <string name="avatar_extras">Dodatki</string>
-  <string name="avatar_skin_color">Kolor skóry </string>
-  <string name="avatar_hair_color">Kolor włosów</string>
-  <string name="avatar_hair_bangs">Grzywka</string>
-  <string name="avatar_hair_ponytail">Koński ogon</string>
-  <string name="avatar_glasses">Okulary</string>
-  <string name="avatar_wheelchair">Wózek</string>
-  <string name="weak">Słaby</string>
-  <string name="strong">Silny</string>
-  <string name="dated">Przestarzały</string>
-  <string name="completed">Ukończone</string>
-  <string name="setuP_group_other">Pozostałe</string>
-  <string name="empty_title_habits">Nie posiadasz żadnych nawyków</string>
-  <string name="empty_description_habits">Nawyki są zadaniami nie posiadającymi sztywnego harmonogramu. Możesz je odhaczać wiele razy dziennie, lub w ogóle.</string>
-  <string name="empty_title_dailies">Nie posiadasz żadnych codziennych</string>
-  <string name="empty_description_dailies">Codzienne są zadaniami regularnie się powtarzającymi. Wybierz pasujący Ci harmonogram!</string>
-  <string name="empty_title_todos">Nie posiadasz żadnych Do-Zrobienia</string>
-  <string name="empty_description_todos">Do-Zrobienia są jednokrotnymi zadaniami. Dodaj listy kontrolne do swoich Do-Zrobienia, aby zwiększyć ich wartość.</string>
-  <string name="empty_title_rewards">Nie posiadasz żadnych nagród</string>
-  <string name="read_community_guidelines">Prosimy, przeczytaj Wytyczne Społeczności zanim umieścisz posta</string>
-  <string name="maintenance">Utrzymanie</string>
-  <string name="reload_content">Odśwież zawartość</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Odśwież</string>
+  <string name="XP_default">Doświadczenie</string>
+  <string name="HP_default">Zdrowie</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Preferencje nie mogą być wczytane z kodu kreskowego</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Ustawienia</string>
+  <string name="SP_address_hint">Domyślny serwer</string>
+  <string name="SP_userID_title">Identyfikator użytkownika</string>
+  <string name="SP_userID_summary">Twój identyfikator</string>
+  <string name="SP_APIToken_title">Token API</string>
+  <string name="SP_APIToken_summary">Twój Token API</string>
+  <string name="Language_title">Język</string>
+  <string name="Language_summary">Zmień język Habitici</string>
+  <string name="SP_user_qr_code">Twój kod QR</string>
+  <string name="PS_contact_title">Skontaktuj się ze mną</string>
+  <string name="unknown_error">Wystąpił błąd...</string>
+  <string name="pref_account_header">Konto</string>
+  <string name="pref_first_day_of_the_week_title">Pierwszy Dzień Tygodnia</string>
+  <string name="pref_first_day_of_the_week_summary">Pierwszy dzień tygodnia we wszystkich kalendarzach</string>
+  <string name="pref_reminder_header">Przypominienie</string>
+  <string name="pref_reminder_checkbox">Aktywuj przypomnienie</string>
+  <string name="pref_reminder_picker">Ustaw czas przypomnienia</string>
+  <string name="pref_cds_header">Własny początek dnia</string>
+  <string name="pref_cds_picker">Ustaw czas własnego początku dnia</string>
+  <string name="pref_push_notifications_checkbox">Powiadomienia użytkownika</string>
+  <string name="push_notifications">Powiadomienia</string>
+  <string name="push_notifications_sum">Ustaw swoje ustawienia powiadomień push</string>
+  <string name="preference_push_you_won_challenge">Ukończono wyzwanie!</string>
+  <string name="preference_push_received_a_private_message">Otrzymano prywatną wiadomość</string>
+  <string name="preference_push_gifted_gems">Otrzymałeś diamenty</string>
+  <string name="preference_push_gifted_subscription">Otrzymałeś subskrypcję</string>
+  <string name="preference_push_invited_to_party">Otrzymano zaproszenie do drużyny</string>
+  <string name="preference_push_invited_to_guild">Otrzymano zaproszenie do gildii</string>
+  <string name="preference_push_your_quest_has_begun">Twoja misja się rozpoczęła</string>
+  <string name="preference_push_invited_to_quest">Zaproszono Cię na misję</string>
+  <!--Adding tasks-->
+  <string name="task_value">Wartość</string>
+  <string name="new_todo">Nowe Do-Zrobienia</string>
+  <string name="new_reward">Nowa nagroda</string>
+  <string name="new_daily">Nowe codzienne</string>
+  <string name="new_habit">Nowy nawyk</string>
+  <string name="action_edit">Edytuj</string>
+  <string name="action_delete">Usuń</string>
+  <string name="action_cancel">Anuluj</string>
+  <string name="login_btn">Logowanie</string>
+  <string name="register_btn">Rejestracja</string>
+  <string name="username">Nazwa użytkownika</string>
+  <string name="email_username">E-mail lub nazwa użytkownika</string>
+  <string name="password">Hasło</string>
+  <string name="emailAddress">Adres e-mail</string>
+  <string name="confirmpassword">Potwierdź hasło</string>
+  <string name="logout">Wyloguj</string>
+  <string name="logout_description">Wyloguj się</string>
+  <string name="account_details_sum">Sprawdź szczegóły swojego konta</string>
+  <string name="account_details">Szczegóły konta</string>
+  <string name="LoginActivityName">Witaj</string>
+  <string name="string_revive">Odrodzenie</string>
+  <string name="please_connect">Proszę zaloguj się przez aplikację przed użyciem widgetu</string>
+  <string name="about.title">O programie</string>
+  <string name="about.libraries">Biblioteki</string>
+  <string name="about.versionhistory">Historia wersji</string>
+  <string name="about.habitica_open_source">Habitica jest dostępna jako otwarte oprogramowanie na platformie Github</string>
+  <string name="about.rate_our_app">Oceń aplikację</string>
+  <string name="about.give_us_feedback">Prześlij nam opinię!</string>
+  <string name="about.bugreport">Zgłoś błąd</string>
+  <string name="about.source_code">Kod źródłowy</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Błąd połączenia</string>
+  <string name="network_error_no_network_body">Nie masz połączenia z internetem.</string>
+  <string name="internal_error_api">Wygląda na to, że mamy problem z serwerem. Spróbuj później.</string>
+  <string name="authentication_error_title">Błąd autentykacji</string>
+  <string name="authentication_error_body">Twoja nazwa użytkownika lub hasło są niepoprawne.</string>
+  <string name="login_validation_error_title">Błąd walidacji</string>
+  <string name="login_validation_error_fieldsmissing">Musisz wypełnić wszystkie pola.</string>
+  <string name="save_changes">Zapisz</string>
+  <string name="copy">Kopiuj</string>
+  <string name="notes">Notatki</string>
+  <string name="text">Tekst</string>
+  <string name="difficulty">Trudność</string>
+  <string name="tags">Tagi</string>
+  <string name="trivial">Trywialny</string>
+  <string name="easy">Łatwy</string>
+  <string name="medium">Średni</string>
+  <string name="hard">Trudny</string>
+  <string name="start_date">Data rozpoczęcia</string>
+  <string name="positive_habit_form">Pozytywne ( + )</string>
+  <string name="negative_habit_form">Negatywne ( - )</string>
+  <string name="checklist">Lista</string>
+  <string name="reminders">Przypomnienia</string>
+  <string name="actions">Akcje</string>
+  <string name="attributes">Atrybuty</string>
+  <string name="physical">Fizyczne</string>
+  <string name="mental">Umysłowe</string>
+  <string name="social">Społeczne</string>
+  <string name="other">Pozostałe</string>
+  <string name="frequency">Częstotliwość</string>
+  <string name="frequency_weekly">W konkretne dni tygodnia</string>
+  <string name="frequency_daily">Co X dni</string>
+  <string name="monday">Poniedziałek</string>
+  <string name="tuesday">Wtorek</string>
+  <string name="wednesday">Środa</string>
+  <string name="thursday">Czwartek</string>
+  <string name="friday">Piątek</string>
+  <string name="saturday">Sobota</string>
+  <string name="sunday">Niedziela</string>
+  <string name="levelup_header">Zyskałeś Poziom!</string>
+  <string name="levelup_detail">Wypełniając życiowe cele, zyskałeś Poziom %1$d!</string>
+  <string name="levelup_health">Zostałeś w pełni uzdrowiony!</string>
+  <string name="levelup_button">Hurra!</string>
+  <string name="faint_subtitle">Nie rozpaczaj!</string>
+  <string name="faint_penalty_body">Straciłeś Poziom, Złoto i jedną część Wyposażenia, ale możesz je odzyskać dzięki ciężkiej pracy! Powodzenia - dasz radę.</string>
+  <string name="faint_header">Możesz stracić całe Zdrowie!</string>
+  <string name="faint_button">Uzupełnij Zdrowie &amp; Spróbuj jeszcze raz</string>
+  <string name="filter">Filtr</string>
+  <string name="profile_image">Obrazek profilowy</string>
+  <string name="mana_price_button">%d PM</string>
+  <string name="used_skill">Użyłeś %1$s za %2$d pkt. many.</string>
+  <string name="used_skill_without_mana">Użyto %1$s.</string>
+  <string name="new_checklist_item">nowa część zadania</string>
+  <string name="add_checklist_item">Dodaj</string>
+  <string name="reminder_title">Pamiętaj o odhaczaniu Codziennych!</string>
+  <string name="skill_progress_title">Użycie umiejętności</string>
+  <string name="coming_soon">Wkrótce dostępne</string>
+  <string name="chat_flag_confirmation">Jesteś pewny że chcesz zgłosić tą wiadomość z powodu naruszeń?</string>
+  <string name="flag_confirm">Oznacz wiadomość</string>
+  <string name="unlock_lvl_11">Odblokuj na poziomie 11</string>
+  <string name="no_party_message">Nie jesteś w drużynie. Żeby dołączyć do drużyny odwiedź stronę internetową.</string>
+  <string name="forgot_pw_btn">Zapomniane hasło</string>
+  <string name="forgot_pw_tv">Zapomniane hasło? Użyj mobilnej strony internetowej.</string>
+  <string name="tavern.inn.checkOut">Reaktywuj swoje codzienne</string>
+  <string name="tavern.inn.rest">Zapauzuj swoje codzienne</string>
+  <string name="reward.dialog.buy">Kup</string>
+  <string name="reward.dialog.dismiss">Anuluj</string>
+  <string name="party">Drużyna</string>
+  <string name="chat">Czat</string>
+  <string name="members">Członkowie</string>
+  <string name="habits">Nawyki</string>
+  <string name="dailies">Codzienne</string>
+  <string name="todos">Do zrobienia</string>
+  <string name="rewards">Nagrody</string>
+  <string name="taskform.delete.title">Jesteś pewien?</string>
+  <string name="taskform.delete.message">Czy na pewno chcesz usunąć?</string>
+  <string name="yes">Tak</string>
+  <string name="no">Nie</string>
+  <string name="quest">Misja</string>
+  <string name="avatar_body">Postura</string>
+  <string name="avatar_hair">Włosy</string>
+  <string name="avatar_shirt">Koszulka</string>
+  <string name="avatar_skin">Skóra</string>
+  <string name="avatar_ears">Zwierzęce uszy</string>
+  <string name="avatar_base">Spód</string>
+  <string name="avatar_color">Kolor</string>
+  <string name="avatar_beard">Broda</string>
+  <string name="avatar_mustache">Wąsy</string>
+  <string name="avatar_flower">Kwiatek</string>
+  <string name="avatar_bangs">Grzywka</string>
+  <string name="avatar_nothing">Niewybrano</string>
+  <string name="avatar_size">Rozmiar</string>
+  <string name="avatar_size_slim">Szczupła</string>
+  <string name="avatar_size_broad">Krzepka</string>
+  <string name="avatar_background">Obrazek</string>
+  <string name="purchase_customization">Ustawienia zakupów</string>
+  <string name="purchase_set_button">Odblokuj zestaw za %d gemów</string>
+  <string name="purchase_button">Kup</string>
+  <string name="purchase_set_title">Kup zestaw %s</string>
+  <string name="due_date">Termin</string>
+  <string name="quest.accept">Akceptuj</string>
+  <string name="quest.reject">Odrzuć</string>
+  <string name="quest.begin">Rozpocznij Quest</string>
+  <string name="quest.cancel">Anuluj Zaproszenie</string>
+  <string name="quest.abort">Przerwij Quest</string>
+  <string name="quest.leave">Opuść Misję</string>
+  <string name="quest.pending">Oczekujące</string>
+  <string name="quest.accepted">Zaakceptowane</string>
+  <string name="quest.rejected">Odrzucone</string>
+  <string name="quest.participants">Uczestnicy</string>
+  <string name="version_info">Wersja %1$s (%2$d)</string>
+  <string name="sidebar_help">Pomoc i FAQ</string>
+  <string name="complete_tutorial">Jasne!</string>
+  <string name="dismiss_tutorial">Przypomnij mi później</string>
+  <string name="intro_1_subtitle">Witaj w</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_2_subtitle">Postęp w grze</string>
+  <string name="intro_2_title">Postęp w życiu</string>
+  <string name="intro_2_description">Odblokuj cechy w grze przez wykonywanie twoich zadań z realnego życia. Zdobywaj broń, chowańce i znacznie więcej za realizacje swoich celów.</string>
+  <string name="intro_3_description">Zmierzaj do swoich celów z pomocą przyjaciół. Wspierajcie się wzajemnie w życiu i w walce, aby wspólnie się udoskonalać!</string>
+  <string name="intro_finish_button">Zaczynajmy!</string>
+  <string name="previous_button">Poprzedni</string>
+  <string name="next_button">Następny</string>
+  <string name="skip_button">Pomiń</string>
+  <string name="setup_welcome_description">Witaj w Habitice, gdzie postęp w grze ulepszy Twoje życie! Osiągając cele w prawdziwym świecie, odblokowujesz ekwipunek, chowańce, misje i wiele więcej.</string>
+  <string name="setup_welcome_title">Witaj</string>
+  <string name="avatar_setup_description">Więc, jak chciałbyś wyglądać. Nie obawiaj się, możesz to później zmienić.</string>
+  <string name="setup_group_work">Praca</string>
+  <string name="setup_group_exercise">Ćwiczenia</string>
+  <string name="setup_group_health">Zdrowie</string>
+  <string name="setup_group_school">Szkoła</string>
+  <string name="setup_group_teams">Zespoły</string>
+  <string name="setup_group_chores">Obowiązki domowe</string>
+  <string name="setup_group_creativity">Twórczość</string>
+  <string name="setup_task_work_1">Przeglądnąć e-maile</string>
+  <string name="setup_task_work_2">Najważniejsze zadanie</string>
+  <string name="setup_task_work_3">Projekt zawodowy</string>
+  <string name="setup_task_exercise_1">10 min cardio</string>
+  <string name="setup_task_exercise_2">Rozciągnąć się</string>
+  <string name="setup_task_exercise_3">Ustalić plan ćwiczeń</string>
+  <string name="setup_task_healthWellness_1">Jeść zdrowe / śmieciowe jedzenie</string>
+  <string name="setup_task_healthWellness_2">Używać nitki dentystycznej</string>
+  <string name="setup_task_healthWellness_3">Umówić się na wizytę u lekarza</string>
+  <string name="setup_task_school_1">Uczyć się / odkładać naukę</string>
+  <string name="setup_task_school_2">Odrobić zadanie domowe</string>
+  <string name="setup_task_school_3">Skończyć projekt szkolny</string>
+  <string name="setup_task_teams_1">Sprawdzić, co z zespółem</string>
+  <string name="setup_task_teams_2">Przekazać najnowsze informacje</string>
+  <string name="setup_task_teams_3">Ukończyć projekt zespołowy</string>
+  <string name="setup_task_chores_1">10 minut sprzątania</string>
+  <string name="setup_task_chores_2">Umyć naczynia</string>
+  <string name="setup_task_chores_3">Posprzątać w szafie</string>
+  <string name="setup_task_creativity_1">Studiować mistrzostwo rzemiosła</string>
+  <string name="setup_task_creativity_2">Pracować nad twórczym projektem</string>
+  <string name="setup_task_creativity_3">Ukończyć twórczy projekt</string>
+  <string name="gem.purchase.support">Chcesz nam pomóc w utrzymaniu Habitiki? Możesz wesprzeć deweloperów kupując Klejnoty!\n\nZa Klejnoty można kupować zabawne dodatki do konta, takie jak:\n\n - Fajne kostiumy dla Twojego awatara\n - Fantastyczne tła\n - Ciekawe misje, w których nagrodą są jaja chowańców\n - Możliwość zmiany klasy przed osiągnięciem poziomu 100\n\nStukrotne dzięki za pomaganie nam w czynieniu Habitiki najlepszą, jaka może być. Twoja pomoc wiele dla nas znaczy!</string>
+  <string name="my_guilds">Moje Gildie</string>
+  <string name="public_guilds">Publiczne Gildie</string>
+  <string name="guild">Gildia</string>
+  <string name="leave">Opuść</string>
+  <string name="join">Dołącz</string>
+  <string name="leader">Lider</string>
+  <string name="gems">Klejnoty</string>
+  <string name="copy_as_todo">Kopiuj jako Do-Zrobienia</string>
+  <string name="send_pm">Wyślij wiadomość</string>
+  <string name="flag">Oznacz</string>
+  <string name="delete">Usuń</string>
+  <string name="name">Nazwa</string>
+  <string name="description">Opis</string>
+  <string name="privacy">Prywatność</string>
+  <string name="write_message">Napisz wiadomość</string>
+  <string name="post">Wyślij</string>
+  <string name="guild_search_hint">Szukaj gildii</string>
+  <string name="todo_due">Termin: %s</string>
+  <string name="daily_streak">licznik serii: %d</string>
+  <string name="todo_has_duedate">Zdania mają termin wykonania</string>
+  <string name="battle_gear">Sprzęt Bojowy</string>
+  <string name="costume">Kostium</string>
+  <string name="outfit_head">Głowa</string>
+  <string name="outfit_headAccessory">Nakrycie Głowy</string>
+  <string name="outfit_eyewear">Na oczy</string>
+  <string name="outfit_armor">Zbroja</string>
+  <string name="outfit_back">Plecy</string>
+  <string name="outfit_body">Postura</string>
+  <string name="outfit_shield">Tarcza</string>
+  <string name="outfit_weapon">Broń</string>
+  <string name="wear_costume">Użyj kostiumu</string>
+  <string name="equipped">W użyciu</string>
+  <string name="quest_cancel_message">Jesteś pewien że chcesz przerwać quest? Quest zostanie przerwany dla wszystkich uczestników. Zwołujący quest odzyska skrypt (quest scroll).</string>
+  <string name="quest.invitation">Zaproszenie do questa.</string>
+  <string name="quest_begin_message">Czy jesteś pewien, ze chcesz zacząć misję? Gdy zostanie aktywowana, żaden dodatkowy członek drużyny nie będzie mógł do niej dołączyc.</string>
+  <string name="quest.invitation.text">Zostałeś zaproszony do udziału w misji!</string>
+  <string name="ago_1day">1 dzień temu</string>
+  <string name="ago_days">%d dni temu</string>
+  <string name="ago_1Minute">1 minutę temu</string>
+  <string name="ago_minutes">%d minut temu</string>
+  <string name="ago_hours">%d godzin temu</string>
+  <string name="ago_1hour">1 godzinę temu</string>
+  <string name="today">Dzisiaj</string>
+  <string name="sidebar_items">Przedmioty</string>
+  <string name="eggs">Jaja</string>
+  <string name="hatching_potions">Eliksiry wyklucia</string>
+  <string name="food">Jedzonko</string>
+  <string name="quests">Misje</string>
+  <string name="pets">Zwierzaki</string>
+  <string name="mounts">Wierzchowce</string>
+  <string name="armoireEquipment">Znalazłeś element rzadkiego Ekwipunku w Skrzyni: %s! Super!</string>
+  <string name="armoireFood">Przeszukujesz Skrzynię i znajdujesz %1$s %2$s. Co to tam robi?</string>
+  <string name="armoireExp">Mocujesz się ze Skrzynią i zyskujesz Doświadczenie. A masz!</string>
+  <string name="armoireNotesFull">Otwórz Skrzynię żeby losowo otrzymać specjalne Wyposażenie, Doświadczenie lub jedzenie! Pozostało elementów : %d</string>
+  <string name="armoireLastItem">Znalazłeś ostatni element rzadkiego Wyposażenia w Zaklętej Skrzyni.</string>
+  <string name="armoireNotesEmpty">Skrzynia otrzyma nowe Wyposażenie w pierwszym tygodniu każdego miesiąca. Do tego czasu klikaj aby otrzymać Doświadczenie i Jedzenie!</string>
+  <string name="sell">Sprzedaj (%d Złoto)</string>
+  <string name="hatch_with_potion">Wykluj za pomocą mikstury</string>
+  <string name="feed_to_pet">Nakarm chowańca</string>
+  <string name="hatch_egg">Wykluj za pomocą jaja</string>
+  <string name="invite_party">Zaproś drużynę</string>
+  <string name="dialog_feeding">Nakarm %1$s %2$s</string>
+  <string name="use_animal">Użyj</string>
+  <string name="feed">Nakarm</string>
+  <string name="hatch_with">Wykluj za pomocą %s</string>
+  <string name="hatched_pet_title">Wyklułeś/as %1$s %2$s!</string>
+  <string name="close">Zamknij</string>
+  <string name="share">Podziel się</string>
+  <string name="notification_pet_fed">Nakarmiłeś/aś %1$s %2$s!</string>
+  <string name="notification_purchase">%s zakupiony</string>
+  <string name="sectionpets">Podstawowe chowańce</string>
+  <string name="sectionpremiumPets">Magiczne chowańce</string>
+  <string name="sectionquestPets">Chowańce z misji</string>
+  <string name="sectionspecialPets">Rzadkie chowańce</string>
+  <string name="sectionmounts">Podstawowe wierzchowce</string>
+  <string name="sectionpremiumMounts">Magiczne wierzchowce</string>
+  <string name="sectionquestMounts">Wierzchowce z misji</string>
+  <string name="sectionspecialMounts">Rzadkie wierzchowce</string>
+  <string name="world_quest">Zadanie ogólnoświatowe</string>
+  <string name="inn_description">Odpoczywaj w Karczmie aby zapobiec obrażeniu z niewykonanych zadań codziennych w ciągu nocy! (Notatka: nie zapobiega przed obrażeniami otrzymanymi od Bossa ogólnoświatowego.)</string>
+  <string name="empty_items">Nie posiadasz %s</string>
+  <string name="user_level">poz %d</string>
+  <string name="user_level_with_class">poz %1$d %2$s</string>
+  <string name="warrior">Wojownik</string>
+  <string name="rogue">Łotrzyk</string>
+  <string name="mage">Mag</string>
+  <string name="healer">Uzdrowiciel</string>
+  <string name="warrior_description">Wojownicy mają częstsze i lepsze \"trafienia krytyczne\", które losowo dają Złoto, Doświadczenie, i szansę na zdobycz za odznaczenie zadania. Zadają także ciężkie obrażenia bossom. Graj jako Wojownik jeśli motywują Cię nieprzewidywalne nagrody, lub jeśli chcesz niszczyć bossów w Misjach!</string>
+  <string name="mage_description">Magowie uczą się sprawnie, zyskując Doświadczenie i Poziomy szybciej niż inne klasy. Dostają także dużo Many na specjalne umiejętności. Graj jako Mag jeśli lubisz elementy gry taktycznej w Habit, lub jeśli jesteś silnie motywowany przez zdobywanie poziomów i odblokowywanie zaawansowanych aspektów gry!</string>
+  <string name="rogue_description">Łotrzyki uwielbiają gromadzić bogactwa, zyskując więcej Złota niż inni, oraz są adeptami w znajdowaniu losowych rzeczy. Ich umiejętność skradania pozwala im uniknąć konsekwencji pominięcia Codziennych. Graj jako Łotrzyk jeśli motywują Cię Nagrody i Osiągnięcia, walczenie o skarby i odznaki!</string>
+  <string name="healer_description">Medycy są odporni na obrażenia, i przedłużają tą ochronę na innych. Pominięte Codzienne i złe Nawyki nie robią na nich wrażenia, mają także sposoby na odzyskanie Zdrowia po porażce. Graj jako Medyk jeśli lubisz pomagać innym w Drużynie, lub jeśli koncepcja oszukania Śmierci dzięki ciężkiej pracy jest dla ciebie inspirująca!</string>
+  <string name="select_class">Wybierz klasę postaci</string>
+  <string name="opt_out_class">Wycofaj się</string>
+  <string name="opt_out_description">Nie zależy ci na klasach? Chcesz wybrać później? Wycofaj się - będziesz wojownikiem bez specjalnych umiejętności. Możesz przeczytać o systemie klas później na wiki i włączyć klasy w każdej chwili.</string>
+  <string name="class_confirmation">Jesteś pewien, że chcesz być %s?</string>
+  <string name="class_changed">Jesteś teraz %s!</string>
+  <string name="class_changed_description">Masz nowe domyślne wyposażenie bojowe, które możesz zmienić pod Wyposażeniem!</string>
+  <string name="choose_class">Wybierz klasę postaci</string>
+  <string name="dialog_go_back">Wróć</string>
+  <string name="opt_out_confirmation">Czy na pewno chcesz wyjść?</string>
+  <string name="change_class">Zmień swoją klasę</string>
+  <string name="change_class_description">Zmień klasę i odzyskaj punkty atrybutów za 3 kryształy. Możesz przedzielić punkty atrybutów poprzez stronę internetową.</string>
+  <string name="enable_class">Odblokuj System Klas</string>
+  <string name="changing_class_progress">Zmiana Klasy</string>
+  <string name="by_email">Przez e-mail</string>
+  <string name="invite_existing_users">Zaproś istniejących użytkowników</string>
+  <string name="send">Wyślij</string>
+  <string name="invite">Zaproś znajomych</string>
+  <string name="invite_id_description">Jeśli Twoi znajomi używają już Habitiki, zaproś ich za pomocą ID Użytkownika tutaj.</string>
+  <string name="invite_email_description">Jeśli przyjaciel dołączył do Habitiki przez Twojego maila, zostanie automatycznie dodany do Twojej drużyny!</string>
+  <string name="add_invites">Dodaj zaproszenia</string>
+  <string name="user_id">ID Użytkownika</string>
+  <string name="email">Email</string>
+  <string name="invite_users">Zaproś do drużyny</string>
+  <string name="share_using">Udostępnij używanie</string>
+  <string name="share_levelup">Uzyskałem poziom %d w Habitice dzięki poprawie moich życiowych nawyków!</string>
+  <string name="share_hatched">Właśnie wyklułem chowańca %1$s %2$s w Habitice dzięki wypełnianiu życiowych zadań!</string>
+  <string name="share_raised">Właśnie zyskałem wierzchowca %1$s %2$s w Habitice dzięki wypełnianiu życiowych zadań!</string>
+  <string name="open_in_store">Otwórz w sklepie Google Play</string>
+  <string name="change_class_confirmation">Jesteś pewien, że chcesz zmienić klasę? Będzie to kosztować 3 kryształy.</string>
+  <string name="change_class_equipment_warning">Ostrzeżenie: Nie będziesz nie będziesz mógł kupić wyposażenia dla klasy: %s</string>
+  <string name="leaderMessage">Wiadomość od %1$s</string>
+  <string name="leaderName">Lider: %1$s</string>
+  <string name="confirm">Potwierdź</string>
+  <string name="market">Sklep</string>
+  <string name="timeTravelers">Podróżnicy w czasie</string>
+  <string name="seasonalShop">Sklep sezonowy</string>
+  <string name="empty_inbox">Nie masz żadnych wiadomości. Możesz wysłać użytkownikowi nową wiadomość za pomocą ich publicznych wiadomości!</string>
+  <string name="party_invite">Odblokuj poprzez zapraszanie przyjaciół</string>
+  <string name="no_gold">Niewystarczająca ilość złota</string>
+  <string name="no_potion">Nie potrzebujesz kupować eliksiru uzdrawiającego</string>
+  <string name="successful_purchase">%1$s jest w Twoim posiadaniu</string>
+  <string name="purchase_confirmation_title">Potwierdź zakup</string>
+  <string name="confirm_purchase_text">Zakup %1$s za %2$s %3$s</string>
+  <string name="gem">diament</string>
+  <string name="hourglass">klepsydra</string>
+  <string name="hourglasses">klepsydry</string>
+  <string name="gold_singular">złoto</string>
+  <string name="gold_plural">złoto</string>
+  <string name="chat_message_copied">Wiadomość skopiowana do schowka</string>
+  <string name="copy_chat_message">Kopiuj do schowka</string>
+  <string name="edit_tag_title">Edytuj tag</string>
+  <string name="edit_tag_btn_edit">Edytuj</string>
+  <string name="edit_tag_btn_done">Zrobione</string>
+  <string name="edit_tag_btn_delete">Usuń</string>
+  <string name="confirm_delete_tag_title">Jesteś pewien?</string>
+  <string name="confirm_delete_tag_message">Czy na pewno chcesz usunąć?</string>
+  <string name="filter_drawer_edit_tags">Edytuj tagi</string>
+  <string name="filter_drawer_filter_tags">Filtruj po tagach</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Czy ktoś zaprosił Cię przy pomocy tego kodu QR?</string>
+  <string name="qr_save_message">Kod QR zapisany w</string>
+  <string name="qr_dialogue_title">Twój kod QR</string>
+  <string name="download">Pobierz</string>
+  <string name="send_new_message">Wyślij nową wiadomość</string>
+  <string name="choose_recipient_title">Wybierz odbiorcę wiadomości</string>
+  <string name="action_continue">Kontynuuj</string>
+  <string name="scan_qr_code">Przeskanuj kod QR</string>
+  <string name="enter_recipient_uuid">Wpisz ID odbiorcy</string>
+  <string name="invited_to_party">Zostałeś zaproszony do drużyny!</string>
+  <string name="stats_widget_label">Statystyki Habitiki</string>
+  <string name="add_task">Dodaj Zadanie</string>
+  <string name="add_habit">Dodaj Nawyk</string>
+  <string name="add_daily">Dodaj Codzienne</string>
+  <string name="add_todo">Dodaj Do-Zrobienia</string>
+  <string name="add_reward">Dodaj Nagrodę</string>
+  <string name="all_dailies_completed">Wykonałeś wszystkie codzienne. Brawo!</string>
+  <string name="widget_habit_button">Nawyk Habitiki</string>
+  <string name="widget_dailies">Codzienne Habitiki</string>
+  <string name="widget_todo_list">Lista Do-Zrobienia Habitiki</string>
+  <string name="widget_add_task">Dodaj zadanie do Habitiki</string>
+  <string name="google_services_missing">Nie znaleziono usługi Google Play.</string>
+  <string name="gem.purchase.toolbartitle">Zamów</string>
+  <string name="gem.purchase.title">Kupując klejnoty, wspierasz deweloperów Habitiki i pozwalasz projektowi istnieć</string>
+  <string name="gem.purchase.subtitle">Klejnoty pozwalają dokupić ekstra dodatki do konta, na przykład:</string>
+  <string name="gem.purchase.listitem1">Świetne kostiumy dla awatara</string>
+  <string name="gem.purchase.listitem2">Genialne tła</string>
+  <string name="gem.purchase.listitem3">Zadania, w których nagrodą są jaja</string>
+  <string name="gem.purchase.listitem4">Możliwość zmiany klasy przed osiągnięciem 100. poziomu</string>
+  <string name="support_habitica">Wesprzyj Habitikę</string>
+  <string name="skill_transformation_use">użyj</string>
+  <string name="hatching_market_info">Nie znajdujesz poszukiwanych prezentów? Sprawdź na Targu!</string>
+  <string name="feeding_market_info">Szukasz innego pokarmu? Kup je na Targu!</string>
+  <string name="open_market">Otwórz Targ</string>
+  <string name="cds_description">Twoje codzienne zostaną zresotowane, podczas pierwszego uruchomienia Habitica po %1$s. Upewnij się, że ukończyłeś swoje codzienne przed upływem tego czasu.</string>
+  <string name="AudioTheme_title">Temat dźwiękowy</string>
+  <string name="AudioTheme_summary">Zmień temat dźwiękowy Habitiki</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Do zobaczenia jutro </string>
+  <string name="belongs_to_challenge">Należy do wyzwania</string>
+  <string name="has_reminder">Ma powiadomienie</string>
+  <string name="has_tag">Ma tag</string>
+  <string name="subscribe.title">Subskrypcja wspiera deweloperów i pozwala utrzymać Habitikę.</string>
+  <string name="subscribe_prompt">Zostań abonentem i uzyskuj te użyteczne korzyści:</string>
+  <string name="subscribe.listitem1">Kup klejnoty za złoto</string>
+  <string name="subscribe.listitem2">Ekskluzywne przedmioty miesiąca </string>
+  <string name="subscriptions">Subskrypcje</string>
+  <string name="subscription_duration">Powtarzaj co %s</string>
+  <string name="subscribe">Subskrybuj</string>
+  <string name="subscription_hourglasses">+%d Mistycznej Klepsydry</string>
+  <string name="payment_method">Metoda płatności</string>
+  <string name="subscription">Subskrypcja</string>
+  <string name="active">Aktywne</string>
+  <string name="cancel_subscription">Anuluj Subskrypcję</string>
+  <string name="cancel_subscription_google.description">Nie chcesz dłużej subskrypcji? Możesz z niej zrezygnować w sekcji \"Moje Aplikacje\" Google Play Store.</string>
+  <string name="visit_habitica_website">Odwiedź Stronę Habitiki</string>
+  <string name="current_bonuses">Obecne Dodatki</string>
+  <string name="months_subscribed">Miesięcy subskrypcji</string>
+  <string name="inactive">Nieaktywne</string>
+  <string name="one_month">1 Miesiąc</string>
+  <string name="months">%d Miesięcy</string>
+  <string name="month">miesiąc</string>
+  <string name="three_months">3 miesiące</string>
+  <string name="six_months">6 miesięcy</string>
+  <string name="twelve_months">12 miesięcy</string>
+  <string name="subscription_status">Status Subskrypcji</string>
+  <string name="byLeader">przez %s</string>
+  <string name="challenge_details">Szczegóły wyzwania</string>
+  <string name="challenge_leave_title">Opuść wyzwanie.</string>
+  <string name="challenge_leave_text">Jesteś pewien, że chcesz opuścić wyzwanie “%s”?</string>
+  <string name="challenge_remove_tasks_title">Usuń zadania</string>
+  <string name="challenge_remove_tasks_text">Czy chcesz usunąć zadania</string>
+  <string name="remove_tasks">Usuń</string>
+  <string name="keep_tasks">Zachowaj</string>
+  <string name="my_challenges">Moje wyzwania</string>
+  <string name="public_challenges">Publiczne</string>
+  <string name="challenges">Wyzwania</string>
+  <string name="daily">Codzienny </string>
+  <string name="habit">Nawyk</string>
+  <string name="reward">Nagroda</string>
+  <string name="todo">Do-Zrobienia</string>
+  <string name="official">Oficjalne</string>
+  <string name="participating">Uczestnictwo </string>
+  <string name="challenge">Wyzwanie</string>
+  <string name="go_to_challenge">Idź do wyzwania </string>
+  <string name="not_part_of_a_challenge">Obecnie nie uczestniczysz w żadnym wyzwaniu!</string>
+  <string name="check_the_public_challenge_tab">Puknij zakładkę \"Publiczne\", aby znaleźć wyzwania stworzone przez innych użytkowników, które najlepiej pasują do ciebie!</string>
+  <string name="add_reminder">Dodaj przypomnienie</string>
+  <string name="warning">Uwaga</string>
+  <string name="open_settings">Otwórz ustawienia</string>
+  <string name="dont_keep_activities_warning">Wygląda, że masz aktywną opcję deweloperską \\"\"Don\'t keep Activities\"\. Obecnie powoduje ona problemy z Habitiką, dlatego też sugerujemy jej wyłączenie.</string>
+  <string name="inbox">Skrzynka odbiorcza</string>
+  <string name="FAQ">Najczęściej Zadawane Pytania</string>
+  <string name="special">Specjalne</string>
+  <string name="gem_for_gold_description">Ponieważ jesteś abonentem Habitiki, możesz co miesiąc kupić, za złoto, pewną ilość klejnotów.</string>
+  <string name="limited_count">%d zostało</string>
+  <string name="gem_shop">Diament</string>
+  <string name="mystery_item">Mistyczny Przedmiot</string>
+  <string name="open">Otwórz</string>
+  <string name="notification_mystery_item">Otwórz pudełko i znajdź %s!</string>
+  <string name="checkInRewardEarned">Zdobyłeś %1$s jako nagrodę za poświęcenie w poprawie swojego życia.</string>
+  <string name="pending_approval">oczekująca aprobata</string>
+  <string name="filters">Filtry</string>
+  <string name="done">Zrobione</string>
+  <string name="group_tasks_edit_description">Grupowe zadanie nie mogą być edytowane.</string>
+  <string name="group_tasks_edit_title">Nie możesz edytować tego zadania</string>
+  <string name="groups">Grupy</string>
+  <string name="all">Wszystkie</string>
+  <string name="none">Żadne</string>
+  <string name="owned">Posiadane</string>
+  <string name="not_owned">Nieposiadane</string>
+  <string name="new_game">Nowa\nGra</string>
+  <string name="login_btn_fb">Zaloguj z Facebookiem</string>
+  <string name="login_btn_google">Zaloguj z Google</string>
+  <string name="action_back">Wróć</string>
+  <string name="randomize">Losowy</string>
+  <string name="avatar_extras">Dodatki</string>
+  <string name="avatar_skin_color">Kolor skóry </string>
+  <string name="avatar_hair_color">Kolor włosów</string>
+  <string name="avatar_hair_bangs">Grzywka</string>
+  <string name="avatar_hair_ponytail">Koński ogon</string>
+  <string name="avatar_glasses">Okulary</string>
+  <string name="avatar_wheelchair">Wózek</string>
+  <string name="weak">Słaby</string>
+  <string name="strong">Silny</string>
+  <string name="dated">Przestarzały</string>
+  <string name="completed">Ukończone</string>
+  <string name="setuP_group_other">Pozostałe</string>
+  <string name="empty_title_habits">Nie posiadasz żadnych nawyków</string>
+  <string name="empty_description_habits">Nawyki są zadaniami nie posiadającymi sztywnego harmonogramu. Możesz je odhaczać wiele razy dziennie, lub w ogóle.</string>
+  <string name="empty_title_dailies">Nie posiadasz żadnych codziennych</string>
+  <string name="empty_description_dailies">Codzienne są zadaniami regularnie się powtarzającymi. Wybierz pasujący Ci harmonogram!</string>
+  <string name="empty_title_todos">Nie posiadasz żadnych Do-Zrobienia</string>
+  <string name="empty_description_todos">Do-Zrobienia są jednokrotnymi zadaniami. Dodaj listy kontrolne do swoich Do-Zrobienia, aby zwiększyć ich wartość.</string>
+  <string name="empty_title_rewards">Nie posiadasz żadnych nagród</string>
+  <string name="read_community_guidelines">Prosimy, przeczytaj Wytyczne Społeczności zanim umieścisz posta</string>
+  <string name="maintenance">Utrzymanie</string>
+  <string name="reload_content">Odśwież zawartość</string>
+</resources>
diff --git a/Habitica/res/values-ru/strings.profile.xml b/Habitica/res/values-ru/strings.profile.xml
index 03867c934..531dea69b 100644
--- a/Habitica/res/values-ru/strings.profile.xml
+++ b/Habitica/res/values-ru/strings.profile.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">Питомцы &amp; Скакуны</string>
-    <string name="profile_pets_found">Найденые питомцы</string>
-    <string name="profile_mounts_tamed">Прирученые скакуны</string>
-    <string name="profile_loading_data">загрузка данных участников.</string>
-    <string name="profile_send_message_to">Отправить сообщение %s</string>
-    <string name="profile_message_sent_to">Сообщение отправлено %s</string>
-    <string name="profile_level">Уровень:</string>
-    <string name="profile_class_bonus">Класс-Бонус:</string>
-    <string name="profile_allocated">Выделено:</string>
-    <string name="profile_boosts">Ускорения:</string>
-    <string name="profile_private_message">Личное сообщение</string>
-    <string name="profile_achievements">Достижения</string>
-    <string name="profile_achievement_ok">Хорошо</string>
-    <string name="profile_qrcode_close">Закрыть</string>
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Питомцы &amp; Скакуны</string>
+    <string name="profile_pets_found">Найденые питомцы</string>
+    <string name="profile_mounts_tamed">Прирученые скакуны</string>
+    <string name="profile_loading_data">загрузка данных участников.</string>
+    <string name="profile_send_message_to">Отправить сообщение %s</string>
+    <string name="profile_message_sent_to">Сообщение отправлено %s</string>
+    <string name="profile_level">Уровень:</string>
+    <string name="profile_class_bonus">Класс-Бонус:</string>
+    <string name="profile_allocated">Выделено:</string>
+    <string name="profile_boosts">Ускорения:</string>
+    <string name="profile_private_message">Личное сообщение</string>
+    <string name="profile_achievements">Достижения</string>
+    <string name="profile_achievement_ok">Хорошо</string>
+    <string name="profile_qrcode_close">Закрыть</string>
+
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ru/strings.tutorial.xml b/Habitica/res/values-ru/strings.tutorial.xml
index 74239648f..a0f694ea8 100644
--- a/Habitica/res/values-ru/strings.tutorial.xml
+++ b/Habitica/res/values-ru/strings.tutorial.xml
@@ -1,20 +1,20 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_overview">Вот и мы! Я выполнил некоторые задания для вас, исходя из ваших интересов. Попробуйте добавить несколько собственных. Вы можете редактировать любую задачу, нажав на заголовок.</string>
-  <string name="tutorial_habits_1">Прежде всего это Привычки. Они могут быть положительными, которые вы хотите приобрести, или негативными, которые вы хотите бросить.</string>
-  <string name="tutorial_habits_2">Каждый раз, когда вы выполняете положительную привычку, нажмите +, чтобы получить опыт и золото!</string>
-  <string name="tutorial_habits_3">Если вы ошибетесь в негативной привычкой, нажав на - , то вы уменьшите здоровье вашего аватара. Это сделано для того, чтобы помочь вам быть более ответственным.</string>
-  <string name="tutorial_dailies_1">Создайте ежедневные задачи, которые необходимо выполнять по расписанию.</string>
-  <string name="tutorial_dailies_2">Будьте осторожны - если вы пропустите раз, ваш аватар в одночасье получит урон . Регулярно выполняя их, вы получите отличные награды!</string>
-  <string name="tutorial_todos_1">Используйте список дел, чтобы отслеживать задачи, которые нужно выполнять только один раз.</string>
-  <string name="tutorial_rewards_1">Покупайте снаряжение для вашего аватара за золото которое вы получаете!</string>
-  <string name="tutorial_rewards_2">Вы также можете создавать свои вознаграждения в зависимости от того, что вас мотивирует.</string>
-  <string name="tutorial_tasks_complete">На этом все. Если вы что-то забыли, проверьте раздел часто задаваемых вопросов.</string>
-  <string name="tutorial_equipment">Когда вы покупаете снаряжение, оно появляется здесь. Ваша Боевая Экипировка влияет на ваши характеристики, а Костюм (если используется) изменяет внешний вид вашего аватара.</string>
-  <string name="tutorial_items">Зарабатывайте предметы, выполняя задания и повышая уровень. Нажмите на предмет, чтобы использовать его!</string>
-  <string name="tutorial_pets">Теперь, когда вы будете выполнять задачи в реальном мире, у Вас есть шанс получить яйца и зелья. Соединяйте их, чтобы вылуплялись питомцы</string>
-  <string name="tutorial_skills">Навыки — это специальные способности, которые имеют мощные эффекты! Нажмите на навык что бы использовать его. Это будет стоить вам очков маны (синяя шкала), которая пополняется при входе в игру каждый день и завершением задач в реальной жизни. Читайте FAQ в меню, чтобы узнать подробности!</string>
-  <string name="tutorial_party">Это место где вы и ваши друзья можете помочь друг другу оставаться ответственными на пути к цели и сражаться с монстрами с помощью своих заданий!</string>
-  <string name="tutorial_tavern">Добро пожаловать в Таверну, где собрались участники всех рас, полов и возрастов! Здесь вы можете болтать или задавать вопросы. Повеселитесь!</string>
-  <string name="tutorial_classes">Выберите, кем вы будете: Воином, Магом, Целителем или Разбойником! У каждого класса есть уникальное снаряжение и навыки. Нажмите (?), чтобы узнать больше!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_overview">Вот и мы! Я выполнил некоторые задания для вас, исходя из ваших интересов. Попробуйте добавить несколько собственных. Вы можете редактировать любую задачу, нажав на заголовок.</string>
+  <string name="tutorial_habits_1">Прежде всего это Привычки. Они могут быть положительными, которые вы хотите приобрести, или негативными, которые вы хотите бросить.</string>
+  <string name="tutorial_habits_2">Каждый раз, когда вы выполняете положительную привычку, нажмите +, чтобы получить опыт и золото!</string>
+  <string name="tutorial_habits_3">Если вы ошибетесь в негативной привычкой, нажав на - , то вы уменьшите здоровье вашего аватара. Это сделано для того, чтобы помочь вам быть более ответственным.</string>
+  <string name="tutorial_dailies_1">Создайте ежедневные задачи, которые необходимо выполнять по расписанию.</string>
+  <string name="tutorial_dailies_2">Будьте осторожны - если вы пропустите раз, ваш аватар в одночасье получит урон . Регулярно выполняя их, вы получите отличные награды!</string>
+  <string name="tutorial_todos_1">Используйте список дел, чтобы отслеживать задачи, которые нужно выполнять только один раз.</string>
+  <string name="tutorial_rewards_1">Покупайте снаряжение для вашего аватара за золото которое вы получаете!</string>
+  <string name="tutorial_rewards_2">Вы также можете создавать свои вознаграждения в зависимости от того, что вас мотивирует.</string>
+  <string name="tutorial_tasks_complete">На этом все. Если вы что-то забыли, проверьте раздел часто задаваемых вопросов.</string>
+  <string name="tutorial_equipment">Когда вы покупаете снаряжение, оно появляется здесь. Ваша Боевая Экипировка влияет на ваши характеристики, а Костюм (если используется) изменяет внешний вид вашего аватара.</string>
+  <string name="tutorial_items">Зарабатывайте предметы, выполняя задания и повышая уровень. Нажмите на предмет, чтобы использовать его!</string>
+  <string name="tutorial_pets">Теперь, когда вы будете выполнять задачи в реальном мире, у Вас есть шанс получить яйца и зелья. Соединяйте их, чтобы вылуплялись питомцы</string>
+  <string name="tutorial_skills">Навыки — это специальные способности, которые имеют мощные эффекты! Нажмите на навык что бы использовать его. Это будет стоить вам очков маны (синяя шкала), которая пополняется при входе в игру каждый день и завершением задач в реальной жизни. Читайте FAQ в меню, чтобы узнать подробности!</string>
+  <string name="tutorial_party">Это место где вы и ваши друзья можете помочь друг другу оставаться ответственными на пути к цели и сражаться с монстрами с помощью своих заданий!</string>
+  <string name="tutorial_tavern">Добро пожаловать в Таверну, где собрались участники всех рас, полов и возрастов! Здесь вы можете болтать или задавать вопросы. Повеселитесь!</string>
+  <string name="tutorial_classes">Выберите, кем вы будете: Воином, Магом, Целителем или Разбойником! У каждого класса есть уникальное снаряжение и навыки. Нажмите (?), чтобы узнать больше!</string>
+</resources>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 9bfd732c6..087eaeeb5 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -1,516 +1,516 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Обновить</string>
-  <string name="XP_default">Опыт</string>
-  <string name="HP_default">Здоровье</string>
-  <string name="MP_default">Мана</string>
-  <string name="ERR_pb_barcode">Настройки не могут быть загружены из штрих-кода</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Настройки</string>
-  <string name="SP_address_hint">Ваш клиентский сервер</string>
-  <string name="SP_userID_title">ID пользователя</string>
-  <string name="SP_userID_summary">Ваш ID</string>
-  <string name="SP_APIToken_title">API Token</string>
-  <string name="SP_APIToken_summary">Ваш API Token</string>
-  <string name="Language_title">Язык</string>
-  <string name="Language_summary">Изменить язык Habitica</string>
-  <string name="SP_user_qr_code">Ваш QR код</string>
-  <string name="PS_contact_title">Свяжитесь со мной</string>
-  <string name="unknown_error">Произошла ошибка...</string>
-  <string name="pref_account_header">Аккаунт</string>
-  <string name="pref_first_day_of_the_week_title">Первый день недели</string>
-  <string name="pref_first_day_of_the_week_summary">Первый день недели во всех календарях</string>
-  <string name="pref_reminder_header">Ежедневное напоминание</string>
-  <string name="pref_reminder_checkbox">Активируйте напоминание</string>
-  <string name="pref_reminder_picker">Установите время напоминания</string>
-  <string name="pref_cds_header">Персональное начало суток</string>
-  <string name="pref_cds_picker">Установить персональное начало суток</string>
-  <string name="pref_push_notifications_checkbox">Push-уведомления пользователя</string>
-  <string name="push_notifications">Push-уведомления</string>
-  <string name="push_notifications_sum">Настройте push-уведомления</string>
-  <string name="preference_push_you_won_challenge">Вы прошли испытание!</string>
-  <string name="preference_push_received_a_private_message">Получено личное сообщение</string>
-  <string name="preference_push_gifted_gems">Подаренные самоцветы</string>
-  <string name="preference_push_gifted_subscription">Подаренная подписка</string>
-  <string name="preference_push_invited_to_party">Приглашены в команду</string>
-  <string name="preference_push_invited_to_guild">Приглашены в гильдию</string>
-  <string name="preference_push_your_quest_has_begun">Ваш Квест начался</string>
-  <string name="preference_push_invited_to_quest">Приглашены в квест</string>
-  <!--Adding tasks-->
-  <string name="task_value">Значение</string>
-  <string name="new_todo">Новая задача</string>
-  <string name="new_reward">Новая награда</string>
-  <string name="new_daily">Новое ежедневное задание</string>
-  <string name="new_habit">Новая привычка</string>
-  <string name="action_edit">Редактировать</string>
-  <string name="action_delete">Удалить</string>
-  <string name="action_cancel">Закрыть</string>
-  <string name="login_btn">Вход</string>
-  <string name="register_btn">Регистрация</string>
-  <string name="username">Имя пользователя</string>
-  <string name="email_username">Имя пользователя или Email</string>
-  <string name="password">Пароль</string>
-  <string name="emailAddress">Электронная почта</string>
-  <string name="confirmpassword">Подтвердите пароль</string>
-  <string name="logout">Выйти</string>
-  <string name="logout_description">Выйти из вашего аккаунта</string>
-  <string name="account_details_sum">Проверьте детали вашего аккаунта</string>
-  <string name="account_details">Детали аккаунта</string>
-  <string name="LoginActivityName">Добро пожаловать</string>
-  <string name="string_revive">Воскресить</string>
-  <string name="please_connect">Пожалуйста, подключитесь через приложение, прежде чем использовать виджет</string>
-  <string name="about.title">О приложении</string>
-  <string name="about.libraries">Библиотеки</string>
-  <string name="about.versionhistory">История версий</string>
-  <string name="about.habitica_open_source">Habitica – проект с открытым исходным кодом, который доступен на Github</string>
-  <string name="about.rate_our_app">Оцените наше приложение</string>
-  <string name="about.give_us_feedback">Оставьте отзыв!</string>
-  <string name="about.bugreport">Сообщить об ошибке</string>
-  <string name="about.source_code">Исходный код</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Ошибка подключения</string>
-  <string name="network_error_no_network_body">Отсутствует соединение с интернетом.</string>
-  <string name="internal_error_api">Кажется, возникли технические проблемы на сервере. Повторите попытку позже.</string>
-  <string name="authentication_error_title">Ошибка аутентификации</string>
-  <string name="authentication_error_body">Неверное имя пользователя и/или пароль.</string>
-  <string name="login_validation_error_title">Ошибка проверки</string>
-  <string name="login_validation_error_fieldsmissing">Вы должны заполнить все поля.</string>
-  <string name="save_changes">Сохранить</string>
-  <string name="copy">Копировать</string>
-  <string name="notes">Заметки</string>
-  <string name="text">Текст</string>
-  <string name="difficulty">Сложность</string>
-  <string name="tags">Метки</string>
-  <string name="trivial">Пустяк</string>
-  <string name="easy">Легко</string>
-  <string name="medium">Нормально</string>
-  <string name="hard">Сложно</string>
-  <string name="start_date">Дата начала</string>
-  <string name="positive_habit_form">Полезная ( + )</string>
-  <string name="negative_habit_form">Вредная ( - )</string>
-  <string name="checklist">Список</string>
-  <string name="reminders">Напоминания</string>
-  <string name="actions">Действия</string>
-  <string name="attributes">Характеристики</string>
-  <string name="physical">Физическое</string>
-  <string name="mental">Умственное</string>
-  <string name="social">Общение</string>
-  <string name="other">Другое</string>
-  <string name="frequency">Периодичность</string>
-  <string name="frequency_weekly">В определенные дни недели</string>
-  <string name="frequency_daily">Каждые X дня/дней</string>
-  <string name="monday">Понедельник</string>
-  <string name="tuesday">Вторник</string>
-  <string name="wednesday">Среда</string>
-  <string name="thursday">Четверг</string>
-  <string name="friday">Пятница</string>
-  <string name="saturday">Суббота</string>
-  <string name="sunday">Воскресенье</string>
-  <string name="levelup_header">Вы получили уровень!</string>
-  <string name="levelup_detail">Через достижение своих целей в реальной жизни Вы достигли %1$d-го уровня!</string>
-  <string name="levelup_health">Вы полностью вылечены!</string>
-  <string name="levelup_button">Ура!</string>
-  <string name="faint_subtitle">Не отчаивайтесь!</string>
-  <string name="faint_penalty_body">Вы потеряли уровень, золото и предмет экипировки, но сможете это наверстать, если постараетесь! Удачи! Все получится!</string>
-  <string name="faint_header">У вас закончилось здоровье!</string>
-  <string name="faint_button">Восстановить здоровье &amp; Попробовать ещё раз</string>
-  <string name="filter">Фильтр</string>
-  <string name="profile_image">Аватар</string>
-  <string name="mana_price_button">%d МP</string>
-  <string name="used_skill">Вы использовали %1$s за %2$d маны.</string>
-  <string name="used_skill_without_mana">Вы использовали %1$s.</string>
-  <string name="new_checklist_item">новый пункт списка</string>
-  <string name="add_checklist_item">Добавить</string>
-  <string name="reminder_title">Не забудьте отметить ежедневные задания!</string>
-  <string name="skill_progress_title">Использовать навык</string>
-  <string name="coming_soon">Скоро</string>
-  <string name="chat_flag_confirmation">Вы уверены, что хотите пожаловаться на это сообщение?</string>
-  <string name="flag_confirm">Пожаловаться на сообщение</string>
-  <string name="unlock_lvl_11">Открывается на 11 уровне</string>
-  <string name="no_party_message">Вы не состоите в команде. Для того, чтобы присоединиться к команде, пожалуйста, перейдите на сайт.</string>
-  <string name="forgot_pw_btn">Забыли пароль</string>
-  <string name="forgot_pw_tv">Забыли пароль? Пожалуйста, перейдите на сайт.</string>
-  <string name="tavern.inn.checkOut">Cнова активировать ваши ежедневные задания</string>
-  <string name="tavern.inn.rest">Временно приостановить ваши ежедневные задания</string>
-  <string name="reward.dialog.buy">Купить</string>
-  <string name="reward.dialog.dismiss">Отклонить</string>
-  <string name="party">Команда</string>
-  <string name="chat">Чат</string>
-  <string name="members">Участники</string>
-  <string name="habits">Привычки</string>
-  <string name="dailies">Ежедневные задания</string>
-  <string name="todos">Задачи</string>
-  <string name="rewards">Награды</string>
-  <string name="taskform.delete.title">Вы уверены?</string>
-  <string name="taskform.delete.message">Вы уверены, что хотите удалить?</string>
-  <string name="yes">Да</string>
-  <string name="no">Нет</string>
-  <string name="quest">Квест</string>
-  <string name="avatar_body">Тело</string>
-  <string name="avatar_hair">Причёска</string>
-  <string name="avatar_shirt">Рубашка</string>
-  <string name="avatar_skin">Кожа</string>
-  <string name="avatar_ears">Уши животных</string>
-  <string name="avatar_base">Основа</string>
-  <string name="avatar_color">Цвет</string>
-  <string name="avatar_beard">Борода</string>
-  <string name="avatar_mustache">Усы</string>
-  <string name="avatar_flower">Цветок</string>
-  <string name="avatar_bangs">Чёлка</string>
-  <string name="avatar_nothing">Не выбрано</string>
-  <string name="avatar_size">Телосложение</string>
-  <string name="avatar_size_slim">Стройное</string>
-  <string name="avatar_size_broad">Плотное</string>
-  <string name="avatar_background">Фон</string>
-  <string name="purchase_customization">Приобрести Персонализацию</string>
-  <string name="purchase_set_button">Разблокируйте набор за %d кристаллов</string>
-  <string name="purchase_button">Купить</string>
-  <string name="purchase_set_title">Купить комплект %s</string>
-  <string name="due_date">Дата выполнения</string>
-  <string name="quest.accept">Принять</string>
-  <string name="quest.reject">Отклонить</string>
-  <string name="quest.begin">Начать квест</string>
-  <string name="quest.cancel">Отменить приглашение</string>
-  <string name="quest.abort">Остановить квест</string>
-  <string name="quest.leave">Покинуть квест</string>
-  <string name="quest.pending">Ожидает</string>
-  <string name="quest.accepted">Принято</string>
-  <string name="quest.rejected">Отклонено</string>
-  <string name="quest.participants">Участники</string>
-  <string name="version_info">Версия %1$s (%2$d)</string>
-  <string name="sidebar_help">Помощь и ЧаВо</string>
-  <string name="complete_tutorial">Есть!</string>
-  <string name="dismiss_tutorial">Напомнить позже</string>
-  <string name="intro_1_subtitle">Добро пожаловать в</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Пришло время веселиться, пока вы делаете свою работу. Присоединитесь к %s участникам, уже улучшающих свою жизнь.</string>
-  <string name="intro_2_subtitle">Прогресс в игре</string>
-  <string name="intro_2_title">Прогресс в жизни</string>
-  <string name="intro_3_description">Добивайтесь поставленнх целей с помощью друзей. Поддерживайте друг друга в реальной жизни и в сражении, делая свою жизнь лучше!</string>
-  <string name="intro_finish_button">Давайте начнем!</string>
-  <string name="previous_button">Назад</string>
-  <string name="next_button">Далее</string>
-  <string name="skip_button">Пропустить</string>
-  <string name="setup_welcome_description">Добро пожаловать в Habitica, где продвижение в игре помогает вам в рельной жизни! Выполняя реальные задачи, вы разблокируете снаряжение, питомцев, квесты и многое другое.</string>
-  <string name="setup_welcome_title">Добро пожаловать</string>
-  <string name="avatar_setup_description">Итак, как бы вы хотели выглядеть? Не беспокойтесь, вы это сможете изменить позже.</string>
-  <string name="task_setup_description">Великолепно! Теперь, вы заинтересованы в работе на протяжении этого путешествия?</string>
-  <string name="setup_group_work">Работа</string>
-  <string name="setup_group_exercise">Тренировки</string>
-  <string name="setup_group_health">Здоровье</string>
-  <string name="setup_group_school">Школа</string>
-  <string name="setup_group_teams">Команды</string>
-  <string name="setup_group_chores">Домашние дела</string>
-  <string name="setup_group_creativity">Творчество</string>
-  <string name="setup_task_work_1">Разобрать электронную почту</string>
-  <string name="setup_task_work_2">Самое важное задание</string>
-  <string name="setup_task_work_3">Рабочий проект</string>
-  <string name="setup_task_exercise_1">10 мин кардионагрузки</string>
-  <string name="setup_task_exercise_2">Растяжка</string>
-  <string name="setup_task_exercise_3">Составить график тренировок</string>
-  <string name="setup_task_healthWellness_1">Съесть здоровую / вредную пищу</string>
-  <string name="setup_task_healthWellness_2">Почистить зубы ниткой</string>
-  <string name="setup_task_healthWellness_3">Проверить расписание</string>
-  <string name="setup_task_school_1">Учиться/Отложить на потом</string>
-  <string name="setup_task_school_2">Сделать домашнюю работу</string>
-  <string name="setup_task_school_3">Закончить учебное задание</string>
-  <string name="setup_task_teams_1">Задания с командой</string>
-  <string name="setup_task_teams_2">Узнать, как обстоят дела у команды</string>
-  <string name="setup_task_teams_3">Завершить командный проект</string>
-  <string name="setup_task_chores_1">10 минут уборки</string>
-  <string name="setup_task_chores_2">Помыть посуду</string>
-  <string name="setup_task_chores_3">Организовать вещи в шкафу</string>
-  <string name="setup_task_creativity_1">Улучшить навык владения ремеслом</string>
-  <string name="setup_task_creativity_2">Поработать над творческим проектом</string>
-  <string name="setup_task_creativity_3">Закончить творческий проект</string>
-  <string name="gem.purchase.support">Хотите помочь нам развивать Habitica и дальше? Вы можете поддержать разработчиков, купив самоцветы!\n\nСамоцветы позволяют вам купить забавные дополнения такие, как:  \n\n - классные костюмы для вашего аватара;\n - потрясающие фоны;\n - веселые квесты, в награду за которые вы получите яйца с питомцами;\n - возможность сменить класс до 100 уровня.\n\nБольшое спасибо за то, что вы помогаете Habitica делать лучшей на сколь это возможно. Ваша поддержка очень важна для нас!</string>
-  <string name="my_guilds">Мои гильдии</string>
-  <string name="public_guilds">Открытые гильдии</string>
-  <string name="guild">Гильдия</string>
-  <string name="leave">Покинуть</string>
-  <string name="join">Присоединиться</string>
-  <string name="leader">Предводитель</string>
-  <string name="gems">Самоцветы</string>
-  <string name="copy_as_todo">Скопировать как «Ежедневное»</string>
-  <string name="send_pm">Отправить личное сообщение</string>
-  <string name="flag">Пометить</string>
-  <string name="delete">Удалить</string>
-  <string name="name">Имя</string>
-  <string name="description">Описание</string>
-  <string name="privacy">Приватность</string>
-  <string name="write_message">Написать сообщение</string>
-  <string name="post">Отправить</string>
-  <string name="guild_search_hint">Поиск для гильдий</string>
-  <string name="todo_due">Выполнить к: %s</string>
-  <string name="daily_streak">выполнено подряд: %d</string>
-  <string name="todo_has_duedate">У задания есть срок выполнения</string>
-  <string name="battle_gear">Боевая экипировка</string>
-  <string name="costume">Костюм</string>
-  <string name="outfit_head">Голова</string>
-  <string name="outfit_headAccessory">Аксессуары</string>
-  <string name="outfit_eyewear">Очки</string>
-  <string name="outfit_armor">Снаряжение</string>
-  <string name="outfit_back">Спина</string>
-  <string name="outfit_body">Тело</string>
-  <string name="outfit_shield">Щит</string>
-  <string name="outfit_weapon">Оружие</string>
-  <string name="wear_costume">Использовать костюм</string>
-  <string name="equipped">Надето</string>
-  <string name="quest_cancel_message">Вы уверены, что хотите отменить квест? Все принятые приглашения будут отменены. Квестовый свиток останется у владельца.</string>
-  <string name="quest.invitation">Приглашение в квест</string>
-  <string name="quest_begin_message">Вы уверены, что хотите начать квест? Никто больше не сможет присоединиться к нему.</string>
-  <string name="quest.invitation.text">Вас пригласили в квест!</string>
-  <string name="ago_1day">1 день назад</string>
-  <string name="ago_days">%d дней назад</string>
-  <string name="ago_1Minute">1 минуту назад</string>
-  <string name="ago_minutes">%d минут назад</string>
-  <string name="ago_hours">%d часов назад</string>
-  <string name="ago_1hour">1 час назад</string>
-  <string name="today">Сегодня</string>
-  <string name="sidebar_items">Предметы</string>
-  <string name="eggs">Яйца</string>
-  <string name="hatching_potions">Инкубационные эликсиры</string>
-  <string name="food">Еда</string>
-  <string name="quests">Квесты</string>
-  <string name="pets">Питомцы</string>
-  <string name="mounts">Скакуны</string>
-  <string name="armoireEquipment">Вы нашли в сундуке редкий предмет: %s! Потрясающе!</string>
-  <string name="armoireFood">Копаясь в сундуке, вы находите %1$s %2$s. Откуда это здесь?</string>
-  <string name="armoireExp">Вы сражаетесь с сундуком и набираете опыт. Получай!</string>
-  <string name="armoireNotesFull">Откройте сундук, чтобы случайным образом получить особое снаряжение, опыт или еду! Осталось предметов снаряжения: %d</string>
-  <string name="armoireLastItem">Вы получили последний редкий предмет из зачарованного сундука.</string>
-  <string name="armoireNotesEmpty">Новое снаряжение будет появляться в сундуке раз в месяц. До тех пор – продолжайте кликать ради опыта и еды!</string>
-  <string name="sell">Продать (%d золота)</string>
-  <string name="hatch_with_potion">Полить эликсиром</string>
-  <string name="feed_to_pet">Покормить питомца</string>
-  <string name="hatch_egg">Вывести питомца из яйца</string>
-  <string name="invite_party">Пригласить команду</string>
-  <string name="dialog_feeding">Покормить %1$s %2$s:</string>
-  <string name="use_animal">Использовать</string>
-  <string name="feed">Покормить</string>
-  <string name="hatch_with">Вылупить питомца с помощью %s</string>
-  <string name="hatched_pet_title">У вас вылупился %1$s %2$s!</string>
-  <string name="close">Закрыть</string>
-  <string name="share">Поделиться</string>
-  <string name="notification_pet_fed">Вы покормили вашего %1$s %2$s!</string>
-  <string name="notification_purchase">%s приобретен</string>
-  <string name="sectionpets">Основные питомцы</string>
-  <string name="sectionpremiumPets">Питомцы из волшебного эликсира</string>
-  <string name="sectionquestPets">Квестовые питомцы</string>
-  <string name="sectionspecialPets">Редкие питомцы</string>
-  <string name="sectionmounts">Основные скакуны</string>
-  <string name="sectionpremiumMounts">Скакуны из волшебного эликсира</string>
-  <string name="sectionquestMounts">Квестовые скакуны</string>
-  <string name="sectionspecialMounts">Редкие скакуны</string>
-  <string name="world_quest">Мировой квест</string>
-  <string name="inn_description">Отдых в гостинице защитит вас от урона за невыполненные ежедневные задания по ночам! (Примечание: не предотвращает получение урона от мирового босса.)</string>
-  <string name="empty_items">У вас нет %s</string>
-  <string name="user_level">Ур. %d</string>
-  <string name="user_level_with_class">Ур. %1$d - %2$s</string>
-  <string name="warrior">Воин</string>
-  <string name="rogue">Разбойник</string>
-  <string name="mage">Маг</string>
-  <string name="healer">Целитель</string>
-  <string name="warrior_description">Воины чаще и лучше наносят «критические удары», которые случайным образом увеличивают награду за выполнение заданий: золото, опыт и шанс выпадения предметов. Кроме того, воины наносят значительный урон монстрам-боссам. Играйте за воина, если для вас существенным стимулом станет возможность сорвать джекпот, неожиданно получив больше наград, или осыпать сильнейшими ударами босса в квестах!</string>
-  <string name="mage_description">Маги быстро учатся, получая опыт и уровни быстрее, чем другие классы. Они также выгодно используют ману на особые навыки. Играйте за мага, если вам по душе тактическая сторона Habitica или если хорошей мотивацией для вас служит получение новых уровней и открытие дополнительных возможностей.</string>
-  <string name="rogue_description">Разбойники накапливают богатства, получая больше золота, чем кто бы там ни было. Они также эксперты по поиску различных предметов. Их культовая способность «Хитрость» позволяет им уклониться от последствий невыполненных ежедневных заданий. Играйте за разбойника, если хорошей мотивацией для вас являются награды и достижения и вы жаждете трофеев и значков!</string>
-  <string name="healer_description">Целители неуязвимы перед уроном и распространяют защиту на других. Пропущенные ежедневные задания и вредные привычки несильно их беспокоят, а после неудачи они могут восстановить здоровье. Играйте за целителя, если вам нравится помогать другим членам команды или если вас вдохновляет мысль о возможности усердным трудом обмануть смерть.</string>
-  <string name="select_class">Выберите класс</string>
-  <string name="opt_out_class">Отказаться</string>
-  <string name="opt_out_description">Не хотите утруждать себя классами? Тогда откажитесь — и останетесь воином и ваши очки будут обрабатываться автоматически. Активировать классы можно будет позже в меню настроек.</string>
-  <string name="class_confirmation">Вы уверены, что хотите быть %s?</string>
-  <string name="class_changed">Теперь вы %s!</string>
-  <string name="class_changed_description">У вас есть новая боевая экипировка по умолчанию, которую вы можете сменить в разделе Снаряжение!</string>
-  <string name="choose_class">Выбрать класс</string>
-  <string name="dialog_go_back">Вернуться назад</string>
-  <string name="opt_out_confirmation">Вы уверены, что хотите отказаться?</string>
-  <string name="change_class">Изменить ваш класс</string>
-  <string name="change_class_description">Поменяйте класс, и получите назад ваши очки характеристик за 3 самоцвета. Распределить очки характеристик можно на сайте.</string>
-  <string name="enable_class">Включить систему классов</string>
-  <string name="changing_class_progress">Изменение класса</string>
-  <string name="by_email">По электронной почте</string>
-  <string name="invite_existing_users">Пригласить существующих пользователей</string>
-  <string name="send">Отправить</string>
-  <string name="invite">Пригласить друзей</string>
-  <string name="invite_id_description">Если у вас уже есть друзья, которые пользуются Habitica, пригласите их с помощью ID пользователя.</string>
-  <string name="invite_email_description">Если друг присоединится к Habitica, перейдя по ссылке в вашем письме, он автоматически будет приглашён в вашу команду!</string>
-  <string name="add_invites">Добавить приглашенных</string>
-  <string name="user_id">ID пользователя</string>
-  <string name="email">Электронная почта</string>
-  <string name="invite_users">Пригласить в команду</string>
-  <string name="share_using">Поделиться с помощью</string>
-  <string name="share_levelup">Я достиг %d уровня в Habitica, улучшая привычки в реальной жизни!</string>
-  <string name="share_hatched">У меня только что вылупился питомец %1$s %2$s в Habitica, потому что я выполнял задачи в реальной жизни!</string>
-  <string name="share_raised">Я только что получил скакуна %1$s %2$s в Habitica, выполняя задачи в реальной жизни!</string>
-  <string name="open_in_store">Откройте в Play маркет</string>
-  <string name="change_class_confirmation">Вы уверены что хотите поменять класс? Это стоит 3 самоцвета.</string>
-  <string name="change_class_equipment_warning">Внимание: вы больше не можете покупать снаряжение класса %s.</string>
-  <string name="leaderMessage">Сообщение от %1$s</string>
-  <string name="leaderName">Предводитель: %1$s</string>
-  <string name="confirm">Подтвердить</string>
-  <string name="market">Магазин</string>
-  <string name="timeTravelers">Путешественники во времени</string>
-  <string name="seasonalShop">Сезонная лавка</string>
-  <string name="empty_inbox">У вас нет входящих сообщений. Вы можете отправить пользователю новое сообщение через общий чат!</string>
-  <string name="party_invite">Разблокировать, пригласив друзей</string>
-  <string name="no_gold">Недостаточно золота</string>
-  <string name="no_potion">Вам не нужно покупать зелье здоровья</string>
-  <string name="successful_purchase">%1$s успешно куплен</string>
-  <string name="purchase_confirmation_title">Подтвердите покупку</string>
-  <string name="confirm_purchase_text">Купить %1$s для %2$s %3$s</string>
-  <string name="gem">самоцвет</string>
-  <string name="hourglass">песочные часы</string>
-  <string name="hourglasses">песочные часы</string>
-  <string name="gold_singular">золото</string>
-  <string name="gold_plural">золото</string>
-  <string name="chat_message_copied">Сообщение скопировано в буфер обмена</string>
-  <string name="copy_chat_message">Скопировать в буфер обмена</string>
-  <string name="edit_tag_title">Редактировать метку</string>
-  <string name="edit_tag_btn_edit">Редактировать</string>
-  <string name="edit_tag_btn_done">Готово</string>
-  <string name="edit_tag_btn_delete">Удалить</string>
-  <string name="confirm_delete_tag_title">Вы уверены?</string>
-  <string name="confirm_delete_tag_message">Вы уверены, что хотите удалить?</string>
-  <string name="filter_drawer_edit_tags">Редактировать метки</string>
-  <string name="filter_drawer_filter_tags">Фильтровать по меткам</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Участник может приласить вас с помощью этого QR кода</string>
-  <string name="qr_save_message">QR код сохранен </string>
-  <string name="qr_dialogue_title">Ваш QR код</string>
-  <string name="download">Скачать</string>
-  <string name="send_new_message">Отправить новое сообщение</string>
-  <string name="choose_recipient_title">Выберите получателя</string>
-  <string name="action_continue">Продолжить</string>
-  <string name="scan_qr_code">Сканировать QR код</string>
-  <string name="enter_recipient_uuid">Ввести пользовательский ID участника</string>
-  <string name="invited_to_party">Вас пригласили в команду!</string>
-  <string name="stats_widget_label">Характеристики Habitica</string>
-  <string name="add_task">Добавить задачу</string>
-  <string name="add_habit">Добавить привычку</string>
-  <string name="add_daily">Добавить ежедневное задание</string>
-  <string name="add_todo">Добавить задачу</string>
-  <string name="add_reward">Добавить награду</string>
-  <string name="all_dailies_completed">Вы справились со всеми ежедневными заданиями. Так держать!</string>
-  <string name="widget_habit_button">Привычки Habitica</string>
-  <string name="widget_dailies">Ежедневные задания Habitica</string>
-  <string name="widget_add_task">Добавить задачу Habitica</string>
-  <string name="google_services_missing">Сервис Google play не найден.</string>
-  <string name="gem.purchase.toolbartitle">Купить</string>
-  <string name="gem.purchase.title">Покупка самоцветов поддерживает разработчиков и помогает развивать Habitica</string>
-  <string name="gem.purchase.subtitle">Самоцветы позволяют получить интересные дополнительные возможности, включая:</string>
-  <string name="gem.purchase.listitem1">Крутые костюмы для аватара</string>
-  <string name="gem.purchase.listitem2">Отличные фоны</string>
-  <string name="gem.purchase.listitem3">Задания с яйцами питомцев в качестве награды</string>
-  <string name="gem.purchase.listitem4">Способность изменить свой класс, если уровень менее 100</string>
-  <string name="support_habitica">Поддержать Habitica</string>
-  <string name="skill_transformation_use">использовать</string>
-  <string name="hatching_market_info">Не выпадает то, что нужно? Посмотри на рынке!</string>
-  <string name="feeding_market_info">Нужна определенная еда? Купи сколько угодно на рынке!</string>
-  <string name="open_market">Зайти на рынок</string>
-  <string name="cds_description">Ваши ежедневные задания будут обновлены после %1$s. Выполните их до этого времени!</string>
-  <string name="AudioTheme_title">Аудио-тема</string>
-  <string name="AudioTheme_summary">Выбрать аудио-тему Habitica</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">До завтра!</string>
-  <string name="belongs_to_challenge">Относится к испытанию</string>
-  <string name="has_reminder">Есть напоминание</string>
-  <string name="has_tag">Отмечено тегом</string>
-  <string name="subscribe.title">Подписка поддерживает разработчиков и помогает развивать Habitica</string>
-  <string name="subscribe_prompt">Став подписчиком вы получите эти полезные преимущества:</string>
-  <string name="subscribe.listitem1">Покупка самоцветов за золото</string>
-  <string name="subscribe.listitem2">Эксклюзивные ежемесячные предметы</string>
-  <string name="subscribe.listitem3">Сохраните дополнительные элементы истории</string>
-  <string name="subscribe.listitem4">Ежедневные трофеи выпадают в два раза чаще</string>
-  <string name="subscriptions">Абонемент</string>
-  <string name="subscription_duration">Повторять каждые %s</string>
-  <string name="subscribe">Подписаться</string>
-  <string name="subscribe.listitem2.description">Каждый месяц вы получаете уникальный косметический элемент для своего аватара! Плюс, каждые три месяца последовательной подписки таинственные путешественники во времени предоставят вам доступ к историческим (и футуристическим!) косметическим предметам.</string>
-  <string name="subscribe.listitem3.description">Завершенный список дел и история доступны дольше.</string>
-  <string name="subscription_hourglasses">+%d Мистических песочных часов</string>
-  <string name="payment_method">Способ оплаты</string>
-  <string name="subscription">Подписка</string>
-  <string name="active">Активный</string>
-  <string name="cancel_subscription">Отменить подписку</string>
-  <string name="cancel_subscription_google.description">Больше не хотите использовать подписку? При желании можете отписаться в разделе \"Мои приложения\" в Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Отменяете подписку? Из-за способа оплаты вы можете отменить подписку только через веб-сайт. Нажмите кнопку ниже, чтобы открыть страницу в браузере!</string>
-  <string name="visit_habitica_website">Посетите сайт Habitica</string>
-  <string name="current_bonuses">Текущие бонусы</string>
-  <string name="months_subscribed">Месяцев подписки</string>
-  <string name="current_hourclasses">Текущие Мистические песочные часы</string>
-  <string name="monthly_gem_cap">Ежемесячный лимит самоцветов</string>
-  <string name="inactive">Неактивный</string>
-  <string name="one_month">1 месяц</string>
-  <string name="months">%d месяцев</string>
-  <string name="month">месяц</string>
-  <string name="three_months">3 месяца</string>
-  <string name="six_months">6 месяцев</string>
-  <string name="twelve_months">12 месяцев</string>
-  <string name="subscribe_prompt_thanks">Как подписчик вы получаете эти полезные преимущества:</string>
-  <string name="subscription_status">Статус подписки</string>
-  <string name="byLeader">сделано %s</string>
-  <string name="challenge_details">Детали испытания</string>
-  <string name="challenge_leave_title">Покинуть испытание</string>
-  <string name="challenge_leave_text">Вы уверены, что хотите покинуть испытание “%s”?</string>
-  <string name="challenge_remove_tasks_title">Удалить задачи</string>
-  <string name="challenge_remove_tasks_text">Вы уверены, что хотите удалить задачи?</string>
-  <string name="remove_tasks">Удалить</string>
-  <string name="my_challenges">Мои испытания</string>
-  <string name="public_challenges">Общее</string>
-  <string name="challenges">Испытания</string>
-  <string name="daily">Ежедневное задание</string>
-  <string name="habit">Привычка</string>
-  <string name="reward">Награда</string>
-  <string name="todo">Задача</string>
-  <string name="official">Официальный</string>
-  <string name="participating">Участие</string>
-  <string name="challenge">Испытание</string>
-  <string name="go_to_challenge">Перейти к испытанию</string>
-  <string name="not_part_of_a_challenge">Сейчас вы не участвуете в испытаниях!</string>
-  <string name="join_a_challenge">Присоединитесь к испытанию, чтобы добавить готовый набор задач в ваш список, и соревнуйтесь с другими хабитанцами, чтобы заработать достижения и даже самоцветы!</string>
-  <string name="check_the_public_challenge_tab">Откройте вкладку \"Общее\", чтобы найти испытания, созданные пользователями, которые больше всего подходят вам.</string>
-  <string name="add_reminder">Добавить напоминание</string>
-  <string name="warning">Предупреждение</string>
-  <string name="open_settings">Открыть настройки</string>
-  <string name="dont_keep_activities_warning">Похоже, что у вас активен параметр разработчика \\"Не сохранять операции\\". Обычно из-за него возникают проблемы с приложением Habitica, поэтому мы советуем его отключить.</string>
-  <string name="inbox">Входящие</string>
-  <string name="FAQ">Часто задаваемые вопросы</string>
-  <string name="special">Специальное</string>
-  <string name="gem_for_gold_description">Ваша подписка Habitica позволяет приобретать несколько самоцветов каждый месяц в обмен на золото.</string>
-  <string name="limited_count">%d осталось</string>
-  <string name="gem_shop">Самоцвет</string>
-  <string name="mystery_item">Загадочный предмет</string>
-  <string name="myster_item_notes">Каждый месяц подписчики получат загадочный предмет. Обычно это происходит за неделю до конца месяца.</string>
-  <string name="open">Открыть</string>
-  <string name="notification_mystery_item">Вы открываете коробку и находите %s!</string>
-  <string name="checkInRewardEarned">Вы заработали %1$s в качестве награды за преданность к улучшению жизни.</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Ваш следующий приз будет доступен после  %1$d входа в игру</string>
-  <string name="pending_approval">ожидает утверждения</string>
-  <string name="filters">Фильтры</string>
-  <string name="done">Выполнено</string>
-  <string name="group_tasks_edit_description">Групповые задания не могут быть редактированы.</string>
-  <string name="group_tasks_edit_title">Нельзя редактировать это задание</string>
-  <string name="groups">Группы</string>
-  <string name="all">Все</string>
-  <string name="none">Никто</string>
-  <string name="owned">Принадлежит</string>
-  <string name="not_owned">Не принадлежит</string>
-  <string name="login_btn_fb">Зарегистрироваться с Facebook</string>
-  <string name="login_btn_google">Зарегистрироваться с Google</string>
-  <string name="action_back">Назад</string>
-  <string name="avatar_extras">Дополнительно</string>
-  <string name="avatar_skin_color">Цвет кожи</string>
-  <string name="avatar_hair_color">Цвет волос</string>
-  <string name="avatar_hair_bangs">Чёлка</string>
-  <string name="avatar_hair_ponytail">Конский хвост</string>
-  <string name="avatar_glasses">Очки</string>
-  <string name="avatar_wheelchair">Кресло-каталка</string>
-  <string name="weak">Стройное</string>
-  <string name="strong">Тучное</string>
-  <string name="completed">Завершить</string>
-  <string name="setuP_group_other">Другое</string>
-  <string name="clear">Очистить</string>
-  <string name="empty_title_habits">У вас нет привычек</string>
-  <string name="empty_title_todos">У вас нет задач</string>
-  <string name="empty_title_rewards">У вас нет вознаграждений</string>
-  <string name="reload_content">Обновить содержимое</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Обновить</string>
+  <string name="XP_default">Опыт</string>
+  <string name="HP_default">Здоровье</string>
+  <string name="MP_default">Мана</string>
+  <string name="ERR_pb_barcode">Настройки не могут быть загружены из штрих-кода</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Настройки</string>
+  <string name="SP_address_hint">Ваш клиентский сервер</string>
+  <string name="SP_userID_title">ID пользователя</string>
+  <string name="SP_userID_summary">Ваш ID</string>
+  <string name="SP_APIToken_title">API Token</string>
+  <string name="SP_APIToken_summary">Ваш API Token</string>
+  <string name="Language_title">Язык</string>
+  <string name="Language_summary">Изменить язык Habitica</string>
+  <string name="SP_user_qr_code">Ваш QR код</string>
+  <string name="PS_contact_title">Свяжитесь со мной</string>
+  <string name="unknown_error">Произошла ошибка...</string>
+  <string name="pref_account_header">Аккаунт</string>
+  <string name="pref_first_day_of_the_week_title">Первый день недели</string>
+  <string name="pref_first_day_of_the_week_summary">Первый день недели во всех календарях</string>
+  <string name="pref_reminder_header">Ежедневное напоминание</string>
+  <string name="pref_reminder_checkbox">Активируйте напоминание</string>
+  <string name="pref_reminder_picker">Установите время напоминания</string>
+  <string name="pref_cds_header">Персональное начало суток</string>
+  <string name="pref_cds_picker">Установить персональное начало суток</string>
+  <string name="pref_push_notifications_checkbox">Push-уведомления пользователя</string>
+  <string name="push_notifications">Push-уведомления</string>
+  <string name="push_notifications_sum">Настройте push-уведомления</string>
+  <string name="preference_push_you_won_challenge">Вы прошли испытание!</string>
+  <string name="preference_push_received_a_private_message">Получено личное сообщение</string>
+  <string name="preference_push_gifted_gems">Подаренные самоцветы</string>
+  <string name="preference_push_gifted_subscription">Подаренная подписка</string>
+  <string name="preference_push_invited_to_party">Приглашены в команду</string>
+  <string name="preference_push_invited_to_guild">Приглашены в гильдию</string>
+  <string name="preference_push_your_quest_has_begun">Ваш Квест начался</string>
+  <string name="preference_push_invited_to_quest">Приглашены в квест</string>
+  <!--Adding tasks-->
+  <string name="task_value">Значение</string>
+  <string name="new_todo">Новая задача</string>
+  <string name="new_reward">Новая награда</string>
+  <string name="new_daily">Новое ежедневное задание</string>
+  <string name="new_habit">Новая привычка</string>
+  <string name="action_edit">Редактировать</string>
+  <string name="action_delete">Удалить</string>
+  <string name="action_cancel">Закрыть</string>
+  <string name="login_btn">Вход</string>
+  <string name="register_btn">Регистрация</string>
+  <string name="username">Имя пользователя</string>
+  <string name="email_username">Имя пользователя или Email</string>
+  <string name="password">Пароль</string>
+  <string name="emailAddress">Электронная почта</string>
+  <string name="confirmpassword">Подтвердите пароль</string>
+  <string name="logout">Выйти</string>
+  <string name="logout_description">Выйти из вашего аккаунта</string>
+  <string name="account_details_sum">Проверьте детали вашего аккаунта</string>
+  <string name="account_details">Детали аккаунта</string>
+  <string name="LoginActivityName">Добро пожаловать</string>
+  <string name="string_revive">Воскресить</string>
+  <string name="please_connect">Пожалуйста, подключитесь через приложение, прежде чем использовать виджет</string>
+  <string name="about.title">О приложении</string>
+  <string name="about.libraries">Библиотеки</string>
+  <string name="about.versionhistory">История версий</string>
+  <string name="about.habitica_open_source">Habitica – проект с открытым исходным кодом, который доступен на Github</string>
+  <string name="about.rate_our_app">Оцените наше приложение</string>
+  <string name="about.give_us_feedback">Оставьте отзыв!</string>
+  <string name="about.bugreport">Сообщить об ошибке</string>
+  <string name="about.source_code">Исходный код</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Ошибка подключения</string>
+  <string name="network_error_no_network_body">Отсутствует соединение с интернетом.</string>
+  <string name="internal_error_api">Кажется, возникли технические проблемы на сервере. Повторите попытку позже.</string>
+  <string name="authentication_error_title">Ошибка аутентификации</string>
+  <string name="authentication_error_body">Неверное имя пользователя и/или пароль.</string>
+  <string name="login_validation_error_title">Ошибка проверки</string>
+  <string name="login_validation_error_fieldsmissing">Вы должны заполнить все поля.</string>
+  <string name="save_changes">Сохранить</string>
+  <string name="copy">Копировать</string>
+  <string name="notes">Заметки</string>
+  <string name="text">Текст</string>
+  <string name="difficulty">Сложность</string>
+  <string name="tags">Метки</string>
+  <string name="trivial">Пустяк</string>
+  <string name="easy">Легко</string>
+  <string name="medium">Нормально</string>
+  <string name="hard">Сложно</string>
+  <string name="start_date">Дата начала</string>
+  <string name="positive_habit_form">Полезная ( + )</string>
+  <string name="negative_habit_form">Вредная ( - )</string>
+  <string name="checklist">Список</string>
+  <string name="reminders">Напоминания</string>
+  <string name="actions">Действия</string>
+  <string name="attributes">Характеристики</string>
+  <string name="physical">Физическое</string>
+  <string name="mental">Умственное</string>
+  <string name="social">Общение</string>
+  <string name="other">Другое</string>
+  <string name="frequency">Периодичность</string>
+  <string name="frequency_weekly">В определенные дни недели</string>
+  <string name="frequency_daily">Каждые X дня/дней</string>
+  <string name="monday">Понедельник</string>
+  <string name="tuesday">Вторник</string>
+  <string name="wednesday">Среда</string>
+  <string name="thursday">Четверг</string>
+  <string name="friday">Пятница</string>
+  <string name="saturday">Суббота</string>
+  <string name="sunday">Воскресенье</string>
+  <string name="levelup_header">Вы получили уровень!</string>
+  <string name="levelup_detail">Через достижение своих целей в реальной жизни Вы достигли %1$d-го уровня!</string>
+  <string name="levelup_health">Вы полностью вылечены!</string>
+  <string name="levelup_button">Ура!</string>
+  <string name="faint_subtitle">Не отчаивайтесь!</string>
+  <string name="faint_penalty_body">Вы потеряли уровень, золото и предмет экипировки, но сможете это наверстать, если постараетесь! Удачи! Все получится!</string>
+  <string name="faint_header">У вас закончилось здоровье!</string>
+  <string name="faint_button">Восстановить здоровье &amp; Попробовать ещё раз</string>
+  <string name="filter">Фильтр</string>
+  <string name="profile_image">Аватар</string>
+  <string name="mana_price_button">%d МP</string>
+  <string name="used_skill">Вы использовали %1$s за %2$d маны.</string>
+  <string name="used_skill_without_mana">Вы использовали %1$s.</string>
+  <string name="new_checklist_item">новый пункт списка</string>
+  <string name="add_checklist_item">Добавить</string>
+  <string name="reminder_title">Не забудьте отметить ежедневные задания!</string>
+  <string name="skill_progress_title">Использовать навык</string>
+  <string name="coming_soon">Скоро</string>
+  <string name="chat_flag_confirmation">Вы уверены, что хотите пожаловаться на это сообщение?</string>
+  <string name="flag_confirm">Пожаловаться на сообщение</string>
+  <string name="unlock_lvl_11">Открывается на 11 уровне</string>
+  <string name="no_party_message">Вы не состоите в команде. Для того, чтобы присоединиться к команде, пожалуйста, перейдите на сайт.</string>
+  <string name="forgot_pw_btn">Забыли пароль</string>
+  <string name="forgot_pw_tv">Забыли пароль? Пожалуйста, перейдите на сайт.</string>
+  <string name="tavern.inn.checkOut">Cнова активировать ваши ежедневные задания</string>
+  <string name="tavern.inn.rest">Временно приостановить ваши ежедневные задания</string>
+  <string name="reward.dialog.buy">Купить</string>
+  <string name="reward.dialog.dismiss">Отклонить</string>
+  <string name="party">Команда</string>
+  <string name="chat">Чат</string>
+  <string name="members">Участники</string>
+  <string name="habits">Привычки</string>
+  <string name="dailies">Ежедневные задания</string>
+  <string name="todos">Задачи</string>
+  <string name="rewards">Награды</string>
+  <string name="taskform.delete.title">Вы уверены?</string>
+  <string name="taskform.delete.message">Вы уверены, что хотите удалить?</string>
+  <string name="yes">Да</string>
+  <string name="no">Нет</string>
+  <string name="quest">Квест</string>
+  <string name="avatar_body">Тело</string>
+  <string name="avatar_hair">Причёска</string>
+  <string name="avatar_shirt">Рубашка</string>
+  <string name="avatar_skin">Кожа</string>
+  <string name="avatar_ears">Уши животных</string>
+  <string name="avatar_base">Основа</string>
+  <string name="avatar_color">Цвет</string>
+  <string name="avatar_beard">Борода</string>
+  <string name="avatar_mustache">Усы</string>
+  <string name="avatar_flower">Цветок</string>
+  <string name="avatar_bangs">Чёлка</string>
+  <string name="avatar_nothing">Не выбрано</string>
+  <string name="avatar_size">Телосложение</string>
+  <string name="avatar_size_slim">Стройное</string>
+  <string name="avatar_size_broad">Плотное</string>
+  <string name="avatar_background">Фон</string>
+  <string name="purchase_customization">Приобрести Персонализацию</string>
+  <string name="purchase_set_button">Разблокируйте набор за %d кристаллов</string>
+  <string name="purchase_button">Купить</string>
+  <string name="purchase_set_title">Купить комплект %s</string>
+  <string name="due_date">Дата выполнения</string>
+  <string name="quest.accept">Принять</string>
+  <string name="quest.reject">Отклонить</string>
+  <string name="quest.begin">Начать квест</string>
+  <string name="quest.cancel">Отменить приглашение</string>
+  <string name="quest.abort">Остановить квест</string>
+  <string name="quest.leave">Покинуть квест</string>
+  <string name="quest.pending">Ожидает</string>
+  <string name="quest.accepted">Принято</string>
+  <string name="quest.rejected">Отклонено</string>
+  <string name="quest.participants">Участники</string>
+  <string name="version_info">Версия %1$s (%2$d)</string>
+  <string name="sidebar_help">Помощь и ЧаВо</string>
+  <string name="complete_tutorial">Есть!</string>
+  <string name="dismiss_tutorial">Напомнить позже</string>
+  <string name="intro_1_subtitle">Добро пожаловать в</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Пришло время веселиться, пока вы делаете свою работу. Присоединитесь к %s участникам, уже улучшающих свою жизнь.</string>
+  <string name="intro_2_subtitle">Прогресс в игре</string>
+  <string name="intro_2_title">Прогресс в жизни</string>
+  <string name="intro_3_description">Добивайтесь поставленнх целей с помощью друзей. Поддерживайте друг друга в реальной жизни и в сражении, делая свою жизнь лучше!</string>
+  <string name="intro_finish_button">Давайте начнем!</string>
+  <string name="previous_button">Назад</string>
+  <string name="next_button">Далее</string>
+  <string name="skip_button">Пропустить</string>
+  <string name="setup_welcome_description">Добро пожаловать в Habitica, где продвижение в игре помогает вам в рельной жизни! Выполняя реальные задачи, вы разблокируете снаряжение, питомцев, квесты и многое другое.</string>
+  <string name="setup_welcome_title">Добро пожаловать</string>
+  <string name="avatar_setup_description">Итак, как бы вы хотели выглядеть? Не беспокойтесь, вы это сможете изменить позже.</string>
+  <string name="task_setup_description">Великолепно! Теперь, вы заинтересованы в работе на протяжении этого путешествия?</string>
+  <string name="setup_group_work">Работа</string>
+  <string name="setup_group_exercise">Тренировки</string>
+  <string name="setup_group_health">Здоровье</string>
+  <string name="setup_group_school">Школа</string>
+  <string name="setup_group_teams">Команды</string>
+  <string name="setup_group_chores">Домашние дела</string>
+  <string name="setup_group_creativity">Творчество</string>
+  <string name="setup_task_work_1">Разобрать электронную почту</string>
+  <string name="setup_task_work_2">Самое важное задание</string>
+  <string name="setup_task_work_3">Рабочий проект</string>
+  <string name="setup_task_exercise_1">10 мин кардионагрузки</string>
+  <string name="setup_task_exercise_2">Растяжка</string>
+  <string name="setup_task_exercise_3">Составить график тренировок</string>
+  <string name="setup_task_healthWellness_1">Съесть здоровую / вредную пищу</string>
+  <string name="setup_task_healthWellness_2">Почистить зубы ниткой</string>
+  <string name="setup_task_healthWellness_3">Проверить расписание</string>
+  <string name="setup_task_school_1">Учиться/Отложить на потом</string>
+  <string name="setup_task_school_2">Сделать домашнюю работу</string>
+  <string name="setup_task_school_3">Закончить учебное задание</string>
+  <string name="setup_task_teams_1">Задания с командой</string>
+  <string name="setup_task_teams_2">Узнать, как обстоят дела у команды</string>
+  <string name="setup_task_teams_3">Завершить командный проект</string>
+  <string name="setup_task_chores_1">10 минут уборки</string>
+  <string name="setup_task_chores_2">Помыть посуду</string>
+  <string name="setup_task_chores_3">Организовать вещи в шкафу</string>
+  <string name="setup_task_creativity_1">Улучшить навык владения ремеслом</string>
+  <string name="setup_task_creativity_2">Поработать над творческим проектом</string>
+  <string name="setup_task_creativity_3">Закончить творческий проект</string>
+  <string name="gem.purchase.support">Хотите помочь нам развивать Habitica и дальше? Вы можете поддержать разработчиков, купив самоцветы!\n\nСамоцветы позволяют вам купить забавные дополнения такие, как:  \n\n - классные костюмы для вашего аватара;\n - потрясающие фоны;\n - веселые квесты, в награду за которые вы получите яйца с питомцами;\n - возможность сменить класс до 100 уровня.\n\nБольшое спасибо за то, что вы помогаете Habitica делать лучшей на сколь это возможно. Ваша поддержка очень важна для нас!</string>
+  <string name="my_guilds">Мои гильдии</string>
+  <string name="public_guilds">Открытые гильдии</string>
+  <string name="guild">Гильдия</string>
+  <string name="leave">Покинуть</string>
+  <string name="join">Присоединиться</string>
+  <string name="leader">Предводитель</string>
+  <string name="gems">Самоцветы</string>
+  <string name="copy_as_todo">Скопировать как «Ежедневное»</string>
+  <string name="send_pm">Отправить личное сообщение</string>
+  <string name="flag">Пометить</string>
+  <string name="delete">Удалить</string>
+  <string name="name">Имя</string>
+  <string name="description">Описание</string>
+  <string name="privacy">Приватность</string>
+  <string name="write_message">Написать сообщение</string>
+  <string name="post">Отправить</string>
+  <string name="guild_search_hint">Поиск для гильдий</string>
+  <string name="todo_due">Выполнить к: %s</string>
+  <string name="daily_streak">выполнено подряд: %d</string>
+  <string name="todo_has_duedate">У задания есть срок выполнения</string>
+  <string name="battle_gear">Боевая экипировка</string>
+  <string name="costume">Костюм</string>
+  <string name="outfit_head">Голова</string>
+  <string name="outfit_headAccessory">Аксессуары</string>
+  <string name="outfit_eyewear">Очки</string>
+  <string name="outfit_armor">Снаряжение</string>
+  <string name="outfit_back">Спина</string>
+  <string name="outfit_body">Тело</string>
+  <string name="outfit_shield">Щит</string>
+  <string name="outfit_weapon">Оружие</string>
+  <string name="wear_costume">Использовать костюм</string>
+  <string name="equipped">Надето</string>
+  <string name="quest_cancel_message">Вы уверены, что хотите отменить квест? Все принятые приглашения будут отменены. Квестовый свиток останется у владельца.</string>
+  <string name="quest.invitation">Приглашение в квест</string>
+  <string name="quest_begin_message">Вы уверены, что хотите начать квест? Никто больше не сможет присоединиться к нему.</string>
+  <string name="quest.invitation.text">Вас пригласили в квест!</string>
+  <string name="ago_1day">1 день назад</string>
+  <string name="ago_days">%d дней назад</string>
+  <string name="ago_1Minute">1 минуту назад</string>
+  <string name="ago_minutes">%d минут назад</string>
+  <string name="ago_hours">%d часов назад</string>
+  <string name="ago_1hour">1 час назад</string>
+  <string name="today">Сегодня</string>
+  <string name="sidebar_items">Предметы</string>
+  <string name="eggs">Яйца</string>
+  <string name="hatching_potions">Инкубационные эликсиры</string>
+  <string name="food">Еда</string>
+  <string name="quests">Квесты</string>
+  <string name="pets">Питомцы</string>
+  <string name="mounts">Скакуны</string>
+  <string name="armoireEquipment">Вы нашли в сундуке редкий предмет: %s! Потрясающе!</string>
+  <string name="armoireFood">Копаясь в сундуке, вы находите %1$s %2$s. Откуда это здесь?</string>
+  <string name="armoireExp">Вы сражаетесь с сундуком и набираете опыт. Получай!</string>
+  <string name="armoireNotesFull">Откройте сундук, чтобы случайным образом получить особое снаряжение, опыт или еду! Осталось предметов снаряжения: %d</string>
+  <string name="armoireLastItem">Вы получили последний редкий предмет из зачарованного сундука.</string>
+  <string name="armoireNotesEmpty">Новое снаряжение будет появляться в сундуке раз в месяц. До тех пор – продолжайте кликать ради опыта и еды!</string>
+  <string name="sell">Продать (%d золота)</string>
+  <string name="hatch_with_potion">Полить эликсиром</string>
+  <string name="feed_to_pet">Покормить питомца</string>
+  <string name="hatch_egg">Вывести питомца из яйца</string>
+  <string name="invite_party">Пригласить команду</string>
+  <string name="dialog_feeding">Покормить %1$s %2$s:</string>
+  <string name="use_animal">Использовать</string>
+  <string name="feed">Покормить</string>
+  <string name="hatch_with">Вылупить питомца с помощью %s</string>
+  <string name="hatched_pet_title">У вас вылупился %1$s %2$s!</string>
+  <string name="close">Закрыть</string>
+  <string name="share">Поделиться</string>
+  <string name="notification_pet_fed">Вы покормили вашего %1$s %2$s!</string>
+  <string name="notification_purchase">%s приобретен</string>
+  <string name="sectionpets">Основные питомцы</string>
+  <string name="sectionpremiumPets">Питомцы из волшебного эликсира</string>
+  <string name="sectionquestPets">Квестовые питомцы</string>
+  <string name="sectionspecialPets">Редкие питомцы</string>
+  <string name="sectionmounts">Основные скакуны</string>
+  <string name="sectionpremiumMounts">Скакуны из волшебного эликсира</string>
+  <string name="sectionquestMounts">Квестовые скакуны</string>
+  <string name="sectionspecialMounts">Редкие скакуны</string>
+  <string name="world_quest">Мировой квест</string>
+  <string name="inn_description">Отдых в гостинице защитит вас от урона за невыполненные ежедневные задания по ночам! (Примечание: не предотвращает получение урона от мирового босса.)</string>
+  <string name="empty_items">У вас нет %s</string>
+  <string name="user_level">Ур. %d</string>
+  <string name="user_level_with_class">Ур. %1$d - %2$s</string>
+  <string name="warrior">Воин</string>
+  <string name="rogue">Разбойник</string>
+  <string name="mage">Маг</string>
+  <string name="healer">Целитель</string>
+  <string name="warrior_description">Воины чаще и лучше наносят «критические удары», которые случайным образом увеличивают награду за выполнение заданий: золото, опыт и шанс выпадения предметов. Кроме того, воины наносят значительный урон монстрам-боссам. Играйте за воина, если для вас существенным стимулом станет возможность сорвать джекпот, неожиданно получив больше наград, или осыпать сильнейшими ударами босса в квестах!</string>
+  <string name="mage_description">Маги быстро учатся, получая опыт и уровни быстрее, чем другие классы. Они также выгодно используют ману на особые навыки. Играйте за мага, если вам по душе тактическая сторона Habitica или если хорошей мотивацией для вас служит получение новых уровней и открытие дополнительных возможностей.</string>
+  <string name="rogue_description">Разбойники накапливают богатства, получая больше золота, чем кто бы там ни было. Они также эксперты по поиску различных предметов. Их культовая способность «Хитрость» позволяет им уклониться от последствий невыполненных ежедневных заданий. Играйте за разбойника, если хорошей мотивацией для вас являются награды и достижения и вы жаждете трофеев и значков!</string>
+  <string name="healer_description">Целители неуязвимы перед уроном и распространяют защиту на других. Пропущенные ежедневные задания и вредные привычки несильно их беспокоят, а после неудачи они могут восстановить здоровье. Играйте за целителя, если вам нравится помогать другим членам команды или если вас вдохновляет мысль о возможности усердным трудом обмануть смерть.</string>
+  <string name="select_class">Выберите класс</string>
+  <string name="opt_out_class">Отказаться</string>
+  <string name="opt_out_description">Не хотите утруждать себя классами? Тогда откажитесь — и останетесь воином и ваши очки будут обрабатываться автоматически. Активировать классы можно будет позже в меню настроек.</string>
+  <string name="class_confirmation">Вы уверены, что хотите быть %s?</string>
+  <string name="class_changed">Теперь вы %s!</string>
+  <string name="class_changed_description">У вас есть новая боевая экипировка по умолчанию, которую вы можете сменить в разделе Снаряжение!</string>
+  <string name="choose_class">Выбрать класс</string>
+  <string name="dialog_go_back">Вернуться назад</string>
+  <string name="opt_out_confirmation">Вы уверены, что хотите отказаться?</string>
+  <string name="change_class">Изменить ваш класс</string>
+  <string name="change_class_description">Поменяйте класс, и получите назад ваши очки характеристик за 3 самоцвета. Распределить очки характеристик можно на сайте.</string>
+  <string name="enable_class">Включить систему классов</string>
+  <string name="changing_class_progress">Изменение класса</string>
+  <string name="by_email">По электронной почте</string>
+  <string name="invite_existing_users">Пригласить существующих пользователей</string>
+  <string name="send">Отправить</string>
+  <string name="invite">Пригласить друзей</string>
+  <string name="invite_id_description">Если у вас уже есть друзья, которые пользуются Habitica, пригласите их с помощью ID пользователя.</string>
+  <string name="invite_email_description">Если друг присоединится к Habitica, перейдя по ссылке в вашем письме, он автоматически будет приглашён в вашу команду!</string>
+  <string name="add_invites">Добавить приглашенных</string>
+  <string name="user_id">ID пользователя</string>
+  <string name="email">Электронная почта</string>
+  <string name="invite_users">Пригласить в команду</string>
+  <string name="share_using">Поделиться с помощью</string>
+  <string name="share_levelup">Я достиг %d уровня в Habitica, улучшая привычки в реальной жизни!</string>
+  <string name="share_hatched">У меня только что вылупился питомец %1$s %2$s в Habitica, потому что я выполнял задачи в реальной жизни!</string>
+  <string name="share_raised">Я только что получил скакуна %1$s %2$s в Habitica, выполняя задачи в реальной жизни!</string>
+  <string name="open_in_store">Откройте в Play маркет</string>
+  <string name="change_class_confirmation">Вы уверены что хотите поменять класс? Это стоит 3 самоцвета.</string>
+  <string name="change_class_equipment_warning">Внимание: вы больше не можете покупать снаряжение класса %s.</string>
+  <string name="leaderMessage">Сообщение от %1$s</string>
+  <string name="leaderName">Предводитель: %1$s</string>
+  <string name="confirm">Подтвердить</string>
+  <string name="market">Магазин</string>
+  <string name="timeTravelers">Путешественники во времени</string>
+  <string name="seasonalShop">Сезонная лавка</string>
+  <string name="empty_inbox">У вас нет входящих сообщений. Вы можете отправить пользователю новое сообщение через общий чат!</string>
+  <string name="party_invite">Разблокировать, пригласив друзей</string>
+  <string name="no_gold">Недостаточно золота</string>
+  <string name="no_potion">Вам не нужно покупать зелье здоровья</string>
+  <string name="successful_purchase">%1$s успешно куплен</string>
+  <string name="purchase_confirmation_title">Подтвердите покупку</string>
+  <string name="confirm_purchase_text">Купить %1$s для %2$s %3$s</string>
+  <string name="gem">самоцвет</string>
+  <string name="hourglass">песочные часы</string>
+  <string name="hourglasses">песочные часы</string>
+  <string name="gold_singular">золото</string>
+  <string name="gold_plural">золото</string>
+  <string name="chat_message_copied">Сообщение скопировано в буфер обмена</string>
+  <string name="copy_chat_message">Скопировать в буфер обмена</string>
+  <string name="edit_tag_title">Редактировать метку</string>
+  <string name="edit_tag_btn_edit">Редактировать</string>
+  <string name="edit_tag_btn_done">Готово</string>
+  <string name="edit_tag_btn_delete">Удалить</string>
+  <string name="confirm_delete_tag_title">Вы уверены?</string>
+  <string name="confirm_delete_tag_message">Вы уверены, что хотите удалить?</string>
+  <string name="filter_drawer_edit_tags">Редактировать метки</string>
+  <string name="filter_drawer_filter_tags">Фильтровать по меткам</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Участник может приласить вас с помощью этого QR кода</string>
+  <string name="qr_save_message">QR код сохранен </string>
+  <string name="qr_dialogue_title">Ваш QR код</string>
+  <string name="download">Скачать</string>
+  <string name="send_new_message">Отправить новое сообщение</string>
+  <string name="choose_recipient_title">Выберите получателя</string>
+  <string name="action_continue">Продолжить</string>
+  <string name="scan_qr_code">Сканировать QR код</string>
+  <string name="enter_recipient_uuid">Ввести пользовательский ID участника</string>
+  <string name="invited_to_party">Вас пригласили в команду!</string>
+  <string name="stats_widget_label">Характеристики Habitica</string>
+  <string name="add_task">Добавить задачу</string>
+  <string name="add_habit">Добавить привычку</string>
+  <string name="add_daily">Добавить ежедневное задание</string>
+  <string name="add_todo">Добавить задачу</string>
+  <string name="add_reward">Добавить награду</string>
+  <string name="all_dailies_completed">Вы справились со всеми ежедневными заданиями. Так держать!</string>
+  <string name="widget_habit_button">Привычки Habitica</string>
+  <string name="widget_dailies">Ежедневные задания Habitica</string>
+  <string name="widget_add_task">Добавить задачу Habitica</string>
+  <string name="google_services_missing">Сервис Google play не найден.</string>
+  <string name="gem.purchase.toolbartitle">Купить</string>
+  <string name="gem.purchase.title">Покупка самоцветов поддерживает разработчиков и помогает развивать Habitica</string>
+  <string name="gem.purchase.subtitle">Самоцветы позволяют получить интересные дополнительные возможности, включая:</string>
+  <string name="gem.purchase.listitem1">Крутые костюмы для аватара</string>
+  <string name="gem.purchase.listitem2">Отличные фоны</string>
+  <string name="gem.purchase.listitem3">Задания с яйцами питомцев в качестве награды</string>
+  <string name="gem.purchase.listitem4">Способность изменить свой класс, если уровень менее 100</string>
+  <string name="support_habitica">Поддержать Habitica</string>
+  <string name="skill_transformation_use">использовать</string>
+  <string name="hatching_market_info">Не выпадает то, что нужно? Посмотри на рынке!</string>
+  <string name="feeding_market_info">Нужна определенная еда? Купи сколько угодно на рынке!</string>
+  <string name="open_market">Зайти на рынок</string>
+  <string name="cds_description">Ваши ежедневные задания будут обновлены после %1$s. Выполните их до этого времени!</string>
+  <string name="AudioTheme_title">Аудио-тема</string>
+  <string name="AudioTheme_summary">Выбрать аудио-тему Habitica</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">До завтра!</string>
+  <string name="belongs_to_challenge">Относится к испытанию</string>
+  <string name="has_reminder">Есть напоминание</string>
+  <string name="has_tag">Отмечено тегом</string>
+  <string name="subscribe.title">Подписка поддерживает разработчиков и помогает развивать Habitica</string>
+  <string name="subscribe_prompt">Став подписчиком вы получите эти полезные преимущества:</string>
+  <string name="subscribe.listitem1">Покупка самоцветов за золото</string>
+  <string name="subscribe.listitem2">Эксклюзивные ежемесячные предметы</string>
+  <string name="subscribe.listitem3">Сохраните дополнительные элементы истории</string>
+  <string name="subscribe.listitem4">Ежедневные трофеи выпадают в два раза чаще</string>
+  <string name="subscriptions">Абонемент</string>
+  <string name="subscription_duration">Повторять каждые %s</string>
+  <string name="subscribe">Подписаться</string>
+  <string name="subscribe.listitem2.description">Каждый месяц вы получаете уникальный косметический элемент для своего аватара! Плюс, каждые три месяца последовательной подписки таинственные путешественники во времени предоставят вам доступ к историческим (и футуристическим!) косметическим предметам.</string>
+  <string name="subscribe.listitem3.description">Завершенный список дел и история доступны дольше.</string>
+  <string name="subscription_hourglasses">+%d Мистических песочных часов</string>
+  <string name="payment_method">Способ оплаты</string>
+  <string name="subscription">Подписка</string>
+  <string name="active">Активный</string>
+  <string name="cancel_subscription">Отменить подписку</string>
+  <string name="cancel_subscription_google.description">Больше не хотите использовать подписку? При желании можете отписаться в разделе \"Мои приложения\" в Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle.description">Отменяете подписку? Из-за способа оплаты вы можете отменить подписку только через веб-сайт. Нажмите кнопку ниже, чтобы открыть страницу в браузере!</string>
+  <string name="visit_habitica_website">Посетите сайт Habitica</string>
+  <string name="current_bonuses">Текущие бонусы</string>
+  <string name="months_subscribed">Месяцев подписки</string>
+  <string name="current_hourclasses">Текущие Мистические песочные часы</string>
+  <string name="monthly_gem_cap">Ежемесячный лимит самоцветов</string>
+  <string name="inactive">Неактивный</string>
+  <string name="one_month">1 месяц</string>
+  <string name="months">%d месяцев</string>
+  <string name="month">месяц</string>
+  <string name="three_months">3 месяца</string>
+  <string name="six_months">6 месяцев</string>
+  <string name="twelve_months">12 месяцев</string>
+  <string name="subscribe_prompt_thanks">Как подписчик вы получаете эти полезные преимущества:</string>
+  <string name="subscription_status">Статус подписки</string>
+  <string name="byLeader">сделано %s</string>
+  <string name="challenge_details">Детали испытания</string>
+  <string name="challenge_leave_title">Покинуть испытание</string>
+  <string name="challenge_leave_text">Вы уверены, что хотите покинуть испытание “%s”?</string>
+  <string name="challenge_remove_tasks_title">Удалить задачи</string>
+  <string name="challenge_remove_tasks_text">Вы уверены, что хотите удалить задачи?</string>
+  <string name="remove_tasks">Удалить</string>
+  <string name="my_challenges">Мои испытания</string>
+  <string name="public_challenges">Общее</string>
+  <string name="challenges">Испытания</string>
+  <string name="daily">Ежедневное задание</string>
+  <string name="habit">Привычка</string>
+  <string name="reward">Награда</string>
+  <string name="todo">Задача</string>
+  <string name="official">Официальный</string>
+  <string name="participating">Участие</string>
+  <string name="challenge">Испытание</string>
+  <string name="go_to_challenge">Перейти к испытанию</string>
+  <string name="not_part_of_a_challenge">Сейчас вы не участвуете в испытаниях!</string>
+  <string name="join_a_challenge">Присоединитесь к испытанию, чтобы добавить готовый набор задач в ваш список, и соревнуйтесь с другими хабитанцами, чтобы заработать достижения и даже самоцветы!</string>
+  <string name="check_the_public_challenge_tab">Откройте вкладку \"Общее\", чтобы найти испытания, созданные пользователями, которые больше всего подходят вам.</string>
+  <string name="add_reminder">Добавить напоминание</string>
+  <string name="warning">Предупреждение</string>
+  <string name="open_settings">Открыть настройки</string>
+  <string name="dont_keep_activities_warning">Похоже, что у вас активен параметр разработчика \\"Не сохранять операции\\". Обычно из-за него возникают проблемы с приложением Habitica, поэтому мы советуем его отключить.</string>
+  <string name="inbox">Входящие</string>
+  <string name="FAQ">Часто задаваемые вопросы</string>
+  <string name="special">Специальное</string>
+  <string name="gem_for_gold_description">Ваша подписка Habitica позволяет приобретать несколько самоцветов каждый месяц в обмен на золото.</string>
+  <string name="limited_count">%d осталось</string>
+  <string name="gem_shop">Самоцвет</string>
+  <string name="mystery_item">Загадочный предмет</string>
+  <string name="myster_item_notes">Каждый месяц подписчики получат загадочный предмет. Обычно это происходит за неделю до конца месяца.</string>
+  <string name="open">Открыть</string>
+  <string name="notification_mystery_item">Вы открываете коробку и находите %s!</string>
+  <string name="checkInRewardEarned">Вы заработали %1$s в качестве награды за преданность к улучшению жизни.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Ваш следующий приз будет доступен после  %1$d входа в игру</string>
+  <string name="pending_approval">ожидает утверждения</string>
+  <string name="filters">Фильтры</string>
+  <string name="done">Выполнено</string>
+  <string name="group_tasks_edit_description">Групповые задания не могут быть редактированы.</string>
+  <string name="group_tasks_edit_title">Нельзя редактировать это задание</string>
+  <string name="groups">Группы</string>
+  <string name="all">Все</string>
+  <string name="none">Никто</string>
+  <string name="owned">Принадлежит</string>
+  <string name="not_owned">Не принадлежит</string>
+  <string name="login_btn_fb">Зарегистрироваться с Facebook</string>
+  <string name="login_btn_google">Зарегистрироваться с Google</string>
+  <string name="action_back">Назад</string>
+  <string name="avatar_extras">Дополнительно</string>
+  <string name="avatar_skin_color">Цвет кожи</string>
+  <string name="avatar_hair_color">Цвет волос</string>
+  <string name="avatar_hair_bangs">Чёлка</string>
+  <string name="avatar_hair_ponytail">Конский хвост</string>
+  <string name="avatar_glasses">Очки</string>
+  <string name="avatar_wheelchair">Кресло-каталка</string>
+  <string name="weak">Стройное</string>
+  <string name="strong">Тучное</string>
+  <string name="completed">Завершить</string>
+  <string name="setuP_group_other">Другое</string>
+  <string name="clear">Очистить</string>
+  <string name="empty_title_habits">У вас нет привычек</string>
+  <string name="empty_title_todos">У вас нет задач</string>
+  <string name="empty_title_rewards">У вас нет вознаграждений</string>
+  <string name="reload_content">Обновить содержимое</string>
+</resources>
diff --git a/Habitica/res/values-tr/strings.profile.xml b/Habitica/res/values-tr/strings.profile.xml
index f810ca377..085d400bd 100644
--- a/Habitica/res/values-tr/strings.profile.xml
+++ b/Habitica/res/values-tr/strings.profile.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">Evcil &amp; Binek Hayvanlar</string>
-    <string name="profile_pets_found">Bulunan Evcil Hayvanlar</string>
-    <string name="profile_mounts_tamed">Evcilleştirilen Binek Hayvanları</string>
-    <string name="profile_loading_data">üye verisi yükleniyor.</string>
-    <string name="profile_send_message_to">%s kişisine mesaj gönder</string>
-    <string name="profile_message_sent_to">%s kişisine mesaj gönderildi</string>
-    <string name="profile_level">Seviye:</string>
-    <string name="profile_class_bonus">Sınıf-Bonusu:</string>
-    <string name="profile_allocated">Dağıtılmış:</string>
-    <string name="profile_boosts">Yükselmeler:</string>
-    <string name="profile_private_message">Özel Mesaj</string>
-    <string name="profile_achievements">Başarılar</string>
-    <string name="profile_achievement_ok">Tamam</string>
-    <string name="profile_qrcode_close">Kapat</string>
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Evcil &amp; Binek Hayvanlar</string>
+    <string name="profile_pets_found">Bulunan Evcil Hayvanlar</string>
+    <string name="profile_mounts_tamed">Evcilleştirilen Binek Hayvanları</string>
+    <string name="profile_loading_data">üye verisi yükleniyor.</string>
+    <string name="profile_send_message_to">%s kişisine mesaj gönder</string>
+    <string name="profile_message_sent_to">%s kişisine mesaj gönderildi</string>
+    <string name="profile_level">Seviye:</string>
+    <string name="profile_class_bonus">Sınıf-Bonusu:</string>
+    <string name="profile_allocated">Dağıtılmış:</string>
+    <string name="profile_boosts">Yükselmeler:</string>
+    <string name="profile_private_message">Özel Mesaj</string>
+    <string name="profile_achievements">Başarılar</string>
+    <string name="profile_achievement_ok">Tamam</string>
+    <string name="profile_qrcode_close">Kapat</string>
+
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-tr/strings.tutorial.xml b/Habitica/res/values-tr/strings.tutorial.xml
index bc1c325f7..9e364475b 100644
--- a/Habitica/res/values-tr/strings.tutorial.xml
+++ b/Habitica/res/values-tr/strings.tutorial.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_overview">İşte geldik! İlgi alanlarına göre sana bazı işler doldurdum. Kendin de birkaç tane eklemeyi dene. Başlığa basarak işleri düzenleyebilirsin.</string>
-  <string name="tutorial_equipment">Ekipman satın aldığında burada gözükür. Savaş Ekipmanın niteliklerini, ve Kostümün (eğer etkinse) avatarının ne giydiğini etkiler.</string>
-  <string name="tutorial_items">Görevlerini tamamlayarak ve seviye yükselerek eşya kazan. Kullanmak için eşyanın üzerine tıkla!</string>
-  <string name="tutorial_pets">Gerçek dünya işlerini tamamladıkça, artık rastgele yumurta ve iksir bulma şansın var. Hayvanları yumurtadan çıkarmak için o ikisini birleştir</string>
-  <string name="tutorial_skills">Yetenekler güçlü etkileri olan özel becerilerdir! Kullanmak için bir yetenğe bas. Bu Mana ile (mavi çubuk), yani hergün giriş yapmakla ve gerçek hayat görevlerini tamamlamakla kazanarak ödenir. Daha fazla bilgi için menüdeki SSS\'ı kontrol et!</string>
-  <string name="tutorial_party">Burası senin ve arkadaşlarının birbirinizi hedeflerinize sorumlu tutabileceğiniz ve görevlerinizle canavarlarla savaştığınız yer!</string>
-  <string name="tutorial_tavern">Taverna, yani herkese açık ve her yaşın sohbet odasına hoşgeldin! Burda üretkenlik hakkında sohbet edebilir ve sorular sorabilirsin. Iyi eğlenceler!</string>
-  <string name="tutorial_classes">Savaşçı, Büyücü, Şifacı veya Düzenbaz olmak için birini seç! Her bir sınıfın kendine özgü donanımı ve yeteneği vardır. Daha fazlasını öğrenmek için (?)\'ne bas!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_overview">İşte geldik! İlgi alanlarına göre sana bazı işler doldurdum. Kendin de birkaç tane eklemeyi dene. Başlığa basarak işleri düzenleyebilirsin.</string>
+  <string name="tutorial_equipment">Ekipman satın aldığında burada gözükür. Savaş Ekipmanın niteliklerini, ve Kostümün (eğer etkinse) avatarının ne giydiğini etkiler.</string>
+  <string name="tutorial_items">Görevlerini tamamlayarak ve seviye yükselerek eşya kazan. Kullanmak için eşyanın üzerine tıkla!</string>
+  <string name="tutorial_pets">Gerçek dünya işlerini tamamladıkça, artık rastgele yumurta ve iksir bulma şansın var. Hayvanları yumurtadan çıkarmak için o ikisini birleştir</string>
+  <string name="tutorial_skills">Yetenekler güçlü etkileri olan özel becerilerdir! Kullanmak için bir yetenğe bas. Bu Mana ile (mavi çubuk), yani hergün giriş yapmakla ve gerçek hayat görevlerini tamamlamakla kazanarak ödenir. Daha fazla bilgi için menüdeki SSS\'ı kontrol et!</string>
+  <string name="tutorial_party">Burası senin ve arkadaşlarının birbirinizi hedeflerinize sorumlu tutabileceğiniz ve görevlerinizle canavarlarla savaştığınız yer!</string>
+  <string name="tutorial_tavern">Taverna, yani herkese açık ve her yaşın sohbet odasına hoşgeldin! Burda üretkenlik hakkında sohbet edebilir ve sorular sorabilirsin. Iyi eğlenceler!</string>
+  <string name="tutorial_classes">Savaşçı, Büyücü, Şifacı veya Düzenbaz olmak için birini seç! Her bir sınıfın kendine özgü donanımı ve yeteneği vardır. Daha fazlasını öğrenmek için (?)\'ne bas!</string>
+</resources>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index bb22da300..46476de47 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -1,532 +1,532 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">Yenile</string>
-  <string name="XP_default">Tecrübe</string>
-  <string name="HP_default">Sağlık</string>
-  <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Ayarlar barkoddan yüklenmedi</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">Ayarlar</string>
-  <string name="SP_address_hint">Sizin özel sunucunuz</string>
-  <string name="SP_userID_title">Kullanıcı ID\'si</string>
-  <string name="SP_userID_summary">Sizin Kullanıcı Kimliğiniz</string>
-  <string name="SP_APIToken_title">API Anahtarı</string>
-  <string name="SP_APIToken_summary">Sizin API Anahtarınız</string>
-  <string name="Language_title">Dil</string>
-  <string name="Language_summary">Habitica dilini değiştirin</string>
-  <string name="SP_user_qr_code">Sizin QR Kodunuz</string>
-  <string name="PS_contact_title">Benimle iletişime geçin</string>
-  <string name="unknown_error">Bir hata oluştu...</string>
-  <string name="pref_account_header">Hesap</string>
-  <string name="pref_first_day_of_the_week_title">Haftanın İlk Günü</string>
-  <string name="pref_first_day_of_the_week_summary">Tüm takvimlerde haftanın ilk günü</string>
-  <string name="pref_reminder_header">Günlük Hatırlatıcı</string>
-  <string name="pref_reminder_checkbox">Hatırlatıcıyı Aktive Edin</string>
-  <string name="pref_reminder_picker">Hatırlatıcı Zamanı Ayarla</string>
-  <string name="pref_cds_header">Özel Gün Başlangıcı</string>
-  <string name="pref_cds_picker">Özel Gün Başlangıç Zamanını Ayarla</string>
-  <string name="pref_push_notifications_checkbox">Kullanıcı Bildirimleri</string>
-  <string name="push_notifications">Bildirimler</string>
-  <string name="push_notifications_sum">Bilgilendirme ayarlarınızı ayarlayın</string>
-  <string name="preference_push_you_won_challenge">Bir Mücadele kazandın!</string>
-  <string name="preference_push_received_a_private_message">Özel Mesaj Aldın</string>
-  <string name="preference_push_gifted_gems">Hediye Edilen Elmaslar</string>
-  <string name="preference_push_gifted_subscription">Hediye Edilen Abonelik</string>
-  <string name="preference_push_invited_to_party">Takıma davet edildin</string>
-  <string name="preference_push_invited_to_guild">Loncaya davet edildin</string>
-  <string name="preference_push_your_quest_has_begun">Görevin Başladı</string>
-  <string name="preference_push_invited_to_quest">Göreve Davet Edildin</string>
-  <!--Adding tasks-->
-  <string name="task_value">Değer</string>
-  <string name="new_todo">Yeni Yapılacak İş</string>
-  <string name="new_reward">Yeni Ödül</string>
-  <string name="new_daily">Yeni Günlük İş</string>
-  <string name="new_habit">Yeni Alışkanlık</string>
-  <string name="action_edit">Düzenle</string>
-  <string name="action_delete">Sil</string>
-  <string name="action_cancel">İptal et</string>
-  <string name="login_btn">Giriş yap</string>
-  <string name="register_btn">Kayıt ol</string>
-  <string name="username">Kullanıcı adı</string>
-  <string name="email_username">E-posta veya Kullanıcı adı</string>
-  <string name="password">Şifre</string>
-  <string name="emailAddress">E-posta adresi</string>
-  <string name="confirmpassword">Şifreni onayla</string>
-  <string name="logout">Çıkış yap</string>
-  <string name="logout_description">Hesabından çıkış yap</string>
-  <string name="account_details_sum">Hesap detaylarını kontrol et</string>
-  <string name="account_details">Hesap Detayları</string>
-  <string name="LoginActivityName">Hoş Geldin</string>
-  <string name="string_revive">Dirilt</string>
-  <string name="please_connect">Lütfen uygulamaya bir ekran aracı kullanmadan önce bağlanın</string>
-  <string name="about.title">Hakkında</string>
-  <string name="about.libraries">Kütüphaneler</string>
-  <string name="about.versionhistory">Sürüm geçmişi</string>
-  <string name="about.habitica_open_source">Habitica yazılımı Github üzerinde açık kaynak olarak mevcuttur.</string>
-  <string name="about.rate_our_app">Uygulamamızı Değerlendir</string>
-  <string name="about.give_us_feedback">Bize Geribildirim gönder!</string>
-  <string name="about.bugreport">Hata Bildir</string>
-  <string name="about.source_code">Kaynak Kodu</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Bağlantı Hatası</string>
-  <string name="network_error_no_network_body">İnternete bağlı değilsin.</string>
-  <string name="internal_error_api">Sunucu ile ilgili bir hata var gibi görünüyor. Daha sonra tekrar dene.</string>
-  <string name="authentication_error_title">Kimlik doğrulama hatası</string>
-  <string name="authentication_error_body">Kullanıcı adı ve/veya Şifre hatalı.</string>
-  <string name="login_validation_error_title">Doğrulama Hatası</string>
-  <string name="login_validation_error_fieldsmissing">Tüm alanları doldurmanız gerekiyor.</string>
-  <string name="save_changes">Kaydet</string>
-  <string name="copy">Kopyala</string>
-  <string name="notes">Notlar</string>
-  <string name="text">Metin</string>
-  <string name="difficulty">Zorluk</string>
-  <string name="tags">Etiketler</string>
-  <string name="trivial">Önemsiz</string>
-  <string name="easy">Kolay</string>
-  <string name="medium">Orta</string>
-  <string name="hard">Zor</string>
-  <string name="start_date">Başlangıç Tarihi</string>
-  <string name="positive_habit_form">Olumlu (+)</string>
-  <string name="negative_habit_form">Olumsuz ( - )</string>
-  <string name="checklist">Yapılacak İşler Listesi</string>
-  <string name="reminders">Hatırlatıcılar</string>
-  <string name="actions">Hareketler</string>
-  <string name="attributes">Özellikler</string>
-  <string name="physical">Fiziksel</string>
-  <string name="mental">Zihinsel</string>
-  <string name="social">Sosyal</string>
-  <string name="other">Diğer</string>
-  <string name="frequency">Sıklık</string>
-  <string name="frequency_weekly">Haftanın Belirli Günlerinde</string>
-  <string name="frequency_daily">X günde bir</string>
-  <string name="monday">Pazartesi</string>
-  <string name="tuesday">Salı</string>
-  <string name="wednesday">Çarşamba</string>
-  <string name="thursday">Perşembe</string>
-  <string name="friday">Cuma</string>
-  <string name="saturday">Cumartesi</string>
-  <string name="sunday">Pazar</string>
-  <string name="levelup_header">Bir seviye yükseldin!</string>
-  <string name="levelup_detail">Gerçek hayattaki hedeflerini gerçekleştirerek %1$d. Seviyesine yükseldin!</string>
-  <string name="levelup_health">Tamamen sağlığına kavuştun!</string>
-  <string name="levelup_button">Yaşasın!</string>
-  <string name="faint_subtitle">Umudunu kaybetme!</string>
-  <string name="faint_penalty_body">Bir Seviye, Altınlarını ve biraz Ekipman kaybettin, ama çok çalışarak hepsini yeniden kazanabilirsin! İyi şanslar--bu işi becereceksin!</string>
-  <string name="faint_header">Sağlığın tükendi!</string>
-  <string name="faint_button">Sağlığını Doldur &amp; Tekrar Dene</string>
-  <string name="filter">Filtre</string>
-  <string name="profile_image">Profil Resmi</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">%2$d mana karşılığında %1$s kullandın.</string>
-  <string name="used_skill_without_mana">%1$s kullandın.</string>
-  <string name="new_checklist_item">yeni yapılacak iş</string>
-  <string name="add_checklist_item">Ekle</string>
-  <string name="reminder_title">Günlük İşlerini kontrol etmeyi unutma!</string>
-  <string name="skill_progress_title">Yetenek Kullanma</string>
-  <string name="coming_soon">Yakında</string>
-  <string name="chat_flag_confirmation">Bu mesajı kural ihlali olarak bildirmek istediğine emin misin?</string>
-  <string name="flag_confirm">Mesajı İşaretle</string>
-  <string name="unlock_lvl_11">Seviye 11\'de aç</string>
-  <string name="no_party_message">Bir takıma üye değilsin. Bir takıma katılmak için lütfen internet sitesini ziyaret et. </string>
-  <string name="forgot_pw_btn">Şifremi Unuttum</string>
-  <string name="forgot_pw_tv">Şifreni mi unuttun? Lütfen mobil internet sitemizi kullan.</string>
-  <string name="tavern.inn.checkOut">Günlük İşlerini tekrar aktive et</string>
-  <string name="tavern.inn.rest">Günlük İşleri durdur</string>
-  <string name="reward.dialog.buy">Satın al</string>
-  <string name="reward.dialog.dismiss">Yoksay</string>
-  <string name="party">Takım</string>
-  <string name="chat">Sohbet</string>
-  <string name="members">Üyeler</string>
-  <string name="habits">Alışkanlıklar</string>
-  <string name="dailies">Günlük İşler</string>
-  <string name="todos">Yapılacak İşler</string>
-  <string name="rewards">Ödüller</string>
-  <string name="taskform.delete.title">Emin misin?</string>
-  <string name="taskform.delete.message">Gerçekten silmek istiyor musun?</string>
-  <string name="yes">Evet</string>
-  <string name="no">Hayır</string>
-  <string name="quest">Görev</string>
-  <string name="avatar_body">Vücut</string>
-  <string name="avatar_hair">Saç</string>
-  <string name="avatar_shirt">Gömlek</string>
-  <string name="avatar_skin">Ten</string>
-  <string name="avatar_ears">Hayvan Kulakları</string>
-  <string name="avatar_base">Üs</string>
-  <string name="avatar_color">Renk</string>
-  <string name="avatar_beard">Sakal</string>
-  <string name="avatar_mustache">Bıyık</string>
-  <string name="avatar_flower">Çiçek</string>
-  <string name="avatar_bangs">Kahkül</string>
-  <string name="avatar_nothing">Hiçbir şey ayarlanmadı</string>
-  <string name="avatar_size">Boyut</string>
-  <string name="avatar_size_slim">İnce</string>
-  <string name="avatar_size_broad">Geniş</string>
-  <string name="avatar_background">Arka plan </string>
-  <string name="purchase_customization">Özelleştirme Satın Al</string>
-  <string name="purchase_set_button">%d elmas ile setin kilidini aç</string>
-  <string name="purchase_button">Satın al</string>
-  <string name="purchase_set_title">%s seti satın al</string>
-  <string name="due_date">Son Tarih</string>
-  <string name="quest.accept">Kabul et</string>
-  <string name="quest.reject">Reddet</string>
-  <string name="quest.begin">Göreve Başla</string>
-  <string name="quest.cancel">Daveti İptal Et</string>
-  <string name="quest.abort">Görevi iptal et</string>
-  <string name="quest.leave">Görevden Ayrıl</string>
-  <string name="quest.pending">Gönderiliyor</string>
-  <string name="quest.accepted">Kabul edildi</string>
-  <string name="quest.rejected">Reddedildi</string>
-  <string name="quest.participants">Katılımcılar</string>
-  <string name="version_info">Versiyon %1$s (%2$d)</string>
-  <string name="sidebar_help">Yardım &amp; SSS</string>
-  <string name="complete_tutorial">Anladım!</string>
-  <string name="dismiss_tutorial">Daha sonra hatırlat</string>
-  <string name="intro_1_subtitle">Hoş Geldin</string>
-  <string name="intro_1_title">Habitica\'ya</string>
-  <string name="intro_1_description">Bir şeyleri tamamlarken artık eğlenebilirsin. %s\'dan fazla kişinin hayatlarını birer işe odaklanarak geliştirmelerine katıl. </string>
-  <string name="intro_2_subtitle">Oyun gelişimi</string>
-  <string name="intro_2_title">Hayatta gelişim</string>
-  <string name="intro_2_description">Gerçek hayatındaki işlerini tamamlayarak oyun içindeki özellikleri aç. Zırh, evcil hayvan ve daha fazlasını hedeflerine ulaştığında ödül olarak kazan.</string>
-  <string name="intro_3_subtitle">Canavarlarla savaş</string>
-  <string name="intro_3_title">Sosyalleş</string>
-  <string name="intro_3_description">Hedeflerini arkadaşlarından yardım alarak devam ettir. Hayatta ve savaşlarda birbirinizi birlikte geliştirerek destek olun!</string>
-  <string name="intro_finish_button">Hadi başlayalım!</string>
-  <string name="previous_button">Önceki</string>
-  <string name="next_button">Sonraki</string>
-  <string name="skip_button">Atla</string>
-  <string name="setup_welcome_description">Habitica\'ya hoşgeldin, oyunda ilerledikçe gerçek hayatını da geliştireceksin! Gerçek hayat hedeflerine ulaştıkça, ekipman, evcil hayvan, görevler ve dahasını da ortaya çıkaracaksın.</string>
-  <string name="setup_welcome_title">Hoş Geldin</string>
-  <string name="avatar_setup_description">Nasıl görünmek istersin? Dert etme, daha sonra bunları değiştirebilirsin.</string>
-  <string name="task_setup_description">Müthiş! Şimdi, bu yolculukta neyi geliştirmek istiyorsun?</string>
-  <string name="setup_group_work">İş</string>
-  <string name="setup_group_exercise">Egzersiz</string>
-  <string name="setup_group_health">Sağlık</string>
-  <string name="setup_group_school">Okul</string>
-  <string name="setup_group_teams">Takımlar</string>
-  <string name="setup_group_chores">Günlük İşler</string>
-  <string name="setup_group_creativity">Yaratıcılık</string>
-  <string name="setup_task_work_1">E-postaları işle</string>
-  <string name="setup_task_work_2">En önemli iş</string>
-  <string name="setup_task_work_3">İş Projesi</string>
-  <string name="setup_task_exercise_1">10 dakikalık kardiyo</string>
-  <string name="setup_task_exercise_2">Esneme</string>
-  <string name="setup_task_exercise_3">Egzersiz programı oluştur</string>
-  <string name="setup_task_healthWellness_1">Sağlıklı beslen / sağlıksız besin</string>
-  <string name="setup_task_healthWellness_2">Diş ipi kullan</string>
-  <string name="setup_task_healthWellness_3">Sağlama planı</string>
-  <string name="setup_task_school_1">Ders çalış / Ertele</string>
-  <string name="setup_task_school_2">Ödev yap</string>
-  <string name="setup_task_school_3">Sınıf için görevlendirmeyi tamamla</string>
-  <string name="setup_task_teams_1">Takıma haber ver</string>
-  <string name="setup_task_teams_2">Durumunu takıma bildir</string>
-  <string name="setup_task_teams_3">Takım projesini tamamla</string>
-  <string name="setup_task_chores_1">10 dakikalık temizlik</string>
-  <string name="setup_task_chores_2">Bulaşıkları yıka</string>
-  <string name="setup_task_chores_3">Dolabı düzenle</string>
-  <string name="setup_task_creativity_1">Bir zanaat uzmanlığına çalış</string>
-  <string name="setup_task_creativity_2">Yaratıcı bir proje üzerinde çalış</string>
-  <string name="setup_task_creativity_3">Yaratıcı projeyi bitir</string>
-  <string name="gem.purchase.support">Habitica\'yı canlı tutmamız için yardımcı olmak ister misiniz? Yapımcıları elmas alarak destekleyebilirsiniz!\n\nElmaslarla hesabınız için eğlenceli ekstralar alabilirsiniz, örneğin: \n\n - Avatar\'ınız için havalı kostümler\n - Muhteşem arkaplanlar\n - Evcil hayvan yumurtaları kazanacağınız eğlenceli görevler\n - 100. seviyeden evvel sınıfınızı değiştirebileceğiniz beceriler\n\nHabitica\'yı en iyisi yapmamız için yardımcı olduğunuz için teşekkürler. Desteğiniz bize çok şey ifade ediyor!</string>
-  <string name="my_guilds">Loncalarım</string>
-  <string name="public_guilds">Açık Loncalar</string>
-  <string name="guild">Lonca</string>
-  <string name="leave">Ayrıl</string>
-  <string name="join">Katıl</string>
-  <string name="leader">Lider</string>
-  <string name="gems">Elmaslar</string>
-  <string name="copy_as_todo">Yapılacak İşlere kopyala</string>
-  <string name="send_pm">ÖM Gönder</string>
-  <string name="flag">Bildir</string>
-  <string name="delete">Sil</string>
-  <string name="name">Ad</string>
-  <string name="description">Tanım</string>
-  <string name="privacy">Gizlilik</string>
-  <string name="write_message">Mesaj Yaz</string>
-  <string name="post">Gönder</string>
-  <string name="guild_search_hint">Loncalarda ara</string>
-  <string name="todo_due">Şu zamana: %s</string>
-  <string name="daily_streak">mevcut seri: %d</string>
-  <string name="todo_has_duedate">İşin Bitirme Tarihi var</string>
-  <string name="battle_gear">Savaş Ekipmanı</string>
-  <string name="costume">Kostüm</string>
-  <string name="outfit_head">Kafa</string>
-  <string name="outfit_headAccessory">Kafa Aksesuarı</string>
-  <string name="outfit_eyewear">Göz Aksesuarı</string>
-  <string name="outfit_armor">Zırh</string>
-  <string name="outfit_back">Sırt</string>
-  <string name="outfit_body">Vücut</string>
-  <string name="outfit_shield">Kalkan</string>
-  <string name="outfit_weapon">Silah</string>
-  <string name="wear_costume">Kostümü Giy</string>
-  <string name="equipped">Giyilmiş</string>
-  <string name="quest_cancel_message">Bu görevi iptal etmek istediğinize emin misiniz?  Tüm davet kabulleri kaybolacak. Görev sahibi görev parşömeni sahipliğini sürdürecektir.</string>
-  <string name="quest.invitation">Görev Daveti</string>
-  <string name="quest_begin_message">Göreve başlamak istediğinize emin misiniz? Bir görev aktif ederseniz, ilave takım üyesi göreve katılamayacaktır.</string>
-  <string name="quest.invitation.text">Göreve katılmak için davet edildin!</string>
-  <string name="ago_1day">1 gün önce</string>
-  <string name="ago_days">%d gün önce</string>
-  <string name="ago_1Minute">1 dakika önce</string>
-  <string name="ago_minutes">%d dakika önce</string>
-  <string name="ago_hours">%d saat önce</string>
-  <string name="ago_1hour">1 saat önce</string>
-  <string name="today">Bugün</string>
-  <string name="sidebar_items">Eşyalar</string>
-  <string name="eggs">Yumurtalar</string>
-  <string name="hatching_potions">Kuluçka İksirleri</string>
-  <string name="food">Yiyecek</string>
-  <string name="quests">Görevler</string>
-  <string name="pets">Evcil Hayvanlar</string>
-  <string name="mounts">Binekler</string>
-  <string name="armoireEquipment">Gardırop içerisinde nadir bir Ekipman parçası buldun: : %s! Harika!</string>
-  <string name="armoireFood">Gardırobun altını üstünü getirdin ve %1$s %2$s buldun. Onun burada ne işi var?</string>
-  <string name="armoireExp">Gardırop ile güreştin ve Tecrübe kazandın. Al sana!</string>
-  <string name="armoireNotesFull">Gardırobu rastgele özel Ekipman, Tecrübe ve yiyecek elde etmek için açın! Kalan ekipman parçaları: %d</string>
-  <string name="armoireLastItem">Büyülü Gardırop içerisinde nadir Ekipman\'ın son parçasını da buldunuz.</string>
-  <string name="armoireNotesEmpty">Gardırop içerisinde her ayın ilk haftasında yeni bir Ekipman yer alacaktır. O zamana kadar Tecrübe ve Yiyecek için tıklamaya devam et.</string>
-  <string name="sell">Sat (%d Altın)</string>
-  <string name="hatch_with_potion">İksir ile üret</string>
-  <string name="feed_to_pet">Evcil hayvana besle</string>
-  <string name="hatch_egg">Yumurta ile üret</string>
-  <string name="invite_party">Takımı davet et</string>
-  <string name="dialog_feeding">%1$s %2$s besle:</string>
-  <string name="use_animal">Kullan</string>
-  <string name="feed">Besle</string>
-  <string name="hatch_with">Evcil hayvanı %s ile üret</string>
-  <string name="hatched_pet_title">%1$s %2$s ürettin!</string>
-  <string name="close">Kapat</string>
-  <string name="share">Paylaş</string>
-  <string name="notification_pet_fed">%1$s %2$s besledin!</string>
-  <string name="notification_purchase">%s satın alındı</string>
-  <string name="sectionpets">Temel Evcil Hayvanlar</string>
-  <string name="sectionpremiumPets">Büyü İksiri Evcil Hayvanları</string>
-  <string name="sectionquestPets">Görev Evcil Hayvanları</string>
-  <string name="sectionspecialPets">Nadir Evcil Hayvanlar</string>
-  <string name="sectionmounts">Temel Binekler</string>
-  <string name="sectionpremiumMounts">Büyü İksiri Binekleri</string>
-  <string name="sectionquestMounts">Görev Binekleri</string>
-  <string name="sectionspecialMounts">Nadir Binekler</string>
-  <string name="world_quest">Dünya Görevi</string>
-  <string name="inn_description">Gece boyunca tamamlayamadığın Günlük İşlerinin seni incitmesinden korunmak için Han\'da dinlen. (Not: Canavar hasarı almaktan korumaz.)</string>
-  <string name="empty_items">Hiç %s sahibi değilsin</string>
-  <string name="user_level">SVY %d</string>
-  <string name="user_level_with_class">SVY %1$d - %2$s</string>
-  <string name="warrior">Savaşçı</string>
-  <string name="rogue">Düzenbaz</string>
-  <string name="mage">Büyücü</string>
-  <string name="healer">Şifacı</string>
-  <string name="warrior_description">Savaşçılar rastgele bonus Altın, Tecrübe ve Görev tamamlarken eşya düşürme şansı veren daha fazla ve iyi \"kritik vuruşlar\" yapar. Ayrıca final canavarlara yüksek hasar verirler. Eğer şans oyunu gibi tahmin edilemez ödüller bulmaktan veya final canavar seferlerinde acıtacak hasarlar vermekten motive oluyorsan bir savaşçı olarak oynayabilirsin.</string>
-  <string name="mage_description">Büyücüler çabuk öğrenir, Tecrübe ve Seviyeleri diğer tüm sınıflardan hızlı kazanır. Ayrıca özel becerilerini kullanarak çok fazla Mana elde edebilirler. Alışkanlıkları taktiksel oyun açılarıyla oynamaktan keyif alıyorsan, veya seviye atlamaktan ve gelişmiş özelliklerin kilidini açmaktan motive oluyorsan bir büyücü olarak oynayabilirsin.</string>
-  <string name="rogue_description">Düzenbazlar servet biriktirmeyi, herkesten daha fazla Altın kazanmayı severler ve rastgele eşyalar bulmada uzmandırlar. Sembolik Gizlilik yetenekleri unutulan günlük görevlerin sonuçlarından sıyrılmasını sağlar. Eğer Ödüller ve Başarılardan, ganimet ve rozetler için uğraşmaktan motivasyon buluyorsan bir düzenbaz olarak oynayabilirsin.</string>
-  <string name="healer_description">Şifacılar hasarlara karşı su getirmez bir şekilde karşı dururlar ve diğerlerine de bu korumayı sürdürürler. Unutulan Günlük Görevler ve Kötü Alışkanlıklar onları çok fazla ürkütmez ve başarısızlıklardan dolayı oluşan sağlıkları iyileştirirler. Takımdaki diğerlerine refakat etmekten veya zor görevlerden dolayı Ölümü atlatma fikri seni heyecanlandırıyorsa bir şifacı olarak oynayabilirsin.</string>
-  <string name="select_class">Sınıf Seç</string>
-  <string name="opt_out_class">Çekil</string>
-  <string name="opt_out_description">Sınıflarla rahatsız edilmek istemiyor musun? Daha sonra seçmek ister misin? Çekilirsen - özel becerileri olmayan bir savaşçı olacaksın. Wiki\'de sınıf sistemin hakkında daha sonra bilgi edinebilir ve istediğin zaman sınıfları aktif edebilirsin.</string>
-  <string name="class_confirmation">Bir %s olmak istediğine emin misin?</string>
-  <string name="class_changed">Yeni sınıfın: %s!</string>
-  <string name="class_changed_description">Ekipmanlar menüsü altında değiştirebileceğin yeni varsayılan Savaş Ekipmanın var!</string>
-  <string name="choose_class">Sınıf Seç</string>
-  <string name="dialog_go_back">Geri dön</string>
-  <string name="opt_out_confirmation">Çekilmek istediğinden emin misin?</string>
-  <string name="change_class">Sınıfını değiştir</string>
-  <string name="change_class_description">3 elmas karşılığında sınıfını değiştir ve özellik puanlarını geri al. Özellik puanlarını websitesi üzerinden atayabilirsin</string>
-  <string name="enable_class">Sınıf Sistemini Aktive Et</string>
-  <string name="changing_class_progress">Sınıf Değiştirme</string>
-  <string name="by_email">Eposta ile</string>
-  <string name="invite_existing_users">Mevcut Kullanıcıları Davet Et</string>
-  <string name="send">Gönder</string>
-  <string name="invite">Arkadaşlarını Davet Et</string>
-  <string name="invite_id_description">Habitica kullanan arkadaşların var ise, Kullanıcı ID\'leri ile davet edebilirsin.</string>
-  <string name="invite_email_description">Epostan ile bir arkadaşın Habitica\'ya katılırsa, otomatik olarak takımına davet edilecektir.</string>
-  <string name="add_invites">Davetleri Ekle</string>
-  <string name="user_id">Kullanıcı ID</string>
-  <string name="email">Eposta</string>
-  <string name="invite_users">Takıma davet et</string>
-  <string name="share_using">Kullanımı paylaş</string>
-  <string name="share_levelup">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %d seviye elde ettim!</string>
-  <string name="share_hatched">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %1$s %2$s evcil hayvan ürettim.</string>
-  <string name="share_raised">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %1$s %2$s binek kazandım.</string>
-  <string name="open_in_store">Play Store\'da Aç</string>
-  <string name="change_class_confirmation">Sınıfınızı değiştirmek istediğinize emin misiniz? Bu işlem 3 elmasa mal olacaktır.</string>
-  <string name="change_class_equipment_warning">Uyarı: %s sınıfından ekipman alamayacaksınız.</string>
-  <string name="leaderMessage">%1$s tarafından mesaj</string>
-  <string name="leaderName">Lider: %1$s</string>
-  <string name="confirm">Onayla</string>
-  <string name="market">Pazar</string>
-  <string name="timeTravelers">Zaman Yolcuları</string>
-  <string name="seasonalShop">Mevsimsel Dükkan</string>
-  <string name="empty_inbox">Mesaj Kutunda hiç mesajın bulunmuyor. Bir kullanıcıya açık sohbet mesaj alanından bir mesaj gönderebilirsin!</string>
-  <string name="party_invite">Arkadaşlarını davet ederek kilidi aç</string>
-  <string name="no_gold">Yeterli Altın yok</string>
-  <string name="no_potion">Sağlık iksiri satın almanıza gerek yoktur</string>
-  <string name="successful_purchase">%1$s başarıyla satın alındı</string>
-  <string name="purchase_confirmation_title">Satın almayı onayla</string>
-  <string name="confirm_purchase_text">%2$s %3$s karşılığında %1$s satın al</string>
-  <string name="gem">elmas</string>
-  <string name="hourglass">kumsaati</string>
-  <string name="hourglasses">kumsaatleri</string>
-  <string name="gold_singular">altın</string>
-  <string name="gold_plural">altın</string>
-  <string name="chat_message_copied">Mesaj Panoya kopyalandı</string>
-  <string name="copy_chat_message">Panoya kopyala</string>
-  <string name="edit_tag_title">Etiketi Düzenle</string>
-  <string name="edit_tag_btn_edit">Düzenle</string>
-  <string name="edit_tag_btn_done">Tamam</string>
-  <string name="edit_tag_btn_delete">Sil</string>
-  <string name="confirm_delete_tag_title">Emin misin?</string>
-  <string name="confirm_delete_tag_message">Silmek istediğine emin misin?</string>
-  <string name="filter_drawer_edit_tags">Etiketleri Düzenle</string>
-  <string name="filter_drawer_filter_tags">Etikete göre filtrele</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Bir kişi sizi bu QR kod ile davet etmiştir</string>
-  <string name="qr_save_message">QR Kodun şurada kaydedildi</string>
-  <string name="qr_dialogue_title">QR Kodun</string>
-  <string name="download">İndir</string>
-  <string name="send_new_message">Yeni mesaj gönder</string>
-  <string name="choose_recipient_title">Mesaj Alıcısını Seç</string>
-  <string name="action_continue">Devam Et</string>
-  <string name="scan_qr_code">QR Kodunu Tara</string>
-  <string name="enter_recipient_uuid">Alıcının Kullanıcı ID\'sini gir</string>
-  <string name="invited_to_party">Bir takıma katılmak için davet edildin!</string>
-  <string name="stats_widget_label">Habitica İstatistikleri</string>
-  <string name="add_task">İş Ekle</string>
-  <string name="add_habit">Alışkanlık Ekle</string>
-  <string name="add_daily">Günlük İş Ekle</string>
-  <string name="add_todo">Yapılacak İş Ekle</string>
-  <string name="add_reward">Ödül Ekle</string>
-  <string name="all_dailies_completed">Tüm günlük işlerini tamamladın. Tebrikler!</string>
-  <string name="widget_habit_button">Habitica Alışkanlığı Yap</string>
-  <string name="widget_dailies">Habitica Günlük İşler</string>
-  <string name="widget_todo_list">Habitica Yapılacak İşler Listesi</string>
-  <string name="widget_add_task">Habitica İş Ekle</string>
-  <string name="google_services_missing">Google play services bulunamadı.</string>
-  <string name="gem.purchase.toolbartitle">Satın al</string>
-  <string name="gem.purchase.title">Elmas satın almak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
-  <string name="gem.purchase.subtitle">Elmaslar hesabın için eğlenceli ekstralar satın almanı sağlar, dahil olmak üzere:</string>
-  <string name="gem.purchase.listitem1">Avatarın için güzel kostümler</string>
-  <string name="gem.purchase.listitem2">Muhteşem arka planlar</string>
-  <string name="gem.purchase.listitem3">Sizi evcil hayvan yumurtası ile ödüllendiren görevler</string>
-  <string name="gem.purchase.listitem4">100. seviyeden önce sınıf değiştirme imkânı</string>
-  <string name="support_habitica">Habitica\'ya Destek Ol</string>
-  <string name="skill_transformation_use">kullan</string>
-  <string name="hatching_market_info">İş tamamlarken doğru eşyalar düşmedi mi? Pazara bir göz at!</string>
-  <string name="feeding_market_info">Farklı yiyecek mi lazım? Pazardan satın al!</string>
-  <string name="open_market">Pazar\'ı Aç</string>
-  <string name="cds_description">Günlük görevleriniz Habitica\'yı %1$s\'den sonra ilk defa kullanacağınızda sıfırlanacaktır. Bu saatten önce günlük görevlerinizi yaptığınızdan emin olun!</string>
-  <string name="AudioTheme_title">Ses Teması</string>
-  <string name="AudioTheme_summary">Habitica Ses Temasını Değiştir</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">Yarın görüşürüz!</string>
-  <string name="belongs_to_challenge">Bir Mücadeleye ait</string>
-  <string name="has_reminder">Hatırlatıcı Mevcut</string>
-  <string name="has_tag">Etiket Mevcut</string>
-  <string name="subscribe.title">Abone olmak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
-  <string name="subscribe_prompt">Abone ol ve bu faydalardan yararlan:</string>
-  <string name="subscribe.listitem1">Altınla elmas satın alabilir</string>
-  <string name="subscribe.listitem2">Özel aylık ekipman</string>
-  <string name="subscribe.listitem3">Fazladan geçmiş kaydını saklamak</string>
-  <string name="subscribe.listitem4">Günlük ganimet limiti ikiye katlanır</string>
-  <string name="subscriptions">Abonelikler</string>
-  <string name="subscription_duration">Her %s tekrar eden</string>
-  <string name="subscribe">Abone Ol</string>
-  <string name="subscribe.listitem1.description">Tüccar İskender artık sana tanesi 20 altına elmas satıcak!\n\nAylık sevkiyatı başlangıçta aylık 25 Elmas ile sınırlıdır, ama ardışık abonelik süresine göre artabilir.\n\nElmas limiti her üç aylık ardışık abonelik için 5 artar, toplam üst limit olan aylık 50 Elmasa kadar artabilir!</string>
-  <string name="subscribe.listitem2.description">Her ay avatarın için özel görsel bir eşya alırsın!\n\nAyrıca, her üç aylık ardışık abonelik için, Gizemli Zaman Yolcuları sana tarihi (ve fütürist!) görsel eşyalara erişim sağlar.</string>
-  <string name="subscribe.listitem3.description">Tamamlanmış Yapılacak İş ve iş geçmişlerine daha uzun süre erişim sağlar.</string>
-  <string name="subscribe.listitem4.description">İki katı ganimet limiti tamamladığın işlerinden her gün daha fazla eşya almana ve ahırını daha hızlı tamamlamana yardımcı olur!</string>
-  <string name="subscribe1month.gemcap">Elmas limiti 25\'le başlar</string>
-  <string name="subscribe3month.gemcap">Elmas limiti 30\'a çıkar</string>
-  <string name="subscribe6month.gemcap">Elmas limiti 35\'e çıkar</string>
-  <string name="subscribe12month.gemcap">Elmas limiti 45\'e çıkar</string>
-  <string name="subscription_hourglasses">+%d Mistik Kum Saati</string>
-  <string name="payment_method">Ödeme şekli</string>
-  <string name="subscription">Abonelik</string>
-  <string name="active">Etkin</string>
-  <string name="cancel_subscription">Aboneliği İptal Et</string>
-  <string name="cancel_subscription_google.description">Artık abone olmak istemiyor musun? Google Play Store\'un \"Uygulamalarım\" bölümünde aboneliği iptal etme seçeneğini bulabilirsin.</string>
-  <string name="cancel_subscription_notgoogle.description">Artık abone olmak istemiyor musun? Ödeme yönteminden dolayı, yalnızca web sitesi üzerinden aboneliğini iptal edebilirsin. Siteyi tarayıcında açmak için aşağıdaki düğmeyi tıkla!</string>
-  <string name="visit_habitica_website">Habitica Websitesini Ziyaret Et</string>
-  <string name="current_bonuses">Sağlanan Faydalar</string>
-  <string name="months_subscribed">Abone olunan aylar</string>
-  <string name="current_hourclasses">Sahip Olunan Mistik Kum Saati</string>
-  <string name="monthly_gem_cap">Aylık elmas limiti</string>
-  <string name="inactive">Etkin Değil</string>
-  <string name="one_month">1 Aylık</string>
-  <string name="months">%d Aylık</string>
-  <string name="month">ay</string>
-  <string name="three_months">3 aylık</string>
-  <string name="six_months">6 aylık</string>
-  <string name="twelve_months">12 aylık</string>
-  <string name="subscribe_prompt_thanks">Abone Olarak bu faydalardan yararlanıyorsun:</string>
-  <string name="subscription_status">Abonelik Durumu</string>
-  <string name="byLeader">%s \'a/e göre</string>
-  <string name="challenge_details">Mücadelele Detayları</string>
-  <string name="challenge_leave_title">Mücadeleden Ayrıl</string>
-  <string name="challenge_leave_text">\"%s\" Mücadelesinden ayrılmak istediğinden emin misin?</string>
-  <string name="challenge_remove_tasks_title">İşleri sil</string>
-  <string name="challenge_remove_tasks_text">İşleri gerçekten silmek istiyor musun?</string>
-  <string name="remove_tasks">Sil</string>
-  <string name="keep_tasks">Tut</string>
-  <string name="my_challenges">Benim Mücadelelerim</string>
-  <string name="public_challenges">Herkese Açık</string>
-  <string name="challenges">Mücadeleler</string>
-  <string name="daily">Günlük İş</string>
-  <string name="habit">Alışkanlık</string>
-  <string name="reward">Ödül</string>
-  <string name="todo">Yapılacak İş</string>
-  <string name="official">Resmi</string>
-  <string name="participating">Katılan</string>
-  <string name="challenge">Mücadele</string>
-  <string name="go_to_challenge">Mücadeleye Git</string>
-  <string name="not_part_of_a_challenge">Henüz herhangi bir Mücadele katılımcısı değilsin!</string>
-  <string name="join_a_challenge">Listene seçili işler eklemek için bir Mücadeleye katıl, sonra da başarılar ve hatta elmaslar kazanmak için diğer Habiticalılarla yarış!</string>
-  <string name="check_the_public_challenge_tab">\"Herkese Açık\" sekmesine basarak kullanıcılar tarafından yaratılmış Mücadelelerden sana en uygun olanını bul!</string>
-  <string name="add_reminder">Hatırlatıcı Ekle</string>
-  <string name="warning">Uyarı</string>
-  <string name="open_settings">Ayarları Aç</string>
-  <string name="dont_keep_activities_warning">Görünüşe göre Geliştirici seçeneğinde \ \"Etkinlikleri saklamayın \\" etkin. Şu anda bu seçenek, habitica uygulamasıyla ilgili sorunlara neden oluyor, bu nedenle devre dışı bırakılmasını öneriyoruz.</string>
-  <string name="inbox">Mesaj Kutusu</string>
-  <string name="FAQ">Sıkça Sorulan Sorular</string>
-  <string name="special">Özel</string>
-  <string name="gem_for_gold_description">Habitica\'ya abone olduğun için, her ay Altın karşılığı bir miktar Elmas satın alabilirsin.</string>
-  <string name="limited_count">%d kaldı</string>
-  <string name="gem_shop">Elmas</string>
-  <string name="mystery_item">Gizemli Eşya</string>
-  <string name="myster_item_notes">Her ay, aboneler gizemli eşya alırlar. Bu genelde ayın son haftasında açıklanır.</string>
-  <string name="open">Aç</string>
-  <string name="notification_mystery_item">Kutuyu açtın ve %s buldun!</string>
-  <string name="checkInRewardEarned">Kendini hayatını geliştirmeye adadığın için ödül olarak %1$s kazandın.</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Bir sonraki ödülün %1$d Girişten sonra açılacak</string>
-  <string name="pending_approval">onay bekleniyor</string>
-  <string name="filters">Filtreler</string>
-  <string name="done">Tamam</string>
-  <string name="group_tasks_edit_description">Grup işleri düzenlenemez.</string>
-  <string name="group_tasks_edit_title">Bu işi düzenleyemezsin</string>
-  <string name="groups">Gruplar</string>
-  <string name="all">Hepsi</string>
-  <string name="none">Hiçbiri</string>
-  <string name="owned">Sahip olunan</string>
-  <string name="not_owned">Sahip olunmayan</string>
-  <string name="new_game">Yeni\nOyun</string>
-  <string name="login_btn_fb">Facebook ile giriş yap</string>
-  <string name="login_btn_google">Google ile giriş yap</string>
-  <string name="action_back">Geri</string>
-  <string name="welcome_text">Ah, burada yeni olmalısın. Ben Justin, Habitica\'da ki rehberin olacağım.\n\nBaşlamak için, bir avatar yaratman gerekecek.</string>
-  <string name="randomize">Rastgele</string>
-  <string name="avatar_extras">Ekstralar</string>
-  <string name="avatar_skin_color">Ten Rengi</string>
-  <string name="avatar_hair_color">Saç Rengi</string>
-  <string name="avatar_hair_bangs">Kahkül</string>
-  <string name="avatar_hair_ponytail">Atkuyruğu</string>
-  <string name="avatar_glasses">Gözlükler</string>
-  <string name="avatar_wheelchair">Tekerlekli Sandalye</string>
-  <string name="weak">Zayıf</string>
-  <string name="strong">Güçlü</string>
-  <string name="gray">Gri</string>
-  <string name="dated">Tarihli</string>
-  <string name="completed">Tamamlanmış</string>
-  <string name="setuP_group_other">Diğer</string>
-  <string name="clear">Temizle</string>
-  <string name="empty_title_habits">Hiç Alışkanlık sahibi değilsin</string>
-  <string name="empty_title_dailies">Hiç Günlük İş sahibi değilsin</string>
-  <string name="empty_title_todos">Hiç Yapılacak İş sahibi değilsin</string>
-  <string name="empty_title_rewards">Hiç Ödül sahibi değilsin</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">Yenile</string>
+  <string name="XP_default">Tecrübe</string>
+  <string name="HP_default">Sağlık</string>
+  <string name="MP_default">Mana</string>
+  <string name="ERR_pb_barcode">Ayarlar barkoddan yüklenmedi</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">Ayarlar</string>
+  <string name="SP_address_hint">Sizin özel sunucunuz</string>
+  <string name="SP_userID_title">Kullanıcı ID\'si</string>
+  <string name="SP_userID_summary">Sizin Kullanıcı Kimliğiniz</string>
+  <string name="SP_APIToken_title">API Anahtarı</string>
+  <string name="SP_APIToken_summary">Sizin API Anahtarınız</string>
+  <string name="Language_title">Dil</string>
+  <string name="Language_summary">Habitica dilini değiştirin</string>
+  <string name="SP_user_qr_code">Sizin QR Kodunuz</string>
+  <string name="PS_contact_title">Benimle iletişime geçin</string>
+  <string name="unknown_error">Bir hata oluştu...</string>
+  <string name="pref_account_header">Hesap</string>
+  <string name="pref_first_day_of_the_week_title">Haftanın İlk Günü</string>
+  <string name="pref_first_day_of_the_week_summary">Tüm takvimlerde haftanın ilk günü</string>
+  <string name="pref_reminder_header">Günlük Hatırlatıcı</string>
+  <string name="pref_reminder_checkbox">Hatırlatıcıyı Aktive Edin</string>
+  <string name="pref_reminder_picker">Hatırlatıcı Zamanı Ayarla</string>
+  <string name="pref_cds_header">Özel Gün Başlangıcı</string>
+  <string name="pref_cds_picker">Özel Gün Başlangıç Zamanını Ayarla</string>
+  <string name="pref_push_notifications_checkbox">Kullanıcı Bildirimleri</string>
+  <string name="push_notifications">Bildirimler</string>
+  <string name="push_notifications_sum">Bilgilendirme ayarlarınızı ayarlayın</string>
+  <string name="preference_push_you_won_challenge">Bir Mücadele kazandın!</string>
+  <string name="preference_push_received_a_private_message">Özel Mesaj Aldın</string>
+  <string name="preference_push_gifted_gems">Hediye Edilen Elmaslar</string>
+  <string name="preference_push_gifted_subscription">Hediye Edilen Abonelik</string>
+  <string name="preference_push_invited_to_party">Takıma davet edildin</string>
+  <string name="preference_push_invited_to_guild">Loncaya davet edildin</string>
+  <string name="preference_push_your_quest_has_begun">Görevin Başladı</string>
+  <string name="preference_push_invited_to_quest">Göreve Davet Edildin</string>
+  <!--Adding tasks-->
+  <string name="task_value">Değer</string>
+  <string name="new_todo">Yeni Yapılacak İş</string>
+  <string name="new_reward">Yeni Ödül</string>
+  <string name="new_daily">Yeni Günlük İş</string>
+  <string name="new_habit">Yeni Alışkanlık</string>
+  <string name="action_edit">Düzenle</string>
+  <string name="action_delete">Sil</string>
+  <string name="action_cancel">İptal et</string>
+  <string name="login_btn">Giriş yap</string>
+  <string name="register_btn">Kayıt ol</string>
+  <string name="username">Kullanıcı adı</string>
+  <string name="email_username">E-posta veya Kullanıcı adı</string>
+  <string name="password">Şifre</string>
+  <string name="emailAddress">E-posta adresi</string>
+  <string name="confirmpassword">Şifreni onayla</string>
+  <string name="logout">Çıkış yap</string>
+  <string name="logout_description">Hesabından çıkış yap</string>
+  <string name="account_details_sum">Hesap detaylarını kontrol et</string>
+  <string name="account_details">Hesap Detayları</string>
+  <string name="LoginActivityName">Hoş Geldin</string>
+  <string name="string_revive">Dirilt</string>
+  <string name="please_connect">Lütfen uygulamaya bir ekran aracı kullanmadan önce bağlanın</string>
+  <string name="about.title">Hakkında</string>
+  <string name="about.libraries">Kütüphaneler</string>
+  <string name="about.versionhistory">Sürüm geçmişi</string>
+  <string name="about.habitica_open_source">Habitica yazılımı Github üzerinde açık kaynak olarak mevcuttur.</string>
+  <string name="about.rate_our_app">Uygulamamızı Değerlendir</string>
+  <string name="about.give_us_feedback">Bize Geribildirim gönder!</string>
+  <string name="about.bugreport">Hata Bildir</string>
+  <string name="about.source_code">Kaynak Kodu</string>
+  <!--Network Errors-->
+  <string name="network_error_title">Bağlantı Hatası</string>
+  <string name="network_error_no_network_body">İnternete bağlı değilsin.</string>
+  <string name="internal_error_api">Sunucu ile ilgili bir hata var gibi görünüyor. Daha sonra tekrar dene.</string>
+  <string name="authentication_error_title">Kimlik doğrulama hatası</string>
+  <string name="authentication_error_body">Kullanıcı adı ve/veya Şifre hatalı.</string>
+  <string name="login_validation_error_title">Doğrulama Hatası</string>
+  <string name="login_validation_error_fieldsmissing">Tüm alanları doldurmanız gerekiyor.</string>
+  <string name="save_changes">Kaydet</string>
+  <string name="copy">Kopyala</string>
+  <string name="notes">Notlar</string>
+  <string name="text">Metin</string>
+  <string name="difficulty">Zorluk</string>
+  <string name="tags">Etiketler</string>
+  <string name="trivial">Önemsiz</string>
+  <string name="easy">Kolay</string>
+  <string name="medium">Orta</string>
+  <string name="hard">Zor</string>
+  <string name="start_date">Başlangıç Tarihi</string>
+  <string name="positive_habit_form">Olumlu (+)</string>
+  <string name="negative_habit_form">Olumsuz ( - )</string>
+  <string name="checklist">Yapılacak İşler Listesi</string>
+  <string name="reminders">Hatırlatıcılar</string>
+  <string name="actions">Hareketler</string>
+  <string name="attributes">Özellikler</string>
+  <string name="physical">Fiziksel</string>
+  <string name="mental">Zihinsel</string>
+  <string name="social">Sosyal</string>
+  <string name="other">Diğer</string>
+  <string name="frequency">Sıklık</string>
+  <string name="frequency_weekly">Haftanın Belirli Günlerinde</string>
+  <string name="frequency_daily">X günde bir</string>
+  <string name="monday">Pazartesi</string>
+  <string name="tuesday">Salı</string>
+  <string name="wednesday">Çarşamba</string>
+  <string name="thursday">Perşembe</string>
+  <string name="friday">Cuma</string>
+  <string name="saturday">Cumartesi</string>
+  <string name="sunday">Pazar</string>
+  <string name="levelup_header">Bir seviye yükseldin!</string>
+  <string name="levelup_detail">Gerçek hayattaki hedeflerini gerçekleştirerek %1$d. Seviyesine yükseldin!</string>
+  <string name="levelup_health">Tamamen sağlığına kavuştun!</string>
+  <string name="levelup_button">Yaşasın!</string>
+  <string name="faint_subtitle">Umudunu kaybetme!</string>
+  <string name="faint_penalty_body">Bir Seviye, Altınlarını ve biraz Ekipman kaybettin, ama çok çalışarak hepsini yeniden kazanabilirsin! İyi şanslar--bu işi becereceksin!</string>
+  <string name="faint_header">Sağlığın tükendi!</string>
+  <string name="faint_button">Sağlığını Doldur &amp; Tekrar Dene</string>
+  <string name="filter">Filtre</string>
+  <string name="profile_image">Profil Resmi</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">%2$d mana karşılığında %1$s kullandın.</string>
+  <string name="used_skill_without_mana">%1$s kullandın.</string>
+  <string name="new_checklist_item">yeni yapılacak iş</string>
+  <string name="add_checklist_item">Ekle</string>
+  <string name="reminder_title">Günlük İşlerini kontrol etmeyi unutma!</string>
+  <string name="skill_progress_title">Yetenek Kullanma</string>
+  <string name="coming_soon">Yakında</string>
+  <string name="chat_flag_confirmation">Bu mesajı kural ihlali olarak bildirmek istediğine emin misin?</string>
+  <string name="flag_confirm">Mesajı İşaretle</string>
+  <string name="unlock_lvl_11">Seviye 11\'de aç</string>
+  <string name="no_party_message">Bir takıma üye değilsin. Bir takıma katılmak için lütfen internet sitesini ziyaret et. </string>
+  <string name="forgot_pw_btn">Şifremi Unuttum</string>
+  <string name="forgot_pw_tv">Şifreni mi unuttun? Lütfen mobil internet sitemizi kullan.</string>
+  <string name="tavern.inn.checkOut">Günlük İşlerini tekrar aktive et</string>
+  <string name="tavern.inn.rest">Günlük İşleri durdur</string>
+  <string name="reward.dialog.buy">Satın al</string>
+  <string name="reward.dialog.dismiss">Yoksay</string>
+  <string name="party">Takım</string>
+  <string name="chat">Sohbet</string>
+  <string name="members">Üyeler</string>
+  <string name="habits">Alışkanlıklar</string>
+  <string name="dailies">Günlük İşler</string>
+  <string name="todos">Yapılacak İşler</string>
+  <string name="rewards">Ödüller</string>
+  <string name="taskform.delete.title">Emin misin?</string>
+  <string name="taskform.delete.message">Gerçekten silmek istiyor musun?</string>
+  <string name="yes">Evet</string>
+  <string name="no">Hayır</string>
+  <string name="quest">Görev</string>
+  <string name="avatar_body">Vücut</string>
+  <string name="avatar_hair">Saç</string>
+  <string name="avatar_shirt">Gömlek</string>
+  <string name="avatar_skin">Ten</string>
+  <string name="avatar_ears">Hayvan Kulakları</string>
+  <string name="avatar_base">Üs</string>
+  <string name="avatar_color">Renk</string>
+  <string name="avatar_beard">Sakal</string>
+  <string name="avatar_mustache">Bıyık</string>
+  <string name="avatar_flower">Çiçek</string>
+  <string name="avatar_bangs">Kahkül</string>
+  <string name="avatar_nothing">Hiçbir şey ayarlanmadı</string>
+  <string name="avatar_size">Boyut</string>
+  <string name="avatar_size_slim">İnce</string>
+  <string name="avatar_size_broad">Geniş</string>
+  <string name="avatar_background">Arka plan </string>
+  <string name="purchase_customization">Özelleştirme Satın Al</string>
+  <string name="purchase_set_button">%d elmas ile setin kilidini aç</string>
+  <string name="purchase_button">Satın al</string>
+  <string name="purchase_set_title">%s seti satın al</string>
+  <string name="due_date">Son Tarih</string>
+  <string name="quest.accept">Kabul et</string>
+  <string name="quest.reject">Reddet</string>
+  <string name="quest.begin">Göreve Başla</string>
+  <string name="quest.cancel">Daveti İptal Et</string>
+  <string name="quest.abort">Görevi iptal et</string>
+  <string name="quest.leave">Görevden Ayrıl</string>
+  <string name="quest.pending">Gönderiliyor</string>
+  <string name="quest.accepted">Kabul edildi</string>
+  <string name="quest.rejected">Reddedildi</string>
+  <string name="quest.participants">Katılımcılar</string>
+  <string name="version_info">Versiyon %1$s (%2$d)</string>
+  <string name="sidebar_help">Yardım &amp; SSS</string>
+  <string name="complete_tutorial">Anladım!</string>
+  <string name="dismiss_tutorial">Daha sonra hatırlat</string>
+  <string name="intro_1_subtitle">Hoş Geldin</string>
+  <string name="intro_1_title">Habitica\'ya</string>
+  <string name="intro_1_description">Bir şeyleri tamamlarken artık eğlenebilirsin. %s\'dan fazla kişinin hayatlarını birer işe odaklanarak geliştirmelerine katıl. </string>
+  <string name="intro_2_subtitle">Oyun gelişimi</string>
+  <string name="intro_2_title">Hayatta gelişim</string>
+  <string name="intro_2_description">Gerçek hayatındaki işlerini tamamlayarak oyun içindeki özellikleri aç. Zırh, evcil hayvan ve daha fazlasını hedeflerine ulaştığında ödül olarak kazan.</string>
+  <string name="intro_3_subtitle">Canavarlarla savaş</string>
+  <string name="intro_3_title">Sosyalleş</string>
+  <string name="intro_3_description">Hedeflerini arkadaşlarından yardım alarak devam ettir. Hayatta ve savaşlarda birbirinizi birlikte geliştirerek destek olun!</string>
+  <string name="intro_finish_button">Hadi başlayalım!</string>
+  <string name="previous_button">Önceki</string>
+  <string name="next_button">Sonraki</string>
+  <string name="skip_button">Atla</string>
+  <string name="setup_welcome_description">Habitica\'ya hoşgeldin, oyunda ilerledikçe gerçek hayatını da geliştireceksin! Gerçek hayat hedeflerine ulaştıkça, ekipman, evcil hayvan, görevler ve dahasını da ortaya çıkaracaksın.</string>
+  <string name="setup_welcome_title">Hoş Geldin</string>
+  <string name="avatar_setup_description">Nasıl görünmek istersin? Dert etme, daha sonra bunları değiştirebilirsin.</string>
+  <string name="task_setup_description">Müthiş! Şimdi, bu yolculukta neyi geliştirmek istiyorsun?</string>
+  <string name="setup_group_work">İş</string>
+  <string name="setup_group_exercise">Egzersiz</string>
+  <string name="setup_group_health">Sağlık</string>
+  <string name="setup_group_school">Okul</string>
+  <string name="setup_group_teams">Takımlar</string>
+  <string name="setup_group_chores">Günlük İşler</string>
+  <string name="setup_group_creativity">Yaratıcılık</string>
+  <string name="setup_task_work_1">E-postaları işle</string>
+  <string name="setup_task_work_2">En önemli iş</string>
+  <string name="setup_task_work_3">İş Projesi</string>
+  <string name="setup_task_exercise_1">10 dakikalık kardiyo</string>
+  <string name="setup_task_exercise_2">Esneme</string>
+  <string name="setup_task_exercise_3">Egzersiz programı oluştur</string>
+  <string name="setup_task_healthWellness_1">Sağlıklı beslen / sağlıksız besin</string>
+  <string name="setup_task_healthWellness_2">Diş ipi kullan</string>
+  <string name="setup_task_healthWellness_3">Sağlama planı</string>
+  <string name="setup_task_school_1">Ders çalış / Ertele</string>
+  <string name="setup_task_school_2">Ödev yap</string>
+  <string name="setup_task_school_3">Sınıf için görevlendirmeyi tamamla</string>
+  <string name="setup_task_teams_1">Takıma haber ver</string>
+  <string name="setup_task_teams_2">Durumunu takıma bildir</string>
+  <string name="setup_task_teams_3">Takım projesini tamamla</string>
+  <string name="setup_task_chores_1">10 dakikalık temizlik</string>
+  <string name="setup_task_chores_2">Bulaşıkları yıka</string>
+  <string name="setup_task_chores_3">Dolabı düzenle</string>
+  <string name="setup_task_creativity_1">Bir zanaat uzmanlığına çalış</string>
+  <string name="setup_task_creativity_2">Yaratıcı bir proje üzerinde çalış</string>
+  <string name="setup_task_creativity_3">Yaratıcı projeyi bitir</string>
+  <string name="gem.purchase.support">Habitica\'yı canlı tutmamız için yardımcı olmak ister misiniz? Yapımcıları elmas alarak destekleyebilirsiniz!\n\nElmaslarla hesabınız için eğlenceli ekstralar alabilirsiniz, örneğin: \n\n - Avatar\'ınız için havalı kostümler\n - Muhteşem arkaplanlar\n - Evcil hayvan yumurtaları kazanacağınız eğlenceli görevler\n - 100. seviyeden evvel sınıfınızı değiştirebileceğiniz beceriler\n\nHabitica\'yı en iyisi yapmamız için yardımcı olduğunuz için teşekkürler. Desteğiniz bize çok şey ifade ediyor!</string>
+  <string name="my_guilds">Loncalarım</string>
+  <string name="public_guilds">Açık Loncalar</string>
+  <string name="guild">Lonca</string>
+  <string name="leave">Ayrıl</string>
+  <string name="join">Katıl</string>
+  <string name="leader">Lider</string>
+  <string name="gems">Elmaslar</string>
+  <string name="copy_as_todo">Yapılacak İşlere kopyala</string>
+  <string name="send_pm">ÖM Gönder</string>
+  <string name="flag">Bildir</string>
+  <string name="delete">Sil</string>
+  <string name="name">Ad</string>
+  <string name="description">Tanım</string>
+  <string name="privacy">Gizlilik</string>
+  <string name="write_message">Mesaj Yaz</string>
+  <string name="post">Gönder</string>
+  <string name="guild_search_hint">Loncalarda ara</string>
+  <string name="todo_due">Şu zamana: %s</string>
+  <string name="daily_streak">mevcut seri: %d</string>
+  <string name="todo_has_duedate">İşin Bitirme Tarihi var</string>
+  <string name="battle_gear">Savaş Ekipmanı</string>
+  <string name="costume">Kostüm</string>
+  <string name="outfit_head">Kafa</string>
+  <string name="outfit_headAccessory">Kafa Aksesuarı</string>
+  <string name="outfit_eyewear">Göz Aksesuarı</string>
+  <string name="outfit_armor">Zırh</string>
+  <string name="outfit_back">Sırt</string>
+  <string name="outfit_body">Vücut</string>
+  <string name="outfit_shield">Kalkan</string>
+  <string name="outfit_weapon">Silah</string>
+  <string name="wear_costume">Kostümü Giy</string>
+  <string name="equipped">Giyilmiş</string>
+  <string name="quest_cancel_message">Bu görevi iptal etmek istediğinize emin misiniz?  Tüm davet kabulleri kaybolacak. Görev sahibi görev parşömeni sahipliğini sürdürecektir.</string>
+  <string name="quest.invitation">Görev Daveti</string>
+  <string name="quest_begin_message">Göreve başlamak istediğinize emin misiniz? Bir görev aktif ederseniz, ilave takım üyesi göreve katılamayacaktır.</string>
+  <string name="quest.invitation.text">Göreve katılmak için davet edildin!</string>
+  <string name="ago_1day">1 gün önce</string>
+  <string name="ago_days">%d gün önce</string>
+  <string name="ago_1Minute">1 dakika önce</string>
+  <string name="ago_minutes">%d dakika önce</string>
+  <string name="ago_hours">%d saat önce</string>
+  <string name="ago_1hour">1 saat önce</string>
+  <string name="today">Bugün</string>
+  <string name="sidebar_items">Eşyalar</string>
+  <string name="eggs">Yumurtalar</string>
+  <string name="hatching_potions">Kuluçka İksirleri</string>
+  <string name="food">Yiyecek</string>
+  <string name="quests">Görevler</string>
+  <string name="pets">Evcil Hayvanlar</string>
+  <string name="mounts">Binekler</string>
+  <string name="armoireEquipment">Gardırop içerisinde nadir bir Ekipman parçası buldun: : %s! Harika!</string>
+  <string name="armoireFood">Gardırobun altını üstünü getirdin ve %1$s %2$s buldun. Onun burada ne işi var?</string>
+  <string name="armoireExp">Gardırop ile güreştin ve Tecrübe kazandın. Al sana!</string>
+  <string name="armoireNotesFull">Gardırobu rastgele özel Ekipman, Tecrübe ve yiyecek elde etmek için açın! Kalan ekipman parçaları: %d</string>
+  <string name="armoireLastItem">Büyülü Gardırop içerisinde nadir Ekipman\'ın son parçasını da buldunuz.</string>
+  <string name="armoireNotesEmpty">Gardırop içerisinde her ayın ilk haftasında yeni bir Ekipman yer alacaktır. O zamana kadar Tecrübe ve Yiyecek için tıklamaya devam et.</string>
+  <string name="sell">Sat (%d Altın)</string>
+  <string name="hatch_with_potion">İksir ile üret</string>
+  <string name="feed_to_pet">Evcil hayvana besle</string>
+  <string name="hatch_egg">Yumurta ile üret</string>
+  <string name="invite_party">Takımı davet et</string>
+  <string name="dialog_feeding">%1$s %2$s besle:</string>
+  <string name="use_animal">Kullan</string>
+  <string name="feed">Besle</string>
+  <string name="hatch_with">Evcil hayvanı %s ile üret</string>
+  <string name="hatched_pet_title">%1$s %2$s ürettin!</string>
+  <string name="close">Kapat</string>
+  <string name="share">Paylaş</string>
+  <string name="notification_pet_fed">%1$s %2$s besledin!</string>
+  <string name="notification_purchase">%s satın alındı</string>
+  <string name="sectionpets">Temel Evcil Hayvanlar</string>
+  <string name="sectionpremiumPets">Büyü İksiri Evcil Hayvanları</string>
+  <string name="sectionquestPets">Görev Evcil Hayvanları</string>
+  <string name="sectionspecialPets">Nadir Evcil Hayvanlar</string>
+  <string name="sectionmounts">Temel Binekler</string>
+  <string name="sectionpremiumMounts">Büyü İksiri Binekleri</string>
+  <string name="sectionquestMounts">Görev Binekleri</string>
+  <string name="sectionspecialMounts">Nadir Binekler</string>
+  <string name="world_quest">Dünya Görevi</string>
+  <string name="inn_description">Gece boyunca tamamlayamadığın Günlük İşlerinin seni incitmesinden korunmak için Han\'da dinlen. (Not: Canavar hasarı almaktan korumaz.)</string>
+  <string name="empty_items">Hiç %s sahibi değilsin</string>
+  <string name="user_level">SVY %d</string>
+  <string name="user_level_with_class">SVY %1$d - %2$s</string>
+  <string name="warrior">Savaşçı</string>
+  <string name="rogue">Düzenbaz</string>
+  <string name="mage">Büyücü</string>
+  <string name="healer">Şifacı</string>
+  <string name="warrior_description">Savaşçılar rastgele bonus Altın, Tecrübe ve Görev tamamlarken eşya düşürme şansı veren daha fazla ve iyi \"kritik vuruşlar\" yapar. Ayrıca final canavarlara yüksek hasar verirler. Eğer şans oyunu gibi tahmin edilemez ödüller bulmaktan veya final canavar seferlerinde acıtacak hasarlar vermekten motive oluyorsan bir savaşçı olarak oynayabilirsin.</string>
+  <string name="mage_description">Büyücüler çabuk öğrenir, Tecrübe ve Seviyeleri diğer tüm sınıflardan hızlı kazanır. Ayrıca özel becerilerini kullanarak çok fazla Mana elde edebilirler. Alışkanlıkları taktiksel oyun açılarıyla oynamaktan keyif alıyorsan, veya seviye atlamaktan ve gelişmiş özelliklerin kilidini açmaktan motive oluyorsan bir büyücü olarak oynayabilirsin.</string>
+  <string name="rogue_description">Düzenbazlar servet biriktirmeyi, herkesten daha fazla Altın kazanmayı severler ve rastgele eşyalar bulmada uzmandırlar. Sembolik Gizlilik yetenekleri unutulan günlük görevlerin sonuçlarından sıyrılmasını sağlar. Eğer Ödüller ve Başarılardan, ganimet ve rozetler için uğraşmaktan motivasyon buluyorsan bir düzenbaz olarak oynayabilirsin.</string>
+  <string name="healer_description">Şifacılar hasarlara karşı su getirmez bir şekilde karşı dururlar ve diğerlerine de bu korumayı sürdürürler. Unutulan Günlük Görevler ve Kötü Alışkanlıklar onları çok fazla ürkütmez ve başarısızlıklardan dolayı oluşan sağlıkları iyileştirirler. Takımdaki diğerlerine refakat etmekten veya zor görevlerden dolayı Ölümü atlatma fikri seni heyecanlandırıyorsa bir şifacı olarak oynayabilirsin.</string>
+  <string name="select_class">Sınıf Seç</string>
+  <string name="opt_out_class">Çekil</string>
+  <string name="opt_out_description">Sınıflarla rahatsız edilmek istemiyor musun? Daha sonra seçmek ister misin? Çekilirsen - özel becerileri olmayan bir savaşçı olacaksın. Wiki\'de sınıf sistemin hakkında daha sonra bilgi edinebilir ve istediğin zaman sınıfları aktif edebilirsin.</string>
+  <string name="class_confirmation">Bir %s olmak istediğine emin misin?</string>
+  <string name="class_changed">Yeni sınıfın: %s!</string>
+  <string name="class_changed_description">Ekipmanlar menüsü altında değiştirebileceğin yeni varsayılan Savaş Ekipmanın var!</string>
+  <string name="choose_class">Sınıf Seç</string>
+  <string name="dialog_go_back">Geri dön</string>
+  <string name="opt_out_confirmation">Çekilmek istediğinden emin misin?</string>
+  <string name="change_class">Sınıfını değiştir</string>
+  <string name="change_class_description">3 elmas karşılığında sınıfını değiştir ve özellik puanlarını geri al. Özellik puanlarını websitesi üzerinden atayabilirsin</string>
+  <string name="enable_class">Sınıf Sistemini Aktive Et</string>
+  <string name="changing_class_progress">Sınıf Değiştirme</string>
+  <string name="by_email">Eposta ile</string>
+  <string name="invite_existing_users">Mevcut Kullanıcıları Davet Et</string>
+  <string name="send">Gönder</string>
+  <string name="invite">Arkadaşlarını Davet Et</string>
+  <string name="invite_id_description">Habitica kullanan arkadaşların var ise, Kullanıcı ID\'leri ile davet edebilirsin.</string>
+  <string name="invite_email_description">Epostan ile bir arkadaşın Habitica\'ya katılırsa, otomatik olarak takımına davet edilecektir.</string>
+  <string name="add_invites">Davetleri Ekle</string>
+  <string name="user_id">Kullanıcı ID</string>
+  <string name="email">Eposta</string>
+  <string name="invite_users">Takıma davet et</string>
+  <string name="share_using">Kullanımı paylaş</string>
+  <string name="share_levelup">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %d seviye elde ettim!</string>
+  <string name="share_hatched">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %1$s %2$s evcil hayvan ürettim.</string>
+  <string name="share_raised">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %1$s %2$s binek kazandım.</string>
+  <string name="open_in_store">Play Store\'da Aç</string>
+  <string name="change_class_confirmation">Sınıfınızı değiştirmek istediğinize emin misiniz? Bu işlem 3 elmasa mal olacaktır.</string>
+  <string name="change_class_equipment_warning">Uyarı: %s sınıfından ekipman alamayacaksınız.</string>
+  <string name="leaderMessage">%1$s tarafından mesaj</string>
+  <string name="leaderName">Lider: %1$s</string>
+  <string name="confirm">Onayla</string>
+  <string name="market">Pazar</string>
+  <string name="timeTravelers">Zaman Yolcuları</string>
+  <string name="seasonalShop">Mevsimsel Dükkan</string>
+  <string name="empty_inbox">Mesaj Kutunda hiç mesajın bulunmuyor. Bir kullanıcıya açık sohbet mesaj alanından bir mesaj gönderebilirsin!</string>
+  <string name="party_invite">Arkadaşlarını davet ederek kilidi aç</string>
+  <string name="no_gold">Yeterli Altın yok</string>
+  <string name="no_potion">Sağlık iksiri satın almanıza gerek yoktur</string>
+  <string name="successful_purchase">%1$s başarıyla satın alındı</string>
+  <string name="purchase_confirmation_title">Satın almayı onayla</string>
+  <string name="confirm_purchase_text">%2$s %3$s karşılığında %1$s satın al</string>
+  <string name="gem">elmas</string>
+  <string name="hourglass">kumsaati</string>
+  <string name="hourglasses">kumsaatleri</string>
+  <string name="gold_singular">altın</string>
+  <string name="gold_plural">altın</string>
+  <string name="chat_message_copied">Mesaj Panoya kopyalandı</string>
+  <string name="copy_chat_message">Panoya kopyala</string>
+  <string name="edit_tag_title">Etiketi Düzenle</string>
+  <string name="edit_tag_btn_edit">Düzenle</string>
+  <string name="edit_tag_btn_done">Tamam</string>
+  <string name="edit_tag_btn_delete">Sil</string>
+  <string name="confirm_delete_tag_title">Emin misin?</string>
+  <string name="confirm_delete_tag_message">Silmek istediğine emin misin?</string>
+  <string name="filter_drawer_edit_tags">Etiketleri Düzenle</string>
+  <string name="filter_drawer_filter_tags">Etikete göre filtrele</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">Bir kişi sizi bu QR kod ile davet etmiştir</string>
+  <string name="qr_save_message">QR Kodun şurada kaydedildi</string>
+  <string name="qr_dialogue_title">QR Kodun</string>
+  <string name="download">İndir</string>
+  <string name="send_new_message">Yeni mesaj gönder</string>
+  <string name="choose_recipient_title">Mesaj Alıcısını Seç</string>
+  <string name="action_continue">Devam Et</string>
+  <string name="scan_qr_code">QR Kodunu Tara</string>
+  <string name="enter_recipient_uuid">Alıcının Kullanıcı ID\'sini gir</string>
+  <string name="invited_to_party">Bir takıma katılmak için davet edildin!</string>
+  <string name="stats_widget_label">Habitica İstatistikleri</string>
+  <string name="add_task">İş Ekle</string>
+  <string name="add_habit">Alışkanlık Ekle</string>
+  <string name="add_daily">Günlük İş Ekle</string>
+  <string name="add_todo">Yapılacak İş Ekle</string>
+  <string name="add_reward">Ödül Ekle</string>
+  <string name="all_dailies_completed">Tüm günlük işlerini tamamladın. Tebrikler!</string>
+  <string name="widget_habit_button">Habitica Alışkanlığı Yap</string>
+  <string name="widget_dailies">Habitica Günlük İşler</string>
+  <string name="widget_todo_list">Habitica Yapılacak İşler Listesi</string>
+  <string name="widget_add_task">Habitica İş Ekle</string>
+  <string name="google_services_missing">Google play services bulunamadı.</string>
+  <string name="gem.purchase.toolbartitle">Satın al</string>
+  <string name="gem.purchase.title">Elmas satın almak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
+  <string name="gem.purchase.subtitle">Elmaslar hesabın için eğlenceli ekstralar satın almanı sağlar, dahil olmak üzere:</string>
+  <string name="gem.purchase.listitem1">Avatarın için güzel kostümler</string>
+  <string name="gem.purchase.listitem2">Muhteşem arka planlar</string>
+  <string name="gem.purchase.listitem3">Sizi evcil hayvan yumurtası ile ödüllendiren görevler</string>
+  <string name="gem.purchase.listitem4">100. seviyeden önce sınıf değiştirme imkânı</string>
+  <string name="support_habitica">Habitica\'ya Destek Ol</string>
+  <string name="skill_transformation_use">kullan</string>
+  <string name="hatching_market_info">İş tamamlarken doğru eşyalar düşmedi mi? Pazara bir göz at!</string>
+  <string name="feeding_market_info">Farklı yiyecek mi lazım? Pazardan satın al!</string>
+  <string name="open_market">Pazar\'ı Aç</string>
+  <string name="cds_description">Günlük görevleriniz Habitica\'yı %1$s\'den sonra ilk defa kullanacağınızda sıfırlanacaktır. Bu saatten önce günlük görevlerinizi yaptığınızdan emin olun!</string>
+  <string name="AudioTheme_title">Ses Teması</string>
+  <string name="AudioTheme_summary">Habitica Ses Temasını Değiştir</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">Yarın görüşürüz!</string>
+  <string name="belongs_to_challenge">Bir Mücadeleye ait</string>
+  <string name="has_reminder">Hatırlatıcı Mevcut</string>
+  <string name="has_tag">Etiket Mevcut</string>
+  <string name="subscribe.title">Abone olmak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
+  <string name="subscribe_prompt">Abone ol ve bu faydalardan yararlan:</string>
+  <string name="subscribe.listitem1">Altınla elmas satın alabilir</string>
+  <string name="subscribe.listitem2">Özel aylık ekipman</string>
+  <string name="subscribe.listitem3">Fazladan geçmiş kaydını saklamak</string>
+  <string name="subscribe.listitem4">Günlük ganimet limiti ikiye katlanır</string>
+  <string name="subscriptions">Abonelikler</string>
+  <string name="subscription_duration">Her %s tekrar eden</string>
+  <string name="subscribe">Abone Ol</string>
+  <string name="subscribe.listitem1.description">Tüccar İskender artık sana tanesi 20 altına elmas satıcak!\n\nAylık sevkiyatı başlangıçta aylık 25 Elmas ile sınırlıdır, ama ardışık abonelik süresine göre artabilir.\n\nElmas limiti her üç aylık ardışık abonelik için 5 artar, toplam üst limit olan aylık 50 Elmasa kadar artabilir!</string>
+  <string name="subscribe.listitem2.description">Her ay avatarın için özel görsel bir eşya alırsın!\n\nAyrıca, her üç aylık ardışık abonelik için, Gizemli Zaman Yolcuları sana tarihi (ve fütürist!) görsel eşyalara erişim sağlar.</string>
+  <string name="subscribe.listitem3.description">Tamamlanmış Yapılacak İş ve iş geçmişlerine daha uzun süre erişim sağlar.</string>
+  <string name="subscribe.listitem4.description">İki katı ganimet limiti tamamladığın işlerinden her gün daha fazla eşya almana ve ahırını daha hızlı tamamlamana yardımcı olur!</string>
+  <string name="subscribe1month.gemcap">Elmas limiti 25\'le başlar</string>
+  <string name="subscribe3month.gemcap">Elmas limiti 30\'a çıkar</string>
+  <string name="subscribe6month.gemcap">Elmas limiti 35\'e çıkar</string>
+  <string name="subscribe12month.gemcap">Elmas limiti 45\'e çıkar</string>
+  <string name="subscription_hourglasses">+%d Mistik Kum Saati</string>
+  <string name="payment_method">Ödeme şekli</string>
+  <string name="subscription">Abonelik</string>
+  <string name="active">Etkin</string>
+  <string name="cancel_subscription">Aboneliği İptal Et</string>
+  <string name="cancel_subscription_google.description">Artık abone olmak istemiyor musun? Google Play Store\'un \"Uygulamalarım\" bölümünde aboneliği iptal etme seçeneğini bulabilirsin.</string>
+  <string name="cancel_subscription_notgoogle.description">Artık abone olmak istemiyor musun? Ödeme yönteminden dolayı, yalnızca web sitesi üzerinden aboneliğini iptal edebilirsin. Siteyi tarayıcında açmak için aşağıdaki düğmeyi tıkla!</string>
+  <string name="visit_habitica_website">Habitica Websitesini Ziyaret Et</string>
+  <string name="current_bonuses">Sağlanan Faydalar</string>
+  <string name="months_subscribed">Abone olunan aylar</string>
+  <string name="current_hourclasses">Sahip Olunan Mistik Kum Saati</string>
+  <string name="monthly_gem_cap">Aylık elmas limiti</string>
+  <string name="inactive">Etkin Değil</string>
+  <string name="one_month">1 Aylık</string>
+  <string name="months">%d Aylık</string>
+  <string name="month">ay</string>
+  <string name="three_months">3 aylık</string>
+  <string name="six_months">6 aylık</string>
+  <string name="twelve_months">12 aylık</string>
+  <string name="subscribe_prompt_thanks">Abone Olarak bu faydalardan yararlanıyorsun:</string>
+  <string name="subscription_status">Abonelik Durumu</string>
+  <string name="byLeader">%s \'a/e göre</string>
+  <string name="challenge_details">Mücadelele Detayları</string>
+  <string name="challenge_leave_title">Mücadeleden Ayrıl</string>
+  <string name="challenge_leave_text">\"%s\" Mücadelesinden ayrılmak istediğinden emin misin?</string>
+  <string name="challenge_remove_tasks_title">İşleri sil</string>
+  <string name="challenge_remove_tasks_text">İşleri gerçekten silmek istiyor musun?</string>
+  <string name="remove_tasks">Sil</string>
+  <string name="keep_tasks">Tut</string>
+  <string name="my_challenges">Benim Mücadelelerim</string>
+  <string name="public_challenges">Herkese Açık</string>
+  <string name="challenges">Mücadeleler</string>
+  <string name="daily">Günlük İş</string>
+  <string name="habit">Alışkanlık</string>
+  <string name="reward">Ödül</string>
+  <string name="todo">Yapılacak İş</string>
+  <string name="official">Resmi</string>
+  <string name="participating">Katılan</string>
+  <string name="challenge">Mücadele</string>
+  <string name="go_to_challenge">Mücadeleye Git</string>
+  <string name="not_part_of_a_challenge">Henüz herhangi bir Mücadele katılımcısı değilsin!</string>
+  <string name="join_a_challenge">Listene seçili işler eklemek için bir Mücadeleye katıl, sonra da başarılar ve hatta elmaslar kazanmak için diğer Habiticalılarla yarış!</string>
+  <string name="check_the_public_challenge_tab">\"Herkese Açık\" sekmesine basarak kullanıcılar tarafından yaratılmış Mücadelelerden sana en uygun olanını bul!</string>
+  <string name="add_reminder">Hatırlatıcı Ekle</string>
+  <string name="warning">Uyarı</string>
+  <string name="open_settings">Ayarları Aç</string>
+  <string name="dont_keep_activities_warning">Görünüşe göre Geliştirici seçeneğinde \ \"Etkinlikleri saklamayın \\" etkin. Şu anda bu seçenek, habitica uygulamasıyla ilgili sorunlara neden oluyor, bu nedenle devre dışı bırakılmasını öneriyoruz.</string>
+  <string name="inbox">Mesaj Kutusu</string>
+  <string name="FAQ">Sıkça Sorulan Sorular</string>
+  <string name="special">Özel</string>
+  <string name="gem_for_gold_description">Habitica\'ya abone olduğun için, her ay Altın karşılığı bir miktar Elmas satın alabilirsin.</string>
+  <string name="limited_count">%d kaldı</string>
+  <string name="gem_shop">Elmas</string>
+  <string name="mystery_item">Gizemli Eşya</string>
+  <string name="myster_item_notes">Her ay, aboneler gizemli eşya alırlar. Bu genelde ayın son haftasında açıklanır.</string>
+  <string name="open">Aç</string>
+  <string name="notification_mystery_item">Kutuyu açtın ve %s buldun!</string>
+  <string name="checkInRewardEarned">Kendini hayatını geliştirmeye adadığın için ödül olarak %1$s kazandın.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Bir sonraki ödülün %1$d Girişten sonra açılacak</string>
+  <string name="pending_approval">onay bekleniyor</string>
+  <string name="filters">Filtreler</string>
+  <string name="done">Tamam</string>
+  <string name="group_tasks_edit_description">Grup işleri düzenlenemez.</string>
+  <string name="group_tasks_edit_title">Bu işi düzenleyemezsin</string>
+  <string name="groups">Gruplar</string>
+  <string name="all">Hepsi</string>
+  <string name="none">Hiçbiri</string>
+  <string name="owned">Sahip olunan</string>
+  <string name="not_owned">Sahip olunmayan</string>
+  <string name="new_game">Yeni\nOyun</string>
+  <string name="login_btn_fb">Facebook ile giriş yap</string>
+  <string name="login_btn_google">Google ile giriş yap</string>
+  <string name="action_back">Geri</string>
+  <string name="welcome_text">Ah, burada yeni olmalısın. Ben Justin, Habitica\'da ki rehberin olacağım.\n\nBaşlamak için, bir avatar yaratman gerekecek.</string>
+  <string name="randomize">Rastgele</string>
+  <string name="avatar_extras">Ekstralar</string>
+  <string name="avatar_skin_color">Ten Rengi</string>
+  <string name="avatar_hair_color">Saç Rengi</string>
+  <string name="avatar_hair_bangs">Kahkül</string>
+  <string name="avatar_hair_ponytail">Atkuyruğu</string>
+  <string name="avatar_glasses">Gözlükler</string>
+  <string name="avatar_wheelchair">Tekerlekli Sandalye</string>
+  <string name="weak">Zayıf</string>
+  <string name="strong">Güçlü</string>
+  <string name="gray">Gri</string>
+  <string name="dated">Tarihli</string>
+  <string name="completed">Tamamlanmış</string>
+  <string name="setuP_group_other">Diğer</string>
+  <string name="clear">Temizle</string>
+  <string name="empty_title_habits">Hiç Alışkanlık sahibi değilsin</string>
+  <string name="empty_title_dailies">Hiç Günlük İş sahibi değilsin</string>
+  <string name="empty_title_todos">Hiç Yapılacak İş sahibi değilsin</string>
+  <string name="empty_title_rewards">Hiç Ödül sahibi değilsin</string>
+</resources>
diff --git a/Habitica/res/values-v19/styles.xml b/Habitica/res/values-v19/styles.xml
index a820635d2..2b5cc6e5c 100644
--- a/Habitica/res/values-v19/styles.xml
+++ b/Habitica/res/values-v19/styles.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme.ActionBar.Transparent">
-        <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionBarOverlay">true</item>
-    </style>
-    <style name="AppTheme.NoActionBar.Transparent">
-        <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="windowNoTitle">true</item>
-    </style>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme.ActionBar.Transparent">
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBarOverlay">true</item>
+    </style>
+    <style name="AppTheme.NoActionBar.Transparent">
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="windowNoTitle">true</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-zh/strings.profile.xml b/Habitica/res/values-zh/strings.profile.xml
index c221ff3f1..9d8ed61e1 100644
--- a/Habitica/res/values-zh/strings.profile.xml
+++ b/Habitica/res/values-zh/strings.profile.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">宠物 &amp; 坐骑</string>
-    <string name="profile_pets_found">发现的宠物</string>
-    <string name="profile_mounts_tamed">驯养的坐骑</string>
-    <string name="profile_loading_data">读取成员数据</string>
-    <string name="profile_send_message_to">给%s发送信息</string>
-    <string name="profile_message_sent_to">发送给%s的信息</string>
-    <string name="profile_level">级别：</string>
-    <string name="profile_class_bonus">职业的额外奖励</string>
-    <string name="profile_allocated">已分配：</string>
-    <string name="profile_boosts">增益：</string>
-    <string name="profile_private_message">私信</string>
-    <string name="profile_achievements">成就</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">关闭</string>
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">宠物 &amp; 坐骑</string>
+    <string name="profile_pets_found">发现的宠物</string>
+    <string name="profile_mounts_tamed">驯养的坐骑</string>
+    <string name="profile_loading_data">读取成员数据</string>
+    <string name="profile_send_message_to">给%s发送信息</string>
+    <string name="profile_message_sent_to">发送给%s的信息</string>
+    <string name="profile_level">级别：</string>
+    <string name="profile_class_bonus">职业的额外奖励</string>
+    <string name="profile_allocated">已分配：</string>
+    <string name="profile_boosts">增益：</string>
+    <string name="profile_private_message">私信</string>
+    <string name="profile_achievements">成就</string>
+    <string name="profile_achievement_ok">OK</string>
+    <string name="profile_qrcode_close">关闭</string>
+
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-zh/strings.tutorial.xml b/Habitica/res/values-zh/strings.tutorial.xml
index ccd660700..736fad917 100644
--- a/Habitica/res/values-zh/strings.tutorial.xml
+++ b/Habitica/res/values-zh/strings.tutorial.xml
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_overview">我们在这儿！我已经根据你的兴趣给你添加了几个任务~也试试自己添加几个吧！你还可以点击任务标题来修改它们。</string>
-  <string name="tutorial_habits_1">首先是习惯。它们可以是你想养成的积极习惯，也可以是你想停止的消极习惯。</string>
-  <string name="tutorial_habits_2">每当你完成一次积极的习惯，点击习惯前的加号，就可以获得经验和金币啦！</string>
-  <string name="tutorial_habits_3">如果你一不留神完成了一次消极习惯，点击减号，这会减少你的角色的生命值来帮助你保持责任感。</string>
-  <string name="tutorial_equipment">在你购买装备后，在这里显示。你的战斗装备会影响你的属性，你的服装(如果装备)会在你的角色上显示。</string>
-  <string name="tutorial_items">通过升级和完成任务获得物品。点击一个物品来使用。</string>
-  <string name="tutorial_pets">完成现实任务后，随机掉落宠物蛋和药水。将药水洒在宠物蛋上孵化宠物。</string>
-  <string name="tutorial_skills">技能是有强大作用的特殊能力！点击技能使用。使用技能需要消耗魔法值(蓝色条)，魔力可由每日打卡和完成现实任务来获得。更多信息请查询FAQ。</string>
-  <string name="tutorial_party">在这里，你和你的朋友可以互相督促完成目标并通过完成任务组团打小怪兽。</string>
-  <string name="tutorial_tavern">欢迎来到酒馆，这里是一个公开的不分年龄的聊天室！这里，可以聊聊心得，问问问题。祝您玩的愉快！</string>
-  <string name="tutorial_classes">选择成为战士、法师、医者或者盗贼！每个职业有独特的装备和技能。点击(?)查看更多！</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="tutorial_overview">我们在这儿！我已经根据你的兴趣给你添加了几个任务~也试试自己添加几个吧！你还可以点击任务标题来修改它们。</string>
+  <string name="tutorial_habits_1">首先是习惯。它们可以是你想养成的积极习惯，也可以是你想停止的消极习惯。</string>
+  <string name="tutorial_habits_2">每当你完成一次积极的习惯，点击习惯前的加号，就可以获得经验和金币啦！</string>
+  <string name="tutorial_habits_3">如果你一不留神完成了一次消极习惯，点击减号，这会减少你的角色的生命值来帮助你保持责任感。</string>
+  <string name="tutorial_equipment">在你购买装备后，在这里显示。你的战斗装备会影响你的属性，你的服装(如果装备)会在你的角色上显示。</string>
+  <string name="tutorial_items">通过升级和完成任务获得物品。点击一个物品来使用。</string>
+  <string name="tutorial_pets">完成现实任务后，随机掉落宠物蛋和药水。将药水洒在宠物蛋上孵化宠物。</string>
+  <string name="tutorial_skills">技能是有强大作用的特殊能力！点击技能使用。使用技能需要消耗魔法值(蓝色条)，魔力可由每日打卡和完成现实任务来获得。更多信息请查询FAQ。</string>
+  <string name="tutorial_party">在这里，你和你的朋友可以互相督促完成目标并通过完成任务组团打小怪兽。</string>
+  <string name="tutorial_tavern">欢迎来到酒馆，这里是一个公开的不分年龄的聊天室！这里，可以聊聊心得，问问问题。祝您玩的愉快！</string>
+  <string name="tutorial_classes">选择成为战士、法师、医者或者盗贼！每个职业有独特的装备和技能。点击(?)查看更多！</string>
+</resources>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 78ff0e6b8..99979140a 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -1,517 +1,517 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-  <string name="action_refresh">刷新</string>
-  <string name="XP_default">经验值</string>
-  <string name="HP_default">生命值</string>
-  <string name="MP_default">魔法值</string>
-  <string name="ERR_pb_barcode">无法从条码上读取数据</string>
-  <!--Prefs-->
-  <string name="PS_settings_title">设置</string>
-  <string name="SP_address_hint">你的自定义服务器</string>
-  <string name="SP_userID_title">用户ID</string>
-  <string name="SP_userID_summary">你的用户ID</string>
-  <string name="SP_APIToken_title">API令牌</string>
-  <string name="SP_APIToken_summary">你的API令牌</string>
-  <string name="Language_title">语言</string>
-  <string name="Language_summary">更改 Habitica的语言</string>
-  <string name="SP_user_qr_code">你的二维码</string>
-  <string name="PS_contact_title">联系我</string>
-  <string name="unknown_error">发生错误……</string>
-  <string name="pref_account_header">账号</string>
-  <string name="pref_first_day_of_the_week_title">每周的第一天</string>
-  <string name="pref_first_day_of_the_week_summary">在所有的日程表中，每周的第一天</string>
-  <string name="pref_reminder_header">每日任务提醒</string>
-  <string name="pref_reminder_checkbox">激活提醒</string>
-  <string name="pref_reminder_picker">设置提醒时间</string>
-  <string name="pref_cds_header">自定义每日起始时间</string>
-  <string name="pref_cds_picker">设置每天的起始时间（用于任务结算）</string>
-  <string name="pref_push_notifications_checkbox">用户推送通知</string>
-  <string name="push_notifications">推送通知</string>
-  <string name="push_notifications_sum">设置用户推送通知</string>
-  <string name="preference_push_you_won_challenge">你赢得了一项挑战！</string>
-  <string name="preference_push_received_a_private_message">收到一条私信</string>
-  <string name="preference_push_gifted_gems">赠送的钻石</string>
-  <string name="preference_push_gifted_subscription">赠送的订阅</string>
-  <string name="preference_push_invited_to_party">被邀请加入队伍</string>
-  <string name="preference_push_invited_to_guild">已邀请至公会</string>
-  <string name="preference_push_your_quest_has_begun">你的冒险开始了</string>
-  <string name="preference_push_invited_to_quest">被邀请加入冒险</string>
-  <!--Adding tasks-->
-  <string name="task_value">数值</string>
-  <string name="new_todo">新待办事项</string>
-  <string name="new_reward">新奖励</string>
-  <string name="new_daily">新每日任务</string>
-  <string name="new_habit">新习惯</string>
-  <string name="action_edit">编辑</string>
-  <string name="action_delete">删除</string>
-  <string name="action_cancel">取消</string>
-  <string name="login_btn">登陆</string>
-  <string name="register_btn">注册</string>
-  <string name="username">用户名</string>
-  <string name="email_username">电子邮件或用户名</string>
-  <string name="password">密码</string>
-  <string name="emailAddress">电子邮件地址</string>
-  <string name="confirmpassword">确认密码</string>
-  <string name="logout">注销</string>
-  <string name="logout_description">从你的账号登出</string>
-  <string name="account_details_sum">账号信息</string>
-  <string name="account_details">账号信息</string>
-  <string name="LoginActivityName">欢迎</string>
-  <string name="string_revive">重生</string>
-  <string name="please_connect">请在使用小部件之前与应用链接</string>
-  <string name="about.title">关于</string>
-  <string name="about.libraries">资源库</string>
-  <string name="about.versionhistory">版本历史</string>
-  <string name="about.habitica_open_source">Habitica是一个发布在Github上的开源软件</string>
-  <string name="about.rate_our_app">评价我们的应用</string>
-  <string name="about.give_us_feedback">请给我们提交建议！</string>
-  <string name="about.bugreport">反馈漏洞</string>
-  <string name="about.source_code">源代码</string>
-  <!--Network Errors-->
-  <string name="network_error_title">连接错误</string>
-  <string name="network_error_no_network_body">您没有连接到互联网。</string>
-  <string name="internal_error_api">与服务器通信故障，请稍后再试。</string>
-  <string name="authentication_error_title">鉴定错误</string>
-  <string name="authentication_error_body">您的用户名和/或密码错误。</string>
-  <string name="login_validation_error_title">认可错误</string>
-  <string name="login_validation_error_fieldsmissing">请填写所有内容。</string>
-  <string name="save_changes">保存</string>
-  <string name="copy">复制</string>
-  <string name="notes">注释</string>
-  <string name="text">文字</string>
-  <string name="difficulty">难度</string>
-  <string name="tags">标签</string>
-  <string name="trivial">琐事</string>
-  <string name="easy">简单</string>
-  <string name="medium">中等</string>
-  <string name="hard">困难</string>
-  <string name="start_date">开始日期</string>
-  <string name="positive_habit_form">正面的(+)</string>
-  <string name="negative_habit_form">负面的(-)</string>
-  <string name="checklist">检查单</string>
-  <string name="reminders">提醒</string>
-  <string name="actions">动作</string>
-  <string name="attributes">属性</string>
-  <string name="physical">身体上的</string>
-  <string name="mental">精神上的</string>
-  <string name="social">社交</string>
-  <string name="other">其他</string>
-  <string name="frequency">频率</string>
-  <string name="frequency_weekly">每周中的特定日期</string>
-  <string name="frequency_daily">每x日</string>
-  <string name="monday">星期一</string>
-  <string name="tuesday">星期二</string>
-  <string name="wednesday">星期三</string>
-  <string name="thursday">星期四</string>
-  <string name="friday">星期五</string>
-  <string name="saturday">星期六</string>
-  <string name="sunday">星期日</string>
-  <string name="levelup_header">你升级了！</string>
-  <string name="levelup_detail">通过完成您现实生活中的目标，你已升至 %1$d 级！</string>
-  <string name="levelup_health">你被完全治愈了！</string>
-  <string name="levelup_button">吼啊~！</string>
-  <string name="faint_subtitle">别失望！</string>
-  <string name="faint_penalty_body">你降了一级，丢失了所有的金币和一件装备。不过继续努力，你就可以把他们都拿回来！加油，你会更棒的！</string>
-  <string name="faint_header">你失去了所有的生命值</string>
-  <string name="faint_button">补满生命值 &amp; 再次尝试</string>
-  <string name="filter">过滤器</string>
-  <string name="profile_image">头像</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">你在 %1$s 用了 %2$d 魔法值。</string>
-  <string name="used_skill_without_mana">你使用了 %1$s.</string>
-  <string name="new_checklist_item">新增清单内容</string>
-  <string name="add_checklist_item">添加</string>
-  <string name="reminder_title">记得完成你的每日任务！</string>
-  <string name="skill_progress_title">使用技能</string>
-  <string name="coming_soon">即将推出</string>
-  <string name="chat_flag_confirmation">你确认要举报这条消息吗？</string>
-  <string name="flag_confirm">旗标消息</string>
-  <string name="unlock_lvl_11">11级时解锁</string>
-  <string name="no_party_message">你没有加入任何队伍。如想加入队伍，请访问网页版。</string>
-  <string name="forgot_pw_btn">忘记密码</string>
-  <string name="forgot_pw_tv">忘记了您的密码？请访问网页版。</string>
-  <string name="tavern.inn.checkOut">重启每日任务</string>
-  <string name="tavern.inn.rest">暂停每日任务</string>
-  <string name="reward.dialog.buy">购买</string>
-  <string name="reward.dialog.dismiss">解散</string>
-  <string name="party">队伍</string>
-  <string name="chat">聊天</string>
-  <string name="members">成员</string>
-  <string name="habits">习惯</string>
-  <string name="dailies">每日任务</string>
-  <string name="todos">待办事项</string>
-  <string name="rewards">奖励</string>
-  <string name="taskform.delete.title">你确定吗？</string>
-  <string name="taskform.delete.message">你确定要删除吗？</string>
-  <string name="yes">是的</string>
-  <string name="no">不</string>
-  <string name="quest">任务</string>
-  <string name="avatar_body">身体</string>
-  <string name="avatar_hair">头发</string>
-  <string name="avatar_shirt">上衣</string>
-  <string name="avatar_skin">皮肤</string>
-  <string name="avatar_ears">兽耳装饰</string>
-  <string name="avatar_base">基础</string>
-  <string name="avatar_color">颜色</string>
-  <string name="avatar_beard">胡子</string>
-  <string name="avatar_mustache">八字胡</string>
-  <string name="avatar_flower">花</string>
-  <string name="avatar_bangs">刘海</string>
-  <string name="avatar_nothing">没有设置</string>
-  <string name="avatar_size">尺寸</string>
-  <string name="avatar_size_slim">瘦小</string>
-  <string name="avatar_size_broad">强壮</string>
-  <string name="avatar_background">背景</string>
-  <string name="purchase_customization">用户支付</string>
-  <string name="purchase_set_button">解锁%d宝石</string>
-  <string name="purchase_button">支付</string>
-  <string name="purchase_set_title">购买礼包 %s</string>
-  <string name="due_date">截止日期</string>
-  <string name="quest.accept">接受</string>
-  <string name="quest.reject">拒绝</string>
-  <string name="quest.begin">开始探索任务</string>
-  <string name="quest.cancel">取消邀请</string>
-  <string name="quest.abort">放弃探索任务</string>
-  <string name="quest.leave">放弃任务</string>
-  <string name="quest.pending">等待中</string>
-  <string name="quest.accepted">接受了</string>
-  <string name="quest.rejected">拒绝的</string>
-  <string name="quest.participants">参与者</string>
-  <string name="version_info">版本%1$s (%2$d)</string>
-  <string name="sidebar_help">帮助 &amp; FAQ</string>
-  <string name="complete_tutorial">成功！</string>
-  <string name="dismiss_tutorial">再次提醒我</string>
-  <string name="intro_1_subtitle">欢迎来到</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_2_subtitle">游戏进度</string>
-  <string name="intro_2_title">生活进度</string>
-  <string name="intro_2_description">通过完成现实生活中的任务来解锁游戏内容。得到装备、宠物和更多的奖励来促使你完成你的目标吧！</string>
-  <string name="intro_3_description">和朋友们一起为目标努力吧。在生活和战斗中互相支持，共同进步！</string>
-  <string name="intro_finish_button">让我们开始吧！</string>
-  <string name="previous_button">上一页</string>
-  <string name="next_button">下一页</string>
-  <string name="skip_button">跳过</string>
-  <string name="setup_welcome_description">欢迎来到Habitica，在游戏中打怪升级的同时改善自己的真实生活。完成现实生活中的目标，解锁大量装备、宠物、任务卷轴，更多特色等你探索。</string>
-  <string name="setup_welcome_title">欢迎你</string>
-  <string name="setup_group_work">工作</string>
-  <string name="setup_group_exercise">运动</string>
-  <string name="setup_group_school">学校</string>
-  <string name="setup_group_teams">团队</string>
-  <string name="setup_group_chores">杂务</string>
-  <string name="setup_group_creativity">创造力</string>
-  <string name="setup_task_work_1">处理电子邮件</string>
-  <string name="setup_task_work_2">最重要的任务</string>
-  <string name="setup_task_work_3">工作项目</string>
-  <string name="setup_task_exercise_1">有氧运动10分钟</string>
-  <string name="setup_task_exercise_2">拉伸</string>
-  <string name="setup_task_exercise_3">制定健身计划</string>
-  <string name="setup_task_healthWellness_1">吃健康/垃圾食品</string>
-  <string name="setup_task_healthWellness_2">使用牙线</string>
-  <string name="setup_task_healthWellness_3">择期体检</string>
-  <string name="setup_task_school_1">学习/拖延</string>
-  <string name="setup_task_school_2">做家庭作业</string>
-  <string name="setup_task_school_3">完成班级委托</string>
-  <string name="setup_task_teams_1">和队友一起检查</string>
-  <string name="setup_task_teams_2">为团队更新现状</string>
-  <string name="setup_task_teams_3">完成团队项目</string>
-  <string name="setup_task_chores_1">清洁10分钟</string>
-  <string name="setup_task_chores_2">洗碗筷</string>
-  <string name="setup_task_chores_3">整理衣橱</string>
-  <string name="setup_task_creativity_1">学习以成为艺术能手</string>
-  <string name="setup_task_creativity_2">进行创新项目</string>
-  <string name="setup_task_creativity_3">完成创新项目</string>
-  <string name="gem.purchase.support">想要帮助我们维持Habitica？通过买宝石的方式来支持开发者吧！\n\n 宝石能用来购买额外的乐趣，包括：\n\n - 角色的酷酷的服装\n - 好看的背景\n - 能获得宠物蛋的有趣的任务\n - 1001级之前改变职业的能力\n\n非常感谢您帮助我们使Habitica变的更好。您的支持非常重要！</string>
-  <string name="my_guilds">我的公会</string>
-  <string name="public_guilds">公共公会</string>
-  <string name="guild">公会</string>
-  <string name="leave">离开</string>
-  <string name="join">加入</string>
-  <string name="leader">会长</string>
-  <string name="gems">宝石</string>
-  <string name="send_pm">发送私人信息</string>
-  <string name="flag">标志</string>
-  <string name="delete">删除</string>
-  <string name="name">名称</string>
-  <string name="description">描述</string>
-  <string name="privacy">隐私</string>
-  <string name="write_message">写消息</string>
-  <string name="post">公告</string>
-  <string name="guild_search_hint">查找公会</string>
-  <string name="todo_due">到期：%s</string>
-  <string name="daily_streak">目前连击数：%d</string>
-  <string name="todo_has_duedate">任务有截止日</string>
-  <string name="battle_gear">战斗装备</string>
-  <string name="costume">服装</string>
-  <string name="outfit_head">头部</string>
-  <string name="outfit_headAccessory">头部配件</string>
-  <string name="outfit_eyewear">护目镜</string>
-  <string name="outfit_armor">盔甲</string>
-  <string name="outfit_back">返回</string>
-  <string name="outfit_body">身体</string>
-  <string name="outfit_shield">盾牌</string>
-  <string name="outfit_weapon">武器</string>
-  <string name="wear_costume">穿上装扮</string>
-  <string name="equipped">装备</string>
-  <string name="quest_cancel_message">你是否确定要放弃这个探索任务？这将会失去所有已接受的邀请。探索任务拥有者将拿回探索任务卷轴。</string>
-  <string name="quest.invitation">任务邀请</string>
-  <string name="quest_begin_message">你是否确定要直接开始这个探索任务？一旦开始，其他队伍成员就不能加入这个探索任务。</string>
-  <string name="quest.invitation.text">你被邀请参加一个探索任务！</string>
-  <string name="ago_1day">1天前</string>
-  <string name="ago_days">%d天前</string>
-  <string name="ago_1Minute">1分钟前</string>
-  <string name="ago_minutes">%d分钟前</string>
-  <string name="ago_hours">%d小时前</string>
-  <string name="ago_1hour">1小时前</string>
-  <string name="today">今天</string>
-  <string name="sidebar_items">物品</string>
-  <string name="eggs">蛋</string>
-  <string name="hatching_potions">孵化药水</string>
-  <string name="food">食物</string>
-  <string name="quests">任务</string>
-  <string name="pets">宠物</string>
-  <string name="mounts">坐骑</string>
-  <string name="armoireEquipment">你在魔法衣橱里找到了一件稀有装备：%s！恭喜你！</string>
-  <string name="armoireFood">你在魔法衣橱里找到了%1$s %2$s。它是用来做什么的？</string>
-  <string name="armoireExp">你和大衣柜展开了殊死搏斗，并赢得了经验，尝尝这个吧！</string>
-  <string name="armoireNotesFull">拉开 魔法衣橱 来获得随机的特殊装备，经验或者食物！剩余的装备：%d</string>
-  <string name="armoireLastItem">你在魔法衣橱里找到了最后一件稀有装备。</string>
-  <string name="armoireNotesEmpty">每个月的第一个星期这里都会有新的装备，到时记得常点进来获得经验和食物！</string>
-  <string name="sell">出售 (%d金币)</string>
-  <string name="hatch_with_potion">用孵化药水孵化</string>
-  <string name="feed_to_pet">喂养宠物</string>
-  <string name="hatch_egg">孵化宠物蛋</string>
-  <string name="invite_party">邀请队伍</string>
-  <string name="dialog_feeding">喂养%1$s %2$s用：</string>
-  <string name="use_animal">使用</string>
-  <string name="feed">喂食</string>
-  <string name="hatch_with">用%s孵化宠物</string>
-  <string name="hatched_pet_title">你孵化了一个 %1$s %2$s！</string>
-  <string name="close">关闭</string>
-  <string name="share">分享</string>
-  <string name="notification_pet_fed">你喂食了你的%1$s %2$s！</string>
-  <string name="notification_purchase">已购买 %s</string>
-  <string name="sectionpets">基本宠物</string>
-  <string name="sectionpremiumPets">神奇药水宠物</string>
-  <string name="sectionquestPets">剧情任务宠物</string>
-  <string name="sectionspecialPets">稀有宠物</string>
-  <string name="sectionmounts">基本坐骑</string>
-  <string name="sectionpremiumMounts">神奇药水坐骑</string>
-  <string name="sectionquestMounts">剧情任务坐骑</string>
-  <string name="sectionspecialMounts">稀有坐骑</string>
-  <string name="world_quest">世界任务</string>
-  <string name="inn_description">在客栈休息让你未完成的每日任务不会伤害你！(注意：它不能阻止来自任务怪物的伤害。)</string>
-  <string name="empty_items">你没有拥有任何的%s</string>
-  <string name="user_level">Lvl %d</string>
-  <string name="user_level_with_class">Lvl %1$d %2$s</string>
-  <string name="warrior">战士</string>
-  <string name="rogue">盗贼</string>
-  <string name="mage">法师</string>
-  <string name="healer">医师</string>
-  <string name="warrior_description">战士们会有更大的机率触发暴击并在完成任务时随机获得额外的金币，经验和掉率。他们还能对boss造成严重的伤害。如果你希望获得随机性的奖励，或者在boss任务中重创boss，来玩战士吧！</string>
-  <string name="mage_description">法师非常善于学习，获得经验值和升级比其他职业快。他们也会获得大量的魔力值来使用一些特殊的法术。如果你喜欢玩得有策略性，或者你强烈地希望升级解锁更多的游戏内容，来玩法师吧！</string>
-  <string name="rogue_description">盗贼热衷于积累财富，比其他人获得更多的金币，还擅长寻找随机物品。他们标志性的潜行技能使得他们能够躲避未完成的日常带来的伤害。如果你希望获得更多的奖励，成就，掉落以及徽章，来玩盗贼吧！</string>
-  <string name="healer_description">医师们对伤害的抗性很强，也可以保护其他的人。错过的日常任务和坏习惯无法伤害他们太多，而且他们有很多回血的技能。如果你热衷于辅助其他的队友，或者是享受那种从死神手里夺取生命的快感，那就成为一名医师吧！</string>
-  <string name="select_class">选择职业</string>
-  <string name="opt_out_class">退出</string>
-  <string name="opt_out_description">不知道选什么职业？想以后再选？没问题 - 你现在可以先做一个没有特殊技能的战士。我们的维基页面上有关于职业系统的介绍，之后随时可以定你的职业。</string>
-  <string name="class_confirmation">你确定想要成为%s吗？</string>
-  <string name="class_changed">你现在是 %s级了！</string>
-  <string name="class_changed_description">你有新的默认战斗装备，你可以改变下了！</string>
-  <string name="choose_class">选择职业</string>
-  <string name="dialog_go_back">返回</string>
-  <string name="opt_out_confirmation">你确定要退出吗？</string>
-  <string name="change_class">更换你的职业</string>
-  <string name="change_class_description">更换你的职业并重置属性点需要3颗宝石。你能通过网页分配属性点</string>
-  <string name="enable_class">开启职业系统</string>
-  <string name="changing_class_progress">更换职业</string>
-  <string name="by_email">通过电子邮件</string>
-  <string name="invite_existing_users">邀请已存在的用户</string>
-  <string name="send">发送</string>
-  <string name="invite">邀请朋友</string>
-  <string name="invite_id_description">如果你的朋友们已经在使用Habitica 了，通过&lt;用户ID邀请他们 。</string>
-  <string name="invite_email_description">如果你的朋友通过你的邮件加入Habitica，他们将自动被邀请加入你的队伍。</string>
-  <string name="add_invites">添加邀请</string>
-  <string name="user_id">用户ID</string>
-  <string name="email">电子邮件</string>
-  <string name="invite_users">邀请加入队伍</string>
-  <string name="share_using">分享使用</string>
-  <string name="share_levelup">我在Habitica中通过改善我现实生活中的习惯到达了%d级！</string>
-  <string name="share_hatched">我刚刚在Habitica中通完成我现实生活中的任务孵化了一只宠物%1$s %2$s！</string>
-  <string name="share_raised">我刚刚在Habitica中通完成我现实生活中的任务得到了一匹坐骑%1$s %2$s！</string>
-  <string name="open_in_store">在应用商店开放</string>
-  <string name="change_class_confirmation">你确定想要转变职业吗？这将花费3颗宝石。</string>
-  <string name="change_class_equipment_warning">提示：你无法再购买%s职业的装备了（已顶级╮(╯_╰)╭）。</string>
-  <string name="leaderMessage">从%1$s来的消息</string>
-  <string name="leaderName">%1$s的会长</string>
-  <string name="confirm">确认</string>
-  <string name="market">市场</string>
-  <string name="timeTravelers">时光旅行</string>
-  <string name="seasonalShop">四季商店</string>
-  <string name="empty_inbox">收件箱里没有消息。您可以在用户的公共聊天窗口中给他发送新消息！</string>
-  <string name="party_invite">通过邀请朋友来解锁</string>
-  <string name="no_gold">没有足够的金币</string>
-  <string name="no_potion">你不需要购买生命药水</string>
-  <string name="successful_purchase">已购买 %1$s</string>
-  <string name="purchase_confirmation_title">确认购买</string>
-  <string name="confirm_purchase_text">为 %2$s %3$s 购买 %1$s</string>
-  <string name="gem">宝石</string>
-  <string name="hourglass">沙漏</string>
-  <string name="hourglasses">沙漏</string>
-  <string name="gold_singular">金币</string>
-  <string name="gold_plural">金币</string>
-  <string name="chat_message_copied">复制到剪帖板的信息</string>
-  <string name="copy_chat_message">复制到剪贴板</string>
-  <string name="edit_tag_title">编辑按钮</string>
-  <string name="edit_tag_btn_edit">编辑</string>
-  <string name="edit_tag_btn_done">完成</string>
-  <string name="edit_tag_btn_delete">删除</string>
-  <string name="confirm_delete_tag_title">你确定吗？</string>
-  <string name="confirm_delete_tag_message">你确定要删除吗？</string>
-  <string name="filter_drawer_edit_tags">编辑按钮</string>
-  <string name="filter_drawer_filter_tags">过滤按钮</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">让别人通过此二维码邀请你</string>
-  <string name="qr_save_message">将二维码保存至</string>
-  <string name="qr_dialogue_title">你的二维码</string>
-  <string name="download">下载</string>
-  <string name="send_new_message">发送新消息</string>
-  <string name="choose_recipient_title">选择消息接收者</string>
-  <string name="action_continue">继续</string>
-  <string name="scan_qr_code">扫描二维码</string>
-  <string name="enter_recipient_uuid">输入接受者的用户ID</string>
-  <string name="invited_to_party">你被邀请加入一个队伍！</string>
-  <string name="stats_widget_label">Habitica状态</string>
-  <string name="add_task">添加任务</string>
-  <string name="add_habit">添加习惯</string>
-  <string name="add_daily">添加每日任务</string>
-  <string name="add_todo">添加待办事项</string>
-  <string name="add_reward">添加奖励</string>
-  <string name="all_dailies_completed">你完成了所有没有任务。干得漂亮！</string>
-  <string name="widget_habit_button">Habitica完成习惯</string>
-  <string name="widget_dailies">Habitica每日任务</string>
-  <string name="widget_add_task">Habitica增加任务</string>
-  <string name="google_services_missing">没有找到Google play服务。</string>
-  <string name="gem.purchase.toolbartitle">购买</string>
-  <string name="gem.purchase.title">购买宝石来支持开发者们和帮助保证Habitica的日常运营</string>
-  <string name="gem.purchase.subtitle">你可以通过宝石给你的账户购买更多有趣的额外物品，包括：</string>
-  <string name="gem.purchase.listitem1">角色形象的炫酷装扮</string>
-  <string name="gem.purchase.listitem2">超棒的背景</string>
-  <string name="gem.purchase.listitem3">任务会奖励你宠物蛋</string>
-  <string name="gem.purchase.listitem4">100级前改变你职业的能力</string>
-  <string name="support_habitica">支持Habitica</string>
-  <string name="skill_transformation_use">使用</string>
-  <string name="hatching_market_info">没有得到想要的掉落物品？来市场瞧瞧！</string>
-  <string name="feeding_market_info">需要不同的食物？在市场可以买到更多！</string>
-  <string name="open_market">打开市场</string>
-  <string name="cds_description">你的每日任务将会在 %1$s 后第一次打开 Habitica 时进行结算并被重置。请确保在此之前完成所有的每日任务！</string>
-  <string name="AudioTheme_title">声音主题</string>
-  <string name="AudioTheme_summary">更改 Habitica 的声音主题</string>
-  <!--Login Incentives-->
-  <string name="see_you_tomorrow">明天再见！</string>
-  <string name="belongs_to_challenge">来自挑战</string>
-  <string name="has_reminder">有任务提示</string>
-  <string name="has_tag">有标签</string>
-  <string name="subscribe.title">捐助支持开发者以帮助维持Habitica运行</string>
-  <string name="subscribe_prompt">成为捐助者你会得到这些好处：</string>
-  <string name="subscribe.listitem1">用金币购买宝石</string>
-  <string name="subscribe.listitem2">高档的季度物品</string>
-  <string name="subscribe.listitem3">保留额外的历史条目</string>
-  <string name="subscribe.listitem4">每日掉落上限翻倍</string>
-  <string name="subscriptions">捐助</string>
-  <string name="subscription_duration">每 %s 重复出现</string>
-  <string name="subscribe">捐助</string>
-  <string name="subscribe.listitem1.description">商人亚历山大可以按每个宝石20金币的价格向你出售宝石！\n\n他每个月的初始进货量是25个宝石，进货量会随着您的捐助长度增长！\n\n 每三个月宝石上限就会增加5，直到最大值1个月50颗宝石！</string>
-  <string name="subscribe.listitem2.description">每个月你将会收到一件独特的角色饰品！另外，每连续捐助三个月，神秘的时间旅行者将授予你得到过去(和将来)的饰品的资格。</string>
-  <string name="subscribe.listitem3.description">使完成的待办事项和任务的历史记录保留更长时间</string>
-  <string name="subscribe.listitem4.description">双倍掉落让你每天能够从完成的任务中得到更多的物品，帮助你更快地驯服坐骑！</string>
-  <string name="subscribe1month.gemcap">宝石上限起始为25</string>
-  <string name="subscribe3month.gemcap">宝石上限增加到30</string>
-  <string name="subscribe6month.gemcap">宝石上限增加到35</string>
-  <string name="subscribe12month.gemcap">宝石上限增加到45</string>
-  <string name="subscription_hourglasses">+%d 神秘沙漏</string>
-  <string name="payment_method">付款方式</string>
-  <string name="subscription">捐助</string>
-  <string name="active">活跃的</string>
-  <string name="cancel_subscription">取消订阅</string>
-  <string name="cancel_subscription_google.description">不想再继续捐助了？你可以在Google应用商店里找到“我的应用程序”部分里找到退订选项。</string>
-  <string name="cancel_subscription_notgoogle.description">不想再继续捐助了？由于您的付款方式，您只能通过这个网站停止捐助。点击下面的按钮，在您的浏览器中打开站点。</string>
-  <string name="visit_habitica_website">访问Habitica的网站</string>
-  <string name="current_bonuses">当前奖励</string>
-  <string name="months_subscribed">捐助的月数</string>
-  <string name="current_hourclasses">当前神秘沙漏</string>
-  <string name="monthly_gem_cap">每月宝石上限</string>
-  <string name="inactive">不活跃的</string>
-  <string name="one_month">1个月</string>
-  <string name="months">%d个月</string>
-  <string name="month">月</string>
-  <string name="three_months">3个月</string>
-  <string name="six_months">6个月</string>
-  <string name="twelve_months">12个月</string>
-  <string name="subscribe_prompt_thanks">通过捐助你会获得这些好处：</string>
-  <string name="subscription_status">捐助状态</string>
-  <string name="byLeader">由 %s</string>
-  <string name="challenge_details">挑战细节</string>
-  <string name="challenge_leave_title">退出挑战</string>
-  <string name="challenge_leave_text">你是否确定想放弃这个挑战“%s”？</string>
-  <string name="challenge_remove_tasks_title">删除任务</string>
-  <string name="challenge_remove_tasks_text">你确定要删除这个任务吗？</string>
-  <string name="remove_tasks">删除</string>
-  <string name="keep_tasks">保持</string>
-  <string name="my_challenges">我的挑战</string>
-  <string name="public_challenges">公共挑战</string>
-  <string name="challenges">挑战</string>
-  <string name="daily">每日任务</string>
-  <string name="habit">习惯</string>
-  <string name="reward">奖励</string>
-  <string name="todo">待办事项</string>
-  <string name="official">官方的</string>
-  <string name="participating">参加</string>
-  <string name="challenge">挑战</string>
-  <string name="go_to_challenge">参加挑战</string>
-  <string name="not_part_of_a_challenge">你还没有加入任何挑战呢！</string>
-  <string name="join_a_challenge">加入一个挑战会将它的任务加入你的任务列表，然后去完成任务战胜其他habitican赢得成就甚至钻石吧！</string>
-  <string name="check_the_public_challenge_tab">点击“公会挑战”按钮来寻找其他勇士创建的挑战吧！也许会有适合你的哟！</string>
-  <string name="add_reminder">增加提醒</string>
-  <string name="warning">警告</string>
-  <string name="open_settings">打开设置</string>
-  <string name="dont_keep_activities_warning">看来您将开发者选项 \"不要保留活动” 英语: \Don\'t keep Activities\ 打开了。启用这个选项将会对应用造成不必要的影响。我们建议您将其关闭。</string>
-  <string name="inbox">收件箱</string>
-  <string name="FAQ">常见问题</string>
-  <string name="special">特殊的</string>
-  <string name="gem_for_gold_description">由于你捐助了Habitica，你每月可以用一定数量的金币购买宝石。</string>
-  <string name="limited_count">还剩%d</string>
-  <string name="gem_shop">宝石</string>
-  <string name="mystery_item">神秘物品</string>
-  <string name="myster_item_notes">每月捐助者将收到一个神秘物品，通常在月末一周前推出。</string>
-  <string name="open">打开</string>
-  <string name="notification_mystery_item">你打开了盒子并发现了%s!</string>
-  <string name="checkInRewardEarned">由于你投入改善你的生活，你得到%1$s。</string>
-  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">你的下一次奖赏在签到%1$d后解锁</string>
-  <string name="pending_approval">等待审批的任务</string>
-  <string name="filters">过滤器</string>
-  <string name="done">完成</string>
-  <string name="group_tasks_edit_description">团队任务无法被编辑。</string>
-  <string name="group_tasks_edit_title">无法编辑此任务</string>
-  <string name="groups">团队</string>
-  <string name="all">所有</string>
-  <string name="none">无</string>
-  <string name="owned">已拥有的</string>
-  <string name="not_owned">未拥有的</string>
-  <string name="login_btn_fb">Facebook登录</string>
-  <string name="login_btn_google">Google登录</string>
-  <string name="action_back">返回</string>
-  <string name="avatar_skin_color">肤色</string>
-  <string name="avatar_hair_color">发色</string>
-  <string name="avatar_hair_bangs">刘海</string>
-  <string name="avatar_hair_ponytail">辫子</string>
-  <string name="avatar_glasses">眼镜</string>
-  <string name="avatar_wheelchair">轮椅</string>
-  <string name="weak">瘦小</string>
-  <string name="strong">强壮</string>
-  <string name="completed">完成</string>
-  <string name="setuP_group_other">其他</string>
-  <string name="empty_title_habits">你还没有任何习惯</string>
-  <string name="empty_title_dailies">你还没有任何每日任务</string>
-  <string name="empty_title_todos">你还没有任何待办事项</string>
-  <string name="empty_title_rewards">你还没有任何奖励项目</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <string name="action_refresh">刷新</string>
+  <string name="XP_default">经验值</string>
+  <string name="HP_default">生命值</string>
+  <string name="MP_default">魔法值</string>
+  <string name="ERR_pb_barcode">无法从条码上读取数据</string>
+  <!--Prefs-->
+  <string name="PS_settings_title">设置</string>
+  <string name="SP_address_hint">你的自定义服务器</string>
+  <string name="SP_userID_title">用户ID</string>
+  <string name="SP_userID_summary">你的用户ID</string>
+  <string name="SP_APIToken_title">API令牌</string>
+  <string name="SP_APIToken_summary">你的API令牌</string>
+  <string name="Language_title">语言</string>
+  <string name="Language_summary">更改 Habitica的语言</string>
+  <string name="SP_user_qr_code">你的二维码</string>
+  <string name="PS_contact_title">联系我</string>
+  <string name="unknown_error">发生错误……</string>
+  <string name="pref_account_header">账号</string>
+  <string name="pref_first_day_of_the_week_title">每周的第一天</string>
+  <string name="pref_first_day_of_the_week_summary">在所有的日程表中，每周的第一天</string>
+  <string name="pref_reminder_header">每日任务提醒</string>
+  <string name="pref_reminder_checkbox">激活提醒</string>
+  <string name="pref_reminder_picker">设置提醒时间</string>
+  <string name="pref_cds_header">自定义每日起始时间</string>
+  <string name="pref_cds_picker">设置每天的起始时间（用于任务结算）</string>
+  <string name="pref_push_notifications_checkbox">用户推送通知</string>
+  <string name="push_notifications">推送通知</string>
+  <string name="push_notifications_sum">设置用户推送通知</string>
+  <string name="preference_push_you_won_challenge">你赢得了一项挑战！</string>
+  <string name="preference_push_received_a_private_message">收到一条私信</string>
+  <string name="preference_push_gifted_gems">赠送的钻石</string>
+  <string name="preference_push_gifted_subscription">赠送的订阅</string>
+  <string name="preference_push_invited_to_party">被邀请加入队伍</string>
+  <string name="preference_push_invited_to_guild">已邀请至公会</string>
+  <string name="preference_push_your_quest_has_begun">你的冒险开始了</string>
+  <string name="preference_push_invited_to_quest">被邀请加入冒险</string>
+  <!--Adding tasks-->
+  <string name="task_value">数值</string>
+  <string name="new_todo">新待办事项</string>
+  <string name="new_reward">新奖励</string>
+  <string name="new_daily">新每日任务</string>
+  <string name="new_habit">新习惯</string>
+  <string name="action_edit">编辑</string>
+  <string name="action_delete">删除</string>
+  <string name="action_cancel">取消</string>
+  <string name="login_btn">登陆</string>
+  <string name="register_btn">注册</string>
+  <string name="username">用户名</string>
+  <string name="email_username">电子邮件或用户名</string>
+  <string name="password">密码</string>
+  <string name="emailAddress">电子邮件地址</string>
+  <string name="confirmpassword">确认密码</string>
+  <string name="logout">注销</string>
+  <string name="logout_description">从你的账号登出</string>
+  <string name="account_details_sum">账号信息</string>
+  <string name="account_details">账号信息</string>
+  <string name="LoginActivityName">欢迎</string>
+  <string name="string_revive">重生</string>
+  <string name="please_connect">请在使用小部件之前与应用链接</string>
+  <string name="about.title">关于</string>
+  <string name="about.libraries">资源库</string>
+  <string name="about.versionhistory">版本历史</string>
+  <string name="about.habitica_open_source">Habitica是一个发布在Github上的开源软件</string>
+  <string name="about.rate_our_app">评价我们的应用</string>
+  <string name="about.give_us_feedback">请给我们提交建议！</string>
+  <string name="about.bugreport">反馈漏洞</string>
+  <string name="about.source_code">源代码</string>
+  <!--Network Errors-->
+  <string name="network_error_title">连接错误</string>
+  <string name="network_error_no_network_body">您没有连接到互联网。</string>
+  <string name="internal_error_api">与服务器通信故障，请稍后再试。</string>
+  <string name="authentication_error_title">鉴定错误</string>
+  <string name="authentication_error_body">您的用户名和/或密码错误。</string>
+  <string name="login_validation_error_title">认可错误</string>
+  <string name="login_validation_error_fieldsmissing">请填写所有内容。</string>
+  <string name="save_changes">保存</string>
+  <string name="copy">复制</string>
+  <string name="notes">注释</string>
+  <string name="text">文字</string>
+  <string name="difficulty">难度</string>
+  <string name="tags">标签</string>
+  <string name="trivial">琐事</string>
+  <string name="easy">简单</string>
+  <string name="medium">中等</string>
+  <string name="hard">困难</string>
+  <string name="start_date">开始日期</string>
+  <string name="positive_habit_form">正面的(+)</string>
+  <string name="negative_habit_form">负面的(-)</string>
+  <string name="checklist">检查单</string>
+  <string name="reminders">提醒</string>
+  <string name="actions">动作</string>
+  <string name="attributes">属性</string>
+  <string name="physical">身体上的</string>
+  <string name="mental">精神上的</string>
+  <string name="social">社交</string>
+  <string name="other">其他</string>
+  <string name="frequency">频率</string>
+  <string name="frequency_weekly">每周中的特定日期</string>
+  <string name="frequency_daily">每x日</string>
+  <string name="monday">星期一</string>
+  <string name="tuesday">星期二</string>
+  <string name="wednesday">星期三</string>
+  <string name="thursday">星期四</string>
+  <string name="friday">星期五</string>
+  <string name="saturday">星期六</string>
+  <string name="sunday">星期日</string>
+  <string name="levelup_header">你升级了！</string>
+  <string name="levelup_detail">通过完成您现实生活中的目标，你已升至 %1$d 级！</string>
+  <string name="levelup_health">你被完全治愈了！</string>
+  <string name="levelup_button">吼啊~！</string>
+  <string name="faint_subtitle">别失望！</string>
+  <string name="faint_penalty_body">你降了一级，丢失了所有的金币和一件装备。不过继续努力，你就可以把他们都拿回来！加油，你会更棒的！</string>
+  <string name="faint_header">你失去了所有的生命值</string>
+  <string name="faint_button">补满生命值 &amp; 再次尝试</string>
+  <string name="filter">过滤器</string>
+  <string name="profile_image">头像</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">你在 %1$s 用了 %2$d 魔法值。</string>
+  <string name="used_skill_without_mana">你使用了 %1$s.</string>
+  <string name="new_checklist_item">新增清单内容</string>
+  <string name="add_checklist_item">添加</string>
+  <string name="reminder_title">记得完成你的每日任务！</string>
+  <string name="skill_progress_title">使用技能</string>
+  <string name="coming_soon">即将推出</string>
+  <string name="chat_flag_confirmation">你确认要举报这条消息吗？</string>
+  <string name="flag_confirm">旗标消息</string>
+  <string name="unlock_lvl_11">11级时解锁</string>
+  <string name="no_party_message">你没有加入任何队伍。如想加入队伍，请访问网页版。</string>
+  <string name="forgot_pw_btn">忘记密码</string>
+  <string name="forgot_pw_tv">忘记了您的密码？请访问网页版。</string>
+  <string name="tavern.inn.checkOut">重启每日任务</string>
+  <string name="tavern.inn.rest">暂停每日任务</string>
+  <string name="reward.dialog.buy">购买</string>
+  <string name="reward.dialog.dismiss">解散</string>
+  <string name="party">队伍</string>
+  <string name="chat">聊天</string>
+  <string name="members">成员</string>
+  <string name="habits">习惯</string>
+  <string name="dailies">每日任务</string>
+  <string name="todos">待办事项</string>
+  <string name="rewards">奖励</string>
+  <string name="taskform.delete.title">你确定吗？</string>
+  <string name="taskform.delete.message">你确定要删除吗？</string>
+  <string name="yes">是的</string>
+  <string name="no">不</string>
+  <string name="quest">任务</string>
+  <string name="avatar_body">身体</string>
+  <string name="avatar_hair">头发</string>
+  <string name="avatar_shirt">上衣</string>
+  <string name="avatar_skin">皮肤</string>
+  <string name="avatar_ears">兽耳装饰</string>
+  <string name="avatar_base">基础</string>
+  <string name="avatar_color">颜色</string>
+  <string name="avatar_beard">胡子</string>
+  <string name="avatar_mustache">八字胡</string>
+  <string name="avatar_flower">花</string>
+  <string name="avatar_bangs">刘海</string>
+  <string name="avatar_nothing">没有设置</string>
+  <string name="avatar_size">尺寸</string>
+  <string name="avatar_size_slim">瘦小</string>
+  <string name="avatar_size_broad">强壮</string>
+  <string name="avatar_background">背景</string>
+  <string name="purchase_customization">用户支付</string>
+  <string name="purchase_set_button">解锁%d宝石</string>
+  <string name="purchase_button">支付</string>
+  <string name="purchase_set_title">购买礼包 %s</string>
+  <string name="due_date">截止日期</string>
+  <string name="quest.accept">接受</string>
+  <string name="quest.reject">拒绝</string>
+  <string name="quest.begin">开始探索任务</string>
+  <string name="quest.cancel">取消邀请</string>
+  <string name="quest.abort">放弃探索任务</string>
+  <string name="quest.leave">放弃任务</string>
+  <string name="quest.pending">等待中</string>
+  <string name="quest.accepted">接受了</string>
+  <string name="quest.rejected">拒绝的</string>
+  <string name="quest.participants">参与者</string>
+  <string name="version_info">版本%1$s (%2$d)</string>
+  <string name="sidebar_help">帮助 &amp; FAQ</string>
+  <string name="complete_tutorial">成功！</string>
+  <string name="dismiss_tutorial">再次提醒我</string>
+  <string name="intro_1_subtitle">欢迎来到</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_2_subtitle">游戏进度</string>
+  <string name="intro_2_title">生活进度</string>
+  <string name="intro_2_description">通过完成现实生活中的任务来解锁游戏内容。得到装备、宠物和更多的奖励来促使你完成你的目标吧！</string>
+  <string name="intro_3_description">和朋友们一起为目标努力吧。在生活和战斗中互相支持，共同进步！</string>
+  <string name="intro_finish_button">让我们开始吧！</string>
+  <string name="previous_button">上一页</string>
+  <string name="next_button">下一页</string>
+  <string name="skip_button">跳过</string>
+  <string name="setup_welcome_description">欢迎来到Habitica，在游戏中打怪升级的同时改善自己的真实生活。完成现实生活中的目标，解锁大量装备、宠物、任务卷轴，更多特色等你探索。</string>
+  <string name="setup_welcome_title">欢迎你</string>
+  <string name="setup_group_work">工作</string>
+  <string name="setup_group_exercise">运动</string>
+  <string name="setup_group_school">学校</string>
+  <string name="setup_group_teams">团队</string>
+  <string name="setup_group_chores">杂务</string>
+  <string name="setup_group_creativity">创造力</string>
+  <string name="setup_task_work_1">处理电子邮件</string>
+  <string name="setup_task_work_2">最重要的任务</string>
+  <string name="setup_task_work_3">工作项目</string>
+  <string name="setup_task_exercise_1">有氧运动10分钟</string>
+  <string name="setup_task_exercise_2">拉伸</string>
+  <string name="setup_task_exercise_3">制定健身计划</string>
+  <string name="setup_task_healthWellness_1">吃健康/垃圾食品</string>
+  <string name="setup_task_healthWellness_2">使用牙线</string>
+  <string name="setup_task_healthWellness_3">择期体检</string>
+  <string name="setup_task_school_1">学习/拖延</string>
+  <string name="setup_task_school_2">做家庭作业</string>
+  <string name="setup_task_school_3">完成班级委托</string>
+  <string name="setup_task_teams_1">和队友一起检查</string>
+  <string name="setup_task_teams_2">为团队更新现状</string>
+  <string name="setup_task_teams_3">完成团队项目</string>
+  <string name="setup_task_chores_1">清洁10分钟</string>
+  <string name="setup_task_chores_2">洗碗筷</string>
+  <string name="setup_task_chores_3">整理衣橱</string>
+  <string name="setup_task_creativity_1">学习以成为艺术能手</string>
+  <string name="setup_task_creativity_2">进行创新项目</string>
+  <string name="setup_task_creativity_3">完成创新项目</string>
+  <string name="gem.purchase.support">想要帮助我们维持Habitica？通过买宝石的方式来支持开发者吧！\n\n 宝石能用来购买额外的乐趣，包括：\n\n - 角色的酷酷的服装\n - 好看的背景\n - 能获得宠物蛋的有趣的任务\n - 1001级之前改变职业的能力\n\n非常感谢您帮助我们使Habitica变的更好。您的支持非常重要！</string>
+  <string name="my_guilds">我的公会</string>
+  <string name="public_guilds">公共公会</string>
+  <string name="guild">公会</string>
+  <string name="leave">离开</string>
+  <string name="join">加入</string>
+  <string name="leader">会长</string>
+  <string name="gems">宝石</string>
+  <string name="send_pm">发送私人信息</string>
+  <string name="flag">标志</string>
+  <string name="delete">删除</string>
+  <string name="name">名称</string>
+  <string name="description">描述</string>
+  <string name="privacy">隐私</string>
+  <string name="write_message">写消息</string>
+  <string name="post">公告</string>
+  <string name="guild_search_hint">查找公会</string>
+  <string name="todo_due">到期：%s</string>
+  <string name="daily_streak">目前连击数：%d</string>
+  <string name="todo_has_duedate">任务有截止日</string>
+  <string name="battle_gear">战斗装备</string>
+  <string name="costume">服装</string>
+  <string name="outfit_head">头部</string>
+  <string name="outfit_headAccessory">头部配件</string>
+  <string name="outfit_eyewear">护目镜</string>
+  <string name="outfit_armor">盔甲</string>
+  <string name="outfit_back">返回</string>
+  <string name="outfit_body">身体</string>
+  <string name="outfit_shield">盾牌</string>
+  <string name="outfit_weapon">武器</string>
+  <string name="wear_costume">穿上装扮</string>
+  <string name="equipped">装备</string>
+  <string name="quest_cancel_message">你是否确定要放弃这个探索任务？这将会失去所有已接受的邀请。探索任务拥有者将拿回探索任务卷轴。</string>
+  <string name="quest.invitation">任务邀请</string>
+  <string name="quest_begin_message">你是否确定要直接开始这个探索任务？一旦开始，其他队伍成员就不能加入这个探索任务。</string>
+  <string name="quest.invitation.text">你被邀请参加一个探索任务！</string>
+  <string name="ago_1day">1天前</string>
+  <string name="ago_days">%d天前</string>
+  <string name="ago_1Minute">1分钟前</string>
+  <string name="ago_minutes">%d分钟前</string>
+  <string name="ago_hours">%d小时前</string>
+  <string name="ago_1hour">1小时前</string>
+  <string name="today">今天</string>
+  <string name="sidebar_items">物品</string>
+  <string name="eggs">蛋</string>
+  <string name="hatching_potions">孵化药水</string>
+  <string name="food">食物</string>
+  <string name="quests">任务</string>
+  <string name="pets">宠物</string>
+  <string name="mounts">坐骑</string>
+  <string name="armoireEquipment">你在魔法衣橱里找到了一件稀有装备：%s！恭喜你！</string>
+  <string name="armoireFood">你在魔法衣橱里找到了%1$s %2$s。它是用来做什么的？</string>
+  <string name="armoireExp">你和大衣柜展开了殊死搏斗，并赢得了经验，尝尝这个吧！</string>
+  <string name="armoireNotesFull">拉开 魔法衣橱 来获得随机的特殊装备，经验或者食物！剩余的装备：%d</string>
+  <string name="armoireLastItem">你在魔法衣橱里找到了最后一件稀有装备。</string>
+  <string name="armoireNotesEmpty">每个月的第一个星期这里都会有新的装备，到时记得常点进来获得经验和食物！</string>
+  <string name="sell">出售 (%d金币)</string>
+  <string name="hatch_with_potion">用孵化药水孵化</string>
+  <string name="feed_to_pet">喂养宠物</string>
+  <string name="hatch_egg">孵化宠物蛋</string>
+  <string name="invite_party">邀请队伍</string>
+  <string name="dialog_feeding">喂养%1$s %2$s用：</string>
+  <string name="use_animal">使用</string>
+  <string name="feed">喂食</string>
+  <string name="hatch_with">用%s孵化宠物</string>
+  <string name="hatched_pet_title">你孵化了一个 %1$s %2$s！</string>
+  <string name="close">关闭</string>
+  <string name="share">分享</string>
+  <string name="notification_pet_fed">你喂食了你的%1$s %2$s！</string>
+  <string name="notification_purchase">已购买 %s</string>
+  <string name="sectionpets">基本宠物</string>
+  <string name="sectionpremiumPets">神奇药水宠物</string>
+  <string name="sectionquestPets">剧情任务宠物</string>
+  <string name="sectionspecialPets">稀有宠物</string>
+  <string name="sectionmounts">基本坐骑</string>
+  <string name="sectionpremiumMounts">神奇药水坐骑</string>
+  <string name="sectionquestMounts">剧情任务坐骑</string>
+  <string name="sectionspecialMounts">稀有坐骑</string>
+  <string name="world_quest">世界任务</string>
+  <string name="inn_description">在客栈休息让你未完成的每日任务不会伤害你！(注意：它不能阻止来自任务怪物的伤害。)</string>
+  <string name="empty_items">你没有拥有任何的%s</string>
+  <string name="user_level">Lvl %d</string>
+  <string name="user_level_with_class">Lvl %1$d %2$s</string>
+  <string name="warrior">战士</string>
+  <string name="rogue">盗贼</string>
+  <string name="mage">法师</string>
+  <string name="healer">医师</string>
+  <string name="warrior_description">战士们会有更大的机率触发暴击并在完成任务时随机获得额外的金币，经验和掉率。他们还能对boss造成严重的伤害。如果你希望获得随机性的奖励，或者在boss任务中重创boss，来玩战士吧！</string>
+  <string name="mage_description">法师非常善于学习，获得经验值和升级比其他职业快。他们也会获得大量的魔力值来使用一些特殊的法术。如果你喜欢玩得有策略性，或者你强烈地希望升级解锁更多的游戏内容，来玩法师吧！</string>
+  <string name="rogue_description">盗贼热衷于积累财富，比其他人获得更多的金币，还擅长寻找随机物品。他们标志性的潜行技能使得他们能够躲避未完成的日常带来的伤害。如果你希望获得更多的奖励，成就，掉落以及徽章，来玩盗贼吧！</string>
+  <string name="healer_description">医师们对伤害的抗性很强，也可以保护其他的人。错过的日常任务和坏习惯无法伤害他们太多，而且他们有很多回血的技能。如果你热衷于辅助其他的队友，或者是享受那种从死神手里夺取生命的快感，那就成为一名医师吧！</string>
+  <string name="select_class">选择职业</string>
+  <string name="opt_out_class">退出</string>
+  <string name="opt_out_description">不知道选什么职业？想以后再选？没问题 - 你现在可以先做一个没有特殊技能的战士。我们的维基页面上有关于职业系统的介绍，之后随时可以定你的职业。</string>
+  <string name="class_confirmation">你确定想要成为%s吗？</string>
+  <string name="class_changed">你现在是 %s级了！</string>
+  <string name="class_changed_description">你有新的默认战斗装备，你可以改变下了！</string>
+  <string name="choose_class">选择职业</string>
+  <string name="dialog_go_back">返回</string>
+  <string name="opt_out_confirmation">你确定要退出吗？</string>
+  <string name="change_class">更换你的职业</string>
+  <string name="change_class_description">更换你的职业并重置属性点需要3颗宝石。你能通过网页分配属性点</string>
+  <string name="enable_class">开启职业系统</string>
+  <string name="changing_class_progress">更换职业</string>
+  <string name="by_email">通过电子邮件</string>
+  <string name="invite_existing_users">邀请已存在的用户</string>
+  <string name="send">发送</string>
+  <string name="invite">邀请朋友</string>
+  <string name="invite_id_description">如果你的朋友们已经在使用Habitica 了，通过&lt;用户ID邀请他们 。</string>
+  <string name="invite_email_description">如果你的朋友通过你的邮件加入Habitica，他们将自动被邀请加入你的队伍。</string>
+  <string name="add_invites">添加邀请</string>
+  <string name="user_id">用户ID</string>
+  <string name="email">电子邮件</string>
+  <string name="invite_users">邀请加入队伍</string>
+  <string name="share_using">分享使用</string>
+  <string name="share_levelup">我在Habitica中通过改善我现实生活中的习惯到达了%d级！</string>
+  <string name="share_hatched">我刚刚在Habitica中通完成我现实生活中的任务孵化了一只宠物%1$s %2$s！</string>
+  <string name="share_raised">我刚刚在Habitica中通完成我现实生活中的任务得到了一匹坐骑%1$s %2$s！</string>
+  <string name="open_in_store">在应用商店开放</string>
+  <string name="change_class_confirmation">你确定想要转变职业吗？这将花费3颗宝石。</string>
+  <string name="change_class_equipment_warning">提示：你无法再购买%s职业的装备了（已顶级╮(╯_╰)╭）。</string>
+  <string name="leaderMessage">从%1$s来的消息</string>
+  <string name="leaderName">%1$s的会长</string>
+  <string name="confirm">确认</string>
+  <string name="market">市场</string>
+  <string name="timeTravelers">时光旅行</string>
+  <string name="seasonalShop">四季商店</string>
+  <string name="empty_inbox">收件箱里没有消息。您可以在用户的公共聊天窗口中给他发送新消息！</string>
+  <string name="party_invite">通过邀请朋友来解锁</string>
+  <string name="no_gold">没有足够的金币</string>
+  <string name="no_potion">你不需要购买生命药水</string>
+  <string name="successful_purchase">已购买 %1$s</string>
+  <string name="purchase_confirmation_title">确认购买</string>
+  <string name="confirm_purchase_text">为 %2$s %3$s 购买 %1$s</string>
+  <string name="gem">宝石</string>
+  <string name="hourglass">沙漏</string>
+  <string name="hourglasses">沙漏</string>
+  <string name="gold_singular">金币</string>
+  <string name="gold_plural">金币</string>
+  <string name="chat_message_copied">复制到剪帖板的信息</string>
+  <string name="copy_chat_message">复制到剪贴板</string>
+  <string name="edit_tag_title">编辑按钮</string>
+  <string name="edit_tag_btn_edit">编辑</string>
+  <string name="edit_tag_btn_done">完成</string>
+  <string name="edit_tag_btn_delete">删除</string>
+  <string name="confirm_delete_tag_title">你确定吗？</string>
+  <string name="confirm_delete_tag_message">你确定要删除吗？</string>
+  <string name="filter_drawer_edit_tags">编辑按钮</string>
+  <string name="filter_drawer_filter_tags">过滤按钮</string>
+  <!--QR Strings-->
+  <string name="qr_section_title">让别人通过此二维码邀请你</string>
+  <string name="qr_save_message">将二维码保存至</string>
+  <string name="qr_dialogue_title">你的二维码</string>
+  <string name="download">下载</string>
+  <string name="send_new_message">发送新消息</string>
+  <string name="choose_recipient_title">选择消息接收者</string>
+  <string name="action_continue">继续</string>
+  <string name="scan_qr_code">扫描二维码</string>
+  <string name="enter_recipient_uuid">输入接受者的用户ID</string>
+  <string name="invited_to_party">你被邀请加入一个队伍！</string>
+  <string name="stats_widget_label">Habitica状态</string>
+  <string name="add_task">添加任务</string>
+  <string name="add_habit">添加习惯</string>
+  <string name="add_daily">添加每日任务</string>
+  <string name="add_todo">添加待办事项</string>
+  <string name="add_reward">添加奖励</string>
+  <string name="all_dailies_completed">你完成了所有没有任务。干得漂亮！</string>
+  <string name="widget_habit_button">Habitica完成习惯</string>
+  <string name="widget_dailies">Habitica每日任务</string>
+  <string name="widget_add_task">Habitica增加任务</string>
+  <string name="google_services_missing">没有找到Google play服务。</string>
+  <string name="gem.purchase.toolbartitle">购买</string>
+  <string name="gem.purchase.title">购买宝石来支持开发者们和帮助保证Habitica的日常运营</string>
+  <string name="gem.purchase.subtitle">你可以通过宝石给你的账户购买更多有趣的额外物品，包括：</string>
+  <string name="gem.purchase.listitem1">角色形象的炫酷装扮</string>
+  <string name="gem.purchase.listitem2">超棒的背景</string>
+  <string name="gem.purchase.listitem3">任务会奖励你宠物蛋</string>
+  <string name="gem.purchase.listitem4">100级前改变你职业的能力</string>
+  <string name="support_habitica">支持Habitica</string>
+  <string name="skill_transformation_use">使用</string>
+  <string name="hatching_market_info">没有得到想要的掉落物品？来市场瞧瞧！</string>
+  <string name="feeding_market_info">需要不同的食物？在市场可以买到更多！</string>
+  <string name="open_market">打开市场</string>
+  <string name="cds_description">你的每日任务将会在 %1$s 后第一次打开 Habitica 时进行结算并被重置。请确保在此之前完成所有的每日任务！</string>
+  <string name="AudioTheme_title">声音主题</string>
+  <string name="AudioTheme_summary">更改 Habitica 的声音主题</string>
+  <!--Login Incentives-->
+  <string name="see_you_tomorrow">明天再见！</string>
+  <string name="belongs_to_challenge">来自挑战</string>
+  <string name="has_reminder">有任务提示</string>
+  <string name="has_tag">有标签</string>
+  <string name="subscribe.title">捐助支持开发者以帮助维持Habitica运行</string>
+  <string name="subscribe_prompt">成为捐助者你会得到这些好处：</string>
+  <string name="subscribe.listitem1">用金币购买宝石</string>
+  <string name="subscribe.listitem2">高档的季度物品</string>
+  <string name="subscribe.listitem3">保留额外的历史条目</string>
+  <string name="subscribe.listitem4">每日掉落上限翻倍</string>
+  <string name="subscriptions">捐助</string>
+  <string name="subscription_duration">每 %s 重复出现</string>
+  <string name="subscribe">捐助</string>
+  <string name="subscribe.listitem1.description">商人亚历山大可以按每个宝石20金币的价格向你出售宝石！\n\n他每个月的初始进货量是25个宝石，进货量会随着您的捐助长度增长！\n\n 每三个月宝石上限就会增加5，直到最大值1个月50颗宝石！</string>
+  <string name="subscribe.listitem2.description">每个月你将会收到一件独特的角色饰品！另外，每连续捐助三个月，神秘的时间旅行者将授予你得到过去(和将来)的饰品的资格。</string>
+  <string name="subscribe.listitem3.description">使完成的待办事项和任务的历史记录保留更长时间</string>
+  <string name="subscribe.listitem4.description">双倍掉落让你每天能够从完成的任务中得到更多的物品，帮助你更快地驯服坐骑！</string>
+  <string name="subscribe1month.gemcap">宝石上限起始为25</string>
+  <string name="subscribe3month.gemcap">宝石上限增加到30</string>
+  <string name="subscribe6month.gemcap">宝石上限增加到35</string>
+  <string name="subscribe12month.gemcap">宝石上限增加到45</string>
+  <string name="subscription_hourglasses">+%d 神秘沙漏</string>
+  <string name="payment_method">付款方式</string>
+  <string name="subscription">捐助</string>
+  <string name="active">活跃的</string>
+  <string name="cancel_subscription">取消订阅</string>
+  <string name="cancel_subscription_google.description">不想再继续捐助了？你可以在Google应用商店里找到“我的应用程序”部分里找到退订选项。</string>
+  <string name="cancel_subscription_notgoogle.description">不想再继续捐助了？由于您的付款方式，您只能通过这个网站停止捐助。点击下面的按钮，在您的浏览器中打开站点。</string>
+  <string name="visit_habitica_website">访问Habitica的网站</string>
+  <string name="current_bonuses">当前奖励</string>
+  <string name="months_subscribed">捐助的月数</string>
+  <string name="current_hourclasses">当前神秘沙漏</string>
+  <string name="monthly_gem_cap">每月宝石上限</string>
+  <string name="inactive">不活跃的</string>
+  <string name="one_month">1个月</string>
+  <string name="months">%d个月</string>
+  <string name="month">月</string>
+  <string name="three_months">3个月</string>
+  <string name="six_months">6个月</string>
+  <string name="twelve_months">12个月</string>
+  <string name="subscribe_prompt_thanks">通过捐助你会获得这些好处：</string>
+  <string name="subscription_status">捐助状态</string>
+  <string name="byLeader">由 %s</string>
+  <string name="challenge_details">挑战细节</string>
+  <string name="challenge_leave_title">退出挑战</string>
+  <string name="challenge_leave_text">你是否确定想放弃这个挑战“%s”？</string>
+  <string name="challenge_remove_tasks_title">删除任务</string>
+  <string name="challenge_remove_tasks_text">你确定要删除这个任务吗？</string>
+  <string name="remove_tasks">删除</string>
+  <string name="keep_tasks">保持</string>
+  <string name="my_challenges">我的挑战</string>
+  <string name="public_challenges">公共挑战</string>
+  <string name="challenges">挑战</string>
+  <string name="daily">每日任务</string>
+  <string name="habit">习惯</string>
+  <string name="reward">奖励</string>
+  <string name="todo">待办事项</string>
+  <string name="official">官方的</string>
+  <string name="participating">参加</string>
+  <string name="challenge">挑战</string>
+  <string name="go_to_challenge">参加挑战</string>
+  <string name="not_part_of_a_challenge">你还没有加入任何挑战呢！</string>
+  <string name="join_a_challenge">加入一个挑战会将它的任务加入你的任务列表，然后去完成任务战胜其他habitican赢得成就甚至钻石吧！</string>
+  <string name="check_the_public_challenge_tab">点击“公会挑战”按钮来寻找其他勇士创建的挑战吧！也许会有适合你的哟！</string>
+  <string name="add_reminder">增加提醒</string>
+  <string name="warning">警告</string>
+  <string name="open_settings">打开设置</string>
+  <string name="dont_keep_activities_warning">看来您将开发者选项 \"不要保留活动” 英语: \Don\'t keep Activities\ 打开了。启用这个选项将会对应用造成不必要的影响。我们建议您将其关闭。</string>
+  <string name="inbox">收件箱</string>
+  <string name="FAQ">常见问题</string>
+  <string name="special">特殊的</string>
+  <string name="gem_for_gold_description">由于你捐助了Habitica，你每月可以用一定数量的金币购买宝石。</string>
+  <string name="limited_count">还剩%d</string>
+  <string name="gem_shop">宝石</string>
+  <string name="mystery_item">神秘物品</string>
+  <string name="myster_item_notes">每月捐助者将收到一个神秘物品，通常在月末一周前推出。</string>
+  <string name="open">打开</string>
+  <string name="notification_mystery_item">你打开了盒子并发现了%s!</string>
+  <string name="checkInRewardEarned">由于你投入改善你的生活，你得到%1$s。</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">你的下一次奖赏在签到%1$d后解锁</string>
+  <string name="pending_approval">等待审批的任务</string>
+  <string name="filters">过滤器</string>
+  <string name="done">完成</string>
+  <string name="group_tasks_edit_description">团队任务无法被编辑。</string>
+  <string name="group_tasks_edit_title">无法编辑此任务</string>
+  <string name="groups">团队</string>
+  <string name="all">所有</string>
+  <string name="none">无</string>
+  <string name="owned">已拥有的</string>
+  <string name="not_owned">未拥有的</string>
+  <string name="login_btn_fb">Facebook登录</string>
+  <string name="login_btn_google">Google登录</string>
+  <string name="action_back">返回</string>
+  <string name="avatar_skin_color">肤色</string>
+  <string name="avatar_hair_color">发色</string>
+  <string name="avatar_hair_bangs">刘海</string>
+  <string name="avatar_hair_ponytail">辫子</string>
+  <string name="avatar_glasses">眼镜</string>
+  <string name="avatar_wheelchair">轮椅</string>
+  <string name="weak">瘦小</string>
+  <string name="strong">强壮</string>
+  <string name="completed">完成</string>
+  <string name="setuP_group_other">其他</string>
+  <string name="empty_title_habits">你还没有任何习惯</string>
+  <string name="empty_title_dailies">你还没有任何每日任务</string>
+  <string name="empty_title_todos">你还没有任何待办事项</string>
+  <string name="empty_title_rewards">你还没有任何奖励项目</string>
+</resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 32f629c30..ac425cd60 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -1,137 +1,137 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="brand_50">#36205D</color>
-    <color name="brand_100">#432874</color>
-    <color name="brand_200">#4f2a93</color>
-    <color name="brand_300">#6133B4</color>
-    <color name="brand_400">#9A62FF</color>
-    <color name="brand_500">#bda8ff</color>
-    <color name="brand_700">#ede7f6</color>
-    <color name="brand">@color/brand_100</color>
-
-    <!--  HabitRPG task color -->
-    <color name="worst_100">#DE3F3F</color>
-    <color name="worst_50">#C92B2B</color>
-    <color name="worst_10">#B01515</color>
-
-    <color name="worse_100">#FF6165</color>
-    <color name="worse_50">#F74E52</color>
-    <color name="worse_10">#F23035</color>
-
-    <color name="bad_100">#FF944C</color>
-    <color name="bad_50">#FA8537</color>
-    <color name="bad_10">#F47825</color>
-
-    <color name="neutral_100">#FFBE5D</color>
-    <color name="neutral_50">#FFB445</color>
-    <color name="neutral_10">#FFA624</color>
-
-    <color name="good_100">#24CC8F</color>
-    <color name="good_50">#20B780</color>
-    <color name="good_10">#1CA372</color>
-
-    <color name="better_100">#3BCAD7</color>
-    <color name="better_50">#34B5C1</color>
-    <color name="better_10">#26A0AB</color>
-
-    <color name="best_100">#50B5E9</color>
-    <color name="best_50">#46A7D9</color>
-    <color name="best_10">#2995cd</color>
-
-    <color name="completed">#D9D9D9</color>
-    <color name="completed_btn">#989898</color>
-
-    <color name="hpColor">@color/worse_100</color>
-    <color name="hpColorBackground">#fcf0f0</color>
-    <color name="hpColorForeground">#250808</color>
-    <color name="xpColor">@color/neutral_100</color>
-    <color name="xpColorBackground">#fffbf0</color>
-    <color name="xpColorForeground">#2e2200</color>
-    <color name="mpColor">@color/best_100</color>
-    <color name="mpColorBackground">#eff4fd</color>
-    <color name="mpColorForeground">#051228</color>
-
-    <color name="changelog.note">#ffcf42</color>
-
-    <color name="colorPrimary">@color/brand_300</color>
-    <color name="colorPrimaryDark">@color/brand_50</color>
-    <!-- text -->
-    <color name="textColorDark">#FFFFFF</color>
-    <color name="textColorSecondaryDark">@color/brand_500</color>
-    <color name="textColorLight">#212121</color>
-    <color name="textColorSecondaryLight">#727272</color>
-
-    <!-- Cards -->
-    <color name="stroke">#dddddd</color>
-    <color name="text_light">#66000000</color>
-    <color name="card_text">#ff8d8d8d</color>
-    <color name="card_title_text">#ff707070</color>
-    <color name="card_light_text">#ffb5b5b5</color>
-    <color name="card_grid_text">#ff707070</color>
-    <color name="card_separator">#ffe5e5e5</color>
-    <color name="card_border">#ffdedede</color>
-
-    <!-- dialog -->
-    <color name="primary_text_light">#000000</color>
-    <color name="transparent">#00000000</color>
-
-    <!--  clock styled weekdays -->
-    <color name="days_gray">#ffb5b5b5</color>
-    <color name="days_black">#FF000000</color>
-    <color name="holo_blue_light">#ff33b5e5</color>
-
-    <color name="btn_separator">#aaa</color>
-    <color name="new_task_bar_color">#555555</color>
-    <color name="white">#ffffff</color>
-
-    <color name="checkbox_tint_color">#ffd8dcdd</color>
-
-    <color name="cell_separator">#c3c2c6</color>
-    <color name="checklist_separator">#ededed</color>
-    <color name="task_gray">#b7b7b7</color>
-    <color name="checkbox_fill">#50ffffff</color>
-    <color name="checkbox_checked_fill">#c8ffffff</color>
-    <color name="checkbox_checklist_fill">#23000000</color>
-
-    <color name="habit_inactive_gray">#F9F9F9</color>
-
-    <!-- Preferences -->
-    <color name="preference_fallback_accent_color">@color/colorAccent</color>
-    <!-- buttons -->
-    <color name="btn_success">@color/good_10</color>
-    <color name="btn_warning">@color/neutral_10</color>
-    <color name="btn_danger">@color/worse_10</color>
-
-    <color name="widget_background">#c8432874</color>
-
-    <color name="gem_view_background">@color/habit_inactive_gray</color>
-    <color name="task_border_gray">#1a000000</color>
-    <color name="task_secondary_text">#B2B2B2</color>
-    <color name="header_class_name">#CCBEED</color>
-    <color name="gem_icon_color">#24cc8f</color>
-    <color name="subscription_description_text">#b1000000</color>
-    <color name="pill_gray">#efefef</color>
-    <color name="white_75_alpha">#bfffffff</color>
-    <color name="white_50_alpha">#7fffffff</color>
-    <color name="white_15_alpha">#26ffffff</color>
-    <color name="black_5_alpha">#0b000000</color>
-    <color name="black_10_alpha">#16000000</color>
-    <color name="black_20_alpha">#33000000</color>
-    <color name="light_gray_bg">#F6F4F8</color>
-
-    <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>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <color name="brand_50">#36205D</color>
+    <color name="brand_100">#432874</color>
+    <color name="brand_200">#4f2a93</color>
+    <color name="brand_300">#6133B4</color>
+    <color name="brand_400">#9A62FF</color>
+    <color name="brand_500">#bda8ff</color>
+    <color name="brand_700">#ede7f6</color>
+    <color name="brand">@color/brand_100</color>
+
+    <!--  HabitRPG task color -->
+    <color name="worst_100">#DE3F3F</color>
+    <color name="worst_50">#C92B2B</color>
+    <color name="worst_10">#B01515</color>
+
+    <color name="worse_100">#FF6165</color>
+    <color name="worse_50">#F74E52</color>
+    <color name="worse_10">#F23035</color>
+
+    <color name="bad_100">#FF944C</color>
+    <color name="bad_50">#FA8537</color>
+    <color name="bad_10">#F47825</color>
+
+    <color name="neutral_100">#FFBE5D</color>
+    <color name="neutral_50">#FFB445</color>
+    <color name="neutral_10">#FFA624</color>
+
+    <color name="good_100">#24CC8F</color>
+    <color name="good_50">#20B780</color>
+    <color name="good_10">#1CA372</color>
+
+    <color name="better_100">#3BCAD7</color>
+    <color name="better_50">#34B5C1</color>
+    <color name="better_10">#26A0AB</color>
+
+    <color name="best_100">#50B5E9</color>
+    <color name="best_50">#46A7D9</color>
+    <color name="best_10">#2995cd</color>
+
+    <color name="completed">#D9D9D9</color>
+    <color name="completed_btn">#989898</color>
+
+    <color name="hpColor">@color/worse_100</color>
+    <color name="hpColorBackground">#fcf0f0</color>
+    <color name="hpColorForeground">#250808</color>
+    <color name="xpColor">@color/neutral_100</color>
+    <color name="xpColorBackground">#fffbf0</color>
+    <color name="xpColorForeground">#2e2200</color>
+    <color name="mpColor">@color/best_100</color>
+    <color name="mpColorBackground">#eff4fd</color>
+    <color name="mpColorForeground">#051228</color>
+
+    <color name="changelog.note">#ffcf42</color>
+
+    <color name="colorPrimary">@color/brand_300</color>
+    <color name="colorPrimaryDark">@color/brand_50</color>
+    <!-- text -->
+    <color name="textColorDark">#FFFFFF</color>
+    <color name="textColorSecondaryDark">@color/brand_500</color>
+    <color name="textColorLight">#212121</color>
+    <color name="textColorSecondaryLight">#727272</color>
+
+    <!-- Cards -->
+    <color name="stroke">#dddddd</color>
+    <color name="text_light">#66000000</color>
+    <color name="card_text">#ff8d8d8d</color>
+    <color name="card_title_text">#ff707070</color>
+    <color name="card_light_text">#ffb5b5b5</color>
+    <color name="card_grid_text">#ff707070</color>
+    <color name="card_separator">#ffe5e5e5</color>
+    <color name="card_border">#ffdedede</color>
+
+    <!-- dialog -->
+    <color name="primary_text_light">#000000</color>
+    <color name="transparent">#00000000</color>
+
+    <!--  clock styled weekdays -->
+    <color name="days_gray">#ffb5b5b5</color>
+    <color name="days_black">#FF000000</color>
+    <color name="holo_blue_light">#ff33b5e5</color>
+
+    <color name="btn_separator">#aaa</color>
+    <color name="new_task_bar_color">#555555</color>
+    <color name="white">#ffffff</color>
+
+    <color name="checkbox_tint_color">#ffd8dcdd</color>
+
+    <color name="cell_separator">#c3c2c6</color>
+    <color name="checklist_separator">#ededed</color>
+    <color name="task_gray">#b7b7b7</color>
+    <color name="checkbox_fill">#50ffffff</color>
+    <color name="checkbox_checked_fill">#c8ffffff</color>
+    <color name="checkbox_checklist_fill">#23000000</color>
+
+    <color name="habit_inactive_gray">#F9F9F9</color>
+
+    <!-- Preferences -->
+    <color name="preference_fallback_accent_color">@color/colorAccent</color>
+    <!-- buttons -->
+    <color name="btn_success">@color/good_10</color>
+    <color name="btn_warning">@color/neutral_10</color>
+    <color name="btn_danger">@color/worse_10</color>
+
+    <color name="widget_background">#c8432874</color>
+
+    <color name="gem_view_background">@color/habit_inactive_gray</color>
+    <color name="task_border_gray">#1a000000</color>
+    <color name="task_secondary_text">#B2B2B2</color>
+    <color name="header_class_name">#CCBEED</color>
+    <color name="gem_icon_color">#24cc8f</color>
+    <color name="subscription_description_text">#b1000000</color>
+    <color name="pill_gray">#efefef</color>
+    <color name="white_75_alpha">#bfffffff</color>
+    <color name="white_50_alpha">#7fffffff</color>
+    <color name="white_15_alpha">#26ffffff</color>
+    <color name="black_5_alpha">#0b000000</color>
+    <color name="black_10_alpha">#16000000</color>
+    <color name="black_20_alpha">#33000000</color>
+    <color name="light_gray_bg">#F6F4F8</color>
+
+    <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/strings.xml b/Habitica/res/values/strings.xml
index cda78452a..d5822b482 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1,572 +1,572 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <string name="action_refresh">Refresh</string>
-    <string name="XP_default">Experience</string>
-    <string name="HP_default">Health</string>
-    <string name="MP_default">Mana</string>
-    <string name="ERR_pb_barcode">Prefs couldn\'t be loaded from the barcode</string>
-
-    <!--  Prefs -->
-    <string name="PS_settings_title">Settings</string>
-    <string name="SP_address_hint">Your custom server</string>
-    <string name="SP_userID_title">User ID</string>
-    <string name="SP_userID_summary">Your User ID</string>
-    <string name="SP_APIToken_title">API Token</string>
-    <string name="SP_APIToken_summary">Your API Token</string>
-    <string name="Language_title">Language</string>
-    <string name="Language_summary">Change Habitica\'s language</string>
-    <string name="SP_user_qr_code">Your QR Code</string>
-    <string name="PS_contact_title">Contact me</string>
-    <string name="unknown_error">An error occurred…</string>
-    <string name="pref_account_header">Account</string>
-    <string name="pref_first_day_of_the_week_title">First Day of the Week</string>
-    <string name="pref_first_day_of_the_week_summary">First day of the week in all calendars</string>
-    <string name="pref_first_day_of_the_week_default_value" translatable="false">1</string>
-    <string name="pref_first_day_of_the_week_key" translatable="false">FirstDayOfTheWeek</string>
-    <string name="pref_reminder_header">Daily Reminder</string>
-    <string name="pref_reminder_checkbox">Activate Reminder</string>
-    <string name="pref_reminder_picker">Set Reminder Time</string>
-
-    <string name="pref_cds_header">Custom Day Start</string>
-    <string name="pref_cds_picker">Set Custom Day Start Time</string>
-
-    <string name="pref_push_notifications_checkbox">User Push Notifications</string>
-    <string name="push_notifications">Push Notifications</string>
-    <string name="push_notifications_sum">Set your push notifications settings</string>
-    <string name="preference_push_you_won_challenge">You won a Challenge!</string>
-    <string name="preference_push_received_a_private_message">Received a Private Message</string>
-    <string name="preference_push_gifted_gems">Gifted Gems</string>
-    <string name="preference_push_gifted_subscription">Gifted Subscription</string>
-    <string name="preference_push_invited_to_party">Invited to Party</string>
-    <string name="preference_push_invited_to_guild">Invited to Guild</string>
-    <string name="preference_push_your_quest_has_begun">Your Quest has Begun</string>
-    <string name="preference_push_invited_to_quest">Invited to Quest</string>
-
-    <!-- Adding tasks -->
-    <string name="task_value">Value</string>
-    <string name="new_todo">New To-Do</string>
-    <string name="new_reward">New Reward</string>
-    <string name="new_daily">New Daily</string>
-    <string name="new_habit">New Habit</string>
-    <string name="action_edit">Edit</string>
-    <string name="action_delete">Delete</string>
-    <string name="action_cancel">Cancel</string>
-    <string name="login_btn">Login</string>
-    <string name="register_btn">Register</string>
-    <string name="username">Username</string>
-    <string name="email_username">Email or Username</string>
-    <string name="password">Password</string>
-    <string name="emailAddress">Email address</string>
-    <string name="confirmpassword">Confirm password</string>
-
-    <string name="logout">Logout</string>
-    <string name="logout_description">Log out of your account</string>
-    <string name="account_details_sum">Check your account details</string>
-    <string name="account_details">Account Details</string>
-    <string name="LoginActivityName">Welcome</string>
-
-    <string name="string_revive">Revive</string>
-    <string name="please_connect">Please connect through the application before using a widget</string>
-        
-    <string name="about.title">About</string>
-    <string name="about.libraries">Libraries</string>
-    <string name="about.versionhistory">Version history</string>
-    <string name="about.habitica_open_source">Habitica is available as open source software on Github</string>
-    <string name="about.rate_our_app">Rate our App</string>
-    <string name="about.give_us_feedback">Send us Feedback!</string>
-    <string name="about.bugreport">Report a Bug</string>
-    <string name="about.source_code">Source Code</string>
-
-    <!-- Network Errors -->
-    <string name="network_error_title">Connection Error</string>
-    <string name="network_error_no_network_body">You are not connected to the internet.</string>
-    <string name="internal_error_api">There seems to be a problem with the server. Try again later.</string>
-
-    <string name="authentication_error_title">Authentication Error</string>
-    <string name="authentication_error_body">Your Username and/or Password was incorrect.</string>
-
-    <string name="login_validation_error_title">Validation Error</string>
-    <string name="login_validation_error_fieldsmissing">You have to fill out all fields.</string>
-
-    <string name="save_changes">Save</string>
-    <string name="copy">Copy</string>
-    <string name="notes">Notes</string>
-    <string name="text">Text</string>
-    <string name="difficulty">Difficulty</string>
-    <string name="tags">Tags</string>
-    <string name="trivial">Trivial</string>
-    <string name="easy">Easy</string>
-    <string name="medium">Medium</string>
-    <string name="hard">Hard</string>
-    <string name="start_date">Start Date</string>
-    <string name="positive_habit_form">Positive ( + )</string>
-    <string name="negative_habit_form">Negative ( - )</string>
-    <string name="checklist">Checklist</string>
-    <string name="reminders">Reminders</string>
-    <string name="actions">Actions</string>
-
-    <string name="attributes">Attributes</string>
-    <string name="physical">Physical</string>
-    <string name="mental">Mental</string>
-    <string name="social">Social</string>
-    <string name="other">Other</string>
-
-    <string name="frequency">Frequency</string>
-    <string name="frequency_weekly">On Certain Days of the Week</string>
-    <string name="frequency_daily">Every X Days</string>
-
-    <string name="monday">Monday</string>
-    <string name="tuesday">Tuesday</string>
-    <string name="wednesday">Wednesday</string>
-    <string name="thursday">Thursday</string>
-    <string name="friday">Friday</string>
-    <string name="saturday">Saturday</string>
-    <string name="sunday">Sunday</string>
-
-    <string name="levelup_header">You gained a level!</string>
-    <string name="levelup_detail">By accomplishing your real-life goals, you\'ve grown to Level %1$d!</string>
-    <string name="levelup_health">You have been fully healed!</string>
-    <string name="levelup_button">Huzzah!</string>
-
-    <string name="faint_subtitle">Don\'t despair!</string>
-    <string name="faint_penalty_body">You lost a Level, your Gold, and a piece of Equipment, but you can get them all back with hard work! Good luck--you\'ll do great.</string>
-    <string name="faint_header">You ran out of Health!</string>
-    <string name="faint_button">Refill Health &amp; Try Again</string>
-
-    <string name="filter">Filter</string>
-    <string name="profile_image">Profile Image</string>
-
-    <string name="mana_price_button" >%d MP</string>
-    <string name="used_skill" >You used %1$s for %2$d mana.</string>
-    <string name="used_skill_without_mana" >You used %1$s.</string>
-    <string name="new_checklist_item">new checklist item</string>
-    <string name="add_checklist_item">Add</string>
-
-    <string name="reminder_title">Remember to check off your Dailies!</string>
-    <string name="skill_progress_title">Using Skill</string>
-    <string name="coming_soon">Coming Soon</string>
-    <string name="chat_flag_confirmation">Are you sure you want to report this message for violation?</string>
-    <string name="flag_confirm">Flag Message</string>
-    <string name="unlock_lvl_11">Unlock at lvl 11</string>
-    <string name="no_party_message">You are not in a party. To join a party, please visit the website.</string>
-    <string name="forgot_pw_btn">Forgot Password</string>
-    <string name="forgot_pw_tv">Forgot Password? Please use the mobile Website.</string>
-    <string name="tavern.inn.checkOut">Reactivate your Dailies</string>
-    <string name="tavern.inn.rest">Pause your Dailies</string>
-    <string name="reward.dialog.buy">Buy</string>
-    <string name="reward.dialog.dismiss">Dismiss</string>
-    <string name="party">Party</string>
-    <string name="chat">Chat</string>
-    <string name="members">Members</string>
-    <string name="habits">Habits</string>
-    <string name="dailies">Dailies</string>
-    <string name="todos">To-Dos</string>
-    <string name="rewards">Rewards</string>
-    <string name="taskform.delete.title">Are you sure?</string>
-    <string name="taskform.delete.message">Do you really want to delete?</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
-    <string name="quest">Quest</string>
-    <string name="avatar_body">Body</string>
-    <string name="avatar_hair">Hair</string>
-    <string name="avatar_shirt">Shirt</string>
-    <string name="avatar_skin">Skin</string>
-    <string name="avatar_ears">Animal Ears</string>
-    <string name="avatar_base">Base</string>
-    <string name="avatar_color">Color</string>
-    <string name="avatar_beard">Beard</string>
-    <string name="avatar_mustache">Mustache</string>
-    <string name="avatar_flower">Flower</string>
-    <string name="avatar_bangs">Bangs</string>
-    <string name="avatar_nothing">Nothing set</string>
-    <string name="avatar_size">Size</string>
-    <string name="avatar_size_slim">Slim</string>
-    <string name="avatar_size_broad">Broad</string>
-    <string name="avatar_background">Background</string>
-    <string name="purchase_customization">Purchase Customization</string>
-    <string name="purchase_set_button" >Unlock set for %d gems</string>
-    <string name="purchase_button">Purchase</string>
-    <string name="purchase_set_title" >Purchase set %s</string>
-    <string name="due_date">Due Date</string>
-    <string name="quest.accept">Accept</string>
-    <string name="quest.reject">Reject</string>
-    <string name="quest.begin">Begin Quest</string>
-    <string name="quest.cancel">Cancel Invitation</string>
-    <string name="quest.abort">Abort Quest</string>
-    <string name="quest.leave">Leave Quest</string>
-    <string name="quest.pending">Pending</string>
-    <string name="quest.accepted">Accepted</string>
-    <string name="quest.rejected">Rejected</string>
-    <string name="quest.participants">Participants</string>
-    <string name="version_info">Version %1$s (%2$d)</string>
-
-    <string name="sidebar_help">Help &amp; FAQ</string>
-    <string name="complete_tutorial">Got it!</string>
-    <string name="dismiss_tutorial">Remind me again</string>
-    <string name="intro_1_subtitle">Welcome to</string>
-    <string name="intro_1_title">Habitica</string>
-    <string name="intro_1_description" >It’s time to have fun while you get things done. Join over %s others improving their life one task at a time.</string>
-    <string name="intro_2_subtitle">Progress in the game</string>
-    <string name="intro_2_title">Progress in life</string>
-    <string name="intro_2_description">Unlock features in the game by checking off your real life tasks. Earn armor, pets, and more as rewards for meeting your goals.</string>
-    <string name="intro_3_subtitle">Fight monsters</string>
-    <string name="intro_3_title">Get social</string>
-    <string name="intro_3_description">Keep your goals on track with help from your friends. Support each other in life and in battle as you improve together!</string>
-    <string name="intro_finish_button">Let\'s start!</string>
-    <string name="previous_button">Previous</string>
-    <string name="next_button">Next</string>
-    <string name="skip_button">Skip</string>
-    <string name="setup_welcome_description">Welcome to Habitica, where advancing in the game will improve your real life! As you accomplish real-world goals, you\'ll unlock equipment, pets, quests, and more.</string>
-    <string name="setup_welcome_title">Welcome</string>
-    <string name="avatar_setup_description">So, how would you like to look? Don\'t worry, you can change this later.</string>
-    <string name="task_setup_description">Great! Now, what are you interested in working on throughout this journey?</string>
-    <string name="setup_group_work">Work</string>
-    <string name="setup_group_exercise">Exercise</string>
-    <string name="setup_group_health">Health</string>
-    <string name="setup_group_school">School</string>
-    <string name="setup_group_teams">Teams</string>
-    <string name="setup_group_chores">Chores</string>
-    <string name="setup_group_creativity">Creativity</string>
-    <string name="setup_task_work_1">Process email</string>
-    <string name="setup_task_work_2">Most important task</string>
-    <string name="setup_task_work_3">Work Project</string>
-    <string name="setup_task_exercise_1">10 min cardio</string>
-    <string name="setup_task_exercise_2">Stretching</string>
-    <string name="setup_task_exercise_3">Set up workout schedule</string>
-    <string name="setup_task_healthWellness_1">Eat healthy / junk food</string>
-    <string name="setup_task_healthWellness_2">Floss</string>
-    <string name="setup_task_healthWellness_3">Schedule check-up</string>
-    <string name="setup_task_school_1">Study/Procrastinate</string>
-    <string name="setup_task_school_2">Do homework</string>
-    <string name="setup_task_school_3">Finish assignment for class</string>
-    <string name="setup_task_teams_1">Check in with team</string>
-    <string name="setup_task_teams_2">Update team on status</string>
-    <string name="setup_task_teams_3">Complete team project</string>
-    <string name="setup_task_chores_1">10 minutes cleaning</string>
-    <string name="setup_task_chores_2">Wash Dishes</string>
-    <string name="setup_task_chores_3">Organize closet</string>
-    <string name="setup_task_creativity_1">Study a master of the craft</string>
-    <string name="setup_task_creativity_2">Work on creative project</string>
-    <string name="setup_task_creativity_3">Finish creative project</string>
-
-    <string name="gem.purchase.support">Want to help us keep Habitica running? You can support the developers by buying gems!\n\nGems allow you to buy fun extras for your account, including: \n\n - Cool costumes for your avatar\n - Awesome backgrounds\n - Fun quests that reward you with pet eggs\n - The ability to change your class before level 100\n\nThank you so much for helping us make Habitica the best it can be. Your support means a lot to us!</string>
-    <string name="my_guilds">My Guilds</string>
-    <string name="public_guilds">Public Guilds</string>
-    <string name="guild">Guild</string>
-    <string name="leave">Leave</string>
-    <string name="join">Join</string>
-    <string name="leader">Leader</string>
-    <string name="gems">Gems</string>
-    <string name="copy_as_todo">Copy as To-Do</string>
-    <string name="send_pm">Send PM</string>
-    <string name="flag">Flag</string>
-    <string name="delete">Delete</string>
-    <string name="name">Name</string>
-    <string name="description">Description</string>
-    <string name="add_tag">Add new Tag</string>
-    <string name="privacy">Privacy</string>
-    <string name="write_message">Write Message</string>
-    <string name="post">Post</string>
-    <string name="guild_search_hint">Search for guilds</string>
-
-    <string name="todo_due" >Due: %s</string>
-    <string name="daily_streak" >current streak: %d</string>
-    <string name="todo_has_duedate">Task has Due Date</string>
-    <string name="battle_gear">Battle Gear</string>
-    <string name="costume">Costume</string>
-    <string name="outfit_head">Head</string>
-    <string name="outfit_headAccessory">Head Accessory</string>
-    <string name="outfit_eyewear">Eyewear</string>
-    <string name="outfit_armor">Armor</string>
-    <string name="outfit_back">Back</string>
-    <string name="outfit_body">Body</string>
-    <string name="outfit_shield">Shield</string>
-    <string name="outfit_weapon">Weapon</string>
-    <string name="wear_costume">Wear Costume</string>
-    <string name="equipped">Equipped</string>
-    <string name="quest_cancel_message">Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll.</string>
-    <string name="quest.invitation">Quest Invitation</string>
-    <string name="quest_begin_message">Are you sure you want to begin the quest? Once it is active, no additional party members can join the quest.</string>
-    <string name="quest.invitation.text">You have been invited to participate in a quest!</string>
-    <string name="ago_1day">1 day ago</string>
-    <string name="ago_days" >%d days ago</string>
-    <string name="ago_1Minute">1 minute ago</string>
-    <string name="ago_minutes" >%d minutes ago</string>
-    <string name="ago_hours" >%d hours ago</string>
-    <string name="ago_1hour">1 hour ago</string>
-    <string name="today">Today</string>
-    <string name="sidebar_items">Items</string>
-    <string name="eggs">Eggs</string>
-    <string name="hatching_potions">Hatching Potions</string>
-    <string name="food">Food</string>
-    <string name="quests">Quests</string>
-    <string name="pets">Pets</string>
-    <string name="mounts">Mounts</string>
-
-    <string name="armoireEquipment" >You found a piece of rare Equipment in the Armoire: %s! Awesome!</string>
-    <string name="armoireFood" >You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here?</string>
-    <string name="armoireExp">You wrestle with the Armoire and gain Experience. Take that!</string>
-    <string name="armoireNotesFull" >Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining: %d</string>
-    <string name="armoireLastItem">You\'ve found the last piece of rare Equipment in the Enchanted Armoire.</string>
-    <string name="armoireNotesEmpty">The Armoire will have new Equipment in the first week of every month. Until then, keep clicking for Experience and Food!</string>
-    <string name="sell" >Sell (%d Gold)</string>
-    <string name="hatch_with_potion">Hatch with potion</string>
-    <string name="feed_to_pet">Feed to pet</string>
-    <string name="hatch_egg">Hatch with egg</string>
-    <string name="invite_party">Invite party</string>
-    <string name="dialog_feeding" >Feed %1$s %2$s with:</string>
-    <string name="use_animal">Use</string>
-    <string name="feed">Feed</string>
-    <string name="hatch_with" >Hatch pet with %s</string>
-    <string name="hatched_pet_title" >You hatched a %1$s %2$s!</string>
-    <string name="close">Close</string>
-    <string name="share">Share</string>
-    <string name="notification_pet_fed" >You fed your %1$s %2$s!</string>
-    <string name="notification_purchase" >%s was purchased</string>
-    <string name="sectionpets">Base Pets</string>
-    <string name="sectionpremiumPets">Magic Potion Pets</string>
-    <string name="sectionquestPets">Quest Pets</string>
-    <string name="sectionspecialPets">Rare Pets</string>
-    <string name="sectionmounts">Base Mounts</string>
-    <string name="sectionpremiumMounts">Magic Potion Mounts</string>
-    <string name="sectionquestMounts">Quest Mounts</string>
-    <string name="sectionspecialMounts">Rare Mounts</string>
-    <string name="world_quest">World Quest</string>
-    <string name="inn_description">Rest in the Inn to prevent your undone Dailies from hurting you overnight! (Note: does not prevent you from receiving Boss damage.)</string>
-    <string name="empty_items" >You don\'t have any %s</string>
-    <string name="user_level" >Lvl %d</string>
-    <string name="user_level_with_class" >Lvl %1$d %2$s</string>
-    <string name="warrior">Warrior</string>
-    <string name="rogue">Rogue</string>
-    <string name="mage">Mage</string>
-    <string name="healer">Healer</string>
-    <string name="warrior_description">Warriors score more and better \"critical hits\", which randomly give bonus Gold, Experience, and drop chance for scoring a task. They also deal heavy damage to boss monsters. Play a Warrior if you find motivation from unpredictable jackpot-style rewards, or want to dish out the hurt in boss Quests!</string>
-    <string name="mage_description">Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habit, or if you are strongly motivated by leveling up and unlocking advanced features!</string>
-    <string name="rogue_description">Rogues love to accumulate wealth, gaining more Gold than anyone else, and are adept at finding random items. Their iconic Stealth ability lets them duck the consequences of missed Dailies. Play a Rogue if you find strong motivation from Rewards and Achievements, striving for loot and badges!</string>
-    <string name="healer_description">Healers stand impervious against harm, and extend that protection to others. Missed Dailies and bad Habits don\'t faze them much, and they have ways to recover Health from failure. Play a Healer if you enjoy assisting others in your Party, or if the idea of cheating Death through hard work inspires you!</string>
-    <string name="select_class">Select Class</string>
-    <string name="opt_out_class">Opt Out</string>
-    <string name="opt_out_description">Can\'t be bothered with classes? Want to choose later? Opt out - you\'ll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time.</string>
-    <string name="class_confirmation" >Are you sure you want to be a %s?</string>
-    <string name="class_changed">You are now a %s!</string>
-    <string name="class_changed_description">You have new default Battle Gear that you can change under Equipment!</string>
-    <string name="choose_class">Choose Class</string>
-    <string name="dialog_go_back">Go Back</string>
-    <string name="opt_out_confirmation">Are you sure you want to Opt Out?</string>
-    <string name="change_class">Change your class</string>
-    <string name="change_class_description">Change your class and refund your attribute points for 3 gems. You can assign attribute points through the website</string>
-    <string name="enable_class">Enable Class System</string>
-    <string name="changing_class_progress">Changing Class</string>
-    <string name="by_email">By Email</string>
-    <string name="invite_existing_users">Invite Existing Users</string>
-    <string name="send">Send</string>
-    <string name="invite">Invite Friends</string>
-    <string name="invite_id_description">If you have friends already using Habitica, invite them by User ID here.</string>
-    <string name="invite_email_description">If a friend joins Habitica via your email, they\'ll automatically be invited to your party!</string>
-    <string name="add_invites">Add Invites</string>
-    <string name="user_id">User ID</string>
-    <string name="email">Email</string>
-    <string name="invite_users">Invite to Party</string>
-    <string name="share_using">Share using</string>o
-    <string name="share_levelup" >I got to level %d in Habitica by improving my real-life habits!</string>
-    <string name="share_hatched" >I just hatched a %1$s %2$s pet in Habitica by completing my real-life tasks!</string>
-    <string name="share_raised" >I just gained a %1$s %2$s mount in Habitica by completing my real-life tasks!</string>
-    <string name="open_in_store">Open in play store</string>
-    <string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
-    <string name="change_class_equipment_warning">Warning: You will no longer be able to buy equipment from the %s class.</string>
-    <string name="leaderMessage" >Message from %1$s</string>
-    <string name="leaderName" >Leader: %1$s</string>
-    <string name="confirm">Confirm</string>
-    <string name="market">Market</string>
-    <string name="timeTravelers">Time Travelers</string>
-    <string name="seasonalShop">Seasonal Shop</string>
-    <string name="empty_inbox">You don\'t have any Inbox messages. You can send a user a new message from their public chat messages!</string>
-    <string name="party_invite">Unlock by inviting friends</string>
-    <string name="no_gold">Not enough Gold</string>
-    <string name="no_potion">You don\'t need to buy an health potion</string>
-    <string name="successful_purchase" >%1$s successfully purchased</string>
-    <string name="purchase_confirmation_title">Confirm purchase</string>
-    <string name="confirm_purchase_text" >Purchase %1$s for %2$s %3$s</string>
-    <string name="gem">gem</string>
-    <string name="hourglass">hourglass</string>
-    <string name="hourglasses">hourglasses</string>
-    <string name="gold_singular">gold</string>
-    <string name="gold_plural">gold</string>
-    <string name="chat_message_copied">Message copied to Clipboard</string>
-    <string name="copy_chat_message">Copy to clipboard</string>
-    <string name="edit_tag_title">Edit Tag</string>
-    <string name="edit_tag_btn_edit">Edit</string>
-    <string name="edit_tag_btn_done">Done</string>
-    <string name="edit_tag_btn_delete">Delete</string>
-    <string name="confirm_delete_tag_title">Are you sure?</string>
-    <string name="confirm_delete_tag_message">Do you really want to delete?</string>
-    <string name="filter_drawer_edit_tags">Edit Tags</string>
-    <string name="filter_drawer_filter_tags">Filter by Tags</string>
-
-    <!-- QR Strings -->
-    <string name="qr_section_title">Have someone invite you with this QR Code</string>
-    <string name="qr_save_message">QR code saved at </string>
-    <string name="qr_dialogue_title">Your QR Code</string>
-    <string name="download">Download</string>
-    <string name="send_new_message">Send new message</string>
-    <string name="choose_recipient_title">Choose Message Recipient</string>
-    <string name="action_continue">Continue</string>
-    <string name="scan_qr_code">Scan QR Code</string>
-    <string name="enter_recipient_uuid">Enter Recipient\'s User ID</string>
-    <string name="invited_to_party">You were invited to join a party!</string>
-    <string name="stats_widget_label">Habitica Stats</string>
-    <string name="add_task">Add Task</string>
-    <string name="add_habit">Add Habit</string>
-    <string name="add_daily">Add Daily</string>
-    <string name="add_todo">Add To-Do</string>
-    <string name="add_reward">Add Reward</string>
-    <string name="all_dailies_completed">You completed all your dailies. Well done!</string>
-    <string name="widget_habit_button">Habitica Do Habit</string>
-    <string name="widget_dailies">Habitica Dailies</string>
-    <string name="widget_todo_list">Habitica To-Do List</string>
-    <string name="widget_add_task">Habitica Add Task</string>
-    <string name="google_services_missing">Google play services could not be found.</string>
-    <string name="gem.purchase.toolbartitle">Purchase</string>
-    <string name="gem.purchase.title">Buying gems supports the developers and helps keep Habitica running</string>
-    <string name="gem.purchase.subtitle">Gems allow you to buy fun extras for you account, including:</string>
-    <string name="gem.purchase.listitem1">Cool costumes for your avatar</string>
-    <string name="gem.purchase.listitem2">Awesome backgrounds</string>
-    <string name="gem.purchase.listitem3">Quests that reward you with pet eggs</string>
-    <string name="gem.purchase.listitem4">The ability to change your class before level 100</string>
-    <string name="support_habitica">Support Habitica</string>
-    <string name="skill_transformation_use">use</string>
-    <string name="hatching_market_info">Not getting the right drops? Check out the Market!</string>
-    <string name="feeding_market_info">Need different food? Buy more from the market!</string>
-    <string name="open_market">Open Market</string>
-    <string name="cds_description" >Your Dailies will next reset the first time you use Habitica after %1$s. Make sure you have completed your Dailies before this time!</string>
-
-    <string name="AudioTheme_title">Audio Theme</string>
-    <string name="AudioTheme_summary">Change Habitica\'s Audio Theme</string>
-
-    <!-- Login Incentives -->
-    <string name="see_you_tomorrow">See you tomorrow!</string>
-    <string name="belongs_to_challenge">Belongs to Challenge</string>
-    <string name="has_reminder">Has Reminder</string>
-    <string name="has_tag">Has Tag</string>
-    <string name="subscribe.title">Subscribing supports the developers and helps keep Habitica running</string>
-    <string name="subscribe_prompt">Become a subscriber and you’ll get these useful benefits:</string>
-    <string name="subscribe.listitem1">Buy gems with gold</string>
-    <string name="subscribe.listitem2">Exclusive monthly items</string>
-    <string name="subscribe.listitem3">Retain additional history entries</string>
-    <string name="subscribe.listitem4">Daily drop-caps doubled</string>
-    <string name="subscriptions">Subscriptions</string>
-    <string name="subscription_duration" >Recurring every %s</string>
-    <string name="subscribe">Subscribe</string>
-    <string name="subscribe.listitem1.description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
-    <string name="subscribe.listitem2.description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.</string>
-    <string name="subscribe.listitem3.description">Makes completed To-Dos and task history available for longer.</string>
-    <string name="subscribe.listitem4.description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
-    <string name="subscribe1month.gemcap">Gem cap starts at 25</string>
-    <string name="subscribe3month.gemcap">Gem cap raised to 30</string>
-    <string name="subscribe6month.gemcap">Gem cap raised to 35</string>
-    <string name="subscribe12month.gemcap">Gem cap raised to 45</string>
-    <string name="subscription_hourglasses" >+%d Mystic Hourglass</string>
-    <string name="payment_method">Payment method</string>
-    <string name="subscription">Subscription</string>
-    <string name="active">Active</string>
-    <string name="cancel_subscription">Cancel Subscription</string>
-    <string name="cancel_subscription_google.description">No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store.</string>
-    <string name="cancel_subscription_notgoogle.description">No longer want to subscribe? Due to your payment method, you can only unsubscribe through the website. Click the button below, to open the site in your browser!</string>
-    <string name="visit_habitica_website">Visit Habitica Website</string>
-    <string name="current_bonuses">Current Bonuses</string>
-    <string name="months_subscribed">Months subscribed</string>
-    <string name="current_hourclasses">Current Mystic Hourglasses</string>
-    <string name="monthly_gem_cap">Monthly gem cap</string>
-    <string name="inactive">Inactive</string>
-    <string name="one_month">1 Month</string>
-    <string name="months" >%d Months</string>
-    <string name="month">month</string>
-    <string name="three_months">3 months</string>
-    <string name="six_months">6 months</string>
-    <string name="twelve_months">12 months</string>
-    <string name="subscribe_prompt_thanks">For Subscribing you are receiving these useful benefits:</string>
-    <string name="subscription_status">Subscription Status</string>
-
-    <string name="byLeader" >by %s</string>
-    <string name="challenge_details">Challenge Details</string>
-    <string name="challenge_leave_title">Leave Challenge</string>
-    <string name="challenge_leave_text">Are you sure you want to leave the Challenge “%s”?</string>
-    <string name="challenge_remove_tasks_title">Remove tasks</string>
-    <string name="challenge_remove_tasks_text">Do you want to remove the tasks?</string>
-    <string name="remove_tasks">Remove</string>
-    <string name="keep_tasks">Keep</string>
-    <string name="my_challenges">My Challenges</string>
-    <string name="public_challenges">Public</string>
-    <string name="challenges">Challenges</string>
-    <string name="daily">Daily</string>
-    <string name="habit">Habit</string>
-    <string name="reward">Reward</string>
-    <string name="todo">To-Do</string>
-    <string name="official">Official</string>
-    <string name="participating">Participating</string>
-    <string name="challenge">Challenge</string>
-    <string name="go_to_challenge">Go to Challenge</string>
-    <string name="not_part_of_a_challenge">You’re not part of any Challenges right now!</string>
-    <string name="join_a_challenge">Join a Challenge to add a curated set of tasks to your list, then compete against other Habiticans to win achievements and even gems!</string>
-    <string name="check_the_public_challenge_tab">Tap the “Public” tab to find the user-created Challenges that are the best fit for you!</string>
-    <string name="add_reminder">Add Reminder</string>
-    <string name="warning">Warning</string>
-    <string name="open_settings">Open Settings</string>
-    <string name="dont_keep_activities_warning">It seems like you have the Developer option \“Don\'t keep Activities\” active. Currently this option causes issues with the habitica app, so we suggest disabling it.</string>
-    <string name="inbox">Inbox</string>
-    <string name="FAQ">Frequently Asked Questions</string>
-    <string name="special">Special</string>
-    <string name="gem_for_gold_description">Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold.</string>
-    <string name="limited_count" >%d left</string>
-    <string name="gem_shop">Gem</string>
-    <string name="mystery_item">Mystery Item</string>
-    <string name="myster_item_notes">Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month.</string>
-    <string name="open">Open</string>
-    <string name="notification_mystery_item">You open the box and find %s!</string>
-    <string name="checkInRewardEarned">You earned a %1$s as a reward for your devotion to improving your life.</string>
-    <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Your next prize unlocks at %1$d Check-Ins</string>
-    <string name="pending_approval">pending approval</string>
-    <string name="filters">Filters</string>
-    <string name="done">Done</string>
-    <string name="group_tasks_edit_description">Group tasks can not be edited.</string>
-    <string name="group_tasks_edit_title">Can\'t edit this task</string>
-    <string name="groups">Groups</string>
-    <string name="all">All</string>
-    <string name="none">None</string>
-    <string name="owned">Owned</string>
-    <string name="not_owned">Not owned</string>
-    <string name="new_game">New\nGame</string>
-    <string name="login_btn_fb">Login with Facebook</string>
-    <string name="login_btn_google">Login with Google</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">Grey</string>
-    <string name="dated">Dated</string>
-    <string name="completed">Completed</string>
-    <string name="setuP_group_other">Other</string>
-    <string name="clear">Clear</string>
-    <string name="empty_title_habits">You don\'t have any Habits</string>
-    <string name="empty_description_habits">Habits are tasks that don\'t have a rigid schedule. You can check them off many times a day, or not at all.</string>
-    <string name="empty_title_dailies">You don\'t have any Dailies</string>
-    <string name="empty_description_dailies">Dailies are tasks that repeat on a regular basis. Choose the schedule that works for you!</string>
-    <string name="empty_title_todos">You don\'t have any To-Dos</string>
-    <string name="empty_description_todos">To-Dos are tasks that only need to be completed once. Add checklists to your To-Dos to increase their value.</string>
-    <string name="empty_title_rewards">You don\'t have any Rewards</string>
-    <string name="reset_walkthrough">Reset Justins Walkthrough</string>
-    <string name="read_community_guidelines">Please read our Community Guidelines before posting</string>
-    <string name="maintenance">Maintenance</string>
-    <string name="reload_content">Reload Content</string>
-    <string name="dailyDueDefaultView">Set Dailies default to ‘due’ tab</string>
-    <string name="dailyDueDefaultViewDescription">With this option set, the Dailies tasks will default to ‘due’ instead of ‘all’</string>
-</resources>
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <string name="action_refresh">Refresh</string>
+    <string name="XP_default">Experience</string>
+    <string name="HP_default">Health</string>
+    <string name="MP_default">Mana</string>
+    <string name="ERR_pb_barcode">Prefs couldn\'t be loaded from the barcode</string>
+
+    <!--  Prefs -->
+    <string name="PS_settings_title">Settings</string>
+    <string name="SP_address_hint">Your custom server</string>
+    <string name="SP_userID_title">User ID</string>
+    <string name="SP_userID_summary">Your User ID</string>
+    <string name="SP_APIToken_title">API Token</string>
+    <string name="SP_APIToken_summary">Your API Token</string>
+    <string name="Language_title">Language</string>
+    <string name="Language_summary">Change Habitica\'s language</string>
+    <string name="SP_user_qr_code">Your QR Code</string>
+    <string name="PS_contact_title">Contact me</string>
+    <string name="unknown_error">An error occurred…</string>
+    <string name="pref_account_header">Account</string>
+    <string name="pref_first_day_of_the_week_title">First Day of the Week</string>
+    <string name="pref_first_day_of_the_week_summary">First day of the week in all calendars</string>
+    <string name="pref_first_day_of_the_week_default_value" translatable="false">1</string>
+    <string name="pref_first_day_of_the_week_key" translatable="false">FirstDayOfTheWeek</string>
+    <string name="pref_reminder_header">Daily Reminder</string>
+    <string name="pref_reminder_checkbox">Activate Reminder</string>
+    <string name="pref_reminder_picker">Set Reminder Time</string>
+
+    <string name="pref_cds_header">Custom Day Start</string>
+    <string name="pref_cds_picker">Set Custom Day Start Time</string>
+
+    <string name="pref_push_notifications_checkbox">User Push Notifications</string>
+    <string name="push_notifications">Push Notifications</string>
+    <string name="push_notifications_sum">Set your push notifications settings</string>
+    <string name="preference_push_you_won_challenge">You won a Challenge!</string>
+    <string name="preference_push_received_a_private_message">Received a Private Message</string>
+    <string name="preference_push_gifted_gems">Gifted Gems</string>
+    <string name="preference_push_gifted_subscription">Gifted Subscription</string>
+    <string name="preference_push_invited_to_party">Invited to Party</string>
+    <string name="preference_push_invited_to_guild">Invited to Guild</string>
+    <string name="preference_push_your_quest_has_begun">Your Quest has Begun</string>
+    <string name="preference_push_invited_to_quest">Invited to Quest</string>
+
+    <!-- Adding tasks -->
+    <string name="task_value">Value</string>
+    <string name="new_todo">New To-Do</string>
+    <string name="new_reward">New Reward</string>
+    <string name="new_daily">New Daily</string>
+    <string name="new_habit">New Habit</string>
+    <string name="action_edit">Edit</string>
+    <string name="action_delete">Delete</string>
+    <string name="action_cancel">Cancel</string>
+    <string name="login_btn">Login</string>
+    <string name="register_btn">Register</string>
+    <string name="username">Username</string>
+    <string name="email_username">Email or Username</string>
+    <string name="password">Password</string>
+    <string name="emailAddress">Email address</string>
+    <string name="confirmpassword">Confirm password</string>
+
+    <string name="logout">Logout</string>
+    <string name="logout_description">Log out of your account</string>
+    <string name="account_details_sum">Check your account details</string>
+    <string name="account_details">Account Details</string>
+    <string name="LoginActivityName">Welcome</string>
+
+    <string name="string_revive">Revive</string>
+    <string name="please_connect">Please connect through the application before using a widget</string>
+        
+    <string name="about.title">About</string>
+    <string name="about.libraries">Libraries</string>
+    <string name="about.versionhistory">Version history</string>
+    <string name="about.habitica_open_source">Habitica is available as open source software on Github</string>
+    <string name="about.rate_our_app">Rate our App</string>
+    <string name="about.give_us_feedback">Send us Feedback!</string>
+    <string name="about.bugreport">Report a Bug</string>
+    <string name="about.source_code">Source Code</string>
+
+    <!-- Network Errors -->
+    <string name="network_error_title">Connection Error</string>
+    <string name="network_error_no_network_body">You are not connected to the internet.</string>
+    <string name="internal_error_api">There seems to be a problem with the server. Try again later.</string>
+
+    <string name="authentication_error_title">Authentication Error</string>
+    <string name="authentication_error_body">Your Username and/or Password was incorrect.</string>
+
+    <string name="login_validation_error_title">Validation Error</string>
+    <string name="login_validation_error_fieldsmissing">You have to fill out all fields.</string>
+
+    <string name="save_changes">Save</string>
+    <string name="copy">Copy</string>
+    <string name="notes">Notes</string>
+    <string name="text">Text</string>
+    <string name="difficulty">Difficulty</string>
+    <string name="tags">Tags</string>
+    <string name="trivial">Trivial</string>
+    <string name="easy">Easy</string>
+    <string name="medium">Medium</string>
+    <string name="hard">Hard</string>
+    <string name="start_date">Start Date</string>
+    <string name="positive_habit_form">Positive ( + )</string>
+    <string name="negative_habit_form">Negative ( - )</string>
+    <string name="checklist">Checklist</string>
+    <string name="reminders">Reminders</string>
+    <string name="actions">Actions</string>
+
+    <string name="attributes">Attributes</string>
+    <string name="physical">Physical</string>
+    <string name="mental">Mental</string>
+    <string name="social">Social</string>
+    <string name="other">Other</string>
+
+    <string name="frequency">Frequency</string>
+    <string name="frequency_weekly">On Certain Days of the Week</string>
+    <string name="frequency_daily">Every X Days</string>
+
+    <string name="monday">Monday</string>
+    <string name="tuesday">Tuesday</string>
+    <string name="wednesday">Wednesday</string>
+    <string name="thursday">Thursday</string>
+    <string name="friday">Friday</string>
+    <string name="saturday">Saturday</string>
+    <string name="sunday">Sunday</string>
+
+    <string name="levelup_header">You gained a level!</string>
+    <string name="levelup_detail">By accomplishing your real-life goals, you\'ve grown to Level %1$d!</string>
+    <string name="levelup_health">You have been fully healed!</string>
+    <string name="levelup_button">Huzzah!</string>
+
+    <string name="faint_subtitle">Don\'t despair!</string>
+    <string name="faint_penalty_body">You lost a Level, your Gold, and a piece of Equipment, but you can get them all back with hard work! Good luck--you\'ll do great.</string>
+    <string name="faint_header">You ran out of Health!</string>
+    <string name="faint_button">Refill Health &amp; Try Again</string>
+
+    <string name="filter">Filter</string>
+    <string name="profile_image">Profile Image</string>
+
+    <string name="mana_price_button" >%d MP</string>
+    <string name="used_skill" >You used %1$s for %2$d mana.</string>
+    <string name="used_skill_without_mana" >You used %1$s.</string>
+    <string name="new_checklist_item">new checklist item</string>
+    <string name="add_checklist_item">Add</string>
+
+    <string name="reminder_title">Remember to check off your Dailies!</string>
+    <string name="skill_progress_title">Using Skill</string>
+    <string name="coming_soon">Coming Soon</string>
+    <string name="chat_flag_confirmation">Are you sure you want to report this message for violation?</string>
+    <string name="flag_confirm">Flag Message</string>
+    <string name="unlock_lvl_11">Unlock at lvl 11</string>
+    <string name="no_party_message">You are not in a party. To join a party, please visit the website.</string>
+    <string name="forgot_pw_btn">Forgot Password</string>
+    <string name="forgot_pw_tv">Forgot Password? Please use the mobile Website.</string>
+    <string name="tavern.inn.checkOut">Reactivate your Dailies</string>
+    <string name="tavern.inn.rest">Pause your Dailies</string>
+    <string name="reward.dialog.buy">Buy</string>
+    <string name="reward.dialog.dismiss">Dismiss</string>
+    <string name="party">Party</string>
+    <string name="chat">Chat</string>
+    <string name="members">Members</string>
+    <string name="habits">Habits</string>
+    <string name="dailies">Dailies</string>
+    <string name="todos">To-Dos</string>
+    <string name="rewards">Rewards</string>
+    <string name="taskform.delete.title">Are you sure?</string>
+    <string name="taskform.delete.message">Do you really want to delete?</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="quest">Quest</string>
+    <string name="avatar_body">Body</string>
+    <string name="avatar_hair">Hair</string>
+    <string name="avatar_shirt">Shirt</string>
+    <string name="avatar_skin">Skin</string>
+    <string name="avatar_ears">Animal Ears</string>
+    <string name="avatar_base">Base</string>
+    <string name="avatar_color">Color</string>
+    <string name="avatar_beard">Beard</string>
+    <string name="avatar_mustache">Mustache</string>
+    <string name="avatar_flower">Flower</string>
+    <string name="avatar_bangs">Bangs</string>
+    <string name="avatar_nothing">Nothing set</string>
+    <string name="avatar_size">Size</string>
+    <string name="avatar_size_slim">Slim</string>
+    <string name="avatar_size_broad">Broad</string>
+    <string name="avatar_background">Background</string>
+    <string name="purchase_customization">Purchase Customization</string>
+    <string name="purchase_set_button" >Unlock set for %d gems</string>
+    <string name="purchase_button">Purchase</string>
+    <string name="purchase_set_title" >Purchase set %s</string>
+    <string name="due_date">Due Date</string>
+    <string name="quest.accept">Accept</string>
+    <string name="quest.reject">Reject</string>
+    <string name="quest.begin">Begin Quest</string>
+    <string name="quest.cancel">Cancel Invitation</string>
+    <string name="quest.abort">Abort Quest</string>
+    <string name="quest.leave">Leave Quest</string>
+    <string name="quest.pending">Pending</string>
+    <string name="quest.accepted">Accepted</string>
+    <string name="quest.rejected">Rejected</string>
+    <string name="quest.participants">Participants</string>
+    <string name="version_info">Version %1$s (%2$d)</string>
+
+    <string name="sidebar_help">Help &amp; FAQ</string>
+    <string name="complete_tutorial">Got it!</string>
+    <string name="dismiss_tutorial">Remind me again</string>
+    <string name="intro_1_subtitle">Welcome to</string>
+    <string name="intro_1_title">Habitica</string>
+    <string name="intro_1_description" >It’s time to have fun while you get things done. Join over %s others improving their life one task at a time.</string>
+    <string name="intro_2_subtitle">Progress in the game</string>
+    <string name="intro_2_title">Progress in life</string>
+    <string name="intro_2_description">Unlock features in the game by checking off your real life tasks. Earn armor, pets, and more as rewards for meeting your goals.</string>
+    <string name="intro_3_subtitle">Fight monsters</string>
+    <string name="intro_3_title">Get social</string>
+    <string name="intro_3_description">Keep your goals on track with help from your friends. Support each other in life and in battle as you improve together!</string>
+    <string name="intro_finish_button">Let\'s start!</string>
+    <string name="previous_button">Previous</string>
+    <string name="next_button">Next</string>
+    <string name="skip_button">Skip</string>
+    <string name="setup_welcome_description">Welcome to Habitica, where advancing in the game will improve your real life! As you accomplish real-world goals, you\'ll unlock equipment, pets, quests, and more.</string>
+    <string name="setup_welcome_title">Welcome</string>
+    <string name="avatar_setup_description">So, how would you like to look? Don\'t worry, you can change this later.</string>
+    <string name="task_setup_description">Great! Now, what are you interested in working on throughout this journey?</string>
+    <string name="setup_group_work">Work</string>
+    <string name="setup_group_exercise">Exercise</string>
+    <string name="setup_group_health">Health</string>
+    <string name="setup_group_school">School</string>
+    <string name="setup_group_teams">Teams</string>
+    <string name="setup_group_chores">Chores</string>
+    <string name="setup_group_creativity">Creativity</string>
+    <string name="setup_task_work_1">Process email</string>
+    <string name="setup_task_work_2">Most important task</string>
+    <string name="setup_task_work_3">Work Project</string>
+    <string name="setup_task_exercise_1">10 min cardio</string>
+    <string name="setup_task_exercise_2">Stretching</string>
+    <string name="setup_task_exercise_3">Set up workout schedule</string>
+    <string name="setup_task_healthWellness_1">Eat healthy / junk food</string>
+    <string name="setup_task_healthWellness_2">Floss</string>
+    <string name="setup_task_healthWellness_3">Schedule check-up</string>
+    <string name="setup_task_school_1">Study/Procrastinate</string>
+    <string name="setup_task_school_2">Do homework</string>
+    <string name="setup_task_school_3">Finish assignment for class</string>
+    <string name="setup_task_teams_1">Check in with team</string>
+    <string name="setup_task_teams_2">Update team on status</string>
+    <string name="setup_task_teams_3">Complete team project</string>
+    <string name="setup_task_chores_1">10 minutes cleaning</string>
+    <string name="setup_task_chores_2">Wash Dishes</string>
+    <string name="setup_task_chores_3">Organize closet</string>
+    <string name="setup_task_creativity_1">Study a master of the craft</string>
+    <string name="setup_task_creativity_2">Work on creative project</string>
+    <string name="setup_task_creativity_3">Finish creative project</string>
+
+    <string name="gem.purchase.support">Want to help us keep Habitica running? You can support the developers by buying gems!\n\nGems allow you to buy fun extras for your account, including: \n\n - Cool costumes for your avatar\n - Awesome backgrounds\n - Fun quests that reward you with pet eggs\n - The ability to change your class before level 100\n\nThank you so much for helping us make Habitica the best it can be. Your support means a lot to us!</string>
+    <string name="my_guilds">My Guilds</string>
+    <string name="public_guilds">Public Guilds</string>
+    <string name="guild">Guild</string>
+    <string name="leave">Leave</string>
+    <string name="join">Join</string>
+    <string name="leader">Leader</string>
+    <string name="gems">Gems</string>
+    <string name="copy_as_todo">Copy as To-Do</string>
+    <string name="send_pm">Send PM</string>
+    <string name="flag">Flag</string>
+    <string name="delete">Delete</string>
+    <string name="name">Name</string>
+    <string name="description">Description</string>
+    <string name="add_tag">Add new Tag</string>
+    <string name="privacy">Privacy</string>
+    <string name="write_message">Write Message</string>
+    <string name="post">Post</string>
+    <string name="guild_search_hint">Search for guilds</string>
+
+    <string name="todo_due" >Due: %s</string>
+    <string name="daily_streak" >current streak: %d</string>
+    <string name="todo_has_duedate">Task has Due Date</string>
+    <string name="battle_gear">Battle Gear</string>
+    <string name="costume">Costume</string>
+    <string name="outfit_head">Head</string>
+    <string name="outfit_headAccessory">Head Accessory</string>
+    <string name="outfit_eyewear">Eyewear</string>
+    <string name="outfit_armor">Armor</string>
+    <string name="outfit_back">Back</string>
+    <string name="outfit_body">Body</string>
+    <string name="outfit_shield">Shield</string>
+    <string name="outfit_weapon">Weapon</string>
+    <string name="wear_costume">Wear Costume</string>
+    <string name="equipped">Equipped</string>
+    <string name="quest_cancel_message">Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll.</string>
+    <string name="quest.invitation">Quest Invitation</string>
+    <string name="quest_begin_message">Are you sure you want to begin the quest? Once it is active, no additional party members can join the quest.</string>
+    <string name="quest.invitation.text">You have been invited to participate in a quest!</string>
+    <string name="ago_1day">1 day ago</string>
+    <string name="ago_days" >%d days ago</string>
+    <string name="ago_1Minute">1 minute ago</string>
+    <string name="ago_minutes" >%d minutes ago</string>
+    <string name="ago_hours" >%d hours ago</string>
+    <string name="ago_1hour">1 hour ago</string>
+    <string name="today">Today</string>
+    <string name="sidebar_items">Items</string>
+    <string name="eggs">Eggs</string>
+    <string name="hatching_potions">Hatching Potions</string>
+    <string name="food">Food</string>
+    <string name="quests">Quests</string>
+    <string name="pets">Pets</string>
+    <string name="mounts">Mounts</string>
+
+    <string name="armoireEquipment" >You found a piece of rare Equipment in the Armoire: %s! Awesome!</string>
+    <string name="armoireFood" >You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here?</string>
+    <string name="armoireExp">You wrestle with the Armoire and gain Experience. Take that!</string>
+    <string name="armoireNotesFull" >Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining: %d</string>
+    <string name="armoireLastItem">You\'ve found the last piece of rare Equipment in the Enchanted Armoire.</string>
+    <string name="armoireNotesEmpty">The Armoire will have new Equipment in the first week of every month. Until then, keep clicking for Experience and Food!</string>
+    <string name="sell" >Sell (%d Gold)</string>
+    <string name="hatch_with_potion">Hatch with potion</string>
+    <string name="feed_to_pet">Feed to pet</string>
+    <string name="hatch_egg">Hatch with egg</string>
+    <string name="invite_party">Invite party</string>
+    <string name="dialog_feeding" >Feed %1$s %2$s with:</string>
+    <string name="use_animal">Use</string>
+    <string name="feed">Feed</string>
+    <string name="hatch_with" >Hatch pet with %s</string>
+    <string name="hatched_pet_title" >You hatched a %1$s %2$s!</string>
+    <string name="close">Close</string>
+    <string name="share">Share</string>
+    <string name="notification_pet_fed" >You fed your %1$s %2$s!</string>
+    <string name="notification_purchase" >%s was purchased</string>
+    <string name="sectionpets">Base Pets</string>
+    <string name="sectionpremiumPets">Magic Potion Pets</string>
+    <string name="sectionquestPets">Quest Pets</string>
+    <string name="sectionspecialPets">Rare Pets</string>
+    <string name="sectionmounts">Base Mounts</string>
+    <string name="sectionpremiumMounts">Magic Potion Mounts</string>
+    <string name="sectionquestMounts">Quest Mounts</string>
+    <string name="sectionspecialMounts">Rare Mounts</string>
+    <string name="world_quest">World Quest</string>
+    <string name="inn_description">Rest in the Inn to prevent your undone Dailies from hurting you overnight! (Note: does not prevent you from receiving Boss damage.)</string>
+    <string name="empty_items" >You don\'t have any %s</string>
+    <string name="user_level" >Lvl %d</string>
+    <string name="user_level_with_class" >Lvl %1$d %2$s</string>
+    <string name="warrior">Warrior</string>
+    <string name="rogue">Rogue</string>
+    <string name="mage">Mage</string>
+    <string name="healer">Healer</string>
+    <string name="warrior_description">Warriors score more and better \"critical hits\", which randomly give bonus Gold, Experience, and drop chance for scoring a task. They also deal heavy damage to boss monsters. Play a Warrior if you find motivation from unpredictable jackpot-style rewards, or want to dish out the hurt in boss Quests!</string>
+    <string name="mage_description">Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habit, or if you are strongly motivated by leveling up and unlocking advanced features!</string>
+    <string name="rogue_description">Rogues love to accumulate wealth, gaining more Gold than anyone else, and are adept at finding random items. Their iconic Stealth ability lets them duck the consequences of missed Dailies. Play a Rogue if you find strong motivation from Rewards and Achievements, striving for loot and badges!</string>
+    <string name="healer_description">Healers stand impervious against harm, and extend that protection to others. Missed Dailies and bad Habits don\'t faze them much, and they have ways to recover Health from failure. Play a Healer if you enjoy assisting others in your Party, or if the idea of cheating Death through hard work inspires you!</string>
+    <string name="select_class">Select Class</string>
+    <string name="opt_out_class">Opt Out</string>
+    <string name="opt_out_description">Can\'t be bothered with classes? Want to choose later? Opt out - you\'ll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time.</string>
+    <string name="class_confirmation" >Are you sure you want to be a %s?</string>
+    <string name="class_changed">You are now a %s!</string>
+    <string name="class_changed_description">You have new default Battle Gear that you can change under Equipment!</string>
+    <string name="choose_class">Choose Class</string>
+    <string name="dialog_go_back">Go Back</string>
+    <string name="opt_out_confirmation">Are you sure you want to Opt Out?</string>
+    <string name="change_class">Change your class</string>
+    <string name="change_class_description">Change your class and refund your attribute points for 3 gems. You can assign attribute points through the website</string>
+    <string name="enable_class">Enable Class System</string>
+    <string name="changing_class_progress">Changing Class</string>
+    <string name="by_email">By Email</string>
+    <string name="invite_existing_users">Invite Existing Users</string>
+    <string name="send">Send</string>
+    <string name="invite">Invite Friends</string>
+    <string name="invite_id_description">If you have friends already using Habitica, invite them by User ID here.</string>
+    <string name="invite_email_description">If a friend joins Habitica via your email, they\'ll automatically be invited to your party!</string>
+    <string name="add_invites">Add Invites</string>
+    <string name="user_id">User ID</string>
+    <string name="email">Email</string>
+    <string name="invite_users">Invite to Party</string>
+    <string name="share_using">Share using</string>o
+    <string name="share_levelup" >I got to level %d in Habitica by improving my real-life habits!</string>
+    <string name="share_hatched" >I just hatched a %1$s %2$s pet in Habitica by completing my real-life tasks!</string>
+    <string name="share_raised" >I just gained a %1$s %2$s mount in Habitica by completing my real-life tasks!</string>
+    <string name="open_in_store">Open in play store</string>
+    <string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
+    <string name="change_class_equipment_warning">Warning: You will no longer be able to buy equipment from the %s class.</string>
+    <string name="leaderMessage" >Message from %1$s</string>
+    <string name="leaderName" >Leader: %1$s</string>
+    <string name="confirm">Confirm</string>
+    <string name="market">Market</string>
+    <string name="timeTravelers">Time Travelers</string>
+    <string name="seasonalShop">Seasonal Shop</string>
+    <string name="empty_inbox">You don\'t have any Inbox messages. You can send a user a new message from their public chat messages!</string>
+    <string name="party_invite">Unlock by inviting friends</string>
+    <string name="no_gold">Not enough Gold</string>
+    <string name="no_potion">You don\'t need to buy an health potion</string>
+    <string name="successful_purchase" >%1$s successfully purchased</string>
+    <string name="purchase_confirmation_title">Confirm purchase</string>
+    <string name="confirm_purchase_text" >Purchase %1$s for %2$s %3$s</string>
+    <string name="gem">gem</string>
+    <string name="hourglass">hourglass</string>
+    <string name="hourglasses">hourglasses</string>
+    <string name="gold_singular">gold</string>
+    <string name="gold_plural">gold</string>
+    <string name="chat_message_copied">Message copied to Clipboard</string>
+    <string name="copy_chat_message">Copy to clipboard</string>
+    <string name="edit_tag_title">Edit Tag</string>
+    <string name="edit_tag_btn_edit">Edit</string>
+    <string name="edit_tag_btn_done">Done</string>
+    <string name="edit_tag_btn_delete">Delete</string>
+    <string name="confirm_delete_tag_title">Are you sure?</string>
+    <string name="confirm_delete_tag_message">Do you really want to delete?</string>
+    <string name="filter_drawer_edit_tags">Edit Tags</string>
+    <string name="filter_drawer_filter_tags">Filter by Tags</string>
+
+    <!-- QR Strings -->
+    <string name="qr_section_title">Have someone invite you with this QR Code</string>
+    <string name="qr_save_message">QR code saved at </string>
+    <string name="qr_dialogue_title">Your QR Code</string>
+    <string name="download">Download</string>
+    <string name="send_new_message">Send new message</string>
+    <string name="choose_recipient_title">Choose Message Recipient</string>
+    <string name="action_continue">Continue</string>
+    <string name="scan_qr_code">Scan QR Code</string>
+    <string name="enter_recipient_uuid">Enter Recipient\'s User ID</string>
+    <string name="invited_to_party">You were invited to join a party!</string>
+    <string name="stats_widget_label">Habitica Stats</string>
+    <string name="add_task">Add Task</string>
+    <string name="add_habit">Add Habit</string>
+    <string name="add_daily">Add Daily</string>
+    <string name="add_todo">Add To-Do</string>
+    <string name="add_reward">Add Reward</string>
+    <string name="all_dailies_completed">You completed all your dailies. Well done!</string>
+    <string name="widget_habit_button">Habitica Do Habit</string>
+    <string name="widget_dailies">Habitica Dailies</string>
+    <string name="widget_todo_list">Habitica To-Do List</string>
+    <string name="widget_add_task">Habitica Add Task</string>
+    <string name="google_services_missing">Google play services could not be found.</string>
+    <string name="gem.purchase.toolbartitle">Purchase</string>
+    <string name="gem.purchase.title">Buying gems supports the developers and helps keep Habitica running</string>
+    <string name="gem.purchase.subtitle">Gems allow you to buy fun extras for you account, including:</string>
+    <string name="gem.purchase.listitem1">Cool costumes for your avatar</string>
+    <string name="gem.purchase.listitem2">Awesome backgrounds</string>
+    <string name="gem.purchase.listitem3">Quests that reward you with pet eggs</string>
+    <string name="gem.purchase.listitem4">The ability to change your class before level 100</string>
+    <string name="support_habitica">Support Habitica</string>
+    <string name="skill_transformation_use">use</string>
+    <string name="hatching_market_info">Not getting the right drops? Check out the Market!</string>
+    <string name="feeding_market_info">Need different food? Buy more from the market!</string>
+    <string name="open_market">Open Market</string>
+    <string name="cds_description" >Your Dailies will next reset the first time you use Habitica after %1$s. Make sure you have completed your Dailies before this time!</string>
+
+    <string name="AudioTheme_title">Audio Theme</string>
+    <string name="AudioTheme_summary">Change Habitica\'s Audio Theme</string>
+
+    <!-- Login Incentives -->
+    <string name="see_you_tomorrow">See you tomorrow!</string>
+    <string name="belongs_to_challenge">Belongs to Challenge</string>
+    <string name="has_reminder">Has Reminder</string>
+    <string name="has_tag">Has Tag</string>
+    <string name="subscribe.title">Subscribing supports the developers and helps keep Habitica running</string>
+    <string name="subscribe_prompt">Become a subscriber and you’ll get these useful benefits:</string>
+    <string name="subscribe.listitem1">Buy gems with gold</string>
+    <string name="subscribe.listitem2">Exclusive monthly items</string>
+    <string name="subscribe.listitem3">Retain additional history entries</string>
+    <string name="subscribe.listitem4">Daily drop-caps doubled</string>
+    <string name="subscriptions">Subscriptions</string>
+    <string name="subscription_duration" >Recurring every %s</string>
+    <string name="subscribe">Subscribe</string>
+    <string name="subscribe.listitem1.description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
+    <string name="subscribe.listitem2.description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.</string>
+    <string name="subscribe.listitem3.description">Makes completed To-Dos and task history available for longer.</string>
+    <string name="subscribe.listitem4.description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
+    <string name="subscribe1month.gemcap">Gem cap starts at 25</string>
+    <string name="subscribe3month.gemcap">Gem cap raised to 30</string>
+    <string name="subscribe6month.gemcap">Gem cap raised to 35</string>
+    <string name="subscribe12month.gemcap">Gem cap raised to 45</string>
+    <string name="subscription_hourglasses" >+%d Mystic Hourglass</string>
+    <string name="payment_method">Payment method</string>
+    <string name="subscription">Subscription</string>
+    <string name="active">Active</string>
+    <string name="cancel_subscription">Cancel Subscription</string>
+    <string name="cancel_subscription_google.description">No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store.</string>
+    <string name="cancel_subscription_notgoogle.description">No longer want to subscribe? Due to your payment method, you can only unsubscribe through the website. Click the button below, to open the site in your browser!</string>
+    <string name="visit_habitica_website">Visit Habitica Website</string>
+    <string name="current_bonuses">Current Bonuses</string>
+    <string name="months_subscribed">Months subscribed</string>
+    <string name="current_hourclasses">Current Mystic Hourglasses</string>
+    <string name="monthly_gem_cap">Monthly gem cap</string>
+    <string name="inactive">Inactive</string>
+    <string name="one_month">1 Month</string>
+    <string name="months" >%d Months</string>
+    <string name="month">month</string>
+    <string name="three_months">3 months</string>
+    <string name="six_months">6 months</string>
+    <string name="twelve_months">12 months</string>
+    <string name="subscribe_prompt_thanks">For Subscribing you are receiving these useful benefits:</string>
+    <string name="subscription_status">Subscription Status</string>
+
+    <string name="byLeader" >by %s</string>
+    <string name="challenge_details">Challenge Details</string>
+    <string name="challenge_leave_title">Leave Challenge</string>
+    <string name="challenge_leave_text">Are you sure you want to leave the Challenge “%s”?</string>
+    <string name="challenge_remove_tasks_title">Remove tasks</string>
+    <string name="challenge_remove_tasks_text">Do you want to remove the tasks?</string>
+    <string name="remove_tasks">Remove</string>
+    <string name="keep_tasks">Keep</string>
+    <string name="my_challenges">My Challenges</string>
+    <string name="public_challenges">Public</string>
+    <string name="challenges">Challenges</string>
+    <string name="daily">Daily</string>
+    <string name="habit">Habit</string>
+    <string name="reward">Reward</string>
+    <string name="todo">To-Do</string>
+    <string name="official">Official</string>
+    <string name="participating">Participating</string>
+    <string name="challenge">Challenge</string>
+    <string name="go_to_challenge">Go to Challenge</string>
+    <string name="not_part_of_a_challenge">You’re not part of any Challenges right now!</string>
+    <string name="join_a_challenge">Join a Challenge to add a curated set of tasks to your list, then compete against other Habiticans to win achievements and even gems!</string>
+    <string name="check_the_public_challenge_tab">Tap the “Public” tab to find the user-created Challenges that are the best fit for you!</string>
+    <string name="add_reminder">Add Reminder</string>
+    <string name="warning">Warning</string>
+    <string name="open_settings">Open Settings</string>
+    <string name="dont_keep_activities_warning">It seems like you have the Developer option \“Don\'t keep Activities\” active. Currently this option causes issues with the habitica app, so we suggest disabling it.</string>
+    <string name="inbox">Inbox</string>
+    <string name="FAQ">Frequently Asked Questions</string>
+    <string name="special">Special</string>
+    <string name="gem_for_gold_description">Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold.</string>
+    <string name="limited_count" >%d left</string>
+    <string name="gem_shop">Gem</string>
+    <string name="mystery_item">Mystery Item</string>
+    <string name="myster_item_notes">Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month.</string>
+    <string name="open">Open</string>
+    <string name="notification_mystery_item">You open the box and find %s!</string>
+    <string name="checkInRewardEarned">You earned a %1$s as a reward for your devotion to improving your life.</string>
+    <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Your next prize unlocks at %1$d Check-Ins</string>
+    <string name="pending_approval">pending approval</string>
+    <string name="filters">Filters</string>
+    <string name="done">Done</string>
+    <string name="group_tasks_edit_description">Group tasks can not be edited.</string>
+    <string name="group_tasks_edit_title">Can\'t edit this task</string>
+    <string name="groups">Groups</string>
+    <string name="all">All</string>
+    <string name="none">None</string>
+    <string name="owned">Owned</string>
+    <string name="not_owned">Not owned</string>
+    <string name="new_game">New\nGame</string>
+    <string name="login_btn_fb">Login with Facebook</string>
+    <string name="login_btn_google">Login with Google</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">Grey</string>
+    <string name="dated">Dated</string>
+    <string name="completed">Completed</string>
+    <string name="setuP_group_other">Other</string>
+    <string name="clear">Clear</string>
+    <string name="empty_title_habits">You don\'t have any Habits</string>
+    <string name="empty_description_habits">Habits are tasks that don\'t have a rigid schedule. You can check them off many times a day, or not at all.</string>
+    <string name="empty_title_dailies">You don\'t have any Dailies</string>
+    <string name="empty_description_dailies">Dailies are tasks that repeat on a regular basis. Choose the schedule that works for you!</string>
+    <string name="empty_title_todos">You don\'t have any To-Dos</string>
+    <string name="empty_description_todos">To-Dos are tasks that only need to be completed once. Add checklists to your To-Dos to increase their value.</string>
+    <string name="empty_title_rewards">You don\'t have any Rewards</string>
+    <string name="reset_walkthrough">Reset Justins Walkthrough</string>
+    <string name="read_community_guidelines">Please read our Community Guidelines before posting</string>
+    <string name="maintenance">Maintenance</string>
+    <string name="reload_content">Reload Content</string>
+    <string name="dailyDueDefaultView">Set Dailies default to ‘due’ tab</string>
+    <string name="dailyDueDefaultViewDescription">With this option set, the Dailies tasks will default to ‘due’ instead of ‘all’</string>
+</resources>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 20f5a2c79..95fcece14 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -1,360 +1,360 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle</item>
-
-        <item name="android:elevation" tools:targetApi="21">0dp</item>
-        <item name="elevation">0dp</item>
-
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="actionMenuTextColor">@color/white</item>
-
-        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
-
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-
-        <!-- ...and here we setting appcompat’s color theming attrs -->
-        <item name="colorPrimary">@color/brand</item>
-        <item name="colorPrimaryDark">@color/brand_50</item>
-        <item name="colorAccent">@color/brand</item>
-
-        <!-- MaterialDrawer specific values -->
-        <item name="material_drawer_background">@color/material_drawer_background</item>
-        <item name="material_drawer_primary_text">@color/material_drawer_primary_text</item>
-        <item name="material_drawer_primary_icon">@color/material_drawer_primary_icon</item>
-        <item name="material_drawer_secondary_text">@color/material_drawer_secondary_text</item>
-        <item name="material_drawer_hint_text">@color/material_drawer_hint_text</item>
-        <item name="material_drawer_divider">@color/material_drawer_divider</item>
-        <item name="material_drawer_selected">@color/material_drawer_selected</item>
-        <item name="material_drawer_selected_text">@color/brand_200</item>
-        <item name="material_drawer_header_selection_text">
-            @color/material_drawer_header_selection_text
-        </item>
-
-        <item name="popupMenuStyle">@style/PopupTheme</item>
-        <item name="actionOverflowMenuStyle">@style/PopupTheme</item>
-        <item name="android:popupMenuStyle">@style/PopupTheme</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-
-        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
-    </style>
-
-    <style name="AppTheme.ActionBar" parent="AppTheme">
-        <item name="windowActionBar">true</item>
-        <item name="windowNoTitle">false</item>
-    </style>
-
-    <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>
-
-    <style name="PopupTheme" parent="Widget.AppCompat.Light.PopupMenu">
-        <item name="android:popupBackground">@android:color/white</item>
-    </style>
-
-    <style name="MyCustomTabLayout" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="android:singleLine">true</item>
-        <item name="android:lines">1</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="CardText">
-        <item name="android:textSize">@dimen/card_small_text</item>
-        <item name="android:textColor">@color/card_text</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
-    <style name="CardTitle" parent="@style/CardText">
-        <item name="android:textSize">@dimen/card_medium_text</item>
-        <item name="android:textColor">@color/card_title_text</item>
-    </style>
-
-    <style name="CardContent">
-        <item name="android:padding">@dimen/card_padding</item>
-    </style>
-
-    <style name="CardContent.Compact" parent="CardContent">
-        <item name="android:padding">@dimen/card_padding_compact</item>
-    </style>
-
-    <style name="CardView.Default" parent="CardView.Light">
-        <item name="android:layout_margin">@dimen/card_margin</item>
-    </style>
-
-    <style name="RowWrapper">
-        <item name="android:padding">@dimen/row_padding</item>
-        <item name="android:background">@drawable/selection_highlight</item>
-    </style>
-
-    <style name="RowText">
-        <item name="android:textSize">@dimen/row_text_size</item>
-        <item name="android:textColor">@color/card_text</item>
-    </style>
-
-    <style name="RowTitle">
-        <item name="android:textSize">@dimen/row_title_size</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@color/card_title_text</item>
-        <item name="android:paddingBottom">@dimen/row_title_bottommargin</item>
-    </style>
-
-    <style name="RowText.unimportant" parent="RowText">
-        <item name="android:textColor">@android:color/darker_gray</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-    </style>
-
-    <style name="MyOwnListSeperatorTextViewStyle">
-        <item name="android:background">@drawable/border_lightgray</item>
-        <item name="android:drawablePadding">4dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:paddingLeft">4dp</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="ChatMessageUserTextViewStyle">
-        <item name="android:shadowColor">#000000</item>
-        <item name="android:shadowDx">1</item>
-        <item name="android:shadowDy">1</item>
-        <item name="android:shadowRadius">1</item>
-    </style>
-
-    <!-- used activity_main.xml -->
-    <style name="Toolbar" parent="Base.ThemeOverlay.AppCompat.ActionBar">
-        <item name="android:textColorPrimary">@color/white</item>
-    </style>
-
-    <style name="HabitButton" parent="android:Widget.Button">
-        <item name="android:radius">0dp</item>
-        <item name="android:layout_margin">0dp</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">20sp</item>
-    </style>
-
-    <style name="DialogButton" parent="android:Widget.Button">
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:textColor">@color/brand_100</item>
-    </style>
-
-    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="colorAccent">@color/brand_100</item>
-    </style>
-
-    <style name="SectionTitle">
-        <item name="android:textSize">@dimen/card_medium_text</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:paddingLeft">@dimen/section_leftright_padding</item>
-        <item name="android:paddingRight">@dimen/section_leftright_padding</item>
-        <item name="android:paddingTop">@dimen/section_top_padding</item>
-    </style>
-
-    <style name="MenuSectionTitle">
-        <item name="android:background">@color/brand</item>
-        <item name="android:textColor">@color/white</item>
-    </style>
-
-    <style name="BottomMenu">
-        <item name="android:divider">?android:listDivider</item>
-        <item name="android:showDividers">middle</item>
-    </style>
-    
-    <style name="BottomMenuItem">
-        <item name="android:padding">@dimen/bottom_menu_padding</item>
-        <item name="android:background">@drawable/selection_highlight</item>
-    </style>
-
-    <style name="BottomMenuItemText">
-        <item name="android:textSize">@dimen/card_medium_text</item>
-    </style>
-
-    <style name="EmptyView">
-        <item name="android:padding">@dimen/section_top_padding</item>
-        <item name="android:layout_gravity">center</item>
-        <item name="android:gravity">center</item>
-        <item name="android:background">@color/white</item>
-        <item name="android:layout_marginLeft">20dp</item>
-        <item name="android:layout_marginRight">20dp</item>
-        <item name="android:visibility">gone</item>
-    </style>
-
-    <style name="LoginRow">
-        <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
-        <item name="android:layout_gravity">center</item>
-    </style>
-
-    <style name="GemPurchaseListItem">
-        <item name="android:textColor">@color/brand_100</item>
-        <item name="android:gravity">center_horizontal</item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:drawableLeft">@drawable/ic_check_purple_24dp</item>
-        <item name="android:layout_gravity">center</item>
-        <item name="android:drawablePadding">4dp</item>
-    </style>
-
-    <style name="SubscriptionListTitle" parent="GemPurchaseListItem">
-        <item name="android:layout_gravity">left|center_vertical</item>
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_medium</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="FragmentDialogTitle">
-        <item name="android:textSize">@dimen/card_medium_text</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:paddingLeft">@dimen/section_leftright_padding</item>
-        <item name="android:paddingRight">@dimen/section_leftright_padding</item>
-        <item name="android:paddingTop">@dimen/section_top_padding</item>
-        <item name="android:paddingBottom">@dimen/section_top_padding</item>
-    </style>
-
-    <style name="GemPurchaseListItemDescription">
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:textSize">13sp</item>
-        <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
-        <item name="android:textColor">@color/subscription_description_text</item>
-    </style>
-
-    <style name="Pill">
-        <item name="android:textSize">11sp</item>
-        <item name="android:background">@drawable/pill_bg</item>
-        <item name="android:paddingRight">@dimen/pill_horizontal_padding</item>
-        <item name="android:paddingLeft">@dimen/pill_horizontal_padding</item>
-        <item name="android:paddingTop">@dimen/pill_vertical_padding</item>
-        <item name="android:paddingBottom">@dimen/pill_vertical_padding</item>
-    </style>
-
-    <style name="Pill.Selected">
-        <item name="android:textColor">@color/white</item>
-        <item name="android:background">@drawable/pill_bg_purple</item>
-    </style>
-
-    <style name="Pill.Selected.Green">
-        <item name="android:background">@drawable/pill_bg_green</item>
-    </style>
-
-    <style name="Pill.Selected.Red">
-        <item name="android:background">@drawable/pill_bg_red</item>
-    </style>
-
-    <style name="subscriptionBox">
-        <item name="android:background">@color/habit_inactive_gray</item>
-        <item name="android:paddingTop">8dp</item>
-        <item name="android:paddingBottom">8dp</item>
-        <item name="android:paddingLeft">12dp</item>
-        <item name="android:paddingRight">12dp</item>
-        <item name="android:layout_marginBottom">8dp</item>
-    </style>
-
-    <style name="subscriptionBoxText">
-        <item name="android:textColor">@color/brand_100</item>
-    </style>
-
-    <style name="subscriptionBoxText.Title">
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="subscriptionBoxText.Subtitle">
-        <item name="android:textSize">11sp</item>
-    </style>
-
-    <style name="subscriptionBoxText.Title.Red">
-        <item name="android:textColor">@color/worse_50</item>
-    </style>
-
-    <style name="SubscriptionListDescription" parent="GemPurchaseListItemDescription">
-        <item name="android:layout_marginBottom">24dp</item>
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">
-            @string/font_family_condensed
-        </item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
-        <item name="android:lineSpacingExtra">2.0dp</item>
-        <item name="android:layout_marginLeft">16dp</item>
-        <item name="android:layout_marginRight">16dp</item>
-    </style>
-
-    <style name="Button">
-        <item name="android:paddingLeft">@dimen/button_padding</item>
-        <item name="android:paddingRight">@dimen/button_padding</item>
-    </style>
-
-    <style name="Button.Purple">
-        <item name="android:background">@drawable/rounded_purple_square</item>
-        <item name="android:textColor">@color/white</item>
-    </style>
-
-    <style name="Button.Purple.Small">
-        <item name="android:paddingLeft">@dimen/button_padding_small</item>
-        <item name="android:paddingRight">@dimen/button_padding_small</item>
-        <item name="android:paddingTop">@dimen/button_padding_vertical_small</item>
-        <item name="android:paddingBottom">@dimen/button_padding_vertical_small</item>
-    </style>
-
-    <style name="LoginEditTextTheme">
-        <item name="colorAccent">@color/white_50_alpha</item>
-        <item name="colorControlNormal">@color/white_15_alpha</item>
-        <item name="colorControlActivated">@color/white_75_alpha</item>
-        <item name="android:drawablePadding">@dimen/spacing_large</item>
-        <item name="android:textColor">@color/white_75_alpha</item>
-        <item name="android:textColorHint">@color/white_50_alpha</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:paddingBottom">20dp</item>
-    </style>
-
-    <style name="LoginButton" parent="@style/Widget.AppCompat.Button.Borderless">
-        <item name="android:shadowColor">@color/transparent</item>
-        <item name="android:background">@drawable/login_button</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:paddingLeft">32dp</item>
-        <item name="android:paddingRight">32dp</item>
-    </style>
-
-    <style name="welcome_floating_icon">
-        <item name="android:layout_width">50dp</item>
-        <item name="android:layout_height">50dp</item>
-        <item name="android:background">@drawable/welcome_diamond_background</item>
-        <item name="android:padding">16dp</item>
-    </style>
-
-    <style name="DiamondButton" parent="@style/Widget.AppCompat.Button.Borderless">
-        <item name="android:layout_height">36dp</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>
-
-    <style name="TagEditTextTheme">
-        <item name="colorAccent">@color/black_20_alpha</item>
-        <item name="colorControlNormal">@color/black_20_alpha</item>
-        <item name="android:drawablePadding">@dimen/spacing_large</item>
-    </style>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <!-- Application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle</item>
+
+        <item name="android:elevation" tools:targetApi="21">0dp</item>
+        <item name="elevation">0dp</item>
+
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="actionMenuTextColor">@color/white</item>
+
+        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
+
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+
+        <!-- ...and here we setting appcompat’s color theming attrs -->
+        <item name="colorPrimary">@color/brand</item>
+        <item name="colorPrimaryDark">@color/brand_50</item>
+        <item name="colorAccent">@color/brand</item>
+
+        <!-- MaterialDrawer specific values -->
+        <item name="material_drawer_background">@color/material_drawer_background</item>
+        <item name="material_drawer_primary_text">@color/material_drawer_primary_text</item>
+        <item name="material_drawer_primary_icon">@color/material_drawer_primary_icon</item>
+        <item name="material_drawer_secondary_text">@color/material_drawer_secondary_text</item>
+        <item name="material_drawer_hint_text">@color/material_drawer_hint_text</item>
+        <item name="material_drawer_divider">@color/material_drawer_divider</item>
+        <item name="material_drawer_selected">@color/material_drawer_selected</item>
+        <item name="material_drawer_selected_text">@color/brand_200</item>
+        <item name="material_drawer_header_selection_text">
+            @color/material_drawer_header_selection_text
+        </item>
+
+        <item name="popupMenuStyle">@style/PopupTheme</item>
+        <item name="actionOverflowMenuStyle">@style/PopupTheme</item>
+        <item name="android:popupMenuStyle">@style/PopupTheme</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+        <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+    </style>
+
+    <style name="AppTheme.ActionBar" parent="AppTheme">
+        <item name="windowActionBar">true</item>
+        <item name="windowNoTitle">false</item>
+    </style>
+
+    <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>
+
+    <style name="PopupTheme" parent="Widget.AppCompat.Light.PopupMenu">
+        <item name="android:popupBackground">@android:color/white</item>
+    </style>
+
+    <style name="MyCustomTabLayout" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+        <item name="android:singleLine">true</item>
+        <item name="android:lines">1</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="CardText">
+        <item name="android:textSize">@dimen/card_small_text</item>
+        <item name="android:textColor">@color/card_text</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="CardTitle" parent="@style/CardText">
+        <item name="android:textSize">@dimen/card_medium_text</item>
+        <item name="android:textColor">@color/card_title_text</item>
+    </style>
+
+    <style name="CardContent">
+        <item name="android:padding">@dimen/card_padding</item>
+    </style>
+
+    <style name="CardContent.Compact" parent="CardContent">
+        <item name="android:padding">@dimen/card_padding_compact</item>
+    </style>
+
+    <style name="CardView.Default" parent="CardView.Light">
+        <item name="android:layout_margin">@dimen/card_margin</item>
+    </style>
+
+    <style name="RowWrapper">
+        <item name="android:padding">@dimen/row_padding</item>
+        <item name="android:background">@drawable/selection_highlight</item>
+    </style>
+
+    <style name="RowText">
+        <item name="android:textSize">@dimen/row_text_size</item>
+        <item name="android:textColor">@color/card_text</item>
+    </style>
+
+    <style name="RowTitle">
+        <item name="android:textSize">@dimen/row_title_size</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@color/card_title_text</item>
+        <item name="android:paddingBottom">@dimen/row_title_bottommargin</item>
+    </style>
+
+    <style name="RowText.unimportant" parent="RowText">
+        <item name="android:textColor">@android:color/darker_gray</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+    </style>
+
+    <style name="MyOwnListSeperatorTextViewStyle">
+        <item name="android:background">@drawable/border_lightgray</item>
+        <item name="android:drawablePadding">4dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+        <item name="android:paddingLeft">4dp</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="ChatMessageUserTextViewStyle">
+        <item name="android:shadowColor">#000000</item>
+        <item name="android:shadowDx">1</item>
+        <item name="android:shadowDy">1</item>
+        <item name="android:shadowRadius">1</item>
+    </style>
+
+    <!-- used activity_main.xml -->
+    <style name="Toolbar" parent="Base.ThemeOverlay.AppCompat.ActionBar">
+        <item name="android:textColorPrimary">@color/white</item>
+    </style>
+
+    <style name="HabitButton" parent="android:Widget.Button">
+        <item name="android:radius">0dp</item>
+        <item name="android:layout_margin">0dp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <style name="DialogButton" parent="android:Widget.Button">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">@color/brand_100</item>
+    </style>
+
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert">
+        <item name="colorAccent">@color/brand_100</item>
+    </style>
+
+    <style name="SectionTitle">
+        <item name="android:textSize">@dimen/card_medium_text</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:paddingLeft">@dimen/section_leftright_padding</item>
+        <item name="android:paddingRight">@dimen/section_leftright_padding</item>
+        <item name="android:paddingTop">@dimen/section_top_padding</item>
+    </style>
+
+    <style name="MenuSectionTitle">
+        <item name="android:background">@color/brand</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="BottomMenu">
+        <item name="android:divider">?android:listDivider</item>
+        <item name="android:showDividers">middle</item>
+    </style>
+    
+    <style name="BottomMenuItem">
+        <item name="android:padding">@dimen/bottom_menu_padding</item>
+        <item name="android:background">@drawable/selection_highlight</item>
+    </style>
+
+    <style name="BottomMenuItemText">
+        <item name="android:textSize">@dimen/card_medium_text</item>
+    </style>
+
+    <style name="EmptyView">
+        <item name="android:padding">@dimen/section_top_padding</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:gravity">center</item>
+        <item name="android:background">@color/white</item>
+        <item name="android:layout_marginLeft">20dp</item>
+        <item name="android:layout_marginRight">20dp</item>
+        <item name="android:visibility">gone</item>
+    </style>
+
+    <style name="LoginRow">
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:layout_gravity">center</item>
+    </style>
+
+    <style name="GemPurchaseListItem">
+        <item name="android:textColor">@color/brand_100</item>
+        <item name="android:gravity">center_horizontal</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:drawableLeft">@drawable/ic_check_purple_24dp</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:drawablePadding">4dp</item>
+    </style>
+
+    <style name="SubscriptionListTitle" parent="GemPurchaseListItem">
+        <item name="android:layout_gravity">left|center_vertical</item>
+        <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_medium</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="FragmentDialogTitle">
+        <item name="android:textSize">@dimen/card_medium_text</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:paddingLeft">@dimen/section_leftright_padding</item>
+        <item name="android:paddingRight">@dimen/section_leftright_padding</item>
+        <item name="android:paddingTop">@dimen/section_top_padding</item>
+        <item name="android:paddingBottom">@dimen/section_top_padding</item>
+    </style>
+
+    <style name="GemPurchaseListItemDescription">
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:textSize">13sp</item>
+        <item name="android:layout_marginLeft">8dp</item>
+        <item name="android:layout_marginRight">8dp</item>
+        <item name="android:textColor">@color/subscription_description_text</item>
+    </style>
+
+    <style name="Pill">
+        <item name="android:textSize">11sp</item>
+        <item name="android:background">@drawable/pill_bg</item>
+        <item name="android:paddingRight">@dimen/pill_horizontal_padding</item>
+        <item name="android:paddingLeft">@dimen/pill_horizontal_padding</item>
+        <item name="android:paddingTop">@dimen/pill_vertical_padding</item>
+        <item name="android:paddingBottom">@dimen/pill_vertical_padding</item>
+    </style>
+
+    <style name="Pill.Selected">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:background">@drawable/pill_bg_purple</item>
+    </style>
+
+    <style name="Pill.Selected.Green">
+        <item name="android:background">@drawable/pill_bg_green</item>
+    </style>
+
+    <style name="Pill.Selected.Red">
+        <item name="android:background">@drawable/pill_bg_red</item>
+    </style>
+
+    <style name="subscriptionBox">
+        <item name="android:background">@color/habit_inactive_gray</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:paddingLeft">12dp</item>
+        <item name="android:paddingRight">12dp</item>
+        <item name="android:layout_marginBottom">8dp</item>
+    </style>
+
+    <style name="subscriptionBoxText">
+        <item name="android:textColor">@color/brand_100</item>
+    </style>
+
+    <style name="subscriptionBoxText.Title">
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="subscriptionBoxText.Subtitle">
+        <item name="android:textSize">11sp</item>
+    </style>
+
+    <style name="subscriptionBoxText.Title.Red">
+        <item name="android:textColor">@color/worse_50</item>
+    </style>
+
+    <style name="SubscriptionListDescription" parent="GemPurchaseListItemDescription">
+        <item name="android:layout_marginBottom">24dp</item>
+        <item name="android:fontFamily" tools:targetApi="jelly_bean">
+            @string/font_family_condensed
+        </item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:letterSpacing" tools:targetApi="lollipop">0.035</item>
+        <item name="android:lineSpacingExtra">2.0dp</item>
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginRight">16dp</item>
+    </style>
+
+    <style name="Button">
+        <item name="android:paddingLeft">@dimen/button_padding</item>
+        <item name="android:paddingRight">@dimen/button_padding</item>
+    </style>
+
+    <style name="Button.Purple">
+        <item name="android:background">@drawable/rounded_purple_square</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="Button.Purple.Small">
+        <item name="android:paddingLeft">@dimen/button_padding_small</item>
+        <item name="android:paddingRight">@dimen/button_padding_small</item>
+        <item name="android:paddingTop">@dimen/button_padding_vertical_small</item>
+        <item name="android:paddingBottom">@dimen/button_padding_vertical_small</item>
+    </style>
+
+    <style name="LoginEditTextTheme">
+        <item name="colorAccent">@color/white_50_alpha</item>
+        <item name="colorControlNormal">@color/white_15_alpha</item>
+        <item name="colorControlActivated">@color/white_75_alpha</item>
+        <item name="android:drawablePadding">@dimen/spacing_large</item>
+        <item name="android:textColor">@color/white_75_alpha</item>
+        <item name="android:textColorHint">@color/white_50_alpha</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingBottom">20dp</item>
+    </style>
+
+    <style name="LoginButton" parent="@style/Widget.AppCompat.Button.Borderless">
+        <item name="android:shadowColor">@color/transparent</item>
+        <item name="android:background">@drawable/login_button</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:layout_gravity">center_horizontal</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:paddingLeft">32dp</item>
+        <item name="android:paddingRight">32dp</item>
+    </style>
+
+    <style name="welcome_floating_icon">
+        <item name="android:layout_width">50dp</item>
+        <item name="android:layout_height">50dp</item>
+        <item name="android:background">@drawable/welcome_diamond_background</item>
+        <item name="android:padding">16dp</item>
+    </style>
+
+    <style name="DiamondButton" parent="@style/Widget.AppCompat.Button.Borderless">
+        <item name="android:layout_height">36dp</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>
+
+    <style name="TagEditTextTheme">
+        <item name="colorAccent">@color/black_20_alpha</item>
+        <item name="colorControlNormal">@color/black_20_alpha</item>
+        <item name="android:drawablePadding">@dimen/spacing_large</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml
index c6927f287..4b1a7ecfb 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -1,195 +1,195 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/PS_contact_title" >
-
-    <PreferenceCategory
-        android:title="@string/pref_account_header"
-        android:key="account_prefs">
-
-        <PreferenceScreen
-            android:key="accountDetails"
-            android:title="@string/account_details"
-            android:summary="@string/account_details_sum"
-            android:order="1">
-
-            <PreferenceCategory android:title="Account Details">
-
-                <Preference
-                    android:key="@string/SP_username"
-                    android:title="Login Name"
-                    android:selectable="true"
-                    android:persistent="false"
-                    android:shouldDisableView="false"
-                    android:summary="Login Name" />
-
-                <Preference
-                    android:key="@string/SP_email"
-                    android:title="E-mail"
-                    android:selectable="true"
-                    android:persistent="false"
-                    android:shouldDisableView="false"
-                    android:summary="E-mail" />
-
-                <Preference
-                    android:key="@string/SP_userID"
-                    android:title="@string/SP_userID_title"
-                    android:selectable="true"
-                    android:persistent="false"
-                    android:shouldDisableView="false"
-                    android:summary="@string/SP_userID_summary"/>
-
-                <Preference
-                    android:key="@string/SP_APIToken"
-                    android:title="@string/SP_APIToken_title"
-                    android:selectable="true"
-                    android:persistent="false"
-                    android:shouldDisableView="false"
-                    android:summary="@string/SP_APIToken_summary"/>
-
-                <Preference
-                    android:key="SP_user_qr_code"
-                    android:title="@string/SP_user_qr_code"
-                    android:selectable="true"
-                    android:persistent="false"
-                    android:shouldDisableView="false"
-                    android:summary="@string/SP_user_qr_code"/>
-                <Preference
-                        android:key="subscription_status"
-                        android:title="@string/subscription_status"
-                        android:selectable="true"
-                        android:persistent="false"
-                        android:shouldDisableView="false"/>
-            </PreferenceCategory>
-
-        </PreferenceScreen>
-
-        <Preference
-            android:key="choose_class"
-            android:order="2"/>
-
-        <ListPreference android:title="@string/pref_first_day_of_the_week_title"
-            android:key="@string/pref_first_day_of_the_week_key"
-            android:entries="@array/weekdays"
-            android:entryValues="@array/weekdayValues"
-            android:summary="@string/pref_first_day_of_the_week_summary"
-            android:order="5"/>
-        <ListPreference android:title="@string/Language_title"
-            android:key="language"
-            android:entries="@array/Language"
-            android:entryValues="@array/LanguageValues"
-            android:summary="@string/Language_summary"
-            android:order="4"/>
-        <ListPreference android:title="@string/AudioTheme_title"
-            android:key="audioTheme"
-            android:entries="@array/AudioThemes"
-            android:entryValues="@array/AudioValues"
-            android:summary="@string/AudioTheme_summary"
-            android:order="3"/>
-        <CheckBoxPreference android:title="@string/dailyDueDefaultView"
-            android:key="dailyDueDefaultView"
-            android:order="6"
-            android:summary="@string/dailyDueDefaultViewDescription"
-            />
-        <Preference android:title="@string/logout"
-            android:key="logout"
-            android:summary="@string/logout_description"
-            android:order="99"/>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/pref_reminder_header">
-
-        <CheckBoxPreference
-            android:key="use_reminder"
-            android:defaultValue="false"
-            android:title="@string/pref_reminder_checkbox"/>
-
-        <com.habitrpg.android.habitica.prefs.TimePreference
-            android:key="reminder_time"
-            android:defaultValue="19:30"
-            android:title="@string/pref_reminder_picker" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-            android:title="@string/pref_cds_header">
-
-        <com.habitrpg.android.habitica.prefs.TimePreference
-                android:key="cds_time"
-                android:defaultValue="00:00"
-                android:title="@string/pref_cds_picker" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/push_notifications">
-
-        <CheckBoxPreference
-            android:key="usePushNotifications"
-            android:defaultValue="true"
-            android:title="@string/pref_push_notifications_checkbox"/>
-
-        <PreferenceScreen
-            android:key="pushNotifications"
-            android:title="@string/push_notifications"
-            android:summary="@string/push_notifications_sum"
-            android:order="1">
-
-            <PreferenceCategory android:title="Push Notifications">
-
-                <CheckBoxPreference
-                    android:key="preference_push_you_won_challenge"
-                    android:defaultValue="true"
-                    android:title="@string/preference_push_you_won_challenge"/>
-
-                <CheckBoxPreference
-                    android:key="preference_push_received_a_private_message"
-                    android:defaultValue="true"
-                    android:title="@string/preference_push_received_a_private_message"/>
-
-                <CheckBoxPreference
-                    android:key="preference_push_gifted_gems"
-                    android:defaultValue="true"
-                    android:title="@string/preference_push_gifted_gems"/>
-
-                <CheckBoxPreference
-                    android:key="preference_push_gifted_subscription"
-                    android:defaultValue="true"
-                    android:title="@string/preference_push_gifted_subscription"/>
-
-                <CheckBoxPreference
-                    android:key="preference_push_invited_to_party"
-                    android:defaultValue="true"
-                    android:title="@string/preference_push_invited_to_party"/>
-
-                <CheckBoxPreference
-                    android:key="preference_push_invited_to_guild"
-                    android:defaultValue="true"
-                    android:title="@string/preference_push_invited_to_guild"/>
-
-                <CheckBoxPreference
-                    android:key="preference_push_your_quest_has_begun"
-                    android:defaultValue="true"
-                    android:title="@string/preference_push_your_quest_has_begun"/>
-
-                <CheckBoxPreference
-                    android:key="preference_push_invited_to_quest"
-                    android:defaultValue="true"
-                    android:title="@string/preference_push_invited_to_quest"/>
-
-
-            </PreferenceCategory>
-
-        </PreferenceScreen>
-
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/maintenance">
-        <Preference android:title="@string/reload_content"
-            android:key="reload_content"
-            android:order="99"/>
-
-    </PreferenceCategory>
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/PS_contact_title" >
+
+    <PreferenceCategory
+        android:title="@string/pref_account_header"
+        android:key="account_prefs">
+
+        <PreferenceScreen
+            android:key="accountDetails"
+            android:title="@string/account_details"
+            android:summary="@string/account_details_sum"
+            android:order="1">
+
+            <PreferenceCategory android:title="Account Details">
+
+                <Preference
+                    android:key="@string/SP_username"
+                    android:title="Login Name"
+                    android:selectable="true"
+                    android:persistent="false"
+                    android:shouldDisableView="false"
+                    android:summary="Login Name" />
+
+                <Preference
+                    android:key="@string/SP_email"
+                    android:title="E-mail"
+                    android:selectable="true"
+                    android:persistent="false"
+                    android:shouldDisableView="false"
+                    android:summary="E-mail" />
+
+                <Preference
+                    android:key="@string/SP_userID"
+                    android:title="@string/SP_userID_title"
+                    android:selectable="true"
+                    android:persistent="false"
+                    android:shouldDisableView="false"
+                    android:summary="@string/SP_userID_summary"/>
+
+                <Preference
+                    android:key="@string/SP_APIToken"
+                    android:title="@string/SP_APIToken_title"
+                    android:selectable="true"
+                    android:persistent="false"
+                    android:shouldDisableView="false"
+                    android:summary="@string/SP_APIToken_summary"/>
+
+                <Preference
+                    android:key="SP_user_qr_code"
+                    android:title="@string/SP_user_qr_code"
+                    android:selectable="true"
+                    android:persistent="false"
+                    android:shouldDisableView="false"
+                    android:summary="@string/SP_user_qr_code"/>
+                <Preference
+                        android:key="subscription_status"
+                        android:title="@string/subscription_status"
+                        android:selectable="true"
+                        android:persistent="false"
+                        android:shouldDisableView="false"/>
+            </PreferenceCategory>
+
+        </PreferenceScreen>
+
+        <Preference
+            android:key="choose_class"
+            android:order="2"/>
+
+        <ListPreference android:title="@string/pref_first_day_of_the_week_title"
+            android:key="@string/pref_first_day_of_the_week_key"
+            android:entries="@array/weekdays"
+            android:entryValues="@array/weekdayValues"
+            android:summary="@string/pref_first_day_of_the_week_summary"
+            android:order="5"/>
+        <ListPreference android:title="@string/Language_title"
+            android:key="language"
+            android:entries="@array/Language"
+            android:entryValues="@array/LanguageValues"
+            android:summary="@string/Language_summary"
+            android:order="4"/>
+        <ListPreference android:title="@string/AudioTheme_title"
+            android:key="audioTheme"
+            android:entries="@array/AudioThemes"
+            android:entryValues="@array/AudioValues"
+            android:summary="@string/AudioTheme_summary"
+            android:order="3"/>
+        <CheckBoxPreference android:title="@string/dailyDueDefaultView"
+            android:key="dailyDueDefaultView"
+            android:order="6"
+            android:summary="@string/dailyDueDefaultViewDescription"
+            />
+        <Preference android:title="@string/logout"
+            android:key="logout"
+            android:summary="@string/logout_description"
+            android:order="99"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/pref_reminder_header">
+
+        <CheckBoxPreference
+            android:key="use_reminder"
+            android:defaultValue="false"
+            android:title="@string/pref_reminder_checkbox"/>
+
+        <com.habitrpg.android.habitica.prefs.TimePreference
+            android:key="reminder_time"
+            android:defaultValue="19:30"
+            android:title="@string/pref_reminder_picker" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:title="@string/pref_cds_header">
+
+        <com.habitrpg.android.habitica.prefs.TimePreference
+                android:key="cds_time"
+                android:defaultValue="00:00"
+                android:title="@string/pref_cds_picker" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/push_notifications">
+
+        <CheckBoxPreference
+            android:key="usePushNotifications"
+            android:defaultValue="true"
+            android:title="@string/pref_push_notifications_checkbox"/>
+
+        <PreferenceScreen
+            android:key="pushNotifications"
+            android:title="@string/push_notifications"
+            android:summary="@string/push_notifications_sum"
+            android:order="1">
+
+            <PreferenceCategory android:title="Push Notifications">
+
+                <CheckBoxPreference
+                    android:key="preference_push_you_won_challenge"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_you_won_challenge"/>
+
+                <CheckBoxPreference
+                    android:key="preference_push_received_a_private_message"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_received_a_private_message"/>
+
+                <CheckBoxPreference
+                    android:key="preference_push_gifted_gems"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_gifted_gems"/>
+
+                <CheckBoxPreference
+                    android:key="preference_push_gifted_subscription"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_gifted_subscription"/>
+
+                <CheckBoxPreference
+                    android:key="preference_push_invited_to_party"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_invited_to_party"/>
+
+                <CheckBoxPreference
+                    android:key="preference_push_invited_to_guild"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_invited_to_guild"/>
+
+                <CheckBoxPreference
+                    android:key="preference_push_your_quest_has_begun"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_your_quest_has_begun"/>
+
+                <CheckBoxPreference
+                    android:key="preference_push_invited_to_quest"
+                    android:defaultValue="true"
+                    android:title="@string/preference_push_invited_to_quest"/>
+
+
+            </PreferenceCategory>
+
+        </PreferenceScreen>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/maintenance">
+        <Preference android:title="@string/reload_content"
+            android:key="reload_content"
+            android:order="99"/>
+
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
deleted file mode 100644
index a98adc9ec..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.habitrpg.android.habitica;
-
-import android.support.annotation.Nullable;
-
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.inventory.QuestBoss;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.sql.language.Where;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import rx.Observable;
-
-
-public class ContentCache {
-    private static final String CONTENT_TYPE_ITEM = "item";
-    private static final String CONTENT_TYPE_QUEST = "quest";
-    private ApiClient apiClient;
-
-
-    public ContentCache(ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    public void getQuestContent(final String key, final QuestContentCallback cb) {
-        final QuestContent quest = new Select().from(QuestContent.class).where(Condition.column(ItemData.UNIQUE_IDENTIFIER).eq(key)).querySingle();
-
-        if (quest != null) {
-            quest.boss = new Select().from(QuestBoss.class).where(Condition.column(ItemData.UNIQUE_IDENTIFIER).eq(key)).querySingle();
-            cb.gotQuest(quest);
-        } else {
-
-            getContentAndSearchFor(CONTENT_TYPE_QUEST, key, cb::gotQuest);
-        }
-    }
-
-    public void getItemData(final String key, final GotContentEntryCallback<ItemData> gotEntry) {
-        final ItemData itemData = new Select().from(ItemData.class).where(Condition.column(ItemData.UNIQUE_IDENTIFIER).eq(key)).querySingle();
-
-        if (itemData != null) {
-            gotEntry.gotObject(itemData);
-        } else {
-            getContentAndSearchFor(CONTENT_TYPE_ITEM, key, gotEntry);
-        }
-    }
-
-    public void getItemDataList(final List<String> keysToSearch, GotContentEntryCallback<List<ItemData>> gotEntries) {
-
-        Condition.In keyCondition = Condition.column(ItemData.UNIQUE_IDENTIFIER).in("");
-
-        for (String item : keysToSearch) {
-            keyCondition = keyCondition.and(item);
-        }
-
-        Where<ItemData> query = new Select().from(ItemData.class).where(keyCondition);
-
-        List<ItemData> items = query.queryList();
-
-        if (items != null && items.size() == keysToSearch.size()) {
-            gotEntries.gotObject(items);
-        } else {
-            getContentAndSearchForList(keysToSearch, gotEntries);
-        }
-    }
-
-    private <T> void getContentAndSearchFor(final String typeOfSearch, final String searchKey, final GotContentEntryCallback<T> gotEntry) {
-        apiClient.getContent()
-
-                .subscribe(contentResult -> {
-                    switch (typeOfSearch) {
-                        case CONTENT_TYPE_QUEST: {
-                            Collection<QuestContent> questList = contentResult.quests;
-
-                            for (QuestContent quest : questList) {
-                                if (quest.getKey().equals(searchKey)) {
-                                    gotEntry.gotObject((T) quest);
-                                }
-                            }
-
-                            break;
-                        }
-                        case CONTENT_TYPE_ITEM: {
-                            T searchedItem = null;
-
-                            if ("potion".equals(searchKey)) {
-                                searchedItem = (T) contentResult.potion;
-                            } else if ("armoire".equals(searchKey)) {
-                                searchedItem = (T) contentResult.armoire;
-                            } else {
-                                Collection<ItemData> itemList = contentResult.gear.flat;
-
-                                for (ItemData item : itemList) {
-                                    if (item.key.equals(searchKey)) {
-                                        searchedItem = (T) item;
-                                    }
-                                }
-                            }
-
-                            gotEntry.gotObject(searchedItem);
-
-                            break;
-                        }
-                        default:
-                            break;
-                    }
-                }, throwable -> {
-                });
-    }
-
-    private void getContentAndSearchForList(final List<String> searchKeys, final GotContentEntryCallback<List<ItemData>> gotEntry) {
-        List<ItemData> resultList = new ArrayList<>();
-        apiClient.getContent()
-
-                .flatMap(contentResult -> {
-                    List<ItemData> itemList = new ArrayList<>(contentResult.gear.flat);
-                    itemList.add(contentResult.potion);
-                    itemList.add(contentResult.armoire);
-                    return Observable.from(itemList);
-                })
-                .filter(item -> searchKeys.contains(item.key))
-                .subscribe(resultList::add, throwable -> {
-                }, () -> gotEntry.gotObject(resultList));
-    }
-
-    public interface GotContentEntryCallback<T extends Object> {
-        void gotObject(@Nullable T obj);
-    }
-
-    public interface QuestContentCallback {
-        void gotQuest(QuestContent content);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java
index b501a8ea6..ce03850ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ErrorResponse.java
@@ -1,23 +1,23 @@
-package com.habitrpg.android.habitica;
-
-import com.habitrpg.android.habitica.models.responses.HabiticaError;
-
-import java.util.List;
-
-public class ErrorResponse {
-    public String message;
-    public List<HabiticaError> errors;
-
-    public String getDisplayMessage() {
-        if (errors != null && errors.size() > 0) {
-            HabiticaError error = errors.get(0);
-            if (error.message != null && error.message.length() > 0) {
-                return error.message;
-            }
-        }
-        if (message != null && message.length() > 0) {
-            return message;
-        }
-        return "";
-    }
-}
+package com.habitrpg.android.habitica;
+
+import com.habitrpg.android.habitica.models.responses.HabiticaError;
+
+import java.util.List;
+
+public class ErrorResponse {
+    public String message;
+    public List<HabiticaError> errors;
+
+    public String getDisplayMessage() {
+        if (errors != null && errors.size() > 0) {
+            HabiticaError error = errors.get(0);
+            if (error.message != null && error.message.length() > 0) {
+                return error.message;
+            }
+        }
+        if (message != null && message.length() > 0) {
+            return message;
+        }
+        return "";
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
index 56ed150b8..06cdb525f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
@@ -1,15 +1,15 @@
-package com.habitrpg.android.habitica;
-
-import com.raizlabs.android.dbflow.annotation.Database;
-
-@Database(name = HabitDatabase.NAME, version = HabitDatabase.VERSION, foreignKeysSupported = true)
-public class HabitDatabase {
-
-    public static final String NAME = "Habitica";
-
-    public static final int VERSION = 36;
-
-    public HabitDatabase() {
-        super();
-    }
-}
+package com.habitrpg.android.habitica;
+
+import com.raizlabs.android.dbflow.annotation.Database;
+
+@Database(name = HabitDatabase.NAME, version = HabitDatabase.VERSION, foreignKeysSupported = true)
+public class HabitDatabase {
+
+    public static final String NAME = "Habitica";
+
+    public static final int VERSION = 36;
+
+    public HabitDatabase() {
+        super();
+    }
+}
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 608a41388..55f1555f0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -1,350 +1,350 @@
-package com.habitrpg.android.habitica;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.database.DatabaseErrorHandler;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-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.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.raizlabs.android.dbflow.config.FlowManager;
-import com.squareup.leakcanary.LeakCanary;
-import com.squareup.leakcanary.RefWatcher;
-
-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 javax.inject.Inject;
-
-import dagger.Lazy;
-
-//contains all HabiticaApplicationLogic except dagger componentInitialisation
-public abstract class HabiticaBaseApplication extends MultiDexApplication {
-
-    public static HabitRPGUser User;
-    public static Activity currentActivity = null;
-    private static AppComponent component;
-    public RefWatcher refWatcher;
-    @Inject
-    Lazy<ApiClient> lazyApiHelper;
-    @Inject
-    SharedPreferences sharedPrefs;
-    @Inject
-    CrashlyticsProxy crashlyticsProxy;
-    /**
-     * For better performance billing class should be used as singleton
-     */
-    private Billing billing;
-    /**
-     * Application wide {@link Checkout} instance (can be used
-     * anywhere in the app).
-     * This instance contains all available products in the app.
-     */
-    private Checkout checkout;
-
-    public static HabiticaBaseApplication getInstance(Context context) {
-        return (HabiticaBaseApplication) context.getApplicationContext();
-    }
-
-    public static boolean exists(@NonNull Context context) {
-        try {
-            File dbFile = context.getDatabasePath(String.format("%s.db", HabitDatabase.NAME));
-            return dbFile.exists();
-        } catch (Exception exception) {
-            Log.e("DbExists", "Database %s doesn't exist.", exception);
-            return false;
-        }
-    }
-
-    private static void setFinalStatic(Field field, @Nullable Object newValue) throws NoSuchFieldException, IllegalAccessException {
-        field.setAccessible(true);
-        field.set(null, newValue);
-    }
-
-    public static void logout(Context context) {
-        getInstance(context).deleteDatabase(HabitDatabase.NAME);
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        boolean use_reminder = preferences.getBoolean("use_reminder", false);
-        String reminder_time = preferences.getString("reminder_time", "19:00");
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.clear();
-        editor.putBoolean("use_reminder", use_reminder);
-        editor.putString("reminder_time", reminder_time);
-        editor.apply();
-        getInstance(context).lazyApiHelper.get().updateAuthenticationCredentials(null, null);
-        startActivity(LoginActivity.class, context);
-    }
-
-    public static boolean checkUserAuthentication(Context context, HostConfig hostConfig) {
-        if (hostConfig == null || hostConfig.getApi() == null || hostConfig.getApi().equals("") || hostConfig.getUser() == null || hostConfig.getUser().equals("")) {
-            startActivity(IntroActivity.class, context);
-
-            return false;
-        }
-
-        return true;
-    }
-
-    private static void startActivity(Class activityClass, Context context) {
-        Intent intent = new Intent(context, activityClass);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
-    }
-
-    // region SQLite overrides
-
-    public static AppComponent getComponent() {
-        return component;
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        if (LeakCanary.isInAnalyzerProcess(this)) {
-            // This process is dedicated to LeakCanary for heap analysis.
-            // You should not init your app in this process.
-            return;
-        }
-        setupDagger();
-        crashlyticsProxy.init(this);
-        setupLeakCanary();
-        setupFlowManager();
-        setupFacebookSdk();
-        createBillingAndCheckout();
-        registerActivityLifecycleCallbacks();
-
-        if (!BuildConfig.DEBUG) {
-            try {
-                Amplitude.getInstance().initialize(this, getString(R.string.amplitude_app_id)).enableForegroundTracking(this);
-            } catch (Resources.NotFoundException e) {
-                //pass
-            }
-        }
-
-        Fresco.initialize(this);
-        checkIfNewVersion();
-    }
-
-    private void checkIfNewVersion() {
-        PackageInfo info = null;
-        try {
-            info = getPackageManager().getPackageInfo(getPackageName(), 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e("MyApplication", "couldn't get package info!");
-        }
-
-        if (info == null) {
-            return;
-        }
-
-        int lastInstalledVersion = sharedPrefs.getInt("last_installed_version", 0);
-        if (lastInstalledVersion < info.versionCode) {
-            sharedPrefs.edit().putInt("last_installed_version", info.versionCode).apply();
-            ApiClient apiClient = this.lazyApiHelper.get();
-
-            apiClient.getContent()
-                    .subscribe(contentResult -> { }, throwable -> {});
-        }
-    }
-
-    private void setupDagger() {
-        component = initDagger();
-        component.inject(this);
-    }
-
-    protected abstract AppComponent initDagger();
-
-    private void setupLeakCanary() {
-        refWatcher = LeakCanary.install(this);
-    }
-
-    private void setupFlowManager() {
-        FlowManager.init(this);
-    }
-
-    private void setupFacebookSdk() {
-        String fbApiKey = null;
-        try {
-            ApplicationInfo ai = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);
-            Bundle bundle = ai.metaData;
-            fbApiKey = bundle.getString(FacebookSdk.APPLICATION_ID_PROPERTY);
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e("FB Error", "Failed to load meta-data, NameNotFound: " + e.getMessage());
-        } catch (NullPointerException e) {
-            Log.e("FB Error", "Failed to load meta-data, NullPointer: " + e.getMessage());
-        }
-        if (fbApiKey != null) {
-            FacebookSdk.sdkInitialize(getApplicationContext());
-        }
-    }
-
-    private void registerActivityLifecycleCallbacks() {
-        registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
-            @Override
-            public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-                HabiticaBaseApplication.currentActivity = activity;
-            }
-
-            @Override
-            public void onActivityStarted(Activity activity) {
-
-            }
-
-            @Override
-            public void onActivityResumed(Activity activity) {
-                HabiticaBaseApplication.currentActivity = activity;
-            }
-
-            @Override
-            public void onActivityPaused(Activity activity) {
-
-            }
-
-            @Override
-            public void onActivityStopped(Activity activity) {
-
-            }
-
-            @Override
-            public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
-
-            }
-
-            @Override
-            public void onActivityDestroyed(Activity activity) {
-                if (currentActivity.equals(activity)) {
-                    currentActivity = null;
-                }
-            }
-        });
-    }
-
-    @Override
-    public SQLiteDatabase openOrCreateDatabase(String name,
-                                               int mode, SQLiteDatabase.CursorFactory factory) {
-        return super.openOrCreateDatabase(getDatabasePath(name).getAbsolutePath(), mode, factory);
-    }
-
-    @Override
-    public SQLiteDatabase openOrCreateDatabase(String name,
-                                               int mode, SQLiteDatabase.CursorFactory factory, DatabaseErrorHandler errorHandler) {
-        return super.openOrCreateDatabase(getDatabasePath(name).getAbsolutePath(), mode, factory, errorHandler);
-    }
-
-    // endregion
-
-    // region IAP - Specific
-
-    @Override
-    public boolean deleteDatabase(String name) {
-        if (!name.endsWith(".db")) {
-            name += ".db";
-        }
-
-        FlowManager.destroy();
-        reflectionHack(getApplicationContext());
-
-        boolean deleted = super.deleteDatabase(getDatabasePath(name).getAbsolutePath());
-
-        if (deleted) {
-            Log.i("hack", "Database deleted");
-        } else {
-            Log.e("hack", "Database not deleted");
-        }
-
-        if (exists(getApplicationContext())) {
-            Log.i("hack", "Database exists before FlowManager.init");
-        } else {
-            Log.i("hack", "Database does not exist before FlowManager.init");
-        }
-
-        return deleted;
-    }
-
-    // Hack for DBFlow - Not deleting Database
-    // https://github.com/kaeawc/dbflow-sample-app/blob/master/app/src/main/java/io/kaeawc/flow/app/ui/MainActivityFragment.java#L201
-    private void reflectionHack(@NonNull Context context) {
-
-        try {
-            Field field = FlowManager.class.getDeclaredField("mDatabaseHolder");
-            setFinalStatic(field, null);
-        } catch (NoSuchFieldException noSuchField) {
-            Log.e("nosuchfield", "No such field exists in FlowManager", noSuchField);
-        } catch (IllegalAccessException illegalAccess) {
-            Log.e("illegalaccess", "Illegal access of FlowManager", illegalAccess);
-        }
-
-        FlowManager.init(context);
-
-        if (exists(context)) {
-            Log.i("Database", "Database exists after FlowManager.init with reflection hack");
-        } else {
-            Log.i("Database", "Database does not exist after FlowManager.init with reflection hack");
-        }
-    }
-
-    @Override
-    public File getDatabasePath(String name) {
-        return new File(getExternalFilesDir(null), "HabiticaDatabase/" + name);
-    }
-
-    private void createBillingAndCheckout() {
-        billing = new Billing(this, new Billing.DefaultConfiguration() {
-            @NonNull
-            @Override
-            public String getPublicKey() {
-                return "DONT-NEED-IT";
-            }
-
-            @Nullable
-            @Override
-            public Cache getCache() {
-                return Billing.newCache();
-            }
-
-            @NonNull
-            @Override
-            public PurchaseVerifier getPurchaseVerifier() {
-                return new HabiticaPurchaseVerifier(HabiticaBaseApplication.this, lazyApiHelper.get());
-            }
-        });
-
-
-        checkout = Checkout.forApplication(billing);
-    }
-
-    @NonNull
-    public Checkout getCheckout() {
-        return checkout;
-    }
-
-    // endregion
-
-    public Billing getBilling() {
-        return billing;
-    }
-}
+package com.habitrpg.android.habitica;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.database.DatabaseErrorHandler;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+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.data.ApiClient;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+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.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 javax.inject.Inject;
+
+import dagger.Lazy;
+
+//contains all HabiticaApplicationLogic except dagger componentInitialisation
+public abstract class HabiticaBaseApplication extends MultiDexApplication {
+
+    public static HabitRPGUser User;
+    public static Activity currentActivity = null;
+    private static AppComponent component;
+    public RefWatcher refWatcher;
+    @Inject
+    Lazy<ApiClient> lazyApiHelper;
+    @Inject
+    SharedPreferences sharedPrefs;
+    @Inject
+    CrashlyticsProxy crashlyticsProxy;
+    /**
+     * For better performance billing class should be used as singleton
+     */
+    private Billing billing;
+    /**
+     * Application wide {@link Checkout} instance (can be used
+     * anywhere in the app).
+     * This instance contains all available products in the app.
+     */
+    private Checkout checkout;
+
+    public static HabiticaBaseApplication getInstance(Context context) {
+        return (HabiticaBaseApplication) context.getApplicationContext();
+    }
+
+    public static boolean exists(@NonNull Context context) {
+        try {
+            File dbFile = context.getDatabasePath(String.format("%s.db", HabitDatabase.NAME));
+            return dbFile.exists();
+        } catch (Exception exception) {
+            Log.e("DbExists", "Database %s doesn't exist.", exception);
+            return false;
+        }
+    }
+
+    private static void setFinalStatic(Field field, @Nullable Object newValue) throws NoSuchFieldException, IllegalAccessException {
+        field.setAccessible(true);
+        field.set(null, newValue);
+    }
+
+    public static void logout(Context context) {
+        getInstance(context).deleteDatabase(HabitDatabase.NAME);
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean use_reminder = preferences.getBoolean("use_reminder", false);
+        String reminder_time = preferences.getString("reminder_time", "19:00");
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.clear();
+        editor.putBoolean("use_reminder", use_reminder);
+        editor.putString("reminder_time", reminder_time);
+        editor.apply();
+        getInstance(context).lazyApiHelper.get().updateAuthenticationCredentials(null, null);
+        startActivity(LoginActivity.class, context);
+    }
+
+    public static boolean checkUserAuthentication(Context context, HostConfig hostConfig) {
+        if (hostConfig == null || hostConfig.getApi() == null || hostConfig.getApi().equals("") || hostConfig.getUser() == null || hostConfig.getUser().equals("")) {
+            startActivity(IntroActivity.class, context);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    private static void startActivity(Class activityClass, Context context) {
+        Intent intent = new Intent(context, activityClass);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
+    // region SQLite overrides
+
+    public static AppComponent getComponent() {
+        return component;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            // This process is dedicated to LeakCanary for heap analysis.
+            // You should not init your app in this process.
+            return;
+        }
+        setupDagger();
+        crashlyticsProxy.init(this);
+        setupLeakCanary();
+        setupFlowManager();
+        setupFacebookSdk();
+        createBillingAndCheckout();
+        registerActivityLifecycleCallbacks();
+
+        if (!BuildConfig.DEBUG) {
+            try {
+                Amplitude.getInstance().initialize(this, getString(R.string.amplitude_app_id)).enableForegroundTracking(this);
+            } catch (Resources.NotFoundException e) {
+                //pass
+            }
+        }
+
+        Fresco.initialize(this);
+        checkIfNewVersion();
+    }
+
+    private void checkIfNewVersion() {
+        PackageInfo info = null;
+        try {
+            info = getPackageManager().getPackageInfo(getPackageName(), 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e("MyApplication", "couldn't get package info!");
+        }
+
+        if (info == null) {
+            return;
+        }
+
+        int lastInstalledVersion = sharedPrefs.getInt("last_installed_version", 0);
+        if (lastInstalledVersion < info.versionCode) {
+            sharedPrefs.edit().putInt("last_installed_version", info.versionCode).apply();
+            ApiClient apiClient = this.lazyApiHelper.get();
+
+            apiClient.getContent()
+                    .subscribe(contentResult -> { }, throwable -> {});
+        }
+    }
+
+    private void setupDagger() {
+        component = initDagger();
+        component.inject(this);
+    }
+
+    protected abstract AppComponent initDagger();
+
+    private void setupLeakCanary() {
+        refWatcher = LeakCanary.install(this);
+    }
+
+    private void setupFlowManager() {
+        FlowManager.init(this);
+    }
+
+    private void setupFacebookSdk() {
+        String fbApiKey = null;
+        try {
+            ApplicationInfo ai = getPackageManager().getApplicationInfo(getPackageName(), PackageManager.GET_META_DATA);
+            Bundle bundle = ai.metaData;
+            fbApiKey = bundle.getString(FacebookSdk.APPLICATION_ID_PROPERTY);
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e("FB Error", "Failed to load meta-data, NameNotFound: " + e.getMessage());
+        } catch (NullPointerException e) {
+            Log.e("FB Error", "Failed to load meta-data, NullPointer: " + e.getMessage());
+        }
+        if (fbApiKey != null) {
+            FacebookSdk.sdkInitialize(getApplicationContext());
+        }
+    }
+
+    private void registerActivityLifecycleCallbacks() {
+        registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
+            @Override
+            public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
+                HabiticaBaseApplication.currentActivity = activity;
+            }
+
+            @Override
+            public void onActivityStarted(Activity activity) {
+
+            }
+
+            @Override
+            public void onActivityResumed(Activity activity) {
+                HabiticaBaseApplication.currentActivity = activity;
+            }
+
+            @Override
+            public void onActivityPaused(Activity activity) {
+
+            }
+
+            @Override
+            public void onActivityStopped(Activity activity) {
+
+            }
+
+            @Override
+            public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+
+            }
+
+            @Override
+            public void onActivityDestroyed(Activity activity) {
+                if (currentActivity.equals(activity)) {
+                    currentActivity = null;
+                }
+            }
+        });
+    }
+
+    @Override
+    public SQLiteDatabase openOrCreateDatabase(String name,
+                                               int mode, SQLiteDatabase.CursorFactory factory) {
+        return super.openOrCreateDatabase(getDatabasePath(name).getAbsolutePath(), mode, factory);
+    }
+
+    @Override
+    public SQLiteDatabase openOrCreateDatabase(String name,
+                                               int mode, SQLiteDatabase.CursorFactory factory, DatabaseErrorHandler errorHandler) {
+        return super.openOrCreateDatabase(getDatabasePath(name).getAbsolutePath(), mode, factory, errorHandler);
+    }
+
+    // endregion
+
+    // region IAP - Specific
+
+    @Override
+    public boolean deleteDatabase(String name) {
+        if (!name.endsWith(".db")) {
+            name += ".db";
+        }
+
+        FlowManager.destroy();
+        reflectionHack(getApplicationContext());
+
+        boolean deleted = super.deleteDatabase(getDatabasePath(name).getAbsolutePath());
+
+        if (deleted) {
+            Log.i("hack", "Database deleted");
+        } else {
+            Log.e("hack", "Database not deleted");
+        }
+
+        if (exists(getApplicationContext())) {
+            Log.i("hack", "Database exists before FlowManager.init");
+        } else {
+            Log.i("hack", "Database does not exist before FlowManager.init");
+        }
+
+        return deleted;
+    }
+
+    // Hack for DBFlow - Not deleting Database
+    // https://github.com/kaeawc/dbflow-sample-app/blob/master/app/src/main/java/io/kaeawc/flow/app/ui/MainActivityFragment.java#L201
+    private void reflectionHack(@NonNull Context context) {
+
+        try {
+            Field field = FlowManager.class.getDeclaredField("mDatabaseHolder");
+            setFinalStatic(field, null);
+        } catch (NoSuchFieldException noSuchField) {
+            Log.e("nosuchfield", "No such field exists in FlowManager", noSuchField);
+        } catch (IllegalAccessException illegalAccess) {
+            Log.e("illegalaccess", "Illegal access of FlowManager", illegalAccess);
+        }
+
+        FlowManager.init(context);
+
+        if (exists(context)) {
+            Log.i("Database", "Database exists after FlowManager.init with reflection hack");
+        } else {
+            Log.i("Database", "Database does not exist after FlowManager.init with reflection hack");
+        }
+    }
+
+    @Override
+    public File getDatabasePath(String name) {
+        return new File(getExternalFilesDir(null), "HabiticaDatabase/" + name);
+    }
+
+    private void createBillingAndCheckout() {
+        billing = new Billing(this, new Billing.DefaultConfiguration() {
+            @NonNull
+            @Override
+            public String getPublicKey() {
+                return "DONT-NEED-IT";
+            }
+
+            @Nullable
+            @Override
+            public Cache getCache() {
+                return Billing.newCache();
+            }
+
+            @NonNull
+            @Override
+            public PurchaseVerifier getPurchaseVerifier() {
+                return new HabiticaPurchaseVerifier(HabiticaBaseApplication.this, lazyApiHelper.get());
+            }
+        });
+
+
+        checkout = Checkout.forApplication(billing);
+    }
+
+    @NonNull
+    public Checkout getCheckout() {
+        return checkout;
+    }
+
+    // endregion
+
+    public Billing getBilling() {
+        return billing;
+    }
+}
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 60e4ca96c..6adafef00 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
@@ -1,132 +1,132 @@
-package com.habitrpg.android.habitica;
-
-import com.habitrpg.android.habitica.events.UserSubscribedEvent;
-import com.habitrpg.android.habitica.helpers.PurchaseTypes;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
-import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
-import com.habitrpg.android.habitica.models.Transaction;
-import com.playseeds.android.sdk.Seeds;
-
-import org.greenrobot.eventbus.EventBus;
-import org.solovyev.android.checkout.BasePurchaseVerifier;
-import org.solovyev.android.checkout.Purchase;
-import org.solovyev.android.checkout.RequestListener;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import retrofit2.HttpException;
-
-/**
- * Created by Negue on 26.11.2015.
- */
-public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
-
-    private static final String PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS";
-    private final ApiClient apiClient;
-    private Set<String> purchasedOrderList = new HashSet<>();
-    private SharedPreferences preferences;
-
-    public HabiticaPurchaseVerifier(Context context, ApiClient apiClient) {
-        preferences = PreferenceManager.getDefaultSharedPreferences(context);
-
-        preferences.getStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
-
-        this.apiClient = apiClient;
-    }
-
-    @Override
-    protected void doVerify(@NonNull final List<Purchase> purchases, @NonNull final RequestListener<List<Purchase>> requestListener) {
-        final List<Purchase> verifiedPurchases = new ArrayList<>(purchases.size());
-
-        for (final Purchase purchase : purchases) {
-            if (purchasedOrderList.contains(purchase.orderId)) {
-                verifiedPurchases.add(purchase);
-
-                requestListener.onSuccess(verifiedPurchases);
-            } else {
-                if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
-                    PurchaseValidationRequest validationRequest = new PurchaseValidationRequest();
-                    validationRequest.transaction = new Transaction();
-                    validationRequest.transaction.receipt = purchase.data;
-                    validationRequest.transaction.signature = purchase.signature;
-
-                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(retrofit2.adapter.rxjava.HttpException.class)) {
-                        HttpException error = (HttpException)throwable;
-                        ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
-                        if (error.code() == 401) {
-                            if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
-                                purchasedOrderList.add(purchase.orderId);
-
-                                    requestListener.onSuccess(verifiedPurchases);
-                                    return;
-                                }
-                            }
-                        }
-                        requestListener.onError(purchases.indexOf(purchase), new Exception());
-                    });
-                } else if (PurchaseTypes.allSubscriptionTypes.contains(purchase.sku)) {
-                    SubscriptionValidationRequest validationRequest = new SubscriptionValidationRequest();
-                    validationRequest.transaction = new Transaction();
-                    validationRequest.transaction.receipt = purchase.data;
-                    validationRequest.transaction.signature = purchase.signature;
-                    validationRequest.sku = purchase.sku;
-                    apiClient.validateSubscription(validationRequest).subscribe(purchaseValidationResult -> {
-                        purchasedOrderList.add(purchase.orderId);
-
-                        verifiedPurchases.add(purchase);
-
-                        requestListener.onSuccess(verifiedPurchases);
-
-                        EventBus.getDefault().post(new UserSubscribedEvent());
-                    }, throwable -> {
-                        if (throwable.getClass().equals(retrofit2.adapter.rxjava.HttpException.class)) {
-                            HttpException error = (HttpException) throwable;
-                            ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
-                            if (error.code() == 401) {
-                                if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
-                                    purchasedOrderList.add(purchase.orderId);
-
-                                    verifiedPurchases.add(purchase);
-
-                                    requestListener.onSuccess(verifiedPurchases);
-                                    return;
-                                }
-                            }
-                        }
-                        requestListener.onError(purchases.indexOf(purchase), new Exception());
-                    });
-                }
-            }
-        }
-
-        SharedPreferences.Editor edit = preferences.edit();
-        edit.putStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
-        edit.apply();
-    }
-}
+package com.habitrpg.android.habitica;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.events.UserSubscribedEvent;
+import com.habitrpg.android.habitica.helpers.PurchaseTypes;
+import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
+import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
+import com.habitrpg.android.habitica.models.Transaction;
+import com.playseeds.android.sdk.Seeds;
+
+import org.greenrobot.eventbus.EventBus;
+import org.solovyev.android.checkout.BasePurchaseVerifier;
+import org.solovyev.android.checkout.Purchase;
+import org.solovyev.android.checkout.RequestListener;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import retrofit2.HttpException;
+
+/**
+ * Created by Negue on 26.11.2015.
+ */
+public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
+
+    private static final String PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS";
+    private final ApiClient apiClient;
+    private Set<String> purchasedOrderList = new HashSet<>();
+    private SharedPreferences preferences;
+
+    public HabiticaPurchaseVerifier(Context context, ApiClient apiClient) {
+        preferences = PreferenceManager.getDefaultSharedPreferences(context);
+
+        preferences.getStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
+
+        this.apiClient = apiClient;
+    }
+
+    @Override
+    protected void doVerify(@NonNull final List<Purchase> purchases, @NonNull final RequestListener<List<Purchase>> requestListener) {
+        final List<Purchase> verifiedPurchases = new ArrayList<>(purchases.size());
+
+        for (final Purchase purchase : purchases) {
+            if (purchasedOrderList.contains(purchase.orderId)) {
+                verifiedPurchases.add(purchase);
+
+                requestListener.onSuccess(verifiedPurchases);
+            } else {
+                if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
+                    PurchaseValidationRequest validationRequest = new PurchaseValidationRequest();
+                    validationRequest.transaction = new Transaction();
+                    validationRequest.transaction.receipt = purchase.data;
+                    validationRequest.transaction.signature = purchase.signature;
+
+                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(retrofit2.adapter.rxjava.HttpException.class)) {
+                        HttpException error = (HttpException)throwable;
+                        ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
+                        if (error.code() == 401) {
+                            if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
+                                purchasedOrderList.add(purchase.orderId);
+
+                                    requestListener.onSuccess(verifiedPurchases);
+                                    return;
+                                }
+                            }
+                        }
+                        requestListener.onError(purchases.indexOf(purchase), new Exception());
+                    });
+                } else if (PurchaseTypes.allSubscriptionTypes.contains(purchase.sku)) {
+                    SubscriptionValidationRequest validationRequest = new SubscriptionValidationRequest();
+                    validationRequest.transaction = new Transaction();
+                    validationRequest.transaction.receipt = purchase.data;
+                    validationRequest.transaction.signature = purchase.signature;
+                    validationRequest.sku = purchase.sku;
+                    apiClient.validateSubscription(validationRequest).subscribe(purchaseValidationResult -> {
+                        purchasedOrderList.add(purchase.orderId);
+
+                        verifiedPurchases.add(purchase);
+
+                        requestListener.onSuccess(verifiedPurchases);
+
+                        EventBus.getDefault().post(new UserSubscribedEvent());
+                    }, throwable -> {
+                        if (throwable.getClass().equals(retrofit2.adapter.rxjava.HttpException.class)) {
+                            HttpException error = (HttpException) throwable;
+                            ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
+                            if (error.code() == 401) {
+                                if (res.message != null && res.message.equals("RECEIPT_ALREADY_USED")) {
+                                    purchasedOrderList.add(purchase.orderId);
+
+                                    verifiedPurchases.add(purchase);
+
+                                    requestListener.onSuccess(verifiedPurchases);
+                                    return;
+                                }
+                            }
+                        }
+                        requestListener.onError(purchases.indexOf(purchase), new Exception());
+                    });
+                }
+            }
+        }
+
+        SharedPreferences.Editor edit = preferences.edit();
+        edit.putStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
+        edit.apply();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java b/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
index dacd96fc0..a0c04ff09 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
@@ -1,92 +1,102 @@
-package com.habitrpg.android.habitica;
-
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import android.annotation.TargetApi;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.support.v4.content.ContextCompat;
-import android.util.Log;
-
-import java.util.List;
-
-
-//https://gist.github.com/BrandonSmith/6679223
-public class NotificationPublisher extends BroadcastReceiver {
-
-    public static String NOTIFICATION_ID = "notification-id";
-    public static String CHECK_DAILIES = "check-dailies";
-    private Context context;
-
-    public void onReceive(Context context, Intent intent) {
-        Log.d("NotificationPublisher", "Publishing notification");
-
-        this.context = context;
-
-        boolean check_dailies = intent.getBooleanExtra(CHECK_DAILIES, false);
-        Notification notification = getNotification();
-        boolean show_notification = true;
-        if (check_dailies) {
-            List<Task> dailies = new Select().from(Task.class)
-                    .where(Condition.column("type").eq("daily"))
-                    .and(Condition.column("completed").eq(false))
-                    .queryList();
-            show_notification = false;
-            for (Task task : dailies) {
-                if (task.isDue(0)) {
-                    show_notification = true;
-                    break;
-                }
-            }
-            TaskAlarmManager.scheduleDailyReminder(context);
-        }
-        if (show_notification) {
-            NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-
-            int id = intent.getIntExtra(NOTIFICATION_ID, 0);
-            notificationManager.notify(id, notification);
-        }
-    }
-
-    @TargetApi(21)
-    private Notification getNotification() {
-        int currentapiVersion = android.os.Build.VERSION.SDK_INT;
-
-        Notification notification;
-        Notification.Builder builder = new Notification.Builder(context);
-        builder.setContentTitle(context.getString(R.string.app_name));
-        builder.setContentText(context.getString(R.string.reminder_title));
-        builder.setSmallIcon(R.drawable.ic_gryphon_white);
-        Intent notificationIntent = new Intent(context, MainActivity.class);
-
-        notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
-                | Intent.FLAG_ACTIVITY_SINGLE_TOP);
-
-        PendingIntent intent = PendingIntent.getActivity(context, 0,
-                notificationIntent, 0);
-        builder.setContentIntent(intent);
-
-        if (currentapiVersion >= Build.VERSION_CODES.LOLLIPOP) {
-            builder.setColor(ContextCompat.getColor(context, R.color.brand_300));
-        }
-
-        if (currentapiVersion >= Build.VERSION_CODES.JELLY_BEAN) {
-            notification = builder.build();
-        } else {
-            notification = builder.getNotification();
-        }
-        notification.defaults |= Notification.DEFAULT_LIGHTS;
-
-        notification.flags |= Notification.FLAG_AUTO_CANCEL | Notification.FLAG_SHOW_LIGHTS;
-        return notification;
-    }
+package com.habitrpg.android.habitica;
+
+import android.annotation.TargetApi;
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.support.v4.content.ContextCompat;
+
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+
+//https://gist.github.com/BrandonSmith/6679223
+public class NotificationPublisher extends BroadcastReceiver {
+
+    @Inject
+    TaskRepository taskRepository;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
+
+    public static String NOTIFICATION_ID = "notification-id";
+    public static String CHECK_DAILIES = "check-dailies";
+    private Context context;
+
+    public void onReceive(Context context, Intent intent) {
+        this.context = context;
+        if (taskRepository == null) {
+            HabiticaApplication.getComponent().inject(this);
+        }
+
+        boolean check_dailies = intent.getBooleanExtra(CHECK_DAILIES, false);
+        Notification notification = getNotification();
+        if (check_dailies) {
+            taskRepository.getTasks(Task.TYPE_DAILY, userId).subscribe(dailies -> {
+                boolean showNotifications = false;
+                for (Task task : dailies) {
+                    if (task.isDue(0)) {
+                        showNotifications = true;
+                        break;
+                    }
+                }
+                TaskAlarmManager.scheduleDailyReminder(context);
+                if (showNotifications) {
+                    NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+                    int id = intent.getIntExtra(NOTIFICATION_ID, 0);
+                    notificationManager.notify(id, notification);
+                }
+            }, throwable -> {});
+
+        } else {
+            NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+            int id = intent.getIntExtra(NOTIFICATION_ID, 0);
+            notificationManager.notify(id, notification);
+        }
+    }
+
+    @TargetApi(21)
+    private Notification getNotification() {
+        int currentapiVersion = android.os.Build.VERSION.SDK_INT;
+
+        Notification notification;
+        Notification.Builder builder = new Notification.Builder(context);
+        builder.setContentTitle(context.getString(R.string.app_name));
+        builder.setContentText(context.getString(R.string.reminder_title));
+        builder.setSmallIcon(R.drawable.ic_gryphon_white);
+        Intent notificationIntent = new Intent(context, MainActivity.class);
+
+        notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
+                | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+
+        PendingIntent intent = PendingIntent.getActivity(context, 0,
+                notificationIntent, 0);
+        builder.setContentIntent(intent);
+
+        if (currentapiVersion >= Build.VERSION_CODES.LOLLIPOP) {
+            builder.setColor(ContextCompat.getColor(context, R.color.brand_300));
+        }
+
+        if (currentapiVersion >= Build.VERSION_CODES.JELLY_BEAN) {
+            notification = builder.build();
+        } else {
+            notification = builder.getNotification();
+        }
+        notification.defaults |= Notification.DEFAULT_LIGHTS;
+
+        notification.flags |= Notification.FLAG_AUTO_CANCEL | Notification.FLAG_SHOW_LIGHTS;
+        return notification;
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
index 1540b4948..55fa84517 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
@@ -1,300 +1,300 @@
-package com.habitrpg.android.habitica.api;
-
-import com.habitrpg.android.habitica.models.AchievementResult;
-import com.habitrpg.android.habitica.models.ContentResult;
-import com.habitrpg.android.habitica.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
-import com.habitrpg.android.habitica.models.PurchaseValidationResult;
-import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
-import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.auth.UserAuth;
-import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
-import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.habitrpg.android.habitica.models.responses.BuyResponse;
-import com.habitrpg.android.habitica.models.responses.FeedResponse;
-import com.habitrpg.android.habitica.models.responses.HabitResponse;
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
-import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.responses.Status;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.models.responses.UnlockResponse;
-import com.habitrpg.android.habitica.models.shops.Shop;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Items;
-
-import java.util.List;
-import java.util.Map;
-
-import retrofit2.http.Body;
-import retrofit2.http.DELETE;
-import retrofit2.http.GET;
-import retrofit2.http.Header;
-import retrofit2.http.POST;
-import retrofit2.http.PUT;
-import retrofit2.http.Path;
-import retrofit2.http.Query;
-import rx.Observable;
-
-
-/**
- * Created by MagicMicky on 10/06/2014.
- */
-public interface ApiService {
-    @GET("status")
-    Observable<HabitResponse<Status>> getStatus();
-
-    @GET("content")
-    Observable<HabitResponse<ContentResult>> getContent(@Query("language") String language);
-
-    /* user API */
-
-    @GET("user/")
-    Observable<HabitResponse<HabitRPGUser>> getUser();
-
-    @PUT("user/")
-    Observable<HabitResponse<HabitRPGUser>> updateUser(@Body Map<String, Object> updateDictionary);
-
-    @PUT("user/")
-    Observable<HabitResponse<HabitRPGUser>> registrationLanguage(@Header("Accept-Language") String registrationLanguage);
-
-    @GET("user/inventory/buy")
-    Observable<HabitResponse<List<ItemData>>> getInventoryBuyableGear();
-
-    @POST("user/equip/{type}/{key}")
-    Observable<HabitResponse<Items>> equipItem(@Path("type") String type, @Path("key") String itemKey);
-
-    @POST("user/buy/{key}")
-    Observable<HabitResponse<BuyResponse>> buyItem(@Path("key") String itemKey);
-
-    @POST("user/purchase/{type}/{key}")
-    Observable<HabitResponse<Void>> purchaseItem(@Path("type") String type, @Path("key") String itemKey);
-
-    @POST("user/purchase-hourglass/{type}/{key}")
-    Observable<HabitResponse<Void>> purchaseHourglassItem(@Path("type") String type, @Path("key") String itemKey);
-
-    @POST("user/buy-mystery-set/{key}")
-    Observable<HabitResponse<Void>> purchaseMysterySet(@Path("key") String itemKey);
-
-    @POST("user/buy-quest/{key}")
-    Observable<HabitResponse<Void>> purchaseQuest(@Path("key") String key);
-
-    @POST("user/sell/{type}/{key}")
-    Observable<HabitResponse<HabitRPGUser>> sellItem(@Path("type") String itemType, @Path("key") String itemKey);
-
-    @POST("user/feed/{pet}/{food}")
-    Observable<HabitResponse<FeedResponse>> feedPet(@Path("pet") String petKey, @Path("food") String foodKey);
-
-    @POST("user/hatch/{egg}/{hatchingPotion}")
-    Observable<HabitResponse<Items>> hatchPet(@Path("egg") String eggKey, @Path("hatchingPotion") String hatchingPotionKey);
-
-
-    @GET("tasks/user")
-    Observable<HabitResponse<TaskList>> getTasks();
-
-    @POST("user/unlock")
-    Observable<HabitResponse<UnlockResponse>> unlockPath(@Query("path") String path);
-
-    @GET("tasks/{id}")
-    Observable<HabitResponse<Task>> getTask(@Path("id") String id);
-
-    @POST("tasks/{id}/score/{direction}")
-    Observable<HabitResponse<TaskDirectionData>> postTaskDirection(@Path("id") String id, @Path("direction") String direction);
-
-    @POST("tasks/{id}/move/to/{position}")
-    Observable<HabitResponse<List<String>>> postTaskNewPosition(@Path("id") String id, @Path("position") String position);
-
-    @POST("tasks/{taskId}/checklist/{itemId}/score")
-    Observable<HabitResponse<Task>> scoreChecklistItem(@Path("taskId") String taskId, @Path("itemId") String itemId);
-
-    @POST("tasks/user")
-    Observable<HabitResponse<Task>> createItem(@Body Task item);
-
-    @POST("tasks/user")
-    Observable<HabitResponse<List<Task>>> createTasks(@Body List<Task> tasks);
-
-    @PUT("tasks/{id}")
-    Observable<HabitResponse<Task>> updateTask(@Path("id") String id, @Body Task item);
-
-    @DELETE("tasks/{id}")
-    Observable<HabitResponse<Void>> deleteTask(@Path("id") String id);
-
-
-    @POST("tags")
-    Observable<HabitResponse<Tag>> createTag(@Body Tag tag);
-
-    @PUT("tags/{id}")
-    Observable<HabitResponse<Tag>> updateTag(@Path("id") String id, @Body Tag tag);
-
-    @DELETE("tags/{id}")
-    Observable<HabitResponse<Void>> deleteTag(@Path("id") String id);
-
-    @POST("user/auth/local/register")
-    Observable<HabitResponse<UserAuthResponse>> registerUser(@Body UserAuth auth);
-
-    @POST("user/auth/local/login")
-    Observable<HabitResponse<UserAuthResponse>> connectLocal(@Body UserAuth auth);
-
-    @POST("user/auth/social")
-    Observable<HabitResponse<UserAuthResponse>> connectSocial(@Body UserAuthSocial auth);
-
-
-    @POST("user/sleep")
-    Observable<HabitResponse<Boolean>> sleep();
-
-    @POST("user/revive")
-    Observable<HabitResponse<HabitRPGUser>> revive();
-
-    @POST("user/class/cast/{skill}")
-    Observable<HabitResponse<SkillResponse>> useSkill(@Path("skill") String skillName, @Query("targetType") String targetType, @Query("targetId") String targetId);
-
-    @POST("user/class/cast/{skill}")
-    Observable<HabitResponse<SkillResponse>> useSkill(@Path("skill") String skillName, @Query("targetType") String targetType);
-
-    @POST("user/change-class")
-    Observable<HabitResponse<HabitRPGUser>> changeClass();
-
-    @POST("user/change-class")
-    Observable<HabitResponse<HabitRPGUser>> changeClass(@Query("class") String className);
-
-    @POST("user/disable-classes")
-    Observable<HabitResponse<HabitRPGUser>> disableClasses();
-
-    @POST("user/mark-pms-read")
-    Observable<HabitResponse<Void>> markPrivateMessagesRead();
-
-
-
-    /* Group API */
-
-    @GET("groups")
-    Observable<HabitResponse<List<Group>>> listGroups(@Query("type") String type);
-
-    @GET("groups/{gid}")
-    Observable<HabitResponse<Group>> getGroup(@Path("gid") String groupId);
-
-    @PUT("groups/{id}")
-    Observable<HabitResponse<Void>> updateGroup(@Path("id") String id, @Body Group item);
-
-    @GET("groups/{gid}/chat")
-    Observable<HabitResponse<List<ChatMessage>>> listGroupChat(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/join")
-    Observable<HabitResponse<Group>> joinGroup(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/leave")
-    Observable<HabitResponse<Void>> leaveGroup(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/chat")
-    Observable<HabitResponse<PostChatMessageResult>> postGroupChat(@Path("gid") String groupId, @Body Map<String, String> message);
-
-    @DELETE("groups/{gid}/chat/{messageId}")
-    Observable<HabitResponse<Void>> deleteMessage(@Path("gid") String groupId, @Path("messageId") String messageId);
-
-    @GET("groups/{gid}/members")
-    Observable<HabitResponse<List<HabitRPGUser>>> getGroupMembers(@Path("gid") String groupId, @Query("includeAllPublicFields") Boolean includeAllPublicFields);
-
-    @GET("groups/{gid}/members")
-    Observable<HabitResponse<List<HabitRPGUser>>> getGroupMembers(@Path("gid") String groupId, @Query("includeAllPublicFields") Boolean includeAllPublicFields, @Query("lastId") String lastId);
-
-    // Like returns the full chat list
-    @POST("groups/{gid}/chat/{mid}/like")
-    Observable<HabitResponse<ChatMessage>> likeMessage(@Path("gid") String groupId, @Path("mid") String mid);
-
-    @POST("groups/{gid}/chat/{mid}/flag")
-    Observable<HabitResponse<Void>> flagMessage(@Path("gid") String groupId, @Path("mid") String mid);
-
-    @POST("groups/{gid}/chat/seen")
-    Observable<HabitResponse<Void>> seenMessages(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/invite")
-    Observable<HabitResponse<Void>> inviteToGroup(@Path("gid") String groupId, @Body Map<String, Object> inviteData);
-
-    @POST("groups/{gid}/reject-invite")
-    Observable<HabitResponse<Void>> rejectGroupInvite(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/quests/accept")
-    Observable<HabitResponse<Void>> acceptQuest(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/quests/reject")
-    Observable<HabitResponse<Void>> rejectQuest(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/quests/cancel")
-    Observable<HabitResponse<Void>> cancelQuest(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/quests/force-start")
-    Observable<HabitResponse<Quest>> forceStartQuest(@Path("gid") String groupId, @Body Group group);
-
-    @POST("groups/{gid}/quests/invite/{questKey}")
-    Observable<HabitResponse<Quest>> inviteToQuest(@Path("gid") String groupId, @Path("questKey") String questKey);
-
-    @POST("groups/{gid}/quests/abort")
-    Observable<HabitResponse<Quest>> abortQuest(@Path("gid") String groupId);
-
-    @POST("groups/{gid}/quests/leave")
-    Observable<HabitResponse<Void>> leaveQuest(@Path("gid") String groupId);
-
-    @POST("/iap/android/verify")
-    Observable<HabitResponse<PurchaseValidationResult>> validatePurchase(@Body PurchaseValidationRequest request);
-
-    @POST("/iap/android/subscribe")
-    Observable<HabitResponse<Void>> validateSubscription(@Body SubscriptionValidationRequest request);
-
-    @POST("user/custom-day-start")
-    Observable<HabitResponse<HabitRPGUser>> changeCustomDayStart(@Body Map<String, Object> updateObject);
-
-    //Members URL
-    @GET("members/{mid}")
-    Observable<HabitResponse<HabitRPGUser>> getMember(@Path("mid") String memberId);
-
-    @GET("members/{mid}/achievements")
-    Observable<HabitResponse<AchievementResult>> getMemberAchievements(@Path("mid") String memberId);
-
-    @POST("members/send-private-message")
-    Observable<HabitResponse<PostChatMessageResult>> postPrivateMessage(@Body Map<String, String> messageDetails);
-
-    @GET("shops/{identifier}")
-    Observable<HabitResponse<Shop>> fetchShopInventory(@Path("identifier") String identifier);
-
-    //Push notifications
-    @POST("user/push-devices")
-    Observable<HabitResponse<Void>> addPushDevice(@Body Map<String, String> pushDeviceData);
-
-    @DELETE("user/push-devices/{regId}")
-    Observable<HabitResponse<Void>> deletePushDevice(@Path("regId") String regId);
-
-    /* challenges api */
-
-    @GET("challenges/user")
-    Observable<HabitResponse<List<Challenge>>> getUserChallenges();
-
-    @GET("tasks/challenge/{challengeId}")
-    Observable<HabitResponse<TaskList>> getChallengeTasks(@Path("challengeId") String challengeId);
-
-    @GET("challenges/{challengeId}")
-    Observable<HabitResponse<Challenge>> getChallenge(@Path("challengeId") String challengeId);
-
-    @POST("challenges/{challengeId}/join")
-    Observable<HabitResponse<Challenge>> joinChallenge(@Path("challengeId") String challengeId);
-
-    @POST("challenges/{challengeId}/leave")
-    Observable<HabitResponse<Void>> leaveChallenge(@Path("challengeId") String challengeId, @Body LeaveChallengeBody body);
-
-    //DEBUG: These calls only work on a local development server
-
-    @POST("debug/add-ten-gems")
-    Observable<HabitResponse<Void>> debugAddTenGems();
-
-    // Notifications
-    @POST("notifications/{notificationId}/read")
-    Observable<HabitResponse<Void>> readNotification(@Path("notificationId") String notificationId);
-
-    @POST("user/open-mystery-item")
-    Observable<HabitResponse<ItemData>> openMysteryItem();
-}
+package com.habitrpg.android.habitica.api;
+
+import com.habitrpg.android.habitica.models.AchievementResult;
+import com.habitrpg.android.habitica.models.ContentResult;
+import com.habitrpg.android.habitica.models.LeaveChallengeBody;
+import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
+import com.habitrpg.android.habitica.models.PurchaseValidationResult;
+import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.auth.UserAuth;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
+import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.habitrpg.android.habitica.models.responses.BuyResponse;
+import com.habitrpg.android.habitica.models.responses.FeedResponse;
+import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.responses.Status;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+
+import java.util.List;
+import java.util.Map;
+
+import retrofit2.http.Body;
+import retrofit2.http.DELETE;
+import retrofit2.http.GET;
+import retrofit2.http.Header;
+import retrofit2.http.POST;
+import retrofit2.http.PUT;
+import retrofit2.http.Path;
+import retrofit2.http.Query;
+import rx.Observable;
+
+
+/**
+ * Created by MagicMicky on 10/06/2014.
+ */
+public interface ApiService {
+    @GET("status")
+    Observable<HabitResponse<Status>> getStatus();
+
+    @GET("content")
+    Observable<HabitResponse<ContentResult>> getContent(@Query("language") String language);
+
+    /* user API */
+
+    @GET("user/")
+    Observable<HabitResponse<HabitRPGUser>> getUser();
+
+    @PUT("user/")
+    Observable<HabitResponse<HabitRPGUser>> updateUser(@Body Map<String, Object> updateDictionary);
+
+    @PUT("user/")
+    Observable<HabitResponse<HabitRPGUser>> registrationLanguage(@Header("Accept-Language") String registrationLanguage);
+
+    @GET("user/inventory/buy")
+    Observable<HabitResponse<List<ItemData>>> getInventoryBuyableGear();
+
+    @POST("user/equip/{type}/{key}")
+    Observable<HabitResponse<Items>> equipItem(@Path("type") String type, @Path("key") String itemKey);
+
+    @POST("user/buy/{key}")
+    Observable<HabitResponse<BuyResponse>> buyItem(@Path("key") String itemKey);
+
+    @POST("user/purchase/{type}/{key}")
+    Observable<HabitResponse<Void>> purchaseItem(@Path("type") String type, @Path("key") String itemKey);
+
+    @POST("user/purchase-hourglass/{type}/{key}")
+    Observable<HabitResponse<Void>> purchaseHourglassItem(@Path("type") String type, @Path("key") String itemKey);
+
+    @POST("user/buy-mystery-set/{key}")
+    Observable<HabitResponse<Void>> purchaseMysterySet(@Path("key") String itemKey);
+
+    @POST("user/buy-quest/{key}")
+    Observable<HabitResponse<Void>> purchaseQuest(@Path("key") String key);
+
+    @POST("user/sell/{type}/{key}")
+    Observable<HabitResponse<HabitRPGUser>> sellItem(@Path("type") String itemType, @Path("key") String itemKey);
+
+    @POST("user/feed/{pet}/{food}")
+    Observable<HabitResponse<FeedResponse>> feedPet(@Path("pet") String petKey, @Path("food") String foodKey);
+
+    @POST("user/hatch/{egg}/{hatchingPotion}")
+    Observable<HabitResponse<Items>> hatchPet(@Path("egg") String eggKey, @Path("hatchingPotion") String hatchingPotionKey);
+
+
+    @GET("tasks/user")
+    Observable<HabitResponse<TaskList>> getTasks();
+
+    @POST("user/unlock")
+    Observable<HabitResponse<UnlockResponse>> unlockPath(@Query("path") String path);
+
+    @GET("tasks/{id}")
+    Observable<HabitResponse<Task>> getTask(@Path("id") String id);
+
+    @POST("tasks/{id}/score/{direction}")
+    Observable<HabitResponse<TaskDirectionData>> postTaskDirection(@Path("id") String id, @Path("direction") String direction);
+
+    @POST("tasks/{id}/move/to/{position}")
+    Observable<HabitResponse<List<String>>> postTaskNewPosition(@Path("id") String id, @Path("position") String position);
+
+    @POST("tasks/{taskId}/checklist/{itemId}/score")
+    Observable<HabitResponse<Task>> scoreChecklistItem(@Path("taskId") String taskId, @Path("itemId") String itemId);
+
+    @POST("tasks/user")
+    Observable<HabitResponse<Task>> createItem(@Body Task item);
+
+    @POST("tasks/user")
+    Observable<HabitResponse<List<Task>>> createTasks(@Body List<Task> tasks);
+
+    @PUT("tasks/{id}")
+    Observable<HabitResponse<Task>> updateTask(@Path("id") String id, @Body Task item);
+
+    @DELETE("tasks/{id}")
+    Observable<HabitResponse<Void>> deleteTask(@Path("id") String id);
+
+
+    @POST("tags")
+    Observable<HabitResponse<Tag>> createTag(@Body Tag tag);
+
+    @PUT("tags/{id}")
+    Observable<HabitResponse<Tag>> updateTag(@Path("id") String id, @Body Tag tag);
+
+    @DELETE("tags/{id}")
+    Observable<HabitResponse<Void>> deleteTag(@Path("id") String id);
+
+    @POST("user/auth/local/register")
+    Observable<HabitResponse<UserAuthResponse>> registerUser(@Body UserAuth auth);
+
+    @POST("user/auth/local/login")
+    Observable<HabitResponse<UserAuthResponse>> connectLocal(@Body UserAuth auth);
+
+    @POST("user/auth/social")
+    Observable<HabitResponse<UserAuthResponse>> connectSocial(@Body UserAuthSocial auth);
+
+
+    @POST("user/sleep")
+    Observable<HabitResponse<Boolean>> sleep();
+
+    @POST("user/revive")
+    Observable<HabitResponse<HabitRPGUser>> revive();
+
+    @POST("user/class/cast/{skill}")
+    Observable<HabitResponse<SkillResponse>> useSkill(@Path("skill") String skillName, @Query("targetType") String targetType, @Query("targetId") String targetId);
+
+    @POST("user/class/cast/{skill}")
+    Observable<HabitResponse<SkillResponse>> useSkill(@Path("skill") String skillName, @Query("targetType") String targetType);
+
+    @POST("user/change-class")
+    Observable<HabitResponse<HabitRPGUser>> changeClass();
+
+    @POST("user/change-class")
+    Observable<HabitResponse<HabitRPGUser>> changeClass(@Query("class") String className);
+
+    @POST("user/disable-classes")
+    Observable<HabitResponse<HabitRPGUser>> disableClasses();
+
+    @POST("user/mark-pms-read")
+    Observable<HabitResponse<Void>> markPrivateMessagesRead();
+
+
+
+    /* Group API */
+
+    @GET("groups")
+    Observable<HabitResponse<List<Group>>> listGroups(@Query("type") String type);
+
+    @GET("groups/{gid}")
+    Observable<HabitResponse<Group>> getGroup(@Path("gid") String groupId);
+
+    @PUT("groups/{id}")
+    Observable<HabitResponse<Void>> updateGroup(@Path("id") String id, @Body Group item);
+
+    @GET("groups/{gid}/chat")
+    Observable<HabitResponse<List<ChatMessage>>> listGroupChat(@Path("gid") String groupId);
+
+    @POST("groups/{gid}/join")
+    Observable<HabitResponse<Group>> joinGroup(@Path("gid") String groupId);
+
+    @POST("groups/{gid}/leave")
+    Observable<HabitResponse<Void>> leaveGroup(@Path("gid") String groupId);
+
+    @POST("groups/{gid}/chat")
+    Observable<HabitResponse<PostChatMessageResult>> postGroupChat(@Path("gid") String groupId, @Body Map<String, String> message);
+
+    @DELETE("groups/{gid}/chat/{messageId}")
+    Observable<HabitResponse<Void>> deleteMessage(@Path("gid") String groupId, @Path("messageId") String messageId);
+
+    @GET("groups/{gid}/members")
+    Observable<HabitResponse<List<HabitRPGUser>>> getGroupMembers(@Path("gid") String groupId, @Query("includeAllPublicFields") Boolean includeAllPublicFields);
+
+    @GET("groups/{gid}/members")
+    Observable<HabitResponse<List<HabitRPGUser>>> getGroupMembers(@Path("gid") String groupId, @Query("includeAllPublicFields") Boolean includeAllPublicFields, @Query("lastId") String lastId);
+
+    // Like returns the full chat list
+    @POST("groups/{gid}/chat/{mid}/like")
+    Observable<HabitResponse<ChatMessage>> likeMessage(@Path("gid") String groupId, @Path("mid") String mid);
+
+    @POST("groups/{gid}/chat/{mid}/flag")
+    Observable<HabitResponse<Void>> flagMessage(@Path("gid") String groupId, @Path("mid") String mid);
+
+    @POST("groups/{gid}/chat/seen")
+    Observable<HabitResponse<Void>> seenMessages(@Path("gid") String groupId);
+
+    @POST("groups/{gid}/invite")
+    Observable<HabitResponse<Void>> inviteToGroup(@Path("gid") String groupId, @Body Map<String, Object> inviteData);
+
+    @POST("groups/{gid}/reject-invite")
+    Observable<HabitResponse<Void>> rejectGroupInvite(@Path("gid") String groupId);
+
+    @POST("groups/{gid}/quests/accept")
+    Observable<HabitResponse<Void>> acceptQuest(@Path("gid") String groupId);
+
+    @POST("groups/{gid}/quests/reject")
+    Observable<HabitResponse<Void>> rejectQuest(@Path("gid") String groupId);
+
+    @POST("groups/{gid}/quests/cancel")
+    Observable<HabitResponse<Void>> cancelQuest(@Path("gid") String groupId);
+
+    @POST("groups/{gid}/quests/force-start")
+    Observable<HabitResponse<Quest>> forceStartQuest(@Path("gid") String groupId, @Body Group group);
+
+    @POST("groups/{gid}/quests/invite/{questKey}")
+    Observable<HabitResponse<Quest>> inviteToQuest(@Path("gid") String groupId, @Path("questKey") String questKey);
+
+    @POST("groups/{gid}/quests/abort")
+    Observable<HabitResponse<Quest>> abortQuest(@Path("gid") String groupId);
+
+    @POST("groups/{gid}/quests/leave")
+    Observable<HabitResponse<Void>> leaveQuest(@Path("gid") String groupId);
+
+    @POST("/iap/android/verify")
+    Observable<HabitResponse<PurchaseValidationResult>> validatePurchase(@Body PurchaseValidationRequest request);
+
+    @POST("/iap/android/subscribe")
+    Observable<HabitResponse<Void>> validateSubscription(@Body SubscriptionValidationRequest request);
+
+    @POST("user/custom-day-start")
+    Observable<HabitResponse<HabitRPGUser>> changeCustomDayStart(@Body Map<String, Object> updateObject);
+
+    //Members URL
+    @GET("members/{mid}")
+    Observable<HabitResponse<HabitRPGUser>> getMember(@Path("mid") String memberId);
+
+    @GET("members/{mid}/achievements")
+    Observable<HabitResponse<AchievementResult>> getMemberAchievements(@Path("mid") String memberId);
+
+    @POST("members/send-private-message")
+    Observable<HabitResponse<PostChatMessageResult>> postPrivateMessage(@Body Map<String, String> messageDetails);
+
+    @GET("shops/{identifier}")
+    Observable<HabitResponse<Shop>> fetchShopInventory(@Path("identifier") String identifier);
+
+    //Push notifications
+    @POST("user/push-devices")
+    Observable<HabitResponse<Void>> addPushDevice(@Body Map<String, String> pushDeviceData);
+
+    @DELETE("user/push-devices/{regId}")
+    Observable<HabitResponse<Void>> deletePushDevice(@Path("regId") String regId);
+
+    /* challenges api */
+
+    @GET("challenges/user")
+    Observable<HabitResponse<List<Challenge>>> getUserChallenges();
+
+    @GET("tasks/challenge/{challengeId}")
+    Observable<HabitResponse<TaskList>> getChallengeTasks(@Path("challengeId") String challengeId);
+
+    @GET("challenges/{challengeId}")
+    Observable<HabitResponse<Challenge>> getChallenge(@Path("challengeId") String challengeId);
+
+    @POST("challenges/{challengeId}/join")
+    Observable<HabitResponse<Challenge>> joinChallenge(@Path("challengeId") String challengeId);
+
+    @POST("challenges/{challengeId}/leave")
+    Observable<HabitResponse<Void>> leaveChallenge(@Path("challengeId") String challengeId, @Body LeaveChallengeBody body);
+
+    //DEBUG: These calls only work on a local development server
+
+    @POST("debug/add-ten-gems")
+    Observable<HabitResponse<Void>> debugAddTenGems();
+
+    // Notifications
+    @POST("notifications/{notificationId}/read")
+    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/habitrpg/android/habitica/api/MaintenanceApiService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
index 439ab6e61..03b5c5df0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/MaintenanceApiService.java
@@ -1,17 +1,17 @@
-package com.habitrpg.android.habitica.api;
-
-import com.habitrpg.android.habitica.models.responses.HabitResponse;
-import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
-
-import retrofit2.http.GET;
-import rx.Observable;
-
-public interface MaintenanceApiService {
-
-    @GET("maintenance-android.json")
-    Observable<HabitResponse<MaintenanceResponse>> getMaintenanceStatus();
-
-    @GET("deprecation-android.json")
-    Observable<HabitResponse<MaintenanceResponse>> getDepricationStatus();
-
-}
+package com.habitrpg.android.habitica.api;
+
+import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
+
+import retrofit2.http.GET;
+import rx.Observable;
+
+public interface MaintenanceApiService {
+
+    @GET("maintenance-android.json")
+    Observable<HabitResponse<MaintenanceResponse>> getMaintenanceStatus();
+
+    @GET("deprecation-android.json")
+    Observable<HabitResponse<MaintenanceResponse>> getDepricationStatus();
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.java
index 7b31e5c86..39c84aa5e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/Server.java
@@ -1,35 +1,35 @@
-package com.habitrpg.android.habitica.api;
-
-/**
- * Created by MagicMicky on 15/06/2014.
- */
-public class Server {
-    private String addr;
-
-    public Server(String addr) {
-        this(addr, true);
-    }
-
-    private Server(String addr, boolean attachSuffix) {
-        if (attachSuffix) {
-            if (addr.endsWith("/api/v3") || addr.endsWith("/api/v3/")) {
-                this.addr = addr;
-            } else if (addr.endsWith("/")) {
-                this.addr = addr + "api/v3/";
-            } else {
-                this.addr = addr + "/api/v3/";
-            }
-        } else {
-            this.addr = addr;
-        }
-    }
-
-    public Server(Server server) {
-        this.addr = server.toString();
-    }
-
-    @Override
-    public String toString() {
-        return this.addr;
-    }
-}
+package com.habitrpg.android.habitica.api;
+
+/**
+ * Created by MagicMicky on 15/06/2014.
+ */
+public class Server {
+    private String addr;
+
+    public Server(String addr) {
+        this(addr, true);
+    }
+
+    private Server(String addr, boolean attachSuffix) {
+        if (attachSuffix) {
+            if (addr.endsWith("/api/v3") || addr.endsWith("/api/v3/")) {
+                this.addr = addr;
+            } else if (addr.endsWith("/")) {
+                this.addr = addr + "api/v3/";
+            } else {
+                this.addr = addr + "/api/v3/";
+            }
+        } else {
+            this.addr = addr;
+        }
+    }
+
+    public Server(Server server) {
+        this.addr = server.toString();
+    }
+
+    @Override
+    public String toString() {
+        return this.addr;
+    }
+}
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 a8f9487e3..f176b30ef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
@@ -1,34 +1,34 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import android.support.annotation.Nullable;
-
-import rx.functions.Action1;
-
-/**
- * r
- * Created by magicmicky on 18/02/15.
- */
-public class HabitRPGUserCallback implements Action1<HabitRPGUser> {
-
-    @Nullable
-    public final OnUserReceived callBack;
-
-    public HabitRPGUserCallback(@Nullable OnUserReceived callback) {
-        this.callBack = callback;
-    }
-
-    @Override
-    public void call(HabitRPGUser user) {
-        // Negue: once everything is refactored to DbFlowTaskLocalRepository, this will be removed
-        user.async().save();
-        if (callBack != null) {
-            callBack.onUserReceived(user);
-        }
-    }
-
-    public interface OnUserReceived {
-        void onUserReceived(HabitRPGUser user);
-    }
-}
+package com.habitrpg.android.habitica.callbacks;
+
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import rx.functions.Action1;
+
+/**
+ * r
+ * Created by magicmicky on 18/02/15.
+ */
+public class HabitRPGUserCallback implements Action1<HabitRPGUser> {
+
+    @Nullable
+    public final OnUserReceived callBack;
+
+    public HabitRPGUserCallback(@Nullable OnUserReceived callback) {
+        this.callBack = callback;
+    }
+
+    @Override
+    public void call(HabitRPGUser user) {
+        // Negue: once everything is refactored to DbFlowTaskLocalRepository, this will be removed
+        user.async().save();
+        if (callBack != null) {
+            callBack.onUserReceived(user);
+        }
+    }
+
+    public interface OnUserReceived {
+        void onUserReceived(HabitRPGUser user);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
index d4ab056ff..ac42796dd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
@@ -1,25 +1,25 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Items;
-
-import rx.functions.Action1;
-
-public class ItemsCallback implements Action1<Items> {
-
-    private final HabitRPGUserCallback.OnUserReceived mCallback;
-
-    private HabitRPGUser user;
-
-    public ItemsCallback(HabitRPGUserCallback.OnUserReceived callback, HabitRPGUser user) {
-        this.mCallback = callback;
-        this.user = user;
-    }
-
-    @Override
-    public void call(Items items) {
-        this.user.setItems(items);
-        this.user.async().save();
-        mCallback.onUserReceived(this.user);
-    }
-}
+package com.habitrpg.android.habitica.callbacks;
+
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+
+import rx.functions.Action1;
+
+public class ItemsCallback implements Action1<Items> {
+
+    private final HabitRPGUserCallback.OnUserReceived mCallback;
+
+    private HabitRPGUser user;
+
+    public ItemsCallback(HabitRPGUserCallback.OnUserReceived callback, HabitRPGUser user) {
+        this.mCallback = callback;
+        this.user = user;
+    }
+
+    @Override
+    public void call(Items items) {
+        this.user.setItems(items);
+        this.user.async().save();
+        mCallback.onUserReceived(this.user);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
index 675ef4e10..82b296828 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
@@ -1,24 +1,24 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import android.support.annotation.Nullable;
-
-
-public class MergeUserCallback extends HabitRPGUserCallback {
-
-    private HabitRPGUser user;
-
-    public MergeUserCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, HabitRPGUser user) {
-        super(callback);
-        this.user = user;
-    }
-
-    @Override
-    public void call(HabitRPGUser user) {
-
-        if (callBack != null) {
-            callBack.onUserReceived(this.user);
-        }
-    }
-}
+package com.habitrpg.android.habitica.callbacks;
+
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+
+public class MergeUserCallback extends HabitRPGUserCallback {
+
+    private HabitRPGUser user;
+
+    public MergeUserCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, HabitRPGUser user) {
+        super(callback);
+        this.user = user;
+    }
+
+    @Override
+    public void call(HabitRPGUser user) {
+
+        if (callBack != null) {
+            callBack.onUserReceived(this.user);
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
index 7c40655a1..9b9e36b18 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
@@ -1,43 +1,43 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import android.support.annotation.Nullable;
-
-import com.habitrpg.android.habitica.events.SkillUsedEvent;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.user.Stats;
-import com.habitrpg.android.habitica.models.responses.SkillResponse;
-
-import org.greenrobot.eventbus.EventBus;
-
-import rx.functions.Action1;
-
-/**
- * Created by viirus on 28/11/15.
- */
-public class SkillCallback implements Action1<SkillResponse> {
-
-    private Skill usedSkill;
-    private HabitRPGUser user;
-    @Nullable
-    private HabitRPGUserCallback.OnUserReceived callBack;
-
-    public SkillCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, @Nullable HabitRPGUser user, Skill usedSkill) {
-        this.usedSkill = usedSkill;
-        this.user = user;
-        this.callBack = callback;
-    }
-
-    @Override
-    public void call(SkillResponse skillResponse) {
-        Double xp = this.user.getStats().getExp();
-        Double hp = this.user.getStats().getHp();
-        Double gold = this.user.getStats().getGp();
-
-        if (callBack != null) {
-            callBack.onUserReceived(this.user);
-        }
-        Stats stats = skillResponse.user.getStats();
-        EventBus.getDefault().post(new SkillUsedEvent(this.usedSkill, stats.getMp(), stats.getExp() - xp, stats.getHp() - hp, stats.getGp() - gold));
-    }
-}
+package com.habitrpg.android.habitica.callbacks;
+
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.events.SkillUsedEvent;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Stats;
+
+import org.greenrobot.eventbus.EventBus;
+
+import rx.functions.Action1;
+
+/**
+ * Created by viirus on 28/11/15.
+ */
+public class SkillCallback implements Action1<SkillResponse> {
+
+    private Skill usedSkill;
+    private HabitRPGUser user;
+    @Nullable
+    private HabitRPGUserCallback.OnUserReceived callBack;
+
+    public SkillCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, @Nullable HabitRPGUser user, Skill usedSkill) {
+        this.usedSkill = usedSkill;
+        this.user = user;
+        this.callBack = callback;
+    }
+
+    @Override
+    public void call(SkillResponse skillResponse) {
+        Double xp = this.user.getStats().getExp();
+        Double hp = this.user.getStats().getHp();
+        Double gold = this.user.getStats().getGp();
+
+        if (callBack != null) {
+            callBack.onUserReceived(this.user);
+        }
+        Stats stats = skillResponse.user.getStats();
+        EventBus.getDefault().post(new SkillUsedEvent(this.usedSkill, stats.getMp(), stats.getExp() - xp, stats.getHp() - hp, stats.getGp() - gold));
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
index 849fb0aa6..c052a6204 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
@@ -1,105 +1,51 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.models.inventory.Egg;
-import com.habitrpg.android.habitica.models.inventory.Food;
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.Item;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.From;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.util.Locale;
-
-import rx.functions.Action1;
-
-/**
- * Created by magicmicky on 18/02/15.
- */
-public class TaskScoringCallback implements Action1<TaskDirectionData> {
-    private final OnTaskScored mCallback;
-    private final String taskId;
-
-    public TaskScoringCallback(OnTaskScored callback, String taskId) {
-        this.mCallback = callback;
-        this.taskId = taskId;
-    }
-
-    @Override
-    public void call(TaskDirectionData taskDirectionData) {
-        new Select().from(Task.class).where(Condition.column("id").eq(taskId))
-                .async()
-                .querySingle(new TransactionListener<Task>() {
-                    @Override
-                    public void onResultReceived(Task task) {
-                        if (task != null && task.type != null && !task.type.equals("reward")) {
-                            task.value = task.value + taskDirectionData.getDelta();
-
-                            task.save();
-                        }
-
-                        mCallback.onTaskDataReceived(taskDirectionData, task);
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<Task> baseTransaction) {
-                        return true;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<Task> baseTransaction, Task task) {
-                        return task != null;
-                    }
-                });
-        if (taskDirectionData.get_tmp() != null) {
-            if (taskDirectionData.get_tmp().getDrop() != null) {
-                String type = taskDirectionData.get_tmp().getDrop().getType();
-                From from = null;
-
-                switch (type.toLowerCase(Locale.US)) {
-                    case "hatchingpotion":
-                        from = new Select().from(HatchingPotion.class);
-                        break;
-                    case "food":
-                        from = new Select().from(Food.class);
-                        break;
-                    case "egg":
-                        from = new Select().from(Egg.class);
-                        break;
-                }
-
-                if (from != null) {
-                    from.where(Condition.column("key").eq(taskDirectionData.get_tmp().getDrop().getKey()))
-                            .async()
-                            .querySingle(new TransactionListener() {
-                                @Override
-                                public void onResultReceived(Object result) {
-                                    if (result != null) {
-                                        Item item = (Item) result;
-                                        item.setOwned(item.getOwned() + 1);
-                                        item.save();
-                                    }
-                                }
-
-                                @Override
-                                public boolean onReady(BaseTransaction transaction) {
-                                    return true;
-                                }
-
-                                @Override
-                                public boolean hasResult(BaseTransaction transaction, Object result) {
-                                    return true;
-                                }
-                            });
-                }
-            }
-        }
-    }
-
-    public interface OnTaskScored {
-        void onTaskDataReceived(TaskDirectionData data, Task task);
-    }
-}
+package com.habitrpg.android.habitica.callbacks;
+
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+import java.util.Locale;
+
+import rx.functions.Action1;
+
+/**
+ * Created by magicmicky on 18/02/15.
+ */
+public class TaskScoringCallback implements Action1<TaskDirectionData> {
+    private final OnTaskScored mCallback;
+    private final String taskId;
+    private final TaskRepository taskRepository;
+    private final InventoryRepository inventoryRepository;
+
+    public TaskScoringCallback(TaskRepository taskRepository, InventoryRepository inventoryRepository, OnTaskScored callback, String taskId) {
+        this.mCallback = callback;
+        this.taskId = taskId;
+        this.taskRepository = taskRepository;
+        this.inventoryRepository = inventoryRepository;
+    }
+
+    @Override
+    public void call(TaskDirectionData taskDirectionData) {
+        taskRepository.getTask(taskId).subscribe(task -> {
+            if (task != null && task.type != null && !task.type.equals("reward")) {
+                task.value = task.value + taskDirectionData.getDelta();
+
+                taskRepository.saveTask(task);
+            }
+
+            mCallback.onTaskDataReceived(taskDirectionData, task);
+        });
+        if (taskDirectionData.get_tmp() != null) {
+            if (taskDirectionData.get_tmp().getDrop() != null) {
+                String type = taskDirectionData.get_tmp().getDrop().getType();
+                String key = taskDirectionData.get_tmp().getDrop().getKey();
+                inventoryRepository.changeOwnedCount(type.toLowerCase(Locale.US), key, 1);
+            }
+        }
+    }
+
+    public interface OnTaskScored {
+        void onTaskDataReceived(TaskDirectionData data, Task task);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
index e2f1d799c..67dfcd0c8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
@@ -1,21 +1,21 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import org.greenrobot.eventbus.EventBus;
-
-import rx.functions.Action1;
-
-/**
- * Created by magicmicky on 02/04/15.
- */
-public class TaskUpdateCallback implements Action1<Task> {
-
-    @Override
-    public void call(Task task) {
-        task.save();
-
-        EventBus.getDefault().post(new TaskUpdatedEvent(task));
-    }
-}
+package com.habitrpg.android.habitica.callbacks;
+
+import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+import org.greenrobot.eventbus.EventBus;
+
+import rx.functions.Action1;
+
+/**
+ * Created by magicmicky on 02/04/15.
+ */
+public class TaskUpdateCallback implements Action1<Task> {
+
+    @Override
+    public void call(Task task) {
+        task.save();
+
+        EventBus.getDefault().post(new TaskUpdatedEvent(task));
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
index e1b811266..1e5be9548 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
@@ -1,31 +1,31 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.responses.UnlockResponse;
-
-import rx.functions.Action1;
-
-/**
- * Created by magicmicky on 18/02/15.
- */
-public class UnlockCallback implements Action1<UnlockResponse> {
-
-    private final HabitRPGUserCallback.OnUserReceived callback;
-
-    private HabitRPGUser user;
-
-    public UnlockCallback(HabitRPGUserCallback.OnUserReceived callback, HabitRPGUser user) {
-        this.callback = callback;
-        this.user = user;
-    }
-
-    @Override
-    public void call(UnlockResponse unlockResponse) {
-        this.user.setPurchased(unlockResponse.purchased);
-        this.user.setItems(unlockResponse.items);
-        this.user.setPreferences(unlockResponse.preferences);
-        this.user.async().save();
-
-        callback.onUserReceived(this.user);
-    }
-}
+package com.habitrpg.android.habitica.callbacks;
+
+import com.habitrpg.android.habitica.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import rx.functions.Action1;
+
+/**
+ * Created by magicmicky on 18/02/15.
+ */
+public class UnlockCallback implements Action1<UnlockResponse> {
+
+    private final HabitRPGUserCallback.OnUserReceived callback;
+
+    private HabitRPGUser user;
+
+    public UnlockCallback(HabitRPGUserCallback.OnUserReceived callback, HabitRPGUser user) {
+        this.callback = callback;
+        this.user = user;
+    }
+
+    @Override
+    public void call(UnlockResponse unlockResponse) {
+        this.user.setPurchased(unlockResponse.purchased);
+        this.user.setItems(unlockResponse.items);
+        this.user.setPreferences(unlockResponse.preferences);
+        this.user.async().save();
+
+        callback.onUserReceived(this.user);
+    }
+}
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 4ba15e3e3..444986499 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,257 +1,260 @@
-package com.habitrpg.android.habitica.components;
-
-import com.habitrpg.android.habitica.helpers.notifications.HabiticaFirebaseInstanceIDService;
-import com.habitrpg.android.habitica.helpers.notifications.HabiticaFirebaseMessagingService;
-import com.habitrpg.android.habitica.receivers.TaskAlarmBootReceiver;
-import com.habitrpg.android.habitica.receivers.TaskReceiver;
-import com.habitrpg.android.habitica.ui.fragments.preferences.AccountDetailsFragment;
-import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.helpers.RemindersManager;
-import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
-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;
-import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
-import com.habitrpg.android.habitica.ui.activities.FullProfileActivity;
-import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
-import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
-import com.habitrpg.android.habitica.ui.activities.HabitButtonWidgetActivity;
-import com.habitrpg.android.habitica.ui.activities.IntroActivity;
-import com.habitrpg.android.habitica.ui.activities.LoginActivity;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.ui.activities.MaintenanceActivity;
-import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity;
-import com.habitrpg.android.habitica.ui.activities.PrefsActivity;
-import com.habitrpg.android.habitica.ui.activities.SetupActivity;
-import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
-import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
-import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
-import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder;
-import com.habitrpg.android.habitica.ui.adapter.tasks.HabitsRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment;
-import com.habitrpg.android.habitica.ui.fragments.NewsFragment;
-import com.habitrpg.android.habitica.ui.fragments.SubscriptionFragment;
-import com.habitrpg.android.habitica.ui.fragments.faq.FAQDetailFragment;
-import com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemsFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.stable.MountDetailRecyclerFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.stable.PetDetailRecyclerFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableRecyclerFragment;
-import com.habitrpg.android.habitica.ui.fragments.preferences.PreferencesFragment;
-import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
-import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
-import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
-import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment;
-import com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.GroupInformationFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.GuildsOverviewFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.InboxFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.InboxMessageListFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.PublicGuildsFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.TavernFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeListFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeTasksRecyclerViewFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.party.PartyMemberListFragment;
-import com.habitrpg.android.habitica.ui.fragments.tasks.TaskRecyclerViewFragment;
-import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment;
-import com.habitrpg.android.habitica.widget.AvatarStatsWidgetProvider;
-import com.habitrpg.android.habitica.widget.BaseWidgetProvider;
-import com.habitrpg.android.habitica.widget.DailiesWidgetProvider;
-import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider;
-import com.habitrpg.android.habitica.widget.HabitButtonWidgetService;
-import com.habitrpg.android.habitica.widget.TaskListFactory;
-import com.habitrpg.android.habitica.widget.TaskListWidgetProvider;
-
-import javax.inject.Singleton;
-
-import dagger.Component;
-
-@Singleton
-@Component(modules = {DeveloperModule.class, AppModule.class, ApiModule.class, RepositoryModule.class})
-public interface AppComponent {
-
-    void inject(ClassSelectionActivity classSelectionActivity);
-
-    void inject(AboutActivity aboutActivity);
-
-    void inject(GroupFormActivity groupFormActivity);
-
-    void inject(IntroActivity introActivity);
-
-    void inject(LoginActivity loginActivity);
-
-    void inject(MainActivity mainActivity);
-
-    void inject(MaintenanceActivity maintenanceActivity);
-
-    void inject(PartyInviteActivity partyInviteActivity);
-
-    void inject(PrefsActivity prefsActivity);
-
-    void inject(SetupActivity setupActivity);
-
-    void inject(SkillTasksActivity skillTasksActivity);
-
-    void inject(SkillMemberActivity skillMembersActivity);
-
-    void inject(TaskFormActivity taskFormActivity);
-
-    void inject(TasksFragment tasksFragment);
-
-    void inject(FAQDetailFragment faqDetailFragment);
-
-    void inject(FAQOverviewFragment faqOverviewFragment);
-
-    void inject(AvatarCustomizationFragment avatarCustomizationFragment);
-
-    void inject(AvatarOverviewFragment avatarOverviewFragment);
-
-    void inject(EquipmentDetailFragment equipmentDetailFragment);
-
-    void inject(EquipmentOverviewFragment equipmentOverviewFragment);
-
-    void inject(ItemRecyclerFragment itemRecyclerFragment);
-
-    void inject(ItemsFragment itemsFragment);
-
-    void inject(MountDetailRecyclerFragment mountDetailRecyclerFragment);
-
-    void inject(PetDetailRecyclerFragment petDetailRecyclerFragment);
-
-    void inject(StableFragment stableFragment);
-
-    void inject(StableRecyclerFragment stableRecyclerFragment);
-
-    void inject(AvatarSetupFragment avatarSetupFragment);
-
-    void inject(IntroFragment introFragment);
-
-    void inject(TaskSetupFragment taskSetupFragment);
-
-    void inject(SkillsFragment skillsFragment);
-
-    void inject(SkillTasksRecyclerViewFragment skillTasksRecyclerViewFragment);
-
-    void inject(PartyFragment partyFragment);
-
-    void inject(PartyInviteFragment partyInviteFragment);
-
-    void inject(PartyMemberListFragment partyMemberListFragment);
-
-    void inject(ChatListFragment chatListFragment);
-
-    void inject(GroupInformationFragment groupInformationFragment);
-
-    void inject(GuildFragment guildFragment);
-
-    void inject(GuildsOverviewFragment guildsOverviewFragment);
-
-    void inject(PublicGuildsFragment publicGuildsFragment);
-
-    void inject(TavernFragment tavernFragment);
-
-    void inject(TaskRecyclerViewFragment taskRecyclerViewFragment);
-
-    void inject(GemsPurchaseFragment gemsPurchaseFragment);
-
-    void inject(NewsFragment newsFragment);
-
-    void inject(HabiticaBaseApplication habiticaApplication);
-
-    void inject(PreferencesFragment preferencesFragment);
-
-    void inject(InboxFragment inboxFragment);
-
-    void inject(InboxMessageListFragment inboxMessageListFragment);
-
-    void inject(ShopsFragment shopsFragment);
-
-    void inject(ShopFragment shopFragment);
-
-    void inject(PushNotificationManager pushNotificationManager);
-
-    void inject(LocalNotificationActionReceiver localNotificationActionReceiver);
-
-    void inject(FullProfileActivity fullProfileActivity);
-
-    void inject(DailiesWidgetProvider dailiesWidgetProvider);
-
-    void inject(HabitButtonWidgetService habitButtonWidgetService);
-
-    void inject(HabitButtonWidgetActivity habitButtonWidgetActivity);
-
-    void inject(HabitButtonWidgetProvider habitButtonWidgetProvider);
-
-    void inject(AvatarStatsWidgetProvider avatarStatsWidgetProvider);
-
-    void inject(SoundManager soundManager);
-
-    void inject(ChallengesOverviewFragment challengesOverviewFragment);
-
-    void inject(ChallengeListFragment challengeListFragment);
-
-    void inject(ChallengeDetailActivity challengeDetailActivity);
-
-    void inject(ApiClient apiClient);
-
-    void inject(TaskListWidgetProvider taskListWidgetProvider);
-
-    void inject(RemindersManager remindersManager);
-
-    void inject(TaskAlarmManager taskAlarmManager);
-
-    void inject(DailiesRecyclerViewHolder dailiesRecyclerViewHolder);
-
-    void inject(HabitsRecyclerViewAdapter habitsRecyclerViewAdapter);
-
-    void inject(RewardsRecyclerViewAdapter rewardsRecyclerViewAdapter);
-
-    void inject(TodosRecyclerViewAdapter todosRecyclerViewAdapter);
-
-    void inject(SubscriptionFragment subscriptionFragment);
-
-    void inject(ChallengeTasksRecyclerViewFragment.ChallengeTasksRecyclerViewAdapter challengeTasksRecyclerViewAdapter);
-
-    void inject(ChallengeTasksRecyclerViewFragment challengeTasksRecyclerViewFragment);
-
-    void inject(TaskListFactory taskListFactory);
-
-    void inject(GemPurchaseActivity gemPurchaseActivity);
-
-    void inject(TaskFilterDialog taskFilterDialog);
-
-    void inject(TaskReceiver taskReceiver);
-
-    void inject(TaskAlarmBootReceiver taskAlarmBootReceiver);
-
-    void inject(HabiticaFirebaseInstanceIDService habiticaFirebaseInstanceIDService);
-
-    void inject(HabiticaFirebaseMessagingService habiticaFirebaseMessagingService);
-
-    void inject(AccountDetailsFragment accountDetailsFragment);
-
-    void inject(BaseWidgetProvider baseWidgetProvider);
-}
+package com.habitrpg.android.habitica.components;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.NotificationPublisher;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.helpers.RemindersManager;
+import com.habitrpg.android.habitica.helpers.SoundManager;
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
+import com.habitrpg.android.habitica.helpers.notifications.HabiticaFirebaseInstanceIDService;
+import com.habitrpg.android.habitica.helpers.notifications.HabiticaFirebaseMessagingService;
+import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
+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.receivers.TaskAlarmBootReceiver;
+import com.habitrpg.android.habitica.receivers.TaskReceiver;
+import com.habitrpg.android.habitica.ui.activities.AboutActivity;
+import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
+import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
+import com.habitrpg.android.habitica.ui.activities.FullProfileActivity;
+import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
+import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
+import com.habitrpg.android.habitica.ui.activities.HabitButtonWidgetActivity;
+import com.habitrpg.android.habitica.ui.activities.IntroActivity;
+import com.habitrpg.android.habitica.ui.activities.LoginActivity;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.habitrpg.android.habitica.ui.activities.MaintenanceActivity;
+import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity;
+import com.habitrpg.android.habitica.ui.activities.PrefsActivity;
+import com.habitrpg.android.habitica.ui.activities.SetupActivity;
+import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
+import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
+import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
+import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder;
+import com.habitrpg.android.habitica.ui.adapter.tasks.HabitsRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment;
+import com.habitrpg.android.habitica.ui.fragments.NewsFragment;
+import com.habitrpg.android.habitica.ui.fragments.SubscriptionFragment;
+import com.habitrpg.android.habitica.ui.fragments.faq.FAQDetailFragment;
+import com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarCustomizationFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentDetailFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemsFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.stable.MountDetailRecyclerFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.stable.PetDetailRecyclerFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableRecyclerFragment;
+import com.habitrpg.android.habitica.ui.fragments.preferences.AccountDetailsFragment;
+import com.habitrpg.android.habitica.ui.fragments.preferences.PreferencesFragment;
+import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
+import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
+import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
+import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment;
+import com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.GroupInformationFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.GuildsOverviewFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.InboxFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.InboxMessageListFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.PublicGuildsFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.TavernFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeListFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeTasksRecyclerViewFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.party.PartyMemberListFragment;
+import com.habitrpg.android.habitica.ui.fragments.tasks.TaskRecyclerViewFragment;
+import com.habitrpg.android.habitica.ui.fragments.tasks.TasksFragment;
+import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog;
+import com.habitrpg.android.habitica.widget.AvatarStatsWidgetProvider;
+import com.habitrpg.android.habitica.widget.BaseWidgetProvider;
+import com.habitrpg.android.habitica.widget.DailiesWidgetProvider;
+import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider;
+import com.habitrpg.android.habitica.widget.HabitButtonWidgetService;
+import com.habitrpg.android.habitica.widget.TaskListFactory;
+import com.habitrpg.android.habitica.widget.TaskListWidgetProvider;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+@Singleton
+@Component(modules = {DeveloperModule.class, AppModule.class, ApiModule.class, RepositoryModule.class})
+public interface AppComponent {
+
+    void inject(ClassSelectionActivity classSelectionActivity);
+
+    void inject(AboutActivity aboutActivity);
+
+    void inject(GroupFormActivity groupFormActivity);
+
+    void inject(IntroActivity introActivity);
+
+    void inject(LoginActivity loginActivity);
+
+    void inject(MainActivity mainActivity);
+
+    void inject(MaintenanceActivity maintenanceActivity);
+
+    void inject(PartyInviteActivity partyInviteActivity);
+
+    void inject(PrefsActivity prefsActivity);
+
+    void inject(SetupActivity setupActivity);
+
+    void inject(SkillTasksActivity skillTasksActivity);
+
+    void inject(SkillMemberActivity skillMembersActivity);
+
+    void inject(TaskFormActivity taskFormActivity);
+
+    void inject(TasksFragment tasksFragment);
+
+    void inject(FAQDetailFragment faqDetailFragment);
+
+    void inject(FAQOverviewFragment faqOverviewFragment);
+
+    void inject(AvatarCustomizationFragment avatarCustomizationFragment);
+
+    void inject(AvatarOverviewFragment avatarOverviewFragment);
+
+    void inject(EquipmentDetailFragment equipmentDetailFragment);
+
+    void inject(EquipmentOverviewFragment equipmentOverviewFragment);
+
+    void inject(ItemRecyclerFragment itemRecyclerFragment);
+
+    void inject(ItemsFragment itemsFragment);
+
+    void inject(MountDetailRecyclerFragment mountDetailRecyclerFragment);
+
+    void inject(PetDetailRecyclerFragment petDetailRecyclerFragment);
+
+    void inject(StableFragment stableFragment);
+
+    void inject(StableRecyclerFragment stableRecyclerFragment);
+
+    void inject(AvatarSetupFragment avatarSetupFragment);
+
+    void inject(IntroFragment introFragment);
+
+    void inject(TaskSetupFragment taskSetupFragment);
+
+    void inject(SkillsFragment skillsFragment);
+
+    void inject(SkillTasksRecyclerViewFragment skillTasksRecyclerViewFragment);
+
+    void inject(PartyFragment partyFragment);
+
+    void inject(PartyInviteFragment partyInviteFragment);
+
+    void inject(PartyMemberListFragment partyMemberListFragment);
+
+    void inject(ChatListFragment chatListFragment);
+
+    void inject(GroupInformationFragment groupInformationFragment);
+
+    void inject(GuildFragment guildFragment);
+
+    void inject(GuildsOverviewFragment guildsOverviewFragment);
+
+    void inject(PublicGuildsFragment publicGuildsFragment);
+
+    void inject(TavernFragment tavernFragment);
+
+    void inject(TaskRecyclerViewFragment taskRecyclerViewFragment);
+
+    void inject(GemsPurchaseFragment gemsPurchaseFragment);
+
+    void inject(NewsFragment newsFragment);
+
+    void inject(HabiticaBaseApplication habiticaApplication);
+
+    void inject(PreferencesFragment preferencesFragment);
+
+    void inject(InboxFragment inboxFragment);
+
+    void inject(InboxMessageListFragment inboxMessageListFragment);
+
+    void inject(ShopsFragment shopsFragment);
+
+    void inject(ShopFragment shopFragment);
+
+    void inject(PushNotificationManager pushNotificationManager);
+
+    void inject(LocalNotificationActionReceiver localNotificationActionReceiver);
+
+    void inject(FullProfileActivity fullProfileActivity);
+
+    void inject(DailiesWidgetProvider dailiesWidgetProvider);
+
+    void inject(HabitButtonWidgetService habitButtonWidgetService);
+
+    void inject(HabitButtonWidgetActivity habitButtonWidgetActivity);
+
+    void inject(HabitButtonWidgetProvider habitButtonWidgetProvider);
+
+    void inject(AvatarStatsWidgetProvider avatarStatsWidgetProvider);
+
+    void inject(SoundManager soundManager);
+
+    void inject(ChallengesOverviewFragment challengesOverviewFragment);
+
+    void inject(ChallengeListFragment challengeListFragment);
+
+    void inject(ChallengeDetailActivity challengeDetailActivity);
+
+    void inject(ApiClient apiClient);
+
+    void inject(TaskListWidgetProvider taskListWidgetProvider);
+
+    void inject(RemindersManager remindersManager);
+
+    void inject(TaskAlarmManager taskAlarmManager);
+
+    void inject(DailiesRecyclerViewHolder dailiesRecyclerViewHolder);
+
+    void inject(HabitsRecyclerViewAdapter habitsRecyclerViewAdapter);
+
+    void inject(RewardsRecyclerViewAdapter rewardsRecyclerViewAdapter);
+
+    void inject(TodosRecyclerViewAdapter todosRecyclerViewAdapter);
+
+    void inject(SubscriptionFragment subscriptionFragment);
+
+    void inject(ChallengeTasksRecyclerViewFragment.ChallengeTasksRecyclerViewAdapter challengeTasksRecyclerViewAdapter);
+
+    void inject(ChallengeTasksRecyclerViewFragment challengeTasksRecyclerViewFragment);
+
+    void inject(TaskListFactory taskListFactory);
+
+    void inject(GemPurchaseActivity gemPurchaseActivity);
+
+    void inject(TaskFilterDialog taskFilterDialog);
+
+    void inject(TaskReceiver taskReceiver);
+
+    void inject(TaskAlarmBootReceiver taskAlarmBootReceiver);
+
+    void inject(HabiticaFirebaseInstanceIDService habiticaFirebaseInstanceIDService);
+
+    void inject(HabiticaFirebaseMessagingService habiticaFirebaseMessagingService);
+
+    void inject(AccountDetailsFragment accountDetailsFragment);
+
+    void inject(BaseWidgetProvider baseWidgetProvider);
+
+    void inject(NotificationPublisher notificationPublisher);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
index 422e0e15d..812b4e8b9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
@@ -1,220 +1,220 @@
-package com.habitrpg.android.habitica.data;
-
-import android.support.annotation.Nullable;
-
-import com.habitrpg.android.habitica.ErrorResponse;
-import com.habitrpg.android.habitica.models.AchievementResult;
-import com.habitrpg.android.habitica.models.ContentResult;
-import com.habitrpg.android.habitica.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
-import com.habitrpg.android.habitica.models.PurchaseValidationResult;
-import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
-import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.habitrpg.android.habitica.models.responses.BuyResponse;
-import com.habitrpg.android.habitica.models.responses.FeedResponse;
-import com.habitrpg.android.habitica.models.responses.HabitResponse;
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
-import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.responses.Status;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.models.responses.UnlockResponse;
-import com.habitrpg.android.habitica.models.shops.Shop;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Items;
-
-import java.util.List;
-import java.util.Map;
-
-import retrofit2.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<List<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, Map<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(Map<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<List<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(@Nullable String userID, @Nullable String apiToken);
-
-    boolean hasAuthenticationKeys();
-
-    Observable<HabitRPGUser> retrieveUser(boolean withTasks);
-
-    <T> Observable.Transformer<HabitResponse<T>, T> configureApiCallObserver();
-
-    Observable<ItemData> openMysteryItem();
-}
+package com.habitrpg.android.habitica.data;
+
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.ErrorResponse;
+import com.habitrpg.android.habitica.models.AchievementResult;
+import com.habitrpg.android.habitica.models.ContentResult;
+import com.habitrpg.android.habitica.models.LeaveChallengeBody;
+import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
+import com.habitrpg.android.habitica.models.PurchaseValidationResult;
+import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.habitrpg.android.habitica.models.responses.BuyResponse;
+import com.habitrpg.android.habitica.models.responses.FeedResponse;
+import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.responses.Status;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+
+import java.util.List;
+import java.util.Map;
+
+import retrofit2.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<List<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, Map<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(Map<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<List<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(@Nullable String userID, @Nullable String apiToken);
+
+    boolean hasAuthenticationKeys();
+
+    Observable<HabitRPGUser> retrieveUser(boolean withTasks);
+
+    <T> Observable.Transformer<HabitResponse<T>, T> configureApiCallObserver();
+
+    Observable<ItemData> openMysteryItem();
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.java
new file mode 100644
index 000000000..951c0db85
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ContentRepository.java
@@ -0,0 +1,10 @@
+package com.habitrpg.android.habitica.data;
+
+import com.habitrpg.android.habitica.models.ContentResult;
+
+import rx.Observable;
+
+public interface ContentRepository extends BaseRepository {
+
+    Observable<ContentResult> retrieveContent();
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.java
new file mode 100644
index 000000000..5391c6089
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.java
@@ -0,0 +1,11 @@
+package com.habitrpg.android.habitica.data;
+
+import com.habitrpg.android.habitica.models.inventory.Customization;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface CustomizationRepository extends ContentRepository {
+    Observable<List<Customization>> getCustomizations(String type, String category);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.java
new file mode 100644
index 000000000..007e46085
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.java
@@ -0,0 +1,12 @@
+package com.habitrpg.android.habitica.data;
+
+import com.habitrpg.android.habitica.models.FAQArticle;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface FAQRepository extends BaseRepository {
+    Observable<List<FAQArticle>> getArticles();
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
new file mode 100644
index 000000000..89a46c37a
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
@@ -0,0 +1,44 @@
+package com.habitrpg.android.habitica.data;
+
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.List;
+
+import rx.Observable;
+
+
+public interface InventoryRepository extends ContentRepository {
+    Observable<QuestContent> getQuestContent(String key);
+
+    Observable<List<ItemData>> getItems(List<String> searchedKeys);
+
+    long getArmoireRemainingCount();
+
+    Observable<List<ItemData>> getInventoryBuyableGear();
+
+    Observable<List<ItemData>> getOwnedEquipment(String type);
+    Observable<List<ItemData>> getOwnedEquipment();
+
+    Observable<List<Item>> getOwnedItems(String itemType);
+
+    Observable<ItemData> getEquipment(String key);
+
+    Observable<ItemData> openMysteryItem(String key);
+
+    void saveEquipment(ItemData itemData);
+
+    Observable<List<Mount>> getMounts();
+    Observable<List<Mount>> getMounts(String type, String group);
+
+    Observable<List<Pet>> getPets();
+    Observable<List<Pet>> getPets(String type, String group);
+
+    void updateOwnedEquipment(HabitRPGUser user);
+
+    void changeOwnedCount(String type, String key, int amountToAdd);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java
index a5962a726..df1d06e81 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java
@@ -1,13 +1,13 @@
-package com.habitrpg.android.habitica.data;
-
-
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.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);
-}
+package com.habitrpg.android.habitica.data;
+
+
+import com.habitrpg.android.habitica.models.SetupCustomization;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+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/SocialRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
index 294e7795f..4a3d6ed6c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
@@ -1,51 +1,58 @@
-package com.habitrpg.android.habitica.data;
-
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import rx.Observable;
-
-public interface SocialRepository extends BaseRepository {
-    Observable<List<ChatMessage>> retrieveGroupChat(String groupId);
-    Observable<List<ChatMessage>> getGroupChat(String groupId);
-
-    void markMessagesSeen(String seenGroupId);
-
-    Observable<Void> flagMessage(String groupId, String id);
-
-    Observable<ChatMessage> likeMessage(String groupId, String id);
-
-    Observable<Void> deleteMessage(String groupId, String id);
-
-    Observable<PostChatMessageResult> postGroupChat(String groupId, HashMap<String, String> messageObject);
-    Observable<PostChatMessageResult> postGroupChat(String groupId, String message);
-
-    Observable<Group> retrieveGroup(String id);
-    Observable<Group> getGroup(String id);
-
-    Observable<Void> leaveGroup(String id);
-
-    Observable<Group> joinGroup(String id);
-
-    Observable<Void> updateGroup(Group group);
-
-    Observable<List<Group>> retrieveGroups(String type);
-    Observable<List<Group>> getGroups(String type);
-
-    Observable<PostChatMessageResult> postPrivateMessage(HashMap<String, String> messageObject);
-    Observable<PostChatMessageResult> postPrivateMessage(String recipientId, String message);
-
-
-    Observable<List<HabitRPGUser>> getGroupMembers(String id, boolean includeAllPublicFields);
-
-    Observable<Void> inviteToGroup(String id, Map<String, Object> inviteData);
-
-    Observable<List<Challenge>> getUserChallenges();
-}
+package com.habitrpg.android.habitica.data;
+
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import rx.Observable;
+
+public interface SocialRepository extends BaseRepository {
+    Observable<List<ChatMessage>> retrieveGroupChat(String groupId);
+    Observable<List<ChatMessage>> getGroupChat(String groupId);
+
+    void markMessagesSeen(String seenGroupId);
+
+    Observable<Void> flagMessage(String groupId, String id);
+
+    Observable<ChatMessage> likeMessage(String groupId, String id);
+
+    Observable<Void> deleteMessage(String groupId, String id);
+
+    Observable<PostChatMessageResult> postGroupChat(String groupId, HashMap<String, String> messageObject);
+    Observable<PostChatMessageResult> postGroupChat(String groupId, String message);
+
+    Observable<Group> retrieveGroup(String id);
+    Observable<Group> getGroup(String id);
+
+    Observable<Void> leaveGroup(String id);
+
+    Observable<Group> joinGroup(String id);
+
+    Observable<Void> updateGroup(Group group);
+
+    Observable<List<Group>> retrieveGroups(String type);
+    Observable<List<Group>> getGroups(String type);
+
+    Observable<PostChatMessageResult> postPrivateMessage(HashMap<String, String> messageObject);
+    Observable<PostChatMessageResult> postPrivateMessage(String recipientId, String message);
+
+
+    Observable<List<HabitRPGUser>> getGroupMembers(String id, boolean includeAllPublicFields);
+
+    Observable<Void> inviteToGroup(String id, Map<String, Object> inviteData);
+
+    Observable<List<Challenge>> getUserChallenges();
+
+    Observable<HabitRPGUser> getMember(String userId);
+
+    Observable<Challenge> getChallenge(String challengeId);
+
+    Observable<List<Challenge>> getChallenges();
+    Observable<List<Challenge>> getUserChallenges(String id);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
index 0b2a59782..29312b5e2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
@@ -1,24 +1,24 @@
-package com.habitrpg.android.habitica.data;
-
-import com.habitrpg.android.habitica.models.Tag;
-
-import java.util.Collection;
-import java.util.List;
-
-import rx.Observable;
-
-public interface TagRepository extends BaseRepository {
-
-    Observable<List<Tag>> getTags(String userId);
-
-    Observable<Tag> createTag(Tag tag);
-    Observable<Tag> updateTag(Tag tag);
-    Observable<Void> deleteTag(String id);
-
-
-    Observable<Tag> createTags(Collection<Tag> tags);
-    Observable<Tag> updateTags(Collection<Tag> tags);
-    Observable<List<Void>> deleteTags(Collection<String> tagIds);
-
-    void removeOldTags(List<Tag> onlineTags);
-}
+package com.habitrpg.android.habitica.data;
+
+import com.habitrpg.android.habitica.models.Tag;
+
+import java.util.Collection;
+import java.util.List;
+
+import rx.Observable;
+
+public interface TagRepository extends BaseRepository {
+
+    Observable<List<Tag>> getTags(String userId);
+
+    Observable<Tag> createTag(Tag tag);
+    Observable<Tag> updateTag(Tag tag);
+    Observable<Void> deleteTag(String id);
+
+
+    Observable<Tag> createTags(Collection<Tag> tags);
+    Observable<Tag> updateTags(Collection<Tag> tags);
+    Observable<List<Void>> deleteTags(Collection<String> tagIds);
+
+    void removeOldTags(List<Tag> onlineTags);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
index bf8ef6cee..b30cfc53b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
@@ -1,39 +1,40 @@
-package com.habitrpg.android.habitica.data;
-
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.habitrpg.android.habitica.models.tasks.TasksOrder;
-
-import java.util.List;
-
-import rx.Observable;
-
-public interface TaskRepository extends BaseRepository  {
-    Observable<List<Task>> getTasks(String taskType, String userID);
-
-    Observable<TaskList> refreshTasks(TasksOrder tasksOrder);
-
-    Observable<TaskDirectionData> taskChecked(Task task, boolean up);
-    Observable<Task> scoreChecklistItem(String taskId, String itemId);
-
-    Observable<Task> getTask(String taskId);
-    Observable<Task> createTask(Task task);
-    Observable<Task> updateTask(Task task);
-    Observable<Void> deleteTask(String taskId);
-    void saveTask(Task task);
-
-    Observable<List<Task>> createTasks(List<Task> newTasks);
-
-    void removeOldTasks(String userID, List<Task> onlineTaskList);
-    void removeOldChecklists(List<ChecklistItem> onlineChecklistItems);
-    void removeOldTaskTags(List<TaskTag> onlineTaskTags);
-    void removeOldReminders(List<RemindersItem> onlineReminders);
-
-    Observable<TaskDirectionData> postTaskDirection(String taskId, String direction);
-
-    void markTaskCompleted(String taskId, boolean isCompleted);
-}
+package com.habitrpg.android.habitica.data;
+
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface TaskRepository extends BaseRepository  {
+    Observable<List<Task>> getTasks(String taskType, String userID);
+    Observable<List<Task>> getTasks(String userId);
+
+    Observable<TaskList> refreshTasks(TasksOrder tasksOrder);
+
+    Observable<TaskDirectionData> taskChecked(Task task, boolean up);
+    Observable<Task> scoreChecklistItem(String taskId, String itemId);
+
+    Observable<Task> getTask(String taskId);
+    Observable<Task> createTask(Task task);
+    Observable<Task> updateTask(Task task);
+    Observable<Void> deleteTask(String taskId);
+    void saveTask(Task task);
+
+    Observable<List<Task>> createTasks(List<Task> newTasks);
+
+    void removeOldTasks(String userID, List<Task> onlineTaskList);
+    void removeOldChecklists(List<ChecklistItem> onlineChecklistItems);
+    void removeOldTaskTags(List<TaskTag> onlineTaskTags);
+    void removeOldReminders(List<RemindersItem> onlineReminders);
+
+    Observable<TaskDirectionData> postTaskDirection(String taskId, String direction);
+
+    void markTaskCompleted(String taskId, boolean isCompleted);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.java
new file mode 100644
index 000000000..7c2f6f2cf
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.java
@@ -0,0 +1,14 @@
+package com.habitrpg.android.habitica.data;
+
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface TutorialRepository extends BaseRepository {
+
+    Observable<TutorialStep> getTutorialStep(String key);
+    Observable<List<TutorialStep>> getTutorialSteps(List<String> keys);
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
index 79778664d..4ad3e53cf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
@@ -1,35 +1,35 @@
-package com.habitrpg.android.habitica.data;
-
-import android.support.annotation.Nullable;
-
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import java.util.List;
-import java.util.Map;
-
-import rx.Observable;
-
-public interface UserRepository extends BaseRepository {
-
-    Observable<HabitRPGUser> getUser(String userID);
-    Observable<HabitRPGUser> updateUser(HabitRPGUser user, Map<String, Object> updateData);
-    Observable<HabitRPGUser> updateUser(HabitRPGUser user, String key, Object value);
-
-    Observable<HabitRPGUser> retrieveUser(Boolean withTasks);
-
-    Observable<HabitRPGUser> revive(HabitRPGUser user);
-
-    void resetTutorial(@Nullable HabitRPGUser user);
-
-    Observable<HabitRPGUser> sleep(HabitRPGUser user);
-
-    Observable<List<Skill>> getSkills(HabitRPGUser user);
-
-    Observable<List<Skill>> getSpecialItems(HabitRPGUser user);
-
-    Observable<SkillResponse> useSkill(@Nullable HabitRPGUser user, String key, String target, String taskId);
-
-    Observable<SkillResponse> useSkill(@Nullable HabitRPGUser user, String key, String target);
-}
+package com.habitrpg.android.habitica.data;
+
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.List;
+import java.util.Map;
+
+import rx.Observable;
+
+public interface UserRepository extends BaseRepository {
+
+    Observable<HabitRPGUser> getUser(String userID);
+    Observable<HabitRPGUser> updateUser(HabitRPGUser user, Map<String, Object> updateData);
+    Observable<HabitRPGUser> updateUser(HabitRPGUser user, String key, Object value);
+
+    Observable<HabitRPGUser> retrieveUser(Boolean withTasks);
+
+    Observable<HabitRPGUser> revive(HabitRPGUser user);
+
+    void resetTutorial(@Nullable HabitRPGUser user);
+
+    Observable<HabitRPGUser> sleep(HabitRPGUser user);
+
+    Observable<List<Skill>> getSkills(HabitRPGUser user);
+
+    Observable<List<Skill>> getSpecialItems(HabitRPGUser user);
+
+    Observable<SkillResponse> useSkill(@Nullable HabitRPGUser user, String key, String target, String taskId);
+
+    Observable<SkillResponse> useSkill(@Nullable HabitRPGUser user, String key, String target);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index e97e200b9..38ac206aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -1,849 +1,849 @@
-package com.habitrpg.android.habitica.data.implementation;
-
-import android.content.Context;
-import android.support.v7.app.AlertDialog;
-
-import com.amplitude.api.Amplitude;
-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.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.ErrorResponse;
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.database.CheckListItemExcludeStrategy;
-import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
-import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.habitrpg.android.habitica.api.ApiService;
-import com.habitrpg.android.habitica.api.Server;
-import com.habitrpg.android.habitica.models.AchievementResult;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.ContentResult;
-import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.habitrpg.android.habitica.models.FAQArticle;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Items;
-import com.habitrpg.android.habitica.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
-import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
-import com.habitrpg.android.habitica.models.PurchaseValidationResult;
-import com.habitrpg.android.habitica.models.user.Purchases;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.habitrpg.android.habitica.models.shops.Shop;
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.responses.Status;
-import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
-import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.models.TutorialStep;
-import com.habitrpg.android.habitica.models.auth.UserAuth;
-import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
-import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
-import com.habitrpg.android.habitica.models.auth.UserAuthSocialTokens;
-import com.habitrpg.android.habitica.models.inventory.Egg;
-import com.habitrpg.android.habitica.models.inventory.Food;
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.Mount;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.responses.BuyResponse;
-import com.habitrpg.android.habitica.models.responses.FeedResponse;
-import com.habitrpg.android.habitica.models.responses.HabitResponse;
-import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.responses.UnlockResponse;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.habitrpg.android.habitica.utils.BooleanAsIntAdapter;
-import com.habitrpg.android.habitica.utils.ChallengeDeserializer;
-import com.habitrpg.android.habitica.utils.ChatMessageDeserializer;
-import com.habitrpg.android.habitica.utils.ChecklistItemSerializer;
-import com.habitrpg.android.habitica.utils.ContentDeserializer;
-import com.habitrpg.android.habitica.utils.CustomizationDeserializer;
-import com.habitrpg.android.habitica.utils.DateDeserializer;
-import com.habitrpg.android.habitica.utils.EggListDeserializer;
-import com.habitrpg.android.habitica.utils.FAQArticleListDeserilializer;
-import com.habitrpg.android.habitica.utils.FeedResponseDeserializer;
-import com.habitrpg.android.habitica.utils.FoodListDeserializer;
-import com.habitrpg.android.habitica.utils.GroupSerialization;
-import com.habitrpg.android.habitica.utils.HatchingPotionListDeserializer;
-import com.habitrpg.android.habitica.utils.ItemDataListDeserializer;
-import com.habitrpg.android.habitica.utils.MountListDeserializer;
-import com.habitrpg.android.habitica.utils.PetListDeserializer;
-import com.habitrpg.android.habitica.utils.PurchasedDeserializer;
-import com.habitrpg.android.habitica.utils.QuestListDeserializer;
-import com.habitrpg.android.habitica.utils.RemindersItemSerializer;
-import com.habitrpg.android.habitica.utils.SkillDeserializer;
-import com.habitrpg.android.habitica.utils.TaskListDeserializer;
-import com.habitrpg.android.habitica.utils.TaskSerializer;
-import com.habitrpg.android.habitica.utils.TaskTagDeserializer;
-import com.habitrpg.android.habitica.utils.TutorialStepListDeserializer;
-import com.raizlabs.android.dbflow.structure.ModelAdapter;
-
-import java.io.IOException;
-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.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.HttpException;
-import retrofit2.Response;
-import retrofit2.Retrofit;
-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 final PopupNotificationsManager popupNotificationsManager;
-
-    private CrashlyticsProxy crashlyticsProxy;
-    private Context context;
-
-    // I think we don't need the ApiClientImpl anymore we could just use ApiService
-    private final ApiService apiService;
-
-    private final Observable.Transformer apiCallTransformer =
-            observable -> ((Observable) observable)
-                    .map(new Func1<HabitResponse, Object>() {
-                        @Override
-                        public Object call(HabitResponse habitResponse) {
-                            if (habitResponse.notifications != null) {
-                                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, PopupNotificationsManager popupNotificationsManager, Context context) {
-        this.gsonConverter = gsonConverter;
-        this.hostConfig = hostConfig;
-        this.context = context;
-        this.crashlyticsProxy = crashlyticsProxy;
-        this.popupNotificationsManager = popupNotificationsManager;
-        this.popupNotificationsManager.setApiClient(this);
-
-        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<Map<String, Pet>>() {
-        }.getType();
-        Type mountListType = new TypeToken<Map<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 field) {
-                        return field.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(retrofit2.adapter.rxjava.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.getDisplayMessage().length() > 0) {
-                    showConnectionProblemDialog("", res.getDisplayMessage());
-                } else if (status == 401) {
-                    showConnectionProblemDialog(R.string.authentication_error_title, R.string.authentication_error_body);
-                }
-            } else if (status >= 500 && status < 600) {
-                this.showConnectionProblemDialog(R.string.internal_error_api);
-            } else {
-                showConnectionProblemDialog(R.string.internal_error_api);
-            }
-        } else {
-            crashlyticsProxy.logException(throwable);
-        }
-    }
-
-    public ErrorResponse getErrorResponse(HttpException error) {
-        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 Task.TYPE_HABIT:
-                                    habitRPGUser.getHabits().add(task);
-                                    break;
-                                case Task.TYPE_DAILY:
-                                    habitRPGUser.getDailys().add(task);
-                                    break;
-                                case Task.TYPE_TODO:
-                                    habitRPGUser.getTodos().add(task);
-                                    break;
-                                case Task.TYPE_REWARD:
-                                    habitRPGUser.getRewards().add(task);
-                                    break;
-                                default:
-                                    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) {
-        showConnectionProblemDialog(context.getString(resourceTitleString), context.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).map(habitResponse -> {
-            if (habitResponse.notifications != null) {
-                popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
-            }
-            return habitResponse.getData();
-        });
-    }
-
-    @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<List<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, Map<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).map(habitResponse -> {
-            if (habitResponse.notifications != null) {
-                popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
-            }
-            return habitResponse.getData();
-        });
-    }
-
-    @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(Map<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<List<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());
-    }
-
+package com.habitrpg.android.habitica.data.implementation;
+
+import android.content.Context;
+import android.support.v7.app.AlertDialog;
+
+import com.amplitude.api.Amplitude;
+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.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.ErrorResponse;
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.api.ApiService;
+import com.habitrpg.android.habitica.api.Server;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.database.CheckListItemExcludeStrategy;
+import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
+import com.habitrpg.android.habitica.models.AchievementResult;
+import com.habitrpg.android.habitica.models.ContentResult;
+import com.habitrpg.android.habitica.models.FAQArticle;
+import com.habitrpg.android.habitica.models.LeaveChallengeBody;
+import com.habitrpg.android.habitica.models.PurchaseValidationRequest;
+import com.habitrpg.android.habitica.models.PurchaseValidationResult;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.auth.UserAuth;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
+import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
+import com.habitrpg.android.habitica.models.auth.UserAuthSocialTokens;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.responses.BuyResponse;
+import com.habitrpg.android.habitica.models.responses.FeedResponse;
+import com.habitrpg.android.habitica.models.responses.HabitResponse;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.responses.Status;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.UnlockResponse;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.user.Purchases;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+import com.habitrpg.android.habitica.utils.BooleanAsIntAdapter;
+import com.habitrpg.android.habitica.utils.ChallengeDeserializer;
+import com.habitrpg.android.habitica.utils.ChatMessageDeserializer;
+import com.habitrpg.android.habitica.utils.ChecklistItemSerializer;
+import com.habitrpg.android.habitica.utils.ContentDeserializer;
+import com.habitrpg.android.habitica.utils.CustomizationDeserializer;
+import com.habitrpg.android.habitica.utils.DateDeserializer;
+import com.habitrpg.android.habitica.utils.EggListDeserializer;
+import com.habitrpg.android.habitica.utils.FAQArticleListDeserilializer;
+import com.habitrpg.android.habitica.utils.FeedResponseDeserializer;
+import com.habitrpg.android.habitica.utils.FoodListDeserializer;
+import com.habitrpg.android.habitica.utils.GroupSerialization;
+import com.habitrpg.android.habitica.utils.HatchingPotionListDeserializer;
+import com.habitrpg.android.habitica.utils.ItemDataListDeserializer;
+import com.habitrpg.android.habitica.utils.MountListDeserializer;
+import com.habitrpg.android.habitica.utils.PetListDeserializer;
+import com.habitrpg.android.habitica.utils.PurchasedDeserializer;
+import com.habitrpg.android.habitica.utils.QuestListDeserializer;
+import com.habitrpg.android.habitica.utils.RemindersItemSerializer;
+import com.habitrpg.android.habitica.utils.SkillDeserializer;
+import com.habitrpg.android.habitica.utils.TaskListDeserializer;
+import com.habitrpg.android.habitica.utils.TaskSerializer;
+import com.habitrpg.android.habitica.utils.TaskTagDeserializer;
+import com.habitrpg.android.habitica.utils.TutorialStepListDeserializer;
+import com.raizlabs.android.dbflow.structure.ModelAdapter;
+
+import java.io.IOException;
+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.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.HttpException;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+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 final PopupNotificationsManager popupNotificationsManager;
+
+    private CrashlyticsProxy crashlyticsProxy;
+    private Context context;
+
+    // I think we don't need the ApiClientImpl anymore we could just use ApiService
+    private final ApiService apiService;
+
+    private final Observable.Transformer apiCallTransformer =
+            observable -> ((Observable) observable)
+                    .map(new Func1<HabitResponse, Object>() {
+                        @Override
+                        public Object call(HabitResponse habitResponse) {
+                            if (habitResponse.notifications != null) {
+                                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, PopupNotificationsManager popupNotificationsManager, Context context) {
+        this.gsonConverter = gsonConverter;
+        this.hostConfig = hostConfig;
+        this.context = context;
+        this.crashlyticsProxy = crashlyticsProxy;
+        this.popupNotificationsManager = popupNotificationsManager;
+        this.popupNotificationsManager.setApiClient(this);
+
+        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<Map<String, Pet>>() {
+        }.getType();
+        Type mountListType = new TypeToken<Map<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 field) {
+                        return field.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(retrofit2.adapter.rxjava.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.getDisplayMessage().length() > 0) {
+                    showConnectionProblemDialog("", res.getDisplayMessage());
+                } else if (status == 401) {
+                    showConnectionProblemDialog(R.string.authentication_error_title, R.string.authentication_error_body);
+                }
+            } else if (status >= 500 && status < 600) {
+                this.showConnectionProblemDialog(R.string.internal_error_api);
+            } else {
+                showConnectionProblemDialog(R.string.internal_error_api);
+            }
+        } else {
+            crashlyticsProxy.logException(throwable);
+        }
+    }
+
+    public ErrorResponse getErrorResponse(HttpException error) {
+        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 Task.TYPE_HABIT:
+                                    habitRPGUser.getHabits().add(task);
+                                    break;
+                                case Task.TYPE_DAILY:
+                                    habitRPGUser.getDailys().add(task);
+                                    break;
+                                case Task.TYPE_TODO:
+                                    habitRPGUser.getTodos().add(task);
+                                    break;
+                                case Task.TYPE_REWARD:
+                                    habitRPGUser.getRewards().add(task);
+                                    break;
+                                default:
+                                    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) {
+        showConnectionProblemDialog(context.getString(resourceTitleString), context.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).map(habitResponse -> {
+            if (habitResponse.notifications != null) {
+                popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
+            }
+            return habitResponse.getData();
+        });
+    }
+
+    @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<List<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, Map<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).map(habitResponse -> {
+            if (habitResponse.notifications != null) {
+                popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
+            }
+            return habitResponse.getData();
+        });
+    }
+
+    @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(Map<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<List<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/data/implementation/BaseRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.java
index 7647e761a..4dbec8745 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/BaseRepositoryImpl.java
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.data.implementation;
 
+import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.BaseRepository;
 import com.habitrpg.android.habitica.data.local.BaseLocalRepository;
-import com.habitrpg.android.habitica.data.ApiClient;
 
 public abstract class BaseRepositoryImpl<T extends BaseLocalRepository> implements BaseRepository {
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.java
new file mode 100644
index 000000000..b5d169f51
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.java
@@ -0,0 +1,21 @@
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.ContentRepository;
+import com.habitrpg.android.habitica.data.local.BaseLocalRepository;
+import com.habitrpg.android.habitica.models.ContentResult;
+
+import rx.Observable;
+
+abstract class ContentRepositoryImpl<T extends BaseLocalRepository> extends BaseRepositoryImpl<T> implements ContentRepository {
+
+    public ContentRepositoryImpl(T localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<ContentResult> retrieveContent() {
+        return apiClient.getContent();
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.java
new file mode 100644
index 000000000..248b18c26
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.java
@@ -0,0 +1,22 @@
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.CustomizationRepository;
+import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+
+import java.util.List;
+
+import rx.Observable;
+
+public class CustomizationRepositoryImpl extends ContentRepositoryImpl<CustomizationLocalRepository> implements CustomizationRepository {
+
+    public CustomizationRepositoryImpl(CustomizationLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<List<Customization>> getCustomizations(String type, String category) {
+        return localRepository.getCustomizations(type, category);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.java
new file mode 100644
index 000000000..5e75a651c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.java
@@ -0,0 +1,22 @@
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.FAQRepository;
+import com.habitrpg.android.habitica.data.local.FAQLocalRepository;
+import com.habitrpg.android.habitica.models.FAQArticle;
+
+import java.util.List;
+
+import rx.Observable;
+
+
+public class FAQRepositoryImpl extends ContentRepositoryImpl<FAQLocalRepository> implements FAQRepository {
+    public FAQRepositoryImpl(FAQLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<List<FAQArticle>> getArticles() {
+        return localRepository.getArticles();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
new file mode 100644
index 000000000..4525ef1b2
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
@@ -0,0 +1,105 @@
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.data.local.InventoryLocalRepository;
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.List;
+
+import rx.Observable;
+
+public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLocalRepository> implements InventoryRepository {
+
+    public InventoryRepositoryImpl(InventoryLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<QuestContent> getQuestContent(String key) {
+        return localRepository.getQuestContent(key);
+    }
+
+    @Override
+    public Observable<List<ItemData>> getItems(List<String> searchedKeys) {
+        return localRepository.getItems(searchedKeys);
+    }
+
+    @Override
+    public long getArmoireRemainingCount() {
+        return localRepository.getArmoireRemainingCount();
+    }
+
+    @Override
+    public Observable<List<ItemData>> getInventoryBuyableGear() {
+        return apiClient.getInventoryBuyableGear();
+    }
+
+    @Override
+    public Observable<List<ItemData>> getOwnedEquipment(String type) {
+        return localRepository.getOwnedEquipment(type);
+    }
+
+    @Override
+    public Observable<List<ItemData>> getOwnedEquipment() {
+        return localRepository.getOwnedEquipment();
+    }
+
+    @Override
+    public Observable<List<Item>> getOwnedItems(String itemType) {
+        return localRepository.getOwnedItems(itemType);
+    }
+
+    @Override
+    public Observable<ItemData> getEquipment(String key) {
+        return localRepository.getEquipment(key);
+    }
+
+    @Override
+    public Observable<ItemData> openMysteryItem(String key) {
+        return apiClient.openMysteryItem().doOnNext(itemData -> {
+            itemData.setOwned(true);
+            localRepository.saveEquipment(itemData);
+        });
+    }
+
+    @Override
+    public void saveEquipment(ItemData itemData) {
+        localRepository.saveEquipment(itemData);
+    }
+
+    @Override
+    public Observable<List<Mount>> getMounts() {
+        return localRepository.getMounts();
+    }
+
+    @Override
+    public Observable<List<Mount>> getMounts(String type, String group) {
+        return localRepository.getMounts(type, group);
+    }
+
+    @Override
+    public Observable<List<Pet>> getPets() {
+        return localRepository.getPets();
+    }
+
+    @Override
+    public Observable<List<Pet>> getPets(String type, String group) {
+        return localRepository.getPets(type, group);
+    }
+
+    @Override
+    public void updateOwnedEquipment(HabitRPGUser user) {
+        localRepository.updateOwnedEquipment(user);
+    }
+
+    @Override
+    public void changeOwnedCount(String type, String key, int amountToAdd) {
+        localRepository.changeOwnedCount(type, key, amountToAdd);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
index 9415dec51..705874458 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
@@ -1,182 +1,182 @@
-package com.habitrpg.android.habitica.data.implementation;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.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(user.getPreferences().getHair().getColor());
-                    case "ponytail":
-                        return getHairBases(user.getPreferences().getHair().getColor());
-                    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("", R.drawable.creator_blank_face),
-                SetupCustomization.createGlasses("eyewear_special_blackTopFrame", R.drawable.creator_eyewear_special_blacktopframe),
-                SetupCustomization.createGlasses("eyewear_special_blueTopFrame", R.drawable.creator_eyewear_special_bluetopframe),
-                SetupCustomization.createGlasses("eyewear_special_greenTopFrame", R.drawable.creator_eyewear_special_greentopframe),
-                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(String color) {
-        return Arrays.asList(
-                SetupCustomization.createHairPonytail("0", R.drawable.creator_blank_face),
-                SetupCustomization.createHairPonytail("1", getResId("creator_hair_base_1_"+color)),
-                SetupCustomization.createHairPonytail("3", getResId("creator_hair_base_3_"+color))
-                );
-    }
-
-    private List<SetupCustomization> getBangs(String color) {
-        return Arrays.asList(
-                SetupCustomization.createHairBangs("0", R.drawable.creator_blank_face),
-                SetupCustomization.createHairBangs("1", getResId("creator_hair_bangs_1_"+color)),
-                SetupCustomization.createHairBangs("2", getResId("creator_hair_bangs_2_"+color)),
-                SetupCustomization.createHairBangs("3", getResId("creator_hair_bangs_3_"+color))
-        );
-    }
-
-    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)
-        );
-    }
-
-    private int getResId(String resName) {
-
-        try {
-            return context.getResources().getIdentifier(resName, "drawable", context.getPackageName());
-        } catch (Exception e) {
-            e.printStackTrace();
-            return -1;
-        }
-    }
-}
+package com.habitrpg.android.habitica.data.implementation;
+
+import android.content.Context;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
+import com.habitrpg.android.habitica.models.SetupCustomization;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+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(user.getPreferences().getHair().getColor());
+                    case "ponytail":
+                        return getHairBases(user.getPreferences().getHair().getColor());
+                    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("", R.drawable.creator_blank_face),
+                SetupCustomization.createGlasses("eyewear_special_blackTopFrame", R.drawable.creator_eyewear_special_blacktopframe),
+                SetupCustomization.createGlasses("eyewear_special_blueTopFrame", R.drawable.creator_eyewear_special_bluetopframe),
+                SetupCustomization.createGlasses("eyewear_special_greenTopFrame", R.drawable.creator_eyewear_special_greentopframe),
+                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(String color) {
+        return Arrays.asList(
+                SetupCustomization.createHairPonytail("0", R.drawable.creator_blank_face),
+                SetupCustomization.createHairPonytail("1", getResId("creator_hair_base_1_"+color)),
+                SetupCustomization.createHairPonytail("3", getResId("creator_hair_base_3_"+color))
+                );
+    }
+
+    private List<SetupCustomization> getBangs(String color) {
+        return Arrays.asList(
+                SetupCustomization.createHairBangs("0", R.drawable.creator_blank_face),
+                SetupCustomization.createHairBangs("1", getResId("creator_hair_bangs_1_"+color)),
+                SetupCustomization.createHairBangs("2", getResId("creator_hair_bangs_2_"+color)),
+                SetupCustomization.createHairBangs("3", getResId("creator_hair_bangs_3_"+color))
+        );
+    }
+
+    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)
+        );
+    }
+
+    private int getResId(String resName) {
+
+        try {
+            return context.getResources().getIdentifier(resName, "drawable", context.getPackageName());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
index 2cd1abef8..446eabf24 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
@@ -1,138 +1,158 @@
-package com.habitrpg.android.habitica.data.implementation;
-
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import rx.Observable;
-import rx.schedulers.Schedulers;
-
-
-public class SocialRepositoryImpl extends BaseRepositoryImpl<SocialLocalRepository> implements SocialRepository {
-
-    public SocialRepositoryImpl(SocialLocalRepository localRepository, ApiClient apiClient) {
-        super(localRepository, apiClient);
-    }
-
-    @Override
-    public Observable<List<ChatMessage>> retrieveGroupChat(String groupId) {
-        return apiClient.listGroupChat(groupId)
-                .flatMap(Observable::from)
-                .map(chatMessage -> {
-                    chatMessage.parsedText = MarkdownParser.parseMarkdown(chatMessage.text);
-                    return chatMessage;
-                })
-                .toList()
-                .subscribeOn(Schedulers.io());
-    }
-
-    @Override
-    public Observable<List<ChatMessage>> getGroupChat(String groupId) {
-        return retrieveGroupChat(groupId);
-    }
-
-    @Override
-    public void markMessagesSeen(String seenGroupId) {
-        apiClient.seenMessages(seenGroupId).subscribe(aVoid -> {}, throwable -> {});
-    }
-
-    @Override
-    public Observable<Void> flagMessage(String groupId, String id) {
-        return apiClient.flagMessage(groupId, id);
-    }
-
-    @Override
-    public Observable<ChatMessage> likeMessage(String groupId, String id) {
-        return apiClient.likeMessage(groupId, id);
-    }
-
-    @Override
-    public Observable<Void> deleteMessage(String groupId, String id) {
-        return apiClient.deleteMessage(groupId, id);
-    }
-
-    @Override
-    public Observable<PostChatMessageResult> postGroupChat(String groupId, HashMap<String, String> messageObject) {
-        return apiClient.postGroupChat(groupId, messageObject);
-    }
-
-    @Override
-    public Observable<PostChatMessageResult> postGroupChat(String groupId, String message) {
-        HashMap<String, String> messageObject = new HashMap<>();
-        messageObject.put("message", message);
-        return postGroupChat(groupId, messageObject);
-    }
-
-    @Override
-    public Observable<Group> retrieveGroup(String id) {
-        return apiClient.getGroup(id);
-    }
-
-    @Override
-    public Observable<Group> getGroup(String id) {
-        return retrieveGroup(id);
-    }
-
-    @Override
-    public Observable<Void> leaveGroup(String id) {
-        return apiClient.leaveGroup(id);
-    }
-
-    @Override
-    public Observable<Group> joinGroup(String id) {
-        return apiClient.joinGroup(id);
-    }
-
-    @Override
-    public Observable<Void> updateGroup(Group group) {
-        return apiClient.updateGroup(group.id, group);
-    }
-
-    @Override
-    public Observable<List<Group>> retrieveGroups(String type) {
-        return apiClient.listGroups(type);
-    }
-
-    @Override
-    public Observable<List<Group>> getGroups(String type) {
-        return retrieveGroups(type);
-    }
-
-    @Override
-    public Observable<PostChatMessageResult> postPrivateMessage(HashMap<String, String> messageObject) {
-        return apiClient.postPrivateMessage(messageObject);
-    }
-
-    @Override
-    public Observable<PostChatMessageResult> postPrivateMessage(String recipientId, String message) {
-        HashMap<String, String> messageObject = new HashMap<>();
-        messageObject.put("message", message);
-        messageObject.put("toUserId", recipientId);
-        return postPrivateMessage(messageObject);
-    }
-
-    @Override
-    public Observable<List<HabitRPGUser>> getGroupMembers(String id, boolean includeAllPublicFields) {
-        return apiClient.getGroupMembers(id, includeAllPublicFields);
-    }
-
-    @Override
-    public Observable<Void> inviteToGroup(String id, Map<String, Object> inviteData) {
-        return apiClient.inviteToGroup(id, inviteData);
-    }
-
-    @Override
-    public Observable<List<Challenge>> getUserChallenges() {
-        return apiClient.getUserChallenges();
-    }
-}
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import rx.Observable;
+import rx.schedulers.Schedulers;
+
+
+public class SocialRepositoryImpl extends BaseRepositoryImpl<SocialLocalRepository> implements SocialRepository {
+
+    public SocialRepositoryImpl(SocialLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<List<ChatMessage>> retrieveGroupChat(String groupId) {
+        return apiClient.listGroupChat(groupId)
+                .flatMap(Observable::from)
+                .map(chatMessage -> {
+                    chatMessage.parsedText = MarkdownParser.parseMarkdown(chatMessage.text);
+                    return chatMessage;
+                })
+                .toList()
+                .subscribeOn(Schedulers.io());
+    }
+
+    @Override
+    public Observable<List<ChatMessage>> getGroupChat(String groupId) {
+        return retrieveGroupChat(groupId);
+    }
+
+    @Override
+    public void markMessagesSeen(String seenGroupId) {
+        apiClient.seenMessages(seenGroupId).subscribe(aVoid -> {}, throwable -> {});
+    }
+
+    @Override
+    public Observable<Void> flagMessage(String groupId, String id) {
+        return apiClient.flagMessage(groupId, id);
+    }
+
+    @Override
+    public Observable<ChatMessage> likeMessage(String groupId, String id) {
+        return apiClient.likeMessage(groupId, id);
+    }
+
+    @Override
+    public Observable<Void> deleteMessage(String groupId, String id) {
+        return apiClient.deleteMessage(groupId, id);
+    }
+
+    @Override
+    public Observable<PostChatMessageResult> postGroupChat(String groupId, HashMap<String, String> messageObject) {
+        return apiClient.postGroupChat(groupId, messageObject);
+    }
+
+    @Override
+    public Observable<PostChatMessageResult> postGroupChat(String groupId, String message) {
+        HashMap<String, String> messageObject = new HashMap<>();
+        messageObject.put("message", message);
+        return postGroupChat(groupId, messageObject);
+    }
+
+    @Override
+    public Observable<Group> retrieveGroup(String id) {
+        return apiClient.getGroup(id);
+    }
+
+    @Override
+    public Observable<Group> getGroup(String id) {
+        return retrieveGroup(id);
+    }
+
+    @Override
+    public Observable<Void> leaveGroup(String id) {
+        return apiClient.leaveGroup(id);
+    }
+
+    @Override
+    public Observable<Group> joinGroup(String id) {
+        return apiClient.joinGroup(id);
+    }
+
+    @Override
+    public Observable<Void> updateGroup(Group group) {
+        return apiClient.updateGroup(group.id, group);
+    }
+
+    @Override
+    public Observable<List<Group>> retrieveGroups(String type) {
+        return apiClient.listGroups(type);
+    }
+
+    @Override
+    public Observable<List<Group>> getGroups(String type) {
+        return retrieveGroups(type);
+    }
+
+    @Override
+    public Observable<PostChatMessageResult> postPrivateMessage(HashMap<String, String> messageObject) {
+        return apiClient.postPrivateMessage(messageObject);
+    }
+
+    @Override
+    public Observable<PostChatMessageResult> postPrivateMessage(String recipientId, String message) {
+        HashMap<String, String> messageObject = new HashMap<>();
+        messageObject.put("message", message);
+        messageObject.put("toUserId", recipientId);
+        return postPrivateMessage(messageObject);
+    }
+
+    @Override
+    public Observable<List<HabitRPGUser>> getGroupMembers(String id, boolean includeAllPublicFields) {
+        return apiClient.getGroupMembers(id, includeAllPublicFields);
+    }
+
+    @Override
+    public Observable<Void> inviteToGroup(String id, Map<String, Object> inviteData) {
+        return apiClient.inviteToGroup(id, inviteData);
+    }
+
+    @Override
+    public Observable<List<Challenge>> getUserChallenges() {
+        return apiClient.getUserChallenges();
+    }
+
+    @Override
+    public Observable<HabitRPGUser> getMember(String userId) {
+        return apiClient.getMember(userId);
+    }
+
+    @Override
+    public Observable<Challenge> getChallenge(String challengeId) {
+        return localRepository.getChallenge(challengeId);
+    }
+
+    @Override
+    public Observable<List<Challenge>> getChallenges() {
+        return localRepository.getChallenges();
+    }
+
+    @Override
+    public Observable<List<Challenge>> getUserChallenges(String userId) {
+        return localRepository.getUserChallenges(userId);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
index 5be928eb6..cecae96e5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
@@ -1,64 +1,64 @@
-package com.habitrpg.android.habitica.data.implementation;
-
-import com.habitrpg.android.habitica.data.TagRepository;
-import com.habitrpg.android.habitica.data.local.TagLocalRepository;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.Tag;
-
-import java.util.Collection;
-import java.util.List;
-
-import rx.Observable;
-
-
-public class TagRepositoryImpl extends BaseRepositoryImpl<TagLocalRepository> implements TagRepository {
-
-    public TagRepositoryImpl(TagLocalRepository localRepository, ApiClient apiClient) {
-        super(localRepository, apiClient);
-    }
-
-    @Override
-    public Observable<List<Tag>> getTags(String userId) {
-        return localRepository.getTags(userId);
-    }
-
-    @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();
-    }
-
-    @Override
-    public void removeOldTags(List<Tag> onlineTags) {
-        localRepository.removeOldTags(onlineTags);
-    }
-}
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.TagRepository;
+import com.habitrpg.android.habitica.data.local.TagLocalRepository;
+import com.habitrpg.android.habitica.models.Tag;
+
+import java.util.Collection;
+import java.util.List;
+
+import rx.Observable;
+
+
+public class TagRepositoryImpl extends BaseRepositoryImpl<TagLocalRepository> implements TagRepository {
+
+    public TagRepositoryImpl(TagLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<List<Tag>> getTags(String userId) {
+        return localRepository.getTags(userId);
+    }
+
+    @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();
+    }
+
+    @Override
+    public void removeOldTags(List<Tag> onlineTags) {
+        localRepository.removeOldTags(onlineTags);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
index c86c19a92..135407c2a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -1,144 +1,149 @@
-package com.habitrpg.android.habitica.data.implementation;
-
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
-import com.habitrpg.android.habitica.events.TaskCreatedEvent;
-import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
-import com.habitrpg.android.habitica.models.responses.TaskDirection;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.habitrpg.android.habitica.models.tasks.TasksOrder;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.Date;
-import java.util.List;
-
-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<List<Task>> getTasks(String taskType, String userID) {
-        return this.localRepository.getTasks(taskType, userID);
-    }
-
-    @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> getTask(String taskId) {
-        return localRepository.getTask(taskId);
-    }
-
-    @Override
-    public Observable<Task> createTask(Task task) {
-        long now = new Date().getTime();
-        if (lastTaskAction > now-500) {
-            return Observable.empty();
-        }
-        lastTaskAction = now;
-        return apiClient.createItem(task)
-                .doOnNext(task1 -> {
-                    localRepository.saveTask(task1);
-                    EventBus.getDefault().post(new TaskCreatedEvent(task1));
-                });
-    }
-
-    @Override
-    public Observable<Task> updateTask(Task task) {
-        long now = new Date().getTime();
-        if (lastTaskAction > now-500) {
-            return Observable.empty();
-        }
-        lastTaskAction = now;
-        return apiClient.updateTask(task.getId(), task)
-                .doOnNext(task1 -> {
-                    localRepository.saveTask(task1);
-                    EventBus.getDefault().post(new TaskUpdatedEvent(task1));
-                });
-    }
-
-    @Override
-    public Observable<Void> deleteTask(String taskID) {
-        return apiClient.deleteTask(taskID)
-                .doOnNext(aVoid -> localRepository.deleteTask(taskID));
-    }
-
-    @Override
-    public void saveTask(Task task) {
-        localRepository.saveTask(task);
-    }
-
-    @Override
-    public Observable<List<Task>> createTasks(List<Task> newTasks) {
-        return apiClient.createTasks(newTasks);
-    }
-
-    @Override
-    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
-        localRepository.removeOldTasks(userID, onlineTaskList);
-    }
-
-    @Override
-    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
-        localRepository.removeOldChecklists(onlineChecklistItems);
-    }
-
-    @Override
-    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
-        localRepository.removeOldTaskTags(onlineTaskTags);
-    }
-
-    @Override
-    public void removeOldReminders(List<RemindersItem> onlineReminders) {
-        localRepository.removeOldReminders(onlineReminders);
-    }
-
-    @Override
-    public Observable<TaskDirectionData> postTaskDirection(String taskId, String direction) {
-        return apiClient.postTaskDirection(taskId, direction);
-    }
-
-    @Override
-    public void markTaskCompleted(String taskId, boolean isCompleted) {
-        localRepository.markTaskCompleted(taskId, isCompleted);
-    }
-}
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
+import com.habitrpg.android.habitica.events.TaskCreatedEvent;
+import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
+import com.habitrpg.android.habitica.models.responses.TaskDirection;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.Date;
+import java.util.List;
+
+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<List<Task>> getTasks(String taskType, String userID) {
+        return this.localRepository.getTasks(taskType, userID);
+    }
+
+    @Override
+    public Observable<List<Task>> getTasks(String userId) {
+        return this.localRepository.getTasks(userId);
+    }
+
+    @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> getTask(String taskId) {
+        return localRepository.getTask(taskId);
+    }
+
+    @Override
+    public Observable<Task> createTask(Task task) {
+        long now = new Date().getTime();
+        if (lastTaskAction > now-500) {
+            return Observable.empty();
+        }
+        lastTaskAction = now;
+        return apiClient.createItem(task)
+                .doOnNext(task1 -> {
+                    localRepository.saveTask(task1);
+                    EventBus.getDefault().post(new TaskCreatedEvent(task1));
+                });
+    }
+
+    @Override
+    public Observable<Task> updateTask(Task task) {
+        long now = new Date().getTime();
+        if (lastTaskAction > now-500) {
+            return Observable.empty();
+        }
+        lastTaskAction = now;
+        return apiClient.updateTask(task.getId(), task)
+                .doOnNext(task1 -> {
+                    localRepository.saveTask(task1);
+                    EventBus.getDefault().post(new TaskUpdatedEvent(task1));
+                });
+    }
+
+    @Override
+    public Observable<Void> deleteTask(String taskID) {
+        return apiClient.deleteTask(taskID)
+                .doOnNext(aVoid -> localRepository.deleteTask(taskID));
+    }
+
+    @Override
+    public void saveTask(Task task) {
+        localRepository.saveTask(task);
+    }
+
+    @Override
+    public Observable<List<Task>> createTasks(List<Task> newTasks) {
+        return apiClient.createTasks(newTasks);
+    }
+
+    @Override
+    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
+        localRepository.removeOldTasks(userID, onlineTaskList);
+    }
+
+    @Override
+    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
+        localRepository.removeOldChecklists(onlineChecklistItems);
+    }
+
+    @Override
+    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
+        localRepository.removeOldTaskTags(onlineTaskTags);
+    }
+
+    @Override
+    public void removeOldReminders(List<RemindersItem> onlineReminders) {
+        localRepository.removeOldReminders(onlineReminders);
+    }
+
+    @Override
+    public Observable<TaskDirectionData> postTaskDirection(String taskId, String direction) {
+        return apiClient.postTaskDirection(taskId, direction);
+    }
+
+    @Override
+    public void markTaskCompleted(String taskId, boolean isCompleted) {
+        localRepository.markTaskCompleted(taskId, isCompleted);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.java
new file mode 100644
index 000000000..816136ee7
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.java
@@ -0,0 +1,27 @@
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.TutorialRepository;
+import com.habitrpg.android.habitica.data.local.TutorialLocalRepository;
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.util.List;
+
+import rx.Observable;
+
+
+public class TutorialRepositoryImpl extends BaseRepositoryImpl<TutorialLocalRepository> implements TutorialRepository {
+    public TutorialRepositoryImpl(TutorialLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<TutorialStep> getTutorialStep(String key) {
+        return localRepository.getTutorialStep(key);
+    }
+
+    @Override
+    public Observable<List<TutorialStep>> getTutorialSteps(List<String> keys) {
+        return localRepository.getTutorialSteps(keys);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 98c65a4ae..e6f1ca3f9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -1,131 +1,129 @@
-package com.habitrpg.android.habitica.data.implementation;
-
-import android.support.annotation.Nullable;
-
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.data.local.UserLocalRepository;
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.TutorialStep;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import rx.Observable;
-
-
-public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository> implements UserRepository {
-
-    public UserRepositoryImpl(UserLocalRepository localRepository, ApiClient apiClient) {
-        super(localRepository, apiClient);
-    }
-
-    @Override
-    public Observable<HabitRPGUser> getUser(String userID) {
-        return localRepository.getUser(userID)
-                .flatMap(habitRPGUser -> {
-                    if (habitRPGUser == null) {
-                        return retrieveUser(true);
-                    } else {
-                        return Observable.just(habitRPGUser);
-                    }
-                });
-    }
-
-    @Override
-    public Observable<HabitRPGUser> updateUser(HabitRPGUser user, Map<String, Object> updateData) {
-        return apiClient.updateUser(updateData)
-                .map(newUser -> mergeUser(user, newUser));
-    }
-
-    @Override
-    public Observable<HabitRPGUser> updateUser(HabitRPGUser user, String key, Object value) {
-        Map<String, Object> updateData = new HashMap<>();
-        updateData.put(key, value);
-        return updateUser(user, updateData);
-    }
-
-    @Override
-    public Observable<HabitRPGUser> retrieveUser(Boolean withTasks) {
-        return apiClient.retrieveUser(withTasks)
-                .doOnNext(localRepository::saveUser);
-    }
-
-    @Override
-    public Observable<HabitRPGUser> revive(HabitRPGUser user) {
-        return apiClient.revive().map(newUser -> mergeUser(user, newUser));
-    }
-
-    @Override
-    public void resetTutorial(HabitRPGUser user) {
-        localRepository.getTutorialSteps()
-                .map(tutorialSteps -> {
-                    Map<String, Object> updateData = new HashMap<>();
-                    for (TutorialStep step : tutorialSteps) {
-                        updateData.put("flags.tutorial." + step.getTutorialGroup() + "." + step.getIdentifier(), false);
-                    }
-                    return updateData;
-                })
-                .flatMap(updateData -> updateUser(user, updateData))
-                .subscribe(tutorialSteps -> {}, throwable -> {});
-    }
-
-    @Override
-    public Observable<HabitRPGUser> sleep(HabitRPGUser user) {
-        return apiClient.sleep()
-                .map(isSleeping -> {
-                    user.getPreferences().setSleep(isSleeping);
-                    localRepository.saveUser(user);
-                    return user;
-                });
-    }
-
-    @Override
-    public Observable<List<Skill>> getSkills(HabitRPGUser user) {
-        return localRepository.getSkills(user);
-    }
-
-    @Override
-    public Observable<List<Skill>> getSpecialItems(HabitRPGUser user) {
-        return localRepository.getSpecialItems(user);
-    }
-
-    @Override
-    public Observable<SkillResponse> useSkill(HabitRPGUser user, String key, String target, String taskId) {
-        return apiClient.useSkill(key, target, taskId).doOnNext(skillResponse -> {
-            if (user != null) {
-                mergeUser(user, skillResponse.user);
-            }
-        });
-    }
-
-    @Override
-    public Observable<SkillResponse> useSkill(HabitRPGUser user, String key, String target) {
-        return apiClient.useSkill(key, target).doOnNext(skillResponse -> {
-            if (user != null) {
-                mergeUser(user, skillResponse.user);
-            }
-        });
-    }
-
-    private HabitRPGUser mergeUser(HabitRPGUser oldUser, HabitRPGUser newUser) {
-        if (newUser.getItems() != null) {
-            oldUser.setItems(newUser.getItems());
-        }
-        if (newUser.getPreferences() != null) {
-            oldUser.setPreferences(newUser.getPreferences());
-        }
-        if (newUser.getFlags() != null) {
-            oldUser.setFlags(newUser.getFlags());
-        }
-        if (newUser.getStats() != null) {
-            oldUser.getStats().merge(newUser.getStats());
-        }
-
-        localRepository.saveUser(oldUser);
-        return oldUser;
-    }
-}
+package com.habitrpg.android.habitica.data.implementation;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.data.local.UserLocalRepository;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import rx.Observable;
+
+
+public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository> implements UserRepository {
+
+    public UserRepositoryImpl(UserLocalRepository localRepository, ApiClient apiClient) {
+        super(localRepository, apiClient);
+    }
+
+    @Override
+    public Observable<HabitRPGUser> getUser(String userID) {
+        return localRepository.getUser(userID)
+                .flatMap(habitRPGUser -> {
+                    if (habitRPGUser == null) {
+                        return retrieveUser(true);
+                    } else {
+                        return Observable.just(habitRPGUser);
+                    }
+                });
+    }
+
+    @Override
+    public Observable<HabitRPGUser> updateUser(HabitRPGUser user, Map<String, Object> updateData) {
+        return apiClient.updateUser(updateData)
+                .map(newUser -> mergeUser(user, newUser));
+    }
+
+    @Override
+    public Observable<HabitRPGUser> updateUser(HabitRPGUser user, String key, Object value) {
+        Map<String, Object> updateData = new HashMap<>();
+        updateData.put(key, value);
+        return updateUser(user, updateData);
+    }
+
+    @Override
+    public Observable<HabitRPGUser> retrieveUser(Boolean withTasks) {
+        return apiClient.retrieveUser(withTasks)
+                .doOnNext(localRepository::saveUser);
+    }
+
+    @Override
+    public Observable<HabitRPGUser> revive(HabitRPGUser user) {
+        return apiClient.revive().map(newUser -> mergeUser(user, newUser));
+    }
+
+    @Override
+    public void resetTutorial(HabitRPGUser user) {
+        localRepository.getTutorialSteps()
+                .map(tutorialSteps -> {
+                    Map<String, Object> updateData = new HashMap<>();
+                    for (TutorialStep step : tutorialSteps) {
+                        updateData.put("flags.tutorial." + step.getTutorialGroup() + "." + step.getIdentifier(), false);
+                    }
+                    return updateData;
+                })
+                .flatMap(updateData -> updateUser(user, updateData))
+                .subscribe(tutorialSteps -> {}, throwable -> {});
+    }
+
+    @Override
+    public Observable<HabitRPGUser> sleep(HabitRPGUser user) {
+        return apiClient.sleep()
+                .map(isSleeping -> {
+                    user.getPreferences().setSleep(isSleeping);
+                    localRepository.saveUser(user);
+                    return user;
+                });
+    }
+
+    @Override
+    public Observable<List<Skill>> getSkills(HabitRPGUser user) {
+        return localRepository.getSkills(user);
+    }
+
+    @Override
+    public Observable<List<Skill>> getSpecialItems(HabitRPGUser user) {
+        return localRepository.getSpecialItems(user);
+    }
+
+    @Override
+    public Observable<SkillResponse> useSkill(HabitRPGUser user, String key, String target, String taskId) {
+        return apiClient.useSkill(key, target, taskId).doOnNext(skillResponse -> {
+            if (user != null) {
+                mergeUser(user, skillResponse.user);
+            }
+        });
+    }
+
+    @Override
+    public Observable<SkillResponse> useSkill(HabitRPGUser user, String key, String target) {
+        return apiClient.useSkill(key, target).doOnNext(skillResponse -> {
+            if (user != null) {
+                mergeUser(user, skillResponse.user);
+            }
+        });
+    }
+
+    private HabitRPGUser mergeUser(HabitRPGUser oldUser, HabitRPGUser newUser) {
+        if (newUser.getItems() != null) {
+            oldUser.setItems(newUser.getItems());
+        }
+        if (newUser.getPreferences() != null) {
+            oldUser.setPreferences(newUser.getPreferences());
+        }
+        if (newUser.getFlags() != null) {
+            oldUser.setFlags(newUser.getFlags());
+        }
+        if (newUser.getStats() != null) {
+            oldUser.getStats().merge(newUser.getStats());
+        }
+
+        localRepository.saveUser(oldUser);
+        return oldUser;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java
new file mode 100644
index 000000000..056041328
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java
@@ -0,0 +1,11 @@
+package com.habitrpg.android.habitica.data.local;
+
+import com.habitrpg.android.habitica.models.inventory.Customization;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface CustomizationLocalRepository extends BaseLocalRepository {
+    Observable<List<Customization>> getCustomizations(String type, String category);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java
new file mode 100644
index 000000000..7a22ed29e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java
@@ -0,0 +1,12 @@
+package com.habitrpg.android.habitica.data.local;
+
+import com.habitrpg.android.habitica.models.FAQArticle;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface FAQLocalRepository extends BaseLocalRepository {
+
+    Observable<List<FAQArticle>> getArticles();
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
new file mode 100644
index 000000000..50e8f7a5d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
@@ -0,0 +1,39 @@
+package com.habitrpg.android.habitica.data.local;
+
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface InventoryLocalRepository extends BaseLocalRepository {
+    Observable<QuestContent> getQuestContent(String key);
+
+    Observable<List<ItemData>> getItems(List<String> searchedKeys);
+
+    long getArmoireRemainingCount();
+
+    Observable<List<ItemData>> getOwnedEquipment(String type);
+    Observable<List<ItemData>> getOwnedEquipment();
+
+    Observable<List<Item>> getOwnedItems(String itemType);
+
+    Observable<ItemData> getEquipment(String key);
+
+    void saveEquipment(ItemData itemData);
+
+    Observable<List<Mount>> getMounts();
+    Observable<List<Mount>> getMounts(String type, String group);
+
+    Observable<List<Pet>> getPets();
+    Observable<List<Pet>> getPets(String type, String group);
+
+    void updateOwnedEquipment(HabitRPGUser user);
+
+    void changeOwnedCount(String type, String key, int amountToAdd);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java
index 913768b14..7faf9391c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java
@@ -1,4 +1,15 @@
-package com.habitrpg.android.habitica.data.local;
-
-public interface SocialLocalRepository extends BaseLocalRepository {
-}
+package com.habitrpg.android.habitica.data.local;
+
+import com.habitrpg.android.habitica.models.social.Challenge;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface SocialLocalRepository extends BaseLocalRepository {
+    Observable<Challenge> getChallenge(String challengeId);
+
+    Observable<List<Challenge>> getChallenges();
+
+    Observable<List<Challenge>> getUserChallenges(String userId);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
index 6c1b0d3f3..8e79d43d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
@@ -1,13 +1,13 @@
-package com.habitrpg.android.habitica.data.local;
-
-import com.habitrpg.android.habitica.models.Tag;
-
-import java.util.List;
-
-import rx.Observable;
-
-public interface TagLocalRepository extends BaseLocalRepository {
-    Observable<List<Tag>> getTags(String userId);
-
-    void removeOldTags(List<Tag> onlineTags);
-}
+package com.habitrpg.android.habitica.data.local;
+
+import com.habitrpg.android.habitica.models.Tag;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface TagLocalRepository extends BaseLocalRepository {
+    Observable<List<Tag>> getTags(String userId);
+
+    void removeOldTags(List<Tag> onlineTags);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
index 5f98da8fc..a0bf5d613 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
@@ -1,32 +1,33 @@
-package com.habitrpg.android.habitica.data.local;
-
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.habitrpg.android.habitica.models.tasks.TasksOrder;
-
-import java.util.List;
-
-import rx.Observable;
-
-public interface TaskLocalRepository extends BaseLocalRepository {
-
-    Observable<List<Task>> getTasks(String taskType, String userID);
-
-    void saveTasks(TasksOrder tasksOrder, TaskList tasks);
-
-    void saveTask(Task task);
-
-    void removeOldTasks(String userID, List<Task> onlineTaskList);
-    void removeOldChecklists(List<ChecklistItem> onlineChecklistItems);
-    void removeOldTaskTags(List<TaskTag> onlineTaskTags);
-    void removeOldReminders(List<RemindersItem> onlineReminders);
-
-    void deleteTask(String taskID);
-
-    Observable<Task> getTask(String taskId);
-
-    void markTaskCompleted(String taskId, boolean isCompleted);
-}
+package com.habitrpg.android.habitica.data.local;
+
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface TaskLocalRepository extends BaseLocalRepository {
+
+    Observable<List<Task>> getTasks(String taskType, String userID);
+    Observable<List<Task>> getTasks(String userId);
+
+    void saveTasks(TasksOrder tasksOrder, TaskList tasks);
+
+    void saveTask(Task task);
+
+    void removeOldTasks(String userID, List<Task> onlineTaskList);
+    void removeOldChecklists(List<ChecklistItem> onlineChecklistItems);
+    void removeOldTaskTags(List<TaskTag> onlineTaskTags);
+    void removeOldReminders(List<RemindersItem> onlineReminders);
+
+    void deleteTask(String taskID);
+
+    Observable<Task> getTask(String taskId);
+
+    void markTaskCompleted(String taskId, boolean isCompleted);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.java
new file mode 100644
index 000000000..92b61e537
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.java
@@ -0,0 +1,13 @@
+package com.habitrpg.android.habitica.data.local;
+
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface TutorialLocalRepository extends BaseLocalRepository {
+
+    Observable<TutorialStep> getTutorialStep(String key);
+    Observable<List<TutorialStep>> getTutorialSteps(List<String> keys);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
index 3b037c63a..42548c396 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
@@ -1,22 +1,22 @@
-package com.habitrpg.android.habitica.data.local;
-
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.TutorialStep;
-
-import java.util.List;
-
-import rx.Observable;
-
-public interface UserLocalRepository extends BaseLocalRepository {
-
-    Observable<HabitRPGUser> getUser(String userID);
-
-    void saveUser(HabitRPGUser user);
-
-    Observable<List<TutorialStep>> getTutorialSteps();
-
-    Observable<List<Skill>> getSkills(HabitRPGUser user);
-
-    Observable<List<Skill>> getSpecialItems(HabitRPGUser user);
-}
+package com.habitrpg.android.habitica.data.local;
+
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.List;
+
+import rx.Observable;
+
+public interface UserLocalRepository extends BaseLocalRepository {
+
+    Observable<HabitRPGUser> getUser(String userID);
+
+    void saveUser(HabitRPGUser user);
+
+    Observable<List<TutorialStep>> getTutorialSteps();
+
+    Observable<List<Skill>> getSkills(HabitRPGUser user);
+
+    Observable<List<Skill>> getSpecialItems(HabitRPGUser user);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java
new file mode 100644
index 000000000..d053b64fa
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java
@@ -0,0 +1,53 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.OrderBy;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.raizlabs.android.dbflow.sql.language.Where;
+
+import java.util.Date;
+import java.util.List;
+
+import rx.Observable;
+
+public class DbFlowCustomizationLocalRepository implements CustomizationLocalRepository {
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public Observable<List<Customization>> getCustomizations(String type, String category) {
+        return Observable.defer(() -> {
+
+            Where<Customization> select = new Select()
+                    .from(Customization.class)
+                    .where(Condition.column("type").eq(type))
+                    .and(Condition.CombinedCondition.begin(Condition.column("purchased").eq(true))
+                            .or(Condition.column("price").eq(0))
+                            .or(Condition.column("price").isNull())
+                            .or(Condition.column("isBuyable").eq(true))
+                            .or(Condition.column("isBuyable").isNull())
+                            .or(Condition.CombinedCondition.begin(
+                                    Condition.CombinedCondition.begin(Condition.column("availableUntil").isNull())
+                                            .or(Condition.column("availableUntil").greaterThanOrEq(new Date().getTime())))
+                                    .and(Condition.CombinedCondition.begin(Condition.column("availableFrom").isNull())
+                                            .or(Condition.column("availableFrom").lessThanOrEq(new Date().getTime()))
+                                    )
+                            )
+                    );
+            if (category != null) {
+                select = select.and(Condition.column("category").eq(category));
+            }
+            if (type != null && type.equals("background")) {
+                select.orderBy(OrderBy.columns("customizationSetName").descending());
+            } else {
+                select.orderBy(true, "customizationSet");
+            }
+
+            return Observable.just(select.queryList());
+        });
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java
new file mode 100644
index 000000000..07f08ecb0
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java
@@ -0,0 +1,21 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.FAQLocalRepository;
+import com.habitrpg.android.habitica.models.FAQArticle;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.util.List;
+
+import rx.Observable;
+
+public class DbFlowFAQLocalRepository implements FAQLocalRepository {
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public Observable<List<FAQArticle>> getArticles() {
+        return Observable.defer(() -> Observable.just(new Select().from(FAQArticle.class).queryList()));
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java
new file mode 100644
index 000000000..370cf5ca4
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java
@@ -0,0 +1,238 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.InventoryLocalRepository;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestBoss;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.raizlabs.android.dbflow.runtime.TransactionManager;
+import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
+import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
+import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
+import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.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 java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import rx.Observable;
+
+public class DbFlowInventoryLocalRepository implements InventoryLocalRepository {
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public Observable<QuestContent> getQuestContent(String key) {
+        return Observable.defer(() -> Observable.just(new Select().from(QuestContent.class).querySingle()))
+                .map(questContent -> {
+                    questContent.boss = new Select().from(QuestBoss.class).where(Condition.column(ItemData.UNIQUE_IDENTIFIER).eq(key)).querySingle();
+                    return questContent;
+                });
+    }
+
+    @Override
+    public Observable<List<ItemData>> getItems(List<String> searchedKeys) {
+        Condition.In keyCondition = Condition.column(ItemData.UNIQUE_IDENTIFIER).in("");
+        for (String item : searchedKeys) {
+            keyCondition = keyCondition.and(item);
+        }
+        Where<ItemData> query = new Select().from(ItemData.class).where(keyCondition);
+        return Observable.defer(() -> Observable.just(query.queryList()));
+    }
+
+    @Override
+    public long getArmoireRemainingCount() {
+        return new Select().count()
+                .from(ItemData.class)
+                .where(Condition.CombinedCondition.begin(Condition.column("klass").eq("armoire"))
+                        .and(Condition.column("owned").isNull())
+                ).count();
+    }
+
+    @Override
+    public Observable<List<ItemData>> getOwnedEquipment(String type) {
+        return Observable.defer(() -> Observable.just(new Select()
+                .from(ItemData.class)
+                .where(Condition.CombinedCondition.begin(Condition.column("type").eq(type))
+                        .and(Condition.column("owned").eq(true))
+                ).queryList()));
+    }
+
+    @Override
+    public Observable<List<ItemData>> getOwnedEquipment() {
+        return Observable.defer(() -> Observable.just(new Select().from(ItemData.class).where(Condition.column("owned").eq(true)).queryList()));
+    }
+
+    @Override
+    public Observable<List<Item>> getOwnedItems(String itemType) {
+        return Observable.defer(() -> {
+                From from = null;
+                switch (itemType) {
+                    case "eggs":
+                        from = new Select().from(Egg.class);
+                        break;
+                    case "hatchingPotions":
+                        from = new Select().from(HatchingPotion.class);
+                        break;
+                    case "food":
+                        from = new Select().from(Food.class);
+                        break;
+                    case "quests":
+                        from = new Select().from(QuestContent.class);
+                }
+            if (from != null) {
+                return Observable.just(((From<Item>)from).where(Condition.column("owned").greaterThan(0)).queryList());
+            } else {
+                return Observable.just(new ArrayList<Item>());
+            }
+        });
+    }
+
+    @Override
+    public Observable<ItemData> getEquipment(String key) {
+        return Observable.defer(() -> Observable.just(new Select().from(ItemData.class).where(Condition.column("key").eq(key)).querySingle()));
+    }
+
+    @Override
+    public void saveEquipment(ItemData itemData) {
+        itemData.async().save();
+    }
+
+    @Override
+    public Observable<List<Mount>> getMounts() {
+        return Observable.defer(() -> Observable.just(new Select().from(Mount.class).orderBy(true, "color").queryList()));
+    }
+
+    @Override
+    public Observable<List<Mount>> getMounts(String type, String group) {
+        return Observable.defer(() -> Observable.just(new Select()
+                .from(Mount.class)
+                .where(Condition.CombinedCondition
+                        .begin(Condition.column("animal").eq(type))
+                        .and(Condition.column("animalGroup").eq(group)))
+                .orderBy(true, "color").queryList()));
+    }
+
+    @Override
+    public Observable<List<Pet>> getPets() {
+        return Observable.defer(() -> Observable.just(new Select().from(Pet.class).orderBy(true, "color").queryList()));
+    }
+
+    @Override
+    public Observable<List<Pet>> getPets(String type, String group) {
+        return Observable.defer(() -> Observable.just(new Select()
+                .from(Pet.class)
+                .where(Condition.CombinedCondition
+                        .begin(Condition.column("animal").eq(type))
+                        .and(Condition.column("animalGroup").eq(group)))
+                .orderBy(true, "color").queryList()));
+    }
+
+    @Override
+    public void updateOwnedEquipment(HabitRPGUser user) {
+        if (user == null || user.getItems() == null) {
+            return;
+        }
+        List<BaseModel> updates = new ArrayList<>();
+        updates.addAll(this.updateOwnedData(Egg.class, user.getItems().getEggs()));
+        updates.addAll(this.updateOwnedData(Food.class, user.getItems().getFood()));
+        updates.addAll(this.updateOwnedData(HatchingPotion.class, user.getItems().getHatchingPotions()));
+        updates.addAll(this.updateOwnedData(QuestContent.class, user.getItems().getQuests()));
+
+        updates.addAll(this.updateOwnedData(user.getItems().getGear().owned));
+        if (!updates.isEmpty()) {
+            TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(updates)));
+        }
+    }
+
+    @Override
+    public void changeOwnedCount(String type, String key, int amountToAdd) {
+        From from = null;
+
+        switch (type) {
+            case "hatchingpotion":
+                from = new Select().from(HatchingPotion.class);
+                break;
+            case "food":
+                from = new Select().from(Food.class);
+                break;
+            case "egg":
+                from = new Select().from(Egg.class);
+                break;
+        }
+
+        if (from != null) {
+            from.where(Condition.column("key").eq(key))
+                    .async()
+                    .querySingle(new TransactionListener() {
+                        @Override
+                        public void onResultReceived(Object result) {
+                            if (result != null) {
+                                Item item = (Item) result;
+                                item.setOwned(item.getOwned() + 1);
+                                item.save();
+                            }
+                        }
+
+                        @Override
+                        public boolean onReady(BaseTransaction transaction) {
+                            return true;
+                        }
+
+                        @Override
+                        public boolean hasResult(BaseTransaction transaction, Object result) {
+                            return true;
+                        }
+                    });
+        }
+    }
+
+    private <T extends Item> List<T> updateOwnedData(Class<T> itemClass, HashMap<String, Integer> ownedMapping) {
+        List<T> updates = new ArrayList<>();
+        if (ownedMapping == null) {
+            return updates;
+        }
+        List<T> items = new Select().from(itemClass).queryList();
+        for (T item : items) {
+            if (ownedMapping.containsKey(item.getKey()) && !item.getOwned().equals(ownedMapping.get(item.getKey()))) {
+                item.setOwned(ownedMapping.get(item.getKey()));
+                updates.add(item);
+            } else if (!ownedMapping.containsKey(item.getKey()) && item.getOwned() > 0) {
+                item.setOwned(0);
+                updates.add(item);
+            }
+        }
+        return updates;
+    }
+
+    private List<ItemData> updateOwnedData(HashMap<String, Boolean> ownedMapping) {
+        List<ItemData> updates = new ArrayList<>();
+        if (ownedMapping == null) {
+            return updates;
+        }
+        List<ItemData> items = new Select().from(ItemData.class).queryList();
+        for (ItemData item : items) {
+            if (ownedMapping.containsKey(item.key) && item.owned != ownedMapping.get(item.key)) {
+                item.owned = ownedMapping.get(item.key);
+                updates.add(item);
+            } else if (!ownedMapping.containsKey(item.key) && item.owned != null) {
+                item.owned = null;
+                updates.add(item);
+            }
+        }
+        return updates;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
index 1b295fc75..114c14671 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
@@ -1,11 +1,37 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
-
-
-public class DbFlowSocialLocalRepository implements SocialLocalRepository {
-    @Override
-    public void close() {
-
-    }
-}
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.util.List;
+
+import rx.Observable;
+
+
+public class DbFlowSocialLocalRepository implements SocialLocalRepository {
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public Observable<Challenge> getChallenge(String challengeId) {
+        return Observable.defer(() -> Observable.just(new Select().from(Challenge.class).where(Condition.column("id").eq(challengeId)).querySingle()));
+    }
+
+    @Override
+    public Observable<List<Challenge>> getChallenges() {
+        return Observable.defer(() -> Observable.just(new Select().from(Challenge.class).where(Condition.column("name").isNotNull()).queryList()));
+    }
+
+    @Override
+    public Observable<List<Challenge>> getUserChallenges(String userId) {
+        return Observable.defer(() -> Observable.just(new Select()
+                .from(Challenge.class)
+                .where(Condition.column("name").isNotNull())
+                .and(Condition.column("user_id").is(userId))
+                .queryList()));
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
index 5053b30d1..ef1b75403 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
@@ -1,79 +1,79 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-
-import android.database.sqlite.SQLiteDoneException;
-
-import com.habitrpg.android.habitica.data.local.TagLocalRepository;
-import com.habitrpg.android.habitica.models.Tag;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.From;
-import com.raizlabs.android.dbflow.sql.language.OrderBy;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import rx.Observable;
-
-public class DbFlowTagLocalRepository implements TagLocalRepository {
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public Observable<List<Tag>> getTags(String userId) {
-        return Observable.defer(() -> Observable.just(new Select().from(Tag.class)
-                .where(Condition.column("user_id").eq(userId))
-                .orderBy(OrderBy.columns("position", "dateCreated").descending())
-                .queryList()));
-    }
-
-    @Override
-    public void removeOldTags(List<Tag> onlineTags) {
-        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
-
-        for (Tag item : onlineTags) {
-            onlineTaskTagItemIdList.add(item.getId());
-        }
-
-        From<Tag> query = new Select().from(Tag.class);
-        try {
-            if (query.count() != onlineTags.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<Tag>>() {
-                    @Override
-                    public void onResultReceived(List<Tag> items) {
-
-                        ArrayList<Tag> tagsToDelete = new ArrayList<>();
-
-                        for (Tag tag : items) {
-                            if (!onlineTaskTagItemIdList.contains(tag.getId())) {
-                                tagsToDelete.add(tag);
-                            }
-                        }
-
-                        for (Tag tag : tagsToDelete) {
-                            tag.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<Tag>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<Tag>> transaction, List<Tag> result) {
-                        return result != null && result.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-}
+package com.habitrpg.android.habitica.data.local.implementation;
+
+
+import android.database.sqlite.SQLiteDoneException;
+
+import com.habitrpg.android.habitica.data.local.TagLocalRepository;
+import com.habitrpg.android.habitica.models.Tag;
+import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
+import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.From;
+import com.raizlabs.android.dbflow.sql.language.OrderBy;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+
+public class DbFlowTagLocalRepository implements TagLocalRepository {
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public Observable<List<Tag>> getTags(String userId) {
+        return Observable.defer(() -> Observable.just(new Select().from(Tag.class)
+                .where(Condition.column("user_id").eq(userId))
+                .orderBy(OrderBy.columns("position", "dateCreated").descending())
+                .queryList()));
+    }
+
+    @Override
+    public void removeOldTags(List<Tag> onlineTags) {
+        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
+
+        for (Tag item : onlineTags) {
+            onlineTaskTagItemIdList.add(item.getId());
+        }
+
+        From<Tag> query = new Select().from(Tag.class);
+        try {
+            if (query.count() != onlineTags.size()) {
+
+                // Load Database Checklist items
+                query.async().queryList(new TransactionListener<List<Tag>>() {
+                    @Override
+                    public void onResultReceived(List<Tag> items) {
+
+                        ArrayList<Tag> tagsToDelete = new ArrayList<>();
+
+                        for (Tag tag : items) {
+                            if (!onlineTaskTagItemIdList.contains(tag.getId())) {
+                                tagsToDelete.add(tag);
+                            }
+                        }
+
+                        for (Tag tag : tagsToDelete) {
+                            tag.async().delete();
+                        }
+                    }
+
+                    @Override
+                    public boolean onReady(BaseTransaction<List<Tag>> baseTransaction) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean hasResult(BaseTransaction<List<Tag>> transaction, List<Tag> result) {
+                        return result != null && result.size() > 0;
+                    }
+                });
+            }
+        } catch (SQLiteDoneException ignored) {
+            //Ignored
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
index 09b222b4a..82b733b45 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
@@ -1,302 +1,313 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import android.database.sqlite.SQLiteDoneException;
-
-import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
-import com.habitrpg.android.habitica.events.TaskRemovedEvent;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.Days;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.habitrpg.android.habitica.models.tasks.TasksOrder;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Delete;
-import com.raizlabs.android.dbflow.sql.language.From;
-import com.raizlabs.android.dbflow.sql.language.OrderBy;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.sql.language.Where;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import rx.Observable;
-
-public class DbFlowTaskLocalRepository implements TaskLocalRepository {
-
-    @Override
-    public Observable<List<Task>> getTasks(String taskType, String userID) {
-        return Observable.defer(() -> Observable.just(new Select().from(Task.class)
-                .where(Condition.column("type").eq(taskType))
-                .and(Condition.CombinedCondition
-                        .begin(Condition.column("completed").eq(false))
-                        .or(Condition.column("type").eq("daily"))
-                )
-                .and(Condition.column("user_id").eq(userID))
-                .orderBy(OrderBy.columns("position", "dateCreated").descending())
-                .queryList()));
-    }
-
-    public Observable<Task> getTask(String taskID) {
-        return Observable.defer(() -> Observable.just(new Select().from(Task.class)
-                .where(Condition.column("id").eq(taskID))
-                .querySingle()));
-    }
-
-    @Override
-    public void markTaskCompleted(String taskId, boolean isCompleted) {
-        getTask(taskId).subscribe(task -> {
-            task.completed = isCompleted;
-            saveTask(task);
-        }, throwable -> {});
-    }
-
-    @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();
-    }
-
-    @Override
-    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
-        final ArrayList<String> onlineTaskIdList = new ArrayList<>();
-
-        for (Task oTask : onlineTaskList) {
-            onlineTaskIdList.add(oTask.getId());
-        }
-
-        Where<Task> query = new Select().from(Task.class).where(Condition.column("user_id").eq(userID));
-        try {
-            if (query.count() != onlineTaskList.size()) {
-
-                // Load Database Tasks
-                query.async().queryList(new TransactionListener<List<Task>>() {
-                    @Override
-                    public void onResultReceived(List<Task> tasks) {
-
-                        ArrayList<Task> tasksToDelete = new ArrayList<>();
-
-                        for (Task dbTask : tasks) {
-                            if (!onlineTaskIdList.contains(dbTask.getId())) {
-                                tasksToDelete.add(dbTask);
-                            }
-                        }
-
-                        for (Task delTask : tasksToDelete) {
-                            // TaskTag
-                            new Delete().from(TaskTag.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
-
-                            // ChecklistItem
-                            new Delete().from(ChecklistItem.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
-
-                            // Days
-                            new Delete().from(Days.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
-
-                            // TASK
-                            delTask.async().delete();
-
-                            EventBus.getDefault().post(new TaskRemovedEvent(delTask.getId()));
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<Task>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<Task>> baseTransaction, List<Task> tasks) {
-                        return tasks != null && tasks.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-
-    @Override
-    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
-        final ArrayList<String> onlineChecklistItemIdList = new ArrayList<>();
-
-        for (ChecklistItem item : onlineChecklistItems) {
-            onlineChecklistItemIdList.add(item.getId());
-        }
-
-        From<ChecklistItem> query = new Select().from(ChecklistItem.class);
-        try {
-            if (query.count() != onlineChecklistItems.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<ChecklistItem>>() {
-                    @Override
-                    public void onResultReceived(List<ChecklistItem> items) {
-
-                        ArrayList<ChecklistItem> checkListItemsToDelete = new ArrayList<>();
-
-                        for (ChecklistItem chItem : items) {
-                            if (!onlineChecklistItemIdList.contains(chItem.getId())) {
-                                checkListItemsToDelete.add(chItem);
-                            }
-                        }
-
-                        for (ChecklistItem chItem : checkListItemsToDelete) {
-                            chItem.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<ChecklistItem>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<ChecklistItem>> baseTransaction, List<ChecklistItem> items) {
-                        return items != null && items.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-
-    @Override
-    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
-        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
-
-        for (TaskTag item : onlineTaskTags) {
-            onlineTaskTagItemIdList.add(item.getId());
-        }
-
-        From<TaskTag> query = new Select().from(TaskTag.class);
-        try {
-            if (query.count() != onlineTaskTags.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<TaskTag>>() {
-                    @Override
-                    public void onResultReceived(List<TaskTag> items) {
-
-                        ArrayList<TaskTag> checkListItemsToDelete = new ArrayList<>();
-
-                        for (TaskTag ttag : items) {
-                            if (!onlineTaskTagItemIdList.contains(ttag.getId())) {
-                                checkListItemsToDelete.add(ttag);
-                            }
-                        }
-
-                        for (TaskTag ttag : checkListItemsToDelete) {
-                            ttag.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<TaskTag>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<TaskTag>> baseTransaction, List<TaskTag> items) {
-                        return items != null && items.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-
-    @Override
-    public void removeOldReminders(List<RemindersItem> onlineReminders) {
-        final ArrayList<String> onlineReminderIds = new ArrayList<>();
-
-        for (RemindersItem item : onlineReminders) {
-            onlineReminderIds.add(item.getId());
-        }
-
-        From<RemindersItem> query = new Select().from(RemindersItem.class);
-        try {
-            if (query.count() != onlineReminders.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<RemindersItem>>() {
-                    @Override
-                    public void onResultReceived(List<RemindersItem> items) {
-
-                        ArrayList<RemindersItem> remindersToDelete = new ArrayList<>();
-
-                        for (RemindersItem reminder : items) {
-                            if (!onlineReminderIds.contains(reminder.getId())) {
-                                remindersToDelete.add(reminder);
-                            }
-                        }
-
-                        for (RemindersItem reminder : remindersToDelete) {
-                            reminder.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<RemindersItem>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<RemindersItem>> baseTransaction, List<RemindersItem> items) {
-                        return items != null && items.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-
-    @Override
-    public void deleteTask(String taskID) {
-        getTask(taskID).subscribe(Task::delete, throwable -> {});
-    }
-
-    private List<Task> sortTasks(TaskList taskList, List<String> taskOrder) {
-        List<Task> taskResult = new ArrayList<>();
-        int position = 0;
-
-        for (String taskId : taskOrder) {
-            Task task = taskList.tasks.get(taskId);
-            if (task != null) {
-                task.position = position;
-                taskResult.add(task);
-                position++;
-                taskList.tasks.remove(taskId);
-            }
-        }
-        return taskResult;
-    }
-
-    @Override
-    public void close() {
-
-    }
-}
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import android.database.sqlite.SQLiteDoneException;
+
+import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
+import com.habitrpg.android.habitica.events.TaskRemovedEvent;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.Days;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
+import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Delete;
+import com.raizlabs.android.dbflow.sql.language.From;
+import com.raizlabs.android.dbflow.sql.language.OrderBy;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.raizlabs.android.dbflow.sql.language.Where;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+
+public class DbFlowTaskLocalRepository implements TaskLocalRepository {
+
+    @Override
+    public Observable<List<Task>> getTasks(String taskType, String userID) {
+        return Observable.defer(() -> Observable.just(new Select().from(Task.class)
+                .where(Condition.column("type").eq(taskType))
+                .and(Condition.CombinedCondition
+                        .begin(Condition.column("completed").eq(false))
+                        .or(Condition.column("type").eq("daily"))
+                )
+                .and(Condition.column("user_id").eq(userID))
+                .orderBy(OrderBy.columns("position", "dateCreated").descending())
+                .queryList()));
+    }
+
+    @Override
+    public Observable<List<Task>> getTasks(String userId) {
+        return Observable.defer(() -> Observable.just(new Select().from(Task.class)
+                .where(Condition.column("user_id").eq(userId))
+                .and(Condition.CombinedCondition
+                        .begin(Condition.column("completed").eq(false))
+                        .or(Condition.column("type").eq("daily"))
+                )
+                .orderBy(OrderBy.columns("position", "dateCreated").descending())
+                .queryList()));    }
+
+    public Observable<Task> getTask(String taskID) {
+        return Observable.defer(() -> Observable.just(new Select().from(Task.class)
+                .where(Condition.column("id").eq(taskID))
+                .querySingle()));
+    }
+
+    @Override
+    public void markTaskCompleted(String taskId, boolean isCompleted) {
+        getTask(taskId).subscribe(task -> {
+            task.completed = isCompleted;
+            saveTask(task);
+        }, throwable -> {});
+    }
+
+    @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();
+    }
+
+    @Override
+    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
+        final ArrayList<String> onlineTaskIdList = new ArrayList<>();
+
+        for (Task oTask : onlineTaskList) {
+            onlineTaskIdList.add(oTask.getId());
+        }
+
+        Where<Task> query = new Select().from(Task.class).where(Condition.column("user_id").eq(userID));
+        try {
+            if (query.count() != onlineTaskList.size()) {
+
+                // Load Database Tasks
+                query.async().queryList(new TransactionListener<List<Task>>() {
+                    @Override
+                    public void onResultReceived(List<Task> tasks) {
+
+                        ArrayList<Task> tasksToDelete = new ArrayList<>();
+
+                        for (Task dbTask : tasks) {
+                            if (!onlineTaskIdList.contains(dbTask.getId())) {
+                                tasksToDelete.add(dbTask);
+                            }
+                        }
+
+                        for (Task delTask : tasksToDelete) {
+                            // TaskTag
+                            new Delete().from(TaskTag.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
+
+                            // ChecklistItem
+                            new Delete().from(ChecklistItem.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
+
+                            // Days
+                            new Delete().from(Days.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
+
+                            // TASK
+                            delTask.async().delete();
+
+                            EventBus.getDefault().post(new TaskRemovedEvent(delTask.getId()));
+                        }
+                    }
+
+                    @Override
+                    public boolean onReady(BaseTransaction<List<Task>> baseTransaction) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean hasResult(BaseTransaction<List<Task>> baseTransaction, List<Task> tasks) {
+                        return tasks != null && tasks.size() > 0;
+                    }
+                });
+            }
+        } catch (SQLiteDoneException ignored) {
+            //Ignored
+        }
+    }
+
+    @Override
+    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
+        final ArrayList<String> onlineChecklistItemIdList = new ArrayList<>();
+
+        for (ChecklistItem item : onlineChecklistItems) {
+            onlineChecklistItemIdList.add(item.getId());
+        }
+
+        From<ChecklistItem> query = new Select().from(ChecklistItem.class);
+        try {
+            if (query.count() != onlineChecklistItems.size()) {
+
+                // Load Database Checklist items
+                query.async().queryList(new TransactionListener<List<ChecklistItem>>() {
+                    @Override
+                    public void onResultReceived(List<ChecklistItem> items) {
+
+                        ArrayList<ChecklistItem> checkListItemsToDelete = new ArrayList<>();
+
+                        for (ChecklistItem chItem : items) {
+                            if (!onlineChecklistItemIdList.contains(chItem.getId())) {
+                                checkListItemsToDelete.add(chItem);
+                            }
+                        }
+
+                        for (ChecklistItem chItem : checkListItemsToDelete) {
+                            chItem.async().delete();
+                        }
+                    }
+
+                    @Override
+                    public boolean onReady(BaseTransaction<List<ChecklistItem>> baseTransaction) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean hasResult(BaseTransaction<List<ChecklistItem>> baseTransaction, List<ChecklistItem> items) {
+                        return items != null && items.size() > 0;
+                    }
+                });
+            }
+        } catch (SQLiteDoneException ignored) {
+            //Ignored
+        }
+    }
+
+    @Override
+    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
+        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
+
+        for (TaskTag item : onlineTaskTags) {
+            onlineTaskTagItemIdList.add(item.getId());
+        }
+
+        From<TaskTag> query = new Select().from(TaskTag.class);
+        try {
+            if (query.count() != onlineTaskTags.size()) {
+
+                // Load Database Checklist items
+                query.async().queryList(new TransactionListener<List<TaskTag>>() {
+                    @Override
+                    public void onResultReceived(List<TaskTag> items) {
+
+                        ArrayList<TaskTag> checkListItemsToDelete = new ArrayList<>();
+
+                        for (TaskTag ttag : items) {
+                            if (!onlineTaskTagItemIdList.contains(ttag.getId())) {
+                                checkListItemsToDelete.add(ttag);
+                            }
+                        }
+
+                        for (TaskTag ttag : checkListItemsToDelete) {
+                            ttag.async().delete();
+                        }
+                    }
+
+                    @Override
+                    public boolean onReady(BaseTransaction<List<TaskTag>> baseTransaction) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean hasResult(BaseTransaction<List<TaskTag>> baseTransaction, List<TaskTag> items) {
+                        return items != null && items.size() > 0;
+                    }
+                });
+            }
+        } catch (SQLiteDoneException ignored) {
+            //Ignored
+        }
+    }
+
+    @Override
+    public void removeOldReminders(List<RemindersItem> onlineReminders) {
+        final ArrayList<String> onlineReminderIds = new ArrayList<>();
+
+        for (RemindersItem item : onlineReminders) {
+            onlineReminderIds.add(item.getId());
+        }
+
+        From<RemindersItem> query = new Select().from(RemindersItem.class);
+        try {
+            if (query.count() != onlineReminders.size()) {
+
+                // Load Database Checklist items
+                query.async().queryList(new TransactionListener<List<RemindersItem>>() {
+                    @Override
+                    public void onResultReceived(List<RemindersItem> items) {
+
+                        ArrayList<RemindersItem> remindersToDelete = new ArrayList<>();
+
+                        for (RemindersItem reminder : items) {
+                            if (!onlineReminderIds.contains(reminder.getId())) {
+                                remindersToDelete.add(reminder);
+                            }
+                        }
+
+                        for (RemindersItem reminder : remindersToDelete) {
+                            reminder.async().delete();
+                        }
+                    }
+
+                    @Override
+                    public boolean onReady(BaseTransaction<List<RemindersItem>> baseTransaction) {
+                        return false;
+                    }
+
+                    @Override
+                    public boolean hasResult(BaseTransaction<List<RemindersItem>> baseTransaction, List<RemindersItem> items) {
+                        return items != null && items.size() > 0;
+                    }
+                });
+            }
+        } catch (SQLiteDoneException ignored) {
+            //Ignored
+        }
+    }
+
+    @Override
+    public void deleteTask(String taskID) {
+        getTask(taskID).subscribe(Task::delete, throwable -> {});
+    }
+
+    private List<Task> sortTasks(TaskList taskList, List<String> taskOrder) {
+        List<Task> taskResult = new ArrayList<>();
+        int position = 0;
+
+        for (String taskId : taskOrder) {
+            Task task = taskList.tasks.get(taskId);
+            if (task != null) {
+                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/DbFlowTutorialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTutorialLocalRepository.java
new file mode 100644
index 000000000..b45508286
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTutorialLocalRepository.java
@@ -0,0 +1,29 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.TutorialLocalRepository;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.util.List;
+
+import rx.Observable;
+
+public class DbFlowTutorialLocalRepository implements TutorialLocalRepository {
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public Observable<TutorialStep> getTutorialStep(String key) {
+        return Observable.defer(() -> Observable.just(new Select().from(TutorialStep.class).where(Condition.column("key").eq(key)).querySingle()));
+    }
+
+    @Override
+    public Observable<List<TutorialStep>> getTutorialSteps(List<String> keys) {
+        return Observable.defer(() -> Observable.just(new Select().from(TutorialStep.class)
+                .where(Condition.column("key").in(keys))
+                .queryList()));
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
index d071db059..deee4f042 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
@@ -1,84 +1,84 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.UserLocalRepository;
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.TutorialStep;
-import com.habitrpg.android.habitica.models.user.SpecialItems;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import rx.Observable;
-
-public class DbFlowUserLocalRepository implements UserLocalRepository {
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public Observable<HabitRPGUser> getUser(String userID) {
-        return Observable.defer(() -> Observable.just(new Select()
-                .from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).querySingle()));
-    }
-
-    @Override
-    public void saveUser(HabitRPGUser user) {
-        user.async().save();
-    }
-
-    @Override
-    public Observable<List<TutorialStep>> getTutorialSteps() {
-        return Observable.defer(() -> Observable.just(new Select()
-                .from(TutorialStep.class).queryList()));
-    }
-
-    @Override
-    public Observable<List<Skill>> getSkills(HabitRPGUser user) {
-        return Observable.defer(() -> Observable.just(new Select()
-                .from(Skill.class)
-                .where(Condition.column("habitClass").eq(user.getStats().get_class()))
-                .and(Condition.column("lvl").lessThanOrEq(user.getStats().getLvl()))
-                .queryList()));
-    }
-
-    @Override
-    public Observable<List<Skill>> getSpecialItems(HabitRPGUser user) {
-        SpecialItems specialItems = user.getItems().getSpecial();
-        if (specialItems != null) {
-
-            Condition.In specialsWhere = Condition.column("key").in("");
-
-            if (specialItems.getSnowball() > 0) {
-                specialsWhere.and("snowball");
-            }
-
-            if (specialItems.getShinySeed() > 0) {
-                specialsWhere.and("shinySeed");
-            }
-
-            if (specialItems.getSeafoam() > 0) {
-                specialsWhere.and("seafoam");
-            }
-
-            if (specialItems.getSpookySparkles() > 0) {
-                specialsWhere.and("spookySparkles");
-            }
-            return Observable.defer(() -> Observable.from(new Select()
-                    .from(Skill.class)
-                    .where(specialsWhere)
-                    .queryList()))
-                    .map(skill -> {
-                        skill.isSpecialItem = true;
-                        skill.target = "party";
-                        return skill;
-                    })
-                    .toList();
-        } else {
-            return Observable.just(new ArrayList<>());
-        }
-    }
-}
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.UserLocalRepository;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.SpecialItems;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+
+public class DbFlowUserLocalRepository implements UserLocalRepository {
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public Observable<HabitRPGUser> getUser(String userID) {
+        return Observable.defer(() -> Observable.just(new Select()
+                .from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).querySingle()));
+    }
+
+    @Override
+    public void saveUser(HabitRPGUser user) {
+        user.async().save();
+    }
+
+    @Override
+    public Observable<List<TutorialStep>> getTutorialSteps() {
+        return Observable.defer(() -> Observable.just(new Select()
+                .from(TutorialStep.class).queryList()));
+    }
+
+    @Override
+    public Observable<List<Skill>> getSkills(HabitRPGUser user) {
+        return Observable.defer(() -> Observable.just(new Select()
+                .from(Skill.class)
+                .where(Condition.column("habitClass").eq(user.getStats().get_class()))
+                .and(Condition.column("lvl").lessThanOrEq(user.getStats().getLvl()))
+                .queryList()));
+    }
+
+    @Override
+    public Observable<List<Skill>> getSpecialItems(HabitRPGUser user) {
+        SpecialItems specialItems = user.getItems().getSpecial();
+        if (specialItems != null) {
+
+            Condition.In specialsWhere = Condition.column("key").in("");
+
+            if (specialItems.getSnowball() > 0) {
+                specialsWhere.and("snowball");
+            }
+
+            if (specialItems.getShinySeed() > 0) {
+                specialsWhere.and("shinySeed");
+            }
+
+            if (specialItems.getSeafoam() > 0) {
+                specialsWhere.and("seafoam");
+            }
+
+            if (specialItems.getSpookySparkles() > 0) {
+                specialsWhere.and("spookySparkles");
+            }
+            return Observable.defer(() -> Observable.from(new Select()
+                    .from(Skill.class)
+                    .where(specialsWhere)
+                    .queryList()))
+                    .map(skill -> {
+                        skill.isSpecialItem = true;
+                        skill.target = "party";
+                        return skill;
+                    })
+                    .toList();
+        } else {
+            return Observable.just(new ArrayList<>());
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/DisplayTutorialEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/DisplayTutorialEvent.java
index ba549a94c..6c15b060a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/DisplayTutorialEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/DisplayTutorialEvent.java
@@ -1,17 +1,17 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.TutorialStep;
-
-import java.util.List;
-
-/**
- * Created by viirus on 26/01/16.
- */
-public class DisplayTutorialEvent {
-
-    public TutorialStep step;
-    public String tutorialText;
-
-    public List<String> tutorialTexts;
-    public boolean canBeDeferred;
-}
+package com.habitrpg.android.habitica.events;
+
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.util.List;
+
+/**
+ * Created by viirus on 26/01/16.
+ */
+public class DisplayTutorialEvent {
+
+    public TutorialStep step;
+    public String tutorialText;
+
+    public List<String> tutorialTexts;
+    public boolean canBeDeferred;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/HabitScoreEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/HabitScoreEvent.java
index 5237f7799..ce85e2455 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/HabitScoreEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/HabitScoreEvent.java
@@ -1,12 +1,12 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-/**
- * Created by Negue on 10.07.2015.
- */
-public class HabitScoreEvent {
-    public boolean Up = false;
-
-    public Task habit;
-}
+package com.habitrpg.android.habitica.events;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+/**
+ * Created by Negue on 10.07.2015.
+ */
+public class HabitScoreEvent {
+    public boolean Up = false;
+
+    public Task habit;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
index 19b5c3ca6..ffe0c840f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
@@ -1,10 +1,10 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-
-public class OpenedMysteryItemEvent {
-
-    public int numberLeft;
-
-    public ItemData mysteryItem;
-}
+package com.habitrpg.android.habitica.events;
+
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+
+public class OpenedMysteryItemEvent {
+
+    public int numberLeft;
+
+    public ItemData mysteryItem;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReminderDeleteEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReminderDeleteEvent.java
index 2e7f02d31..a283ad10d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReminderDeleteEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/ReminderDeleteEvent.java
@@ -1,10 +1,10 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-
-/**
- * Created by keithholliday on 7/16/16.
- */
-public class ReminderDeleteEvent {
-    public RemindersItem reminder;
-}
+package com.habitrpg.android.habitica.events;
+
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+
+/**
+ * Created by keithholliday on 7/16/16.
+ */
+public class ReminderDeleteEvent {
+    public RemindersItem reminder;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java
index b83891e48..0b96967b3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java
@@ -1,20 +1,20 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.Skill;
-
-/**
- * Created by viirus on 28/11/15.
- */
-public class SkillUsedEvent {
-
-    public Skill usedSkill;
-    public Double newMana, xp, hp, gold;
-
-    public SkillUsedEvent(Skill usedSkill, Double newMana, Double xp, Double hp, Double gold) {
-        this.usedSkill = usedSkill;
-        this.newMana = newMana;
-        this.xp = xp;
-        this.hp = hp;
-        this.gold = gold;
-    }
-}
+package com.habitrpg.android.habitica.events;
+
+import com.habitrpg.android.habitica.models.Skill;
+
+/**
+ * Created by viirus on 28/11/15.
+ */
+public class SkillUsedEvent {
+
+    public Skill usedSkill;
+    public Double newMana, xp, hp, gold;
+
+    public SkillUsedEvent(Skill usedSkill, Double newMana, Double xp, Double hp, Double gold) {
+        this.usedSkill = usedSkill;
+        this.newMana = newMana;
+        this.xp = xp;
+        this.hp = hp;
+        this.gold = gold;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskCreatedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskCreatedEvent.java
index d6a4990aa..0f4e1bbec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskCreatedEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskCreatedEvent.java
@@ -1,14 +1,14 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-/**
- * Created by Negue on 28.09.2015.
- */
-public class TaskCreatedEvent {
-    public Task task;
-
-    public TaskCreatedEvent(Task t) {
-        task = t;
-    }
-}
+package com.habitrpg.android.habitica.events;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+/**
+ * Created by Negue on 28.09.2015.
+ */
+public class TaskCreatedEvent {
+    public Task task;
+
+    public TaskCreatedEvent(Task t) {
+        task = t;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java
index 9ce32fe5f..63ecd18a0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskDeleteEvent.java
@@ -1,10 +1,10 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-/**
- * Created by keithholliday on 7/18/16.
- */
-public class TaskDeleteEvent {
-    public Task task;
-}
+package com.habitrpg.android.habitica.events;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+/**
+ * Created by keithholliday on 7/18/16.
+ */
+public class TaskDeleteEvent {
+    public Task task;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java
index b665f1cb1..5e4632c20 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskLongPressedEvent.java
@@ -1,10 +1,10 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-/**
- * Created by Negue on 10.07.2015.
- */
-public class TaskLongPressedEvent {
-    public Task task;
-}
+package com.habitrpg.android.habitica.events;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+/**
+ * Created by Negue on 10.07.2015.
+ */
+public class TaskLongPressedEvent {
+    public Task task;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java
index 1de08eed9..f18f24e03 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskSaveEvent.java
@@ -1,12 +1,12 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-/**
- * Created by viirus on 03/08/15.
- */
-public class TaskSaveEvent {
-    public Task task;
-    public boolean created;
-
-}
+package com.habitrpg.android.habitica.events;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+/**
+ * Created by viirus on 03/08/15.
+ */
+public class TaskSaveEvent {
+    public Task task;
+    public boolean created;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskTappedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskTappedEvent.java
index c4021aeef..820402b59 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskTappedEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskTappedEvent.java
@@ -1,8 +1,8 @@
-package com.habitrpg.android.habitica.events;
-
-/**
- * Created by Negue on 10.07.2015.
- */
-public class TaskTappedEvent {
-    public com.habitrpg.android.habitica.models.tasks.Task Task;
-}
+package com.habitrpg.android.habitica.events;
+
+/**
+ * Created by Negue on 10.07.2015.
+ */
+public class TaskTappedEvent {
+    public com.habitrpg.android.habitica.models.tasks.Task Task;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskUpdatedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskUpdatedEvent.java
index 96546aa6d..52822e06f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskUpdatedEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/TaskUpdatedEvent.java
@@ -1,14 +1,14 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-/**
- * Created by Negue on 28.09.2015.
- */
-public class TaskUpdatedEvent {
-    public Task task;
-
-    public TaskUpdatedEvent(Task t) {
-        task = t;
-    }
-}
+package com.habitrpg.android.habitica.events;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+/**
+ * Created by Negue on 28.09.2015.
+ */
+public class TaskUpdatedEvent {
+    public Task task;
+
+    public TaskUpdatedEvent(Task t) {
+        task = t;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyGemItemCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyGemItemCommand.java
index 5f7a47e6d..679453d60 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyGemItemCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyGemItemCommand.java
@@ -1,9 +1,9 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.shops.ShopItem;
-
-public class BuyGemItemCommand {
-
-    public String shopIdentifier;
-    public ShopItem item;
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.shops.ShopItem;
+
+public class BuyGemItemCommand {
+
+    public String shopIdentifier;
+    public ShopItem item;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyRewardCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyRewardCommand.java
index 11fcca4cf..bdd9ff3db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyRewardCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/BuyRewardCommand.java
@@ -1,10 +1,10 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-/**
- * Created by Negue on 11.07.2015.
- */
-public class BuyRewardCommand {
-    public Task Reward;
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+/**
+ * Created by Negue on 11.07.2015.
+ */
+public class BuyRewardCommand {
+    public Task Reward;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChatMessageCommandBase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChatMessageCommandBase.java
index 86cf73ec9..efc1e0f7c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChatMessageCommandBase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChatMessageCommandBase.java
@@ -1,16 +1,16 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-
-/**
- * Created by Negue on 04.09.2015.
- */
-public abstract class ChatMessageCommandBase {
-    public String groupId;
-    public ChatMessage chatMessage;
-
-    public ChatMessageCommandBase(String groupId, ChatMessage chatMessage) {
-        this.groupId = groupId;
-        this.chatMessage = chatMessage;
-    }
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+
+/**
+ * Created by Negue on 04.09.2015.
+ */
+public abstract class ChatMessageCommandBase {
+    public String groupId;
+    public ChatMessage chatMessage;
+
+    public ChatMessageCommandBase(String groupId, ChatMessage chatMessage) {
+        this.groupId = groupId;
+        this.chatMessage = chatMessage;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChecklistCheckedCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChecklistCheckedCommand.java
index 7322c43c7..8ac752079 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChecklistCheckedCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ChecklistCheckedCommand.java
@@ -1,10 +1,10 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-public class ChecklistCheckedCommand {
-
-    public Task task;
-    public ChecklistItem item;
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+public class ChecklistCheckedCommand {
+
+    public Task task;
+    public ChecklistItem item;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java
index 1acfcd311..8dfa1284a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatAsTodoCommand.java
@@ -1,12 +1,12 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-
-/**
- * Created by Negue on 30.08.2015.
- */
-public class CopyChatAsTodoCommand extends ChatMessageCommandBase {
-    public CopyChatAsTodoCommand(String groupId, ChatMessage chatMessage) {
-        super(groupId, chatMessage);
-    }
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+
+/**
+ * Created by Negue on 30.08.2015.
+ */
+public class CopyChatAsTodoCommand extends ChatMessageCommandBase {
+    public CopyChatAsTodoCommand(String groupId, ChatMessage chatMessage) {
+        super(groupId, chatMessage);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatMessageCommand.java
index 8721d0fde..f7e3fd498 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CopyChatMessageCommand.java
@@ -1,12 +1,12 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-
-/**
- * Created by jjbillings on 7/27/16.
- */
-public class CopyChatMessageCommand extends ChatMessageCommandBase {
-    public CopyChatMessageCommand(String groupId, ChatMessage chatMessage) {
-        super(groupId, chatMessage);
-    }
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+
+/**
+ * Created by jjbillings on 7/27/16.
+ */
+public class CopyChatMessageCommand extends ChatMessageCommandBase {
+    public CopyChatMessageCommand(String groupId, ChatMessage chatMessage) {
+        super(groupId, chatMessage);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java
index 151140f32..ab583f39a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteChatMessageCommand.java
@@ -1,12 +1,12 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-
-/**
- * Created by Negue on 30.08.2015.
- */
-public class DeleteChatMessageCommand extends ChatMessageCommandBase {
-    public DeleteChatMessageCommand(String groupId, ChatMessage chatMessage) {
-        super(groupId, chatMessage);
-    }
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+
+/**
+ * Created by Negue on 30.08.2015.
+ */
+public class DeleteChatMessageCommand extends ChatMessageCommandBase {
+    public DeleteChatMessageCommand(String groupId, ChatMessage chatMessage) {
+        super(groupId, chatMessage);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java
index 9767c641c..623815646 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java
@@ -1,15 +1,15 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.Tag;
-
-/**
- * Created by jjbillings on 8.9.2016.
- */
-public class DeleteTagCommand {
-    public Tag tag;
-
-    public DeleteTagCommand(Tag tag) {
-        this.tag = tag;
-    }
-}
-
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.Tag;
+
+/**
+ * Created by jjbillings on 8.9.2016.
+ */
+public class DeleteTagCommand {
+    public Tag tag;
+
+    public DeleteTagCommand(Tag tag) {
+        this.tag = tag;
+    }
+}
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java
index 896bcd65b..8692ead77 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java
@@ -1,14 +1,14 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.Tag;
-
-/**
- * Created by jjbillings on 8/16/16.
- */
-public class EditTagCommand {
-    public Tag tag;
-
-    public EditTagCommand(Tag tag) {
-        this.tag = tag;
-    }
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.Tag;
+
+/**
+ * Created by jjbillings on 8/16/16.
+ */
+public class EditTagCommand {
+    public Tag tag;
+
+    public EditTagCommand(Tag tag) {
+        this.tag = tag;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FeedCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FeedCommand.java
index 14f520d6a..8843b4d5c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FeedCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FeedCommand.java
@@ -1,11 +1,11 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.inventory.Food;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-
-public class FeedCommand {
-
-    public Pet usingPet;
-    public Food usingFood;
-
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+
+public class FeedCommand {
+
+    public Pet usingPet;
+    public Food usingFood;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java
index e10213228..85d594b9e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FlagChatMessageCommand.java
@@ -1,13 +1,13 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-
-/**
- * Created by Negue on 30.08.2015.
- */
-public class FlagChatMessageCommand extends ChatMessageCommandBase {
-
-    public FlagChatMessageCommand(String groupId, ChatMessage chatMessage) {
-        super(groupId, chatMessage);
-    }
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+
+/**
+ * Created by Negue on 30.08.2015.
+ */
+public class FlagChatMessageCommand extends ChatMessageCommandBase {
+
+    public FlagChatMessageCommand(String groupId, ChatMessage chatMessage) {
+        super(groupId, chatMessage);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/HatchingCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/HatchingCommand.java
index 9ab0c5c80..9fbbb637d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/HatchingCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/HatchingCommand.java
@@ -1,11 +1,11 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.inventory.Egg;
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-
-public class HatchingCommand {
-
-    public Egg usingEgg;
-    public HatchingPotion usingHatchingPotion;
-
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+
+public class HatchingCommand {
+
+    public Egg usingEgg;
+    public HatchingPotion usingHatchingPotion;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java
index 346120fa3..185a4a213 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java
@@ -1,9 +1,9 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.inventory.Item;
-
-public class SellItemCommand {
-
-    public Item item;
-
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.inventory.Item;
+
+public class SellItemCommand {
+
+    public Item item;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
index e3369a196..71cf56b3f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewGroupMessageCommand.java
@@ -1,14 +1,14 @@
-package com.habitrpg.android.habitica.events.commands;
-
-/**
- * Created by Negue on 24.08.2015.
- */
-public class SendNewGroupMessageCommand {
-    public String message;
-    public String targetGroupId;
-
-    public SendNewGroupMessageCommand(String targetGroupId, String message) {
-        this.targetGroupId = targetGroupId;
-        this.message = message;
-    }
-}
+package com.habitrpg.android.habitica.events.commands;
+
+/**
+ * Created by Negue on 24.08.2015.
+ */
+public class SendNewGroupMessageCommand {
+    public String message;
+    public String targetGroupId;
+
+    public SendNewGroupMessageCommand(String targetGroupId, String message) {
+        this.targetGroupId = targetGroupId;
+        this.message = message;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewInboxMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewInboxMessageCommand.java
index 6dc3ad004..e9d9b1696 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewInboxMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SendNewInboxMessageCommand.java
@@ -1,14 +1,14 @@
-package com.habitrpg.android.habitica.events.commands;
-
-/**
- * Created by keithholliday on 6/22/16.
- */
-public class SendNewInboxMessageCommand {
-    public String message;
-    public String userToSendTo;
-
-    public SendNewInboxMessageCommand(String userToSendTo, String message) {
-        this.userToSendTo = userToSendTo;
-        this.message = message;
-    }
-}
+package com.habitrpg.android.habitica.events.commands;
+
+/**
+ * Created by keithholliday on 6/22/16.
+ */
+public class SendNewInboxMessageCommand {
+    public String message;
+    public String userToSendTo;
+
+    public SendNewInboxMessageCommand(String userToSendTo, String message) {
+        this.userToSendTo = userToSendTo;
+        this.message = message;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/TaskCheckedCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/TaskCheckedCommand.java
index 1696f32d2..bee2851b3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/TaskCheckedCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/TaskCheckedCommand.java
@@ -1,11 +1,11 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-/**
- * Created by Negue on 11.07.2015.
- */
-public class TaskCheckedCommand {
-    public Task Task;
-    public boolean completed;
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+/**
+ * Created by Negue on 11.07.2015.
+ */
+public class TaskCheckedCommand {
+    public Task Task;
+    public boolean completed;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleLikeMessageCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleLikeMessageCommand.java
index 5f1a75e11..8573334d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleLikeMessageCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ToggleLikeMessageCommand.java
@@ -1,12 +1,12 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-
-/**
- * Created by Negue on 02.09.2015.
- */
-public class ToggleLikeMessageCommand extends ChatMessageCommandBase {
-    public ToggleLikeMessageCommand(String groupId, ChatMessage chatMessage) {
-        super(groupId, chatMessage);
-    }
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+
+/**
+ * Created by Negue on 02.09.2015.
+ */
+public class ToggleLikeMessageCommand extends ChatMessageCommandBase {
+    public ToggleLikeMessageCommand(String groupId, ChatMessage chatMessage) {
+        super(groupId, chatMessage);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java
index 6befee574..5146628a4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java
@@ -1,16 +1,16 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.Tag;
-
-/**
- * Created by jjbillings on 8/17/16.
- */
-public class UpdateTagCommand {
-    public Tag tag;
-    public String uuid;
-
-    public UpdateTagCommand(Tag tag, String uuid) {
-        this.tag = tag;
-        this.uuid = uuid;
-    }
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.Tag;
+
+/**
+ * Created by jjbillings on 8/17/16.
+ */
+public class UpdateTagCommand {
+    public Tag tag;
+    public String uuid;
+
+    public UpdateTagCommand(Tag tag, String uuid) {
+        this.tag = tag;
+        this.uuid = uuid;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UseSkillCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UseSkillCommand.java
index 6558b015d..31fab5bc4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UseSkillCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UseSkillCommand.java
@@ -1,11 +1,11 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.Skill;
-
-/**
- * Created by viirus on 28/11/15.
- */
-public class UseSkillCommand {
-
-    public Skill skill;
-}
+package com.habitrpg.android.habitica.events.commands;
+
+import com.habitrpg.android.habitica.models.Skill;
+
+/**
+ * Created by viirus on 28/11/15.
+ */
+public class UseSkillCommand {
+
+    public Skill skill;
+}
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 82f3810cb..ef71bf6a7 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,139 +1,138 @@
-package com.habitrpg.android.habitica.helpers;
-
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.view.LayoutInflater;
-import android.view.View;
-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.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.Notification;
-import com.habitrpg.android.habitica.models.notifications.Reward;
-
-import android.content.Context;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by krh12 on 12/9/2016.
- */
-
-public class PopupNotificationsManager {
-    private Map<String, Boolean> seenNotifications;
-    @Nullable
-    private ApiClient apiClient;
-    private Context context;
-
-    // @TODO: A queue for displaying alert dialogues
-
-    public PopupNotificationsManager(Context context) {
-        this.seenNotifications = new HashMap<>();
-        this.context = context.getApplicationContext();
-    }
-
-    public void setApiClient(@Nullable ApiClient apiClient) {
-        this.apiClient = apiClient;
-    }
-
-    Boolean displayNotification(Notification notification) {
-        String title = notification.data.message;
-        String youEarnedMessage = "";
-
-        LayoutInflater factory = LayoutInflater.from(context);
-        final View view = factory.inflate(R.layout.dialog_login_incentive, null);
-
-        SimpleDraweeView imageView = (SimpleDraweeView) view.findViewById(R.id.imageView);
-        String imageKey = "inventory_present_11";
-        if (notification.data.rewardKey != null) {
-            imageKey = notification.data.rewardKey.get(0);
-
-            if (notification.data.reward != null && notification.data.reward.size() > 0) {
-                String earnedString = "";
-                int count = 0;
-                for (Reward reward : notification.data.reward) {
-                    earnedString += reward.key;
-                    count += 1;
-                    if (notification.data.reward.size() > 1 && count != notification.data.reward.size()) {
-                        earnedString += ", ";
-                    }
-                }
-                youEarnedMessage = context.getString(R.string.checkInRewardEarned, earnedString);
-            }
-        }
-        DataBindingUtils.loadImage(imageView, imageKey);
-
-        TextView youEarnedTexView = (TextView) view.findViewById(R.id.you_earned_message);
-        youEarnedTexView.setTextColor(ContextCompat.getColor(context, R.color.textColorLight));
-        youEarnedTexView.setText(youEarnedMessage);
-
-        String message = context.getString(R.string.nextPrizeUnlocks, notification.data.nextRewardAt);
-        TextView nextUnlockTextView = (TextView) view.findViewById(R.id.next_unlock_message);
-        nextUnlockTextView.setTextColor(ContextCompat.getColor(context, R.color.textColorLight));
-        nextUnlockTextView.setText(message);
-
-        Button confirmButton = (Button) view.findViewById(R.id.confirm_button);
-        confirmButton.setTextColor(ContextCompat.getColor(context, R.color.brand_300));
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity, R.style.AlertDialogTheme)
-                .setTitle(title)
-                .setView(view)
-                .setMessage("");
-
-        final AlertDialog dialog = builder.create();
-        dialog.show();
-
-        confirmButton.setOnClickListener(view1 -> {
-            if (apiClient != null) {
-                // @TODO: This should be handled somewhere else? MAybe we notifiy via event
-                apiClient.readNotificaiton(notification.getId())
-                        .subscribe(next -> {}, throwable -> {});
-            }
-
-            dialog.hide();
-        });
-
-        return true;
-    }
-
-    public Boolean showNotificationDialog(final List<Notification> notifications) {
-        if (notifications == null || notifications.size() == 0) {
-            return false;
-        }
-
-        if (HabiticaApplication.currentActivity == null || HabiticaApplication.currentActivity.isFinishing()) {
-            return false;
-        }
-
-        HabiticaApplication.currentActivity.runOnUiThread(() -> {
-            if (HabiticaApplication.currentActivity == null) return;
-            if ((HabiticaApplication.currentActivity).isFinishing()) return;
-
-            if (this.seenNotifications == null) {
-                this.seenNotifications = new HashMap<>();
-            }
-
-            for (Notification notification : notifications) {
-                if (this.seenNotifications.get(notification.getId()) != null) {
-                    continue;
-                }
-
-                if (!notification.getType().equals("LOGIN_INCENTIVE")) {
-                    continue;
-                }
-
-                this.displayNotification(notification);
-                this.seenNotifications.put(notification.getId(), true);
-            }
-        });
-
-        return true;
-    }
-}
+package com.habitrpg.android.habitica.helpers;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+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.data.ApiClient;
+import com.habitrpg.android.habitica.models.Notification;
+import com.habitrpg.android.habitica.models.notifications.Reward;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by krh12 on 12/9/2016.
+ */
+
+public class PopupNotificationsManager {
+    private Map<String, Boolean> seenNotifications;
+    @Nullable
+    private ApiClient apiClient;
+    private Context context;
+
+    // @TODO: A queue for displaying alert dialogues
+
+    public PopupNotificationsManager(Context context) {
+        this.seenNotifications = new HashMap<>();
+        this.context = context.getApplicationContext();
+    }
+
+    public void setApiClient(@Nullable ApiClient apiClient) {
+        this.apiClient = apiClient;
+    }
+
+    Boolean displayNotification(Notification notification) {
+        String title = notification.data.message;
+        String youEarnedMessage = "";
+
+        LayoutInflater factory = LayoutInflater.from(context);
+        final View view = factory.inflate(R.layout.dialog_login_incentive, null);
+
+        SimpleDraweeView imageView = (SimpleDraweeView) view.findViewById(R.id.imageView);
+        String imageKey = "inventory_present_11";
+        if (notification.data.rewardKey != null) {
+            imageKey = notification.data.rewardKey.get(0);
+
+            if (notification.data.reward != null && notification.data.reward.size() > 0) {
+                String earnedString = "";
+                int count = 0;
+                for (Reward reward : notification.data.reward) {
+                    earnedString += reward.key;
+                    count += 1;
+                    if (notification.data.reward.size() > 1 && count != notification.data.reward.size()) {
+                        earnedString += ", ";
+                    }
+                }
+                youEarnedMessage = context.getString(R.string.checkInRewardEarned, earnedString);
+            }
+        }
+        DataBindingUtils.loadImage(imageView, imageKey);
+
+        TextView youEarnedTexView = (TextView) view.findViewById(R.id.you_earned_message);
+        youEarnedTexView.setTextColor(ContextCompat.getColor(context, R.color.textColorLight));
+        youEarnedTexView.setText(youEarnedMessage);
+
+        String message = context.getString(R.string.nextPrizeUnlocks, notification.data.nextRewardAt);
+        TextView nextUnlockTextView = (TextView) view.findViewById(R.id.next_unlock_message);
+        nextUnlockTextView.setTextColor(ContextCompat.getColor(context, R.color.textColorLight));
+        nextUnlockTextView.setText(message);
+
+        Button confirmButton = (Button) view.findViewById(R.id.confirm_button);
+        confirmButton.setTextColor(ContextCompat.getColor(context, R.color.brand_300));
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(HabiticaApplication.currentActivity, R.style.AlertDialogTheme)
+                .setTitle(title)
+                .setView(view)
+                .setMessage("");
+
+        final AlertDialog dialog = builder.create();
+        dialog.show();
+
+        confirmButton.setOnClickListener(view1 -> {
+            if (apiClient != null) {
+                // @TODO: This should be handled somewhere else? MAybe we notifiy via event
+                apiClient.readNotificaiton(notification.getId())
+                        .subscribe(next -> {}, throwable -> {});
+            }
+
+            dialog.hide();
+        });
+
+        return true;
+    }
+
+    public Boolean showNotificationDialog(final List<Notification> notifications) {
+        if (notifications == null || notifications.size() == 0) {
+            return false;
+        }
+
+        if (HabiticaApplication.currentActivity == null || HabiticaApplication.currentActivity.isFinishing()) {
+            return false;
+        }
+
+        HabiticaApplication.currentActivity.runOnUiThread(() -> {
+            if (HabiticaApplication.currentActivity == null) return;
+            if ((HabiticaApplication.currentActivity).isFinishing()) return;
+
+            if (this.seenNotifications == null) {
+                this.seenNotifications = new HashMap<>();
+            }
+
+            for (Notification notification : notifications) {
+                if (this.seenNotifications.get(notification.getId()) != null) {
+                    continue;
+                }
+
+                if (!notification.getType().equals("LOGIN_INCENTIVE")) {
+                    continue;
+                }
+
+                this.displayNotification(notification);
+                this.seenNotifications.put(notification.getId(), true);
+            }
+        });
+
+        return true;
+    }
+}
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 f156118e5..bc015ae3b 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,179 +1,153 @@
-package com.habitrpg.android.habitica.helpers;
-
-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.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import net.glxn.qrgen.android.QRCode;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-/**
- * Created by keithholliday on 8/12/16.
- */
-public class QrCodeManager {
-
-    //@TODO: Allow users to set other content
-    private String content;
-    private String userId;
-    private Context context;
-    private String qrProfileUrl = "https://habitica.com/qr-code/user/";
-
-    private ImageView qrCodeImageView;
-    private Button qrCodeDownloadButton;
-    private AvatarView avatarView;
-    private FrameLayout qrCodeWrapper;
-
-    private String albumnName;
-    private String fileName;
-    private String saveMessage;
-
-    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
-        @Override
-        public void onResultReceived(HabitRPGUser user) {
-            QrCodeManager.this.avatarView.setUser(user);
-        }
-
-        @Override
-        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
-            return true;
-        }
-
-        @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser user) {
-            return true;
-        }
-    };
-
-    public QrCodeManager(Context context) {
-        this.context = context;
-
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.context);
-        String userId = prefs.getString(this.context.getString(R.string.SP_userID), "");
-
-        this.albumnName = this.context.getString(R.string.qr_album_name);
-        this.fileName = this.context.getString(R.string.qr_file_name);
-        this.saveMessage = this.context.getString(R.string.qr_save_message);
-
-        this.content = this.qrProfileUrl + userId;
-        this.userId = userId;
-    }
-
-    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);
-        this.avatarView.configureView(false, false, false);
-        this.qrCodeWrapper = (FrameLayout) qrLayout.findViewById(R.id.qrCodeWrapper);
-
-        //@TODO: Move to user helper/model
-        new Select()
-                .from(HabitRPGUser.class)
-                .where(Condition.column("id")
-                        .eq(userId))
-                .async()
-                .querySingle(userTransactionListener);
-
-        this.displayQrCode();
-        this.setDownloadQr();
-    }
-
-    private void displayQrCode() {
-        if (qrCodeImageView == null) {
-            return;
-        }
-
-        int qrCodeSize = (int) dipToPixels(400.0f);
-
-        Bitmap myBitmap = QRCode.from(this.content)
-                .withErrorCorrection(ErrorCorrectionLevel.H)
-                .withColor(0xFF432874, 0xFFFFFFFF)
-                .withSize(qrCodeSize, qrCodeSize)
-                .bitmap();
-        qrCodeImageView.setImageBitmap(myBitmap);
-    }
-
-    private float dipToPixels(float dipValue) {
-        DisplayMetrics metrics = this.context.getResources().getDisplayMetrics();
-        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dipValue, metrics);
-    }
-
-    private void setDownloadQr() {
-        if (qrCodeDownloadButton == null) {
-            return;
-        }
-
-        qrCodeDownloadButton.setOnClickListener(view -> {
-            File dir = getAlbumStorageDir(context, albumnName);
-            dir.mkdirs();
-
-            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);
-
-                outputStream.close();
-
-                Toast.makeText(context, saveMessage + pathToQRCode.getPath(),
-                        Toast.LENGTH_LONG).show();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        });
-    }
-
-    private File getAlbumStorageDir(Context context, String albumName) {
-        // Get the directory for the app's private pictures directory.
-        File file = new File(context.getExternalFilesDir(
-                Environment.DIRECTORY_PICTURES), albumName);
-        file.mkdirs();
-        return file;
-    }
-
-    public void showDialogue() {
-        final Dialog dialog = new Dialog(context);
-        dialog.setContentView(R.layout.qr_dialogue);
-        dialog.setTitle(R.string.qr_dialogue_title);
-
-        LinearLayout qrLayout = (LinearLayout) dialog.findViewById(R.id.qrLayout);
-        this.setUpView(qrLayout);
-        Button dialogButton = (Button) dialog.findViewById(R.id.dialogButtonOK);
-
-        dialogButton.setOnClickListener(v -> dialog.dismiss());
-
-        dialog.show();
-    }
-}
+package com.habitrpg.android.habitica.helpers;
+
+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.data.UserRepository;
+import com.habitrpg.android.habitica.ui.AvatarView;
+
+import net.glxn.qrgen.android.QRCode;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * Created by keithholliday on 8/12/16.
+ */
+public class QrCodeManager {
+    private static final String qrProfileUrl = "https://habitica.com/qr-code/user/";
+
+    private final UserRepository userRepository;
+    //@TODO: Allow users to set other content
+    private String content;
+    private String userId;
+    private Context context;
+
+    private ImageView qrCodeImageView;
+    private Button qrCodeDownloadButton;
+    private FrameLayout qrCodeWrapper;
+
+    private String albumnName;
+    private String fileName;
+    private String saveMessage;
+
+    public QrCodeManager(UserRepository userRepository, Context context) {
+        this.context = context;
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this.context);
+        String userId = prefs.getString(this.context.getString(R.string.SP_userID), "");
+
+        this.albumnName = this.context.getString(R.string.qr_album_name);
+        this.fileName = this.context.getString(R.string.qr_file_name);
+        this.saveMessage = this.context.getString(R.string.qr_save_message);
+
+        this.content = qrProfileUrl + userId;
+        this.userId = userId;
+        this.userRepository = userRepository;
+    }
+
+    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);
+        AvatarView avatarView = (AvatarView) qrLayout.findViewById(R.id.avatarView);
+        avatarView.configureView(false, false, false);
+        this.qrCodeWrapper = (FrameLayout) qrLayout.findViewById(R.id.qrCodeWrapper);
+
+        userRepository.getUser(userId).subscribe(avatarView::setUser, throwable -> {});
+
+        this.displayQrCode();
+        this.setDownloadQr();
+    }
+
+    private void displayQrCode() {
+        if (qrCodeImageView == null) {
+            return;
+        }
+
+        int qrCodeSize = (int) dipToPixels(400.0f);
+
+        Bitmap myBitmap = QRCode.from(this.content)
+                .withErrorCorrection(ErrorCorrectionLevel.H)
+                .withColor(0xFF432874, 0xFFFFFFFF)
+                .withSize(qrCodeSize, qrCodeSize)
+                .bitmap();
+        qrCodeImageView.setImageBitmap(myBitmap);
+    }
+
+    private float dipToPixels(float dipValue) {
+        DisplayMetrics metrics = this.context.getResources().getDisplayMetrics();
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dipValue, metrics);
+    }
+
+    private void setDownloadQr() {
+        if (qrCodeDownloadButton == null) {
+            return;
+        }
+
+        qrCodeDownloadButton.setOnClickListener(view -> {
+            File dir = getAlbumStorageDir(context, albumnName);
+            dir.mkdirs();
+
+            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);
+
+                outputStream.close();
+
+                Toast.makeText(context, saveMessage + pathToQRCode.getPath(),
+                        Toast.LENGTH_LONG).show();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
+    private File getAlbumStorageDir(Context context, String albumName) {
+        // Get the directory for the app's private pictures directory.
+        File file = new File(context.getExternalFilesDir(
+                Environment.DIRECTORY_PICTURES), albumName);
+        file.mkdirs();
+        return file;
+    }
+
+    public void showDialogue() {
+        final Dialog dialog = new Dialog(context);
+        dialog.setContentView(R.layout.qr_dialogue);
+        dialog.setTitle(R.string.qr_dialogue_title);
+
+        LinearLayout qrLayout = (LinearLayout) dialog.findViewById(R.id.qrLayout);
+        this.setUpView(qrLayout);
+        Button dialogButton = (Button) dialog.findViewById(R.id.dialogButtonOK);
+
+        dialogButton.setOnClickListener(v -> dialog.dismiss());
+
+        dialog.show();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
index 11909f64b..1cc0472f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
@@ -1,142 +1,142 @@
-package com.habitrpg.android.habitica.helpers;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-
-import android.app.Dialog;
-import android.app.TimePickerDialog;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.PreferenceManager;
-import android.widget.Button;
-import android.widget.DatePicker;
-import android.widget.TimePicker;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.TimeZone;
-import java.util.UUID;
-
-import javax.inject.Inject;
-
-public class RemindersManager {
-
-    @Inject
-    CrashlyticsProxy crashlyticsProxy;
-    private DateFormat dateFormater;
-
-    public RemindersManager(String taskType) {
-        HabiticaBaseApplication.getComponent().inject(this);
-        if (taskType.equals("todo")) {
-            dateFormater = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-        } else {
-            dateFormater = DateFormat.getTimeInstance(DateFormat.SHORT);
-        }
-    }
-
-    @Nullable
-    private RemindersItem createReminderFromDateString(String dateString) {
-        try {
-            Date date = dateFormater.parse(dateString);
-            RemindersItem item = new RemindersItem();
-            UUID randomUUID = UUID.randomUUID();
-            item.setId(randomUUID.toString());
-            item.setStartDate(date);
-            item.setTime(date);
-            return item;
-        } catch (ParseException e) {
-            e.printStackTrace();
-            crashlyticsProxy.logException(e);
-            return null;
-        }
-    }
-
-    public String reminderTimeToString(Date time) {
-        return dateFormater.format(time);
-    }
-
-    public void createReminderTimeDialog(@Nullable ReminderTimeSelectedCallback callback, String taskType,
-                                         Context context, @Nullable RemindersItem reminder) {
-        Calendar currentTime = Calendar.getInstance();
-        int hour = currentTime.get(Calendar.HOUR_OF_DAY);
-        int minute = currentTime.get(Calendar.MINUTE);
-
-        if (taskType.equals("todo")) {
-            Dialog dialog = new Dialog(context);
-            dialog.setContentView(R.layout.custom_date_time_dialogue);
-            dialog.setTitle("Select Date and Time");
-
-            Button dialogConfirmButton = (Button) dialog.findViewById(R.id.customDialogConfirmButton);
-            TimePicker dialogTimePicker = (TimePicker) dialog.findViewById(R.id.timePicker);
-            DatePicker dialogDatePicker = (DatePicker) dialog.findViewById(R.id.datePicker);
-
-            dialogTimePicker.setIs24HourView(android.text.format.DateFormat.is24HourFormat(context));
-
-            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-            String dayOfTheWeek = sharedPreferences.getString("FirstDayOfTheWeek",
-                    Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
-            FirstDayOfTheWeekHelper firstDayOfTheWeekHelper =
-                    FirstDayOfTheWeekHelper.newInstance(Integer.parseInt(dayOfTheWeek));
-            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH) {
-                dialogDatePicker.getCalendarView().setFirstDayOfWeek(
-                        firstDayOfTheWeekHelper.getFirstDayOfTheWeek());
-            } else {
-                dialogDatePicker.setFirstDayOfWeek(firstDayOfTheWeekHelper.getFirstDayOfTheWeek());
-            }
-
-            dialogConfirmButton.setOnClickListener(view -> {
-                int day = dialogDatePicker.getDayOfMonth();
-                int month = dialogDatePicker.getMonth();
-                int year = dialogDatePicker.getYear();
-                int hour1 = 0;
-                int minute1 = 0;
-                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
-                    hour1 = dialogTimePicker.getHour();
-                    minute1 = dialogTimePicker.getMinute();
-                } else {
-                    hour1 = dialogTimePicker.getCurrentHour();
-                    minute1 = dialogTimePicker.getCurrentMinute();
-                }
-
-                Calendar calendar = Calendar.getInstance();
-                calendar.set(year, month, day, hour1, minute1, 0);
-
-                onReminderTimeSelected(callback, reminder, calendar);
-                dialog.hide();
-            });
-            dialog.show();
-        } else {
-            TimePickerDialog timePickerDialog;
-            timePickerDialog = new TimePickerDialog(context, (timePicker, selectedHour, selectedMinute) -> {
-                Calendar calendar = Calendar.getInstance(TimeZone.getDefault());
-                calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE), selectedHour, selectedMinute, 0);
-
-                onReminderTimeSelected(callback, reminder, calendar);
-            }, hour, minute, android.text.format.DateFormat.is24HourFormat(context));
-            timePickerDialog.setTitle("Select Time");
-            timePickerDialog.show();
-        }
-    }
-
-    private void onReminderTimeSelected(@Nullable ReminderTimeSelectedCallback callback, @Nullable RemindersItem reminder, Calendar calendar) {
-        RemindersItem remindersItem = reminder;
-        if (remindersItem == null) {
-            remindersItem = createReminderFromDateString(dateFormater.format(calendar.getTime()));
-        } else {
-            remindersItem.setTime(calendar.getTime());
-        }
-        if (callback != null) {
-            callback.onReminderTimeSelected(remindersItem);
-        }
-    }
-
-    public interface ReminderTimeSelectedCallback {
-        void onReminderTimeSelected(@Nullable RemindersItem remindersItem);
-    }
-}
+package com.habitrpg.android.habitica.helpers;
+
+import android.app.Dialog;
+import android.app.TimePickerDialog;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.support.annotation.Nullable;
+import android.support.v7.preference.PreferenceManager;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.TimePicker;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.UUID;
+
+import javax.inject.Inject;
+
+public class RemindersManager {
+
+    @Inject
+    CrashlyticsProxy crashlyticsProxy;
+    private DateFormat dateFormater;
+
+    public RemindersManager(String taskType) {
+        HabiticaBaseApplication.getComponent().inject(this);
+        if (taskType.equals("todo")) {
+            dateFormater = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+        } else {
+            dateFormater = DateFormat.getTimeInstance(DateFormat.SHORT);
+        }
+    }
+
+    @Nullable
+    private RemindersItem createReminderFromDateString(String dateString) {
+        try {
+            Date date = dateFormater.parse(dateString);
+            RemindersItem item = new RemindersItem();
+            UUID randomUUID = UUID.randomUUID();
+            item.setId(randomUUID.toString());
+            item.setStartDate(date);
+            item.setTime(date);
+            return item;
+        } catch (ParseException e) {
+            e.printStackTrace();
+            crashlyticsProxy.logException(e);
+            return null;
+        }
+    }
+
+    public String reminderTimeToString(Date time) {
+        return dateFormater.format(time);
+    }
+
+    public void createReminderTimeDialog(@Nullable ReminderTimeSelectedCallback callback, String taskType,
+                                         Context context, @Nullable RemindersItem reminder) {
+        Calendar currentTime = Calendar.getInstance();
+        int hour = currentTime.get(Calendar.HOUR_OF_DAY);
+        int minute = currentTime.get(Calendar.MINUTE);
+
+        if (taskType.equals("todo")) {
+            Dialog dialog = new Dialog(context);
+            dialog.setContentView(R.layout.custom_date_time_dialogue);
+            dialog.setTitle("Select Date and Time");
+
+            Button dialogConfirmButton = (Button) dialog.findViewById(R.id.customDialogConfirmButton);
+            TimePicker dialogTimePicker = (TimePicker) dialog.findViewById(R.id.timePicker);
+            DatePicker dialogDatePicker = (DatePicker) dialog.findViewById(R.id.datePicker);
+
+            dialogTimePicker.setIs24HourView(android.text.format.DateFormat.is24HourFormat(context));
+
+            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+            String dayOfTheWeek = sharedPreferences.getString("FirstDayOfTheWeek",
+                    Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
+            FirstDayOfTheWeekHelper firstDayOfTheWeekHelper =
+                    FirstDayOfTheWeekHelper.newInstance(Integer.parseInt(dayOfTheWeek));
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH) {
+                dialogDatePicker.getCalendarView().setFirstDayOfWeek(
+                        firstDayOfTheWeekHelper.getFirstDayOfTheWeek());
+            } else {
+                dialogDatePicker.setFirstDayOfWeek(firstDayOfTheWeekHelper.getFirstDayOfTheWeek());
+            }
+
+            dialogConfirmButton.setOnClickListener(view -> {
+                int day = dialogDatePicker.getDayOfMonth();
+                int month = dialogDatePicker.getMonth();
+                int year = dialogDatePicker.getYear();
+                int hour1 = 0;
+                int minute1 = 0;
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                    hour1 = dialogTimePicker.getHour();
+                    minute1 = dialogTimePicker.getMinute();
+                } else {
+                    hour1 = dialogTimePicker.getCurrentHour();
+                    minute1 = dialogTimePicker.getCurrentMinute();
+                }
+
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(year, month, day, hour1, minute1, 0);
+
+                onReminderTimeSelected(callback, reminder, calendar);
+                dialog.hide();
+            });
+            dialog.show();
+        } else {
+            TimePickerDialog timePickerDialog;
+            timePickerDialog = new TimePickerDialog(context, (timePicker, selectedHour, selectedMinute) -> {
+                Calendar calendar = Calendar.getInstance(TimeZone.getDefault());
+                calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE), selectedHour, selectedMinute, 0);
+
+                onReminderTimeSelected(callback, reminder, calendar);
+            }, hour, minute, android.text.format.DateFormat.is24HourFormat(context));
+            timePickerDialog.setTitle("Select Time");
+            timePickerDialog.show();
+        }
+    }
+
+    private void onReminderTimeSelected(@Nullable ReminderTimeSelectedCallback callback, @Nullable RemindersItem reminder, Calendar calendar) {
+        RemindersItem remindersItem = reminder;
+        if (remindersItem == null) {
+            remindersItem = createReminderFromDateString(dateFormater.format(calendar.getTime()));
+        } else {
+            remindersItem.setTime(calendar.getTime());
+        }
+        if (callback != null) {
+            callback.onReminderTimeSelected(remindersItem);
+        }
+    }
+
+    public interface ReminderTimeSelectedCallback {
+        void onReminderTimeSelected(@Nullable RemindersItem remindersItem);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
index f083e2262..629363d42 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
@@ -1,234 +1,228 @@
-package com.habitrpg.android.habitica.helpers;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.NotificationPublisher;
-import com.habitrpg.android.habitica.events.ReminderDeleteEvent;
-import com.habitrpg.android.habitica.events.TaskDeleteEvent;
-import com.habitrpg.android.habitica.events.TaskSaveEvent;
-import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.habitrpg.android.habitica.receivers.TaskReceiver;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.support.v7.preference.PreferenceManager;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import rx.Observable;
-import rx.schedulers.Schedulers;
-
-import static android.os.Build.VERSION.SDK_INT;
-
-/**
- * Created by keithholliday on 5/29/16.
- */
-public class TaskAlarmManager {
-    public static final String TASK_ID_INTENT_KEY = "TASK_ID";
-    public static final String TASK_NAME_INTENT_KEY = "TASK_NAME";
-    @Inject
-    CrashlyticsProxy crashlyticsProxy;
-    private Context context;
-    private AlarmManager am;
-
-    public TaskAlarmManager(Context context) {
-        HabiticaBaseApplication.getComponent().inject(this);
-        this.context = context.getApplicationContext();
-        EventBus.getDefault().register(this);
-        am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-    }
-
-    public static void scheduleDailyReminder(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        if (prefs.getBoolean("use_reminder", false)) {
-
-            String timeval = prefs.getString("reminder_time", "19:00");
-
-            String[] pieces = timeval.split(":");
-            int hour = Integer.parseInt(pieces[0]);
-            int minute = Integer.parseInt(pieces[1]);
-            Calendar cal = Calendar.getInstance();
-            cal.set(Calendar.HOUR_OF_DAY, hour);
-            cal.set(Calendar.MINUTE, minute);
-            cal.set(Calendar.SECOND, 0);
-            if (cal.getTimeInMillis() < new Date().getTime()) {
-                cal.set(Calendar.DAY_OF_YEAR, cal.get(Calendar.DAY_OF_YEAR) + 1);
-            }
-            long trigger_time = cal.getTimeInMillis();
-
-            Intent notificationIntent = new Intent(context, NotificationPublisher.class);
-            notificationIntent.putExtra(NotificationPublisher.NOTIFICATION_ID, 1);
-            notificationIntent.putExtra(NotificationPublisher.CHECK_DAILIES, false);
-
-            AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-            PendingIntent previousSender = PendingIntent.getBroadcast(context, 0, notificationIntent, PendingIntent.FLAG_NO_CREATE);
-            if (previousSender != null) {
-                previousSender.cancel();
-                alarmManager.cancel(previousSender);
-            }
-
-            PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-            setAlarm(context, trigger_time, pendingIntent);
-        }
-    }
-
-    public static void removeDailyReminder(Context context) {
-        Intent notificationIntent = new Intent(context, NotificationPublisher.class);
-        AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        PendingIntent displayIntent = PendingIntent.getBroadcast(context, 0, notificationIntent, 0);
-        alarmManager.cancel(displayIntent);
-    }
-
-    private static void setAlarm(Context context, long time, PendingIntent pendingIntent) {
-        AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-
-        if (pendingIntent == null) {
-            return;
-        }
-
-        if (SDK_INT < Build.VERSION_CODES.KITKAT) {
-            alarmManager.set(AlarmManager.RTC_WAKEUP, time, pendingIntent);
-        } else if (Build.VERSION_CODES.KITKAT <= SDK_INT && SDK_INT < Build.VERSION_CODES.M) {
-            alarmManager.setWindow(AlarmManager.RTC_WAKEUP, time, time + 60000, pendingIntent);
-        } else if (SDK_INT >= Build.VERSION_CODES.M) {
-            alarmManager.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, time, pendingIntent);
-        }
-    }
-
-    @Subscribe
-    public void onEvent(TaskSaveEvent event) {
-        Task task = event.task;
-        this.setAlarmsForTask(task);
-    }
-
-    @Subscribe
-    public void onEvent(TaskDeleteEvent event) {
-        Task task = event.task;
-        this.removeAlarmsForTask(task);
-    }
-
-    @Subscribe
-    public void onEvent(ReminderDeleteEvent event) {
-        RemindersItem remindersItem = event.reminder;
-        this.removeAlarmForRemindersItem(remindersItem);
-    }
-
-    public void setAlarmsForTask(Task task) {
-        List<RemindersItem> reminders = task.getReminders();
-        for (RemindersItem reminder : reminders) {
-            if (task.getType().equals(Task.TYPE_DAILY)) {
-                //Ensure that we set to the next available time
-                reminder = this.setTimeForDailyReminder(reminder, task);
-            }
-            this.setAlarmForRemindersItem(reminder);
-        }
-    }
-
-    public void removeAlarmsForTask(Task task) {
-        List<RemindersItem> reminders = task.getReminders();
-        for (RemindersItem reminder : reminders) {
-            this.removeAlarmForRemindersItem(reminder);
-        }
-    }
-
-    //This function is used from the TaskReceiver since we do not have access to the task
-    //We currently only use this function to schedule the next reminder for dailies
-    //We may be able to use repeating alarms instead of this in the future
-    public void addAlarmForTaskId(String taskId) {
-        List<Task> tasks = new Select()
-                .from(Task.class)
-                .where(Condition.column("id").eq(taskId))
-                .queryList();
-
-        if (tasks.size() == 0) return;
-        Task task = tasks.get(0);
-
-        if (!task.getType().equals(Task.TYPE_DAILY)) {
-            return;
-        }
-
-        this.setAlarmsForTask(task);
-    }
-
-    public void scheduleAllSavedAlarms() {
-        Observable.defer(() -> Observable.from(new Select()
-                .from(Task.class)
-                .queryList()))
-                .doOnNext(this::setAlarmsForTask)
-                .subscribeOn(Schedulers.io())
-                .subscribe(task -> {
-                }, crashlyticsProxy::logException);
-
-        scheduleDailyReminder(context);
-        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        editor.putLong("lastReminderSchedule", new Date().getTime());
-        editor.apply();
-    }
-
-    private RemindersItem setTimeForDailyReminder(RemindersItem remindersItem, Task task) {
-        Date oldTime = remindersItem.getTime();
-        Date newTime = task.getNextReminderOccurence(oldTime);
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(newTime);
-        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE), oldTime.getHours(), oldTime.getMinutes(), 0);
-        remindersItem.setTime(calendar.getTime());
-        return remindersItem;
-    }
-
-    private void setAlarmForRemindersItem(RemindersItem remindersItem) {
-        Task reminderItemTask = remindersItem.getTask();
-
-        Date now = new Date();
-        if (remindersItem.getTime().before(now)) {
-            return;
-        }
-
-        Calendar cal = Calendar.getInstance();
-        cal.setTime(remindersItem.getTime());
-
-        Intent intent = new Intent(context, TaskReceiver.class);
-        intent.setAction(remindersItem.getId());
-        intent.putExtra(TASK_NAME_INTENT_KEY, reminderItemTask.getText());
-        intent.putExtra(TASK_ID_INTENT_KEY, reminderItemTask.getId());
-
-        int intentId = remindersItem.getId().hashCode() & 0xfffffff;
-        //Cancel alarm if already exists
-        PendingIntent previousSender = PendingIntent.getBroadcast(context, intentId, intent, PendingIntent.FLAG_NO_CREATE);
-        if (previousSender != null) {
-            previousSender.cancel();
-            am.cancel(previousSender);
-        }
-
-        PendingIntent sender = PendingIntent.getBroadcast(context, intentId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-        setAlarm(context, cal.getTimeInMillis(), sender);
-
-        remindersItem.save();
-    }
-
-    private void removeAlarmForRemindersItem(RemindersItem remindersItem) {
-        Intent intent = new Intent(context, TaskReceiver.class);
-        intent.setAction(remindersItem.getId());
-        int intentId = remindersItem.getId().hashCode() & 0xfffffff;
-        PendingIntent sender = PendingIntent.getBroadcast(context, intentId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
-        sender.cancel();
-        am.cancel(sender);
-
-    }
-}
+package com.habitrpg.android.habitica.helpers;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.support.v7.preference.PreferenceManager;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.NotificationPublisher;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.events.ReminderDeleteEvent;
+import com.habitrpg.android.habitica.events.TaskDeleteEvent;
+import com.habitrpg.android.habitica.events.TaskSaveEvent;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+import com.habitrpg.android.habitica.receivers.TaskReceiver;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import rx.Observable;
+import rx.schedulers.Schedulers;
+
+import static android.os.Build.VERSION.SDK_INT;
+
+/**
+ * Created by keithholliday on 5/29/16.
+ */
+public class TaskAlarmManager {
+    public static final String TASK_ID_INTENT_KEY = "TASK_ID";
+    public static final String TASK_NAME_INTENT_KEY = "TASK_NAME";
+    @Inject
+    CrashlyticsProxy crashlyticsProxy;
+    @Inject
+    TaskRepository taskRepository;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
+    private Context context;
+    private AlarmManager am;
+
+    public TaskAlarmManager(Context context) {
+        HabiticaBaseApplication.getComponent().inject(this);
+        this.context = context.getApplicationContext();
+        EventBus.getDefault().register(this);
+        am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+    }
+
+    public static void scheduleDailyReminder(Context context) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        if (prefs.getBoolean("use_reminder", false)) {
+
+            String timeval = prefs.getString("reminder_time", "19:00");
+
+            String[] pieces = timeval.split(":");
+            int hour = Integer.parseInt(pieces[0]);
+            int minute = Integer.parseInt(pieces[1]);
+            Calendar cal = Calendar.getInstance();
+            cal.set(Calendar.HOUR_OF_DAY, hour);
+            cal.set(Calendar.MINUTE, minute);
+            cal.set(Calendar.SECOND, 0);
+            if (cal.getTimeInMillis() < new Date().getTime()) {
+                cal.set(Calendar.DAY_OF_YEAR, cal.get(Calendar.DAY_OF_YEAR) + 1);
+            }
+            long trigger_time = cal.getTimeInMillis();
+
+            Intent notificationIntent = new Intent(context, NotificationPublisher.class);
+            notificationIntent.putExtra(NotificationPublisher.NOTIFICATION_ID, 1);
+            notificationIntent.putExtra(NotificationPublisher.CHECK_DAILIES, false);
+
+            AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+            PendingIntent previousSender = PendingIntent.getBroadcast(context, 0, notificationIntent, PendingIntent.FLAG_NO_CREATE);
+            if (previousSender != null) {
+                previousSender.cancel();
+                alarmManager.cancel(previousSender);
+            }
+
+            PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+            setAlarm(context, trigger_time, pendingIntent);
+        }
+    }
+
+    public static void removeDailyReminder(Context context) {
+        Intent notificationIntent = new Intent(context, NotificationPublisher.class);
+        AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+        PendingIntent displayIntent = PendingIntent.getBroadcast(context, 0, notificationIntent, 0);
+        alarmManager.cancel(displayIntent);
+    }
+
+    private static void setAlarm(Context context, long time, PendingIntent pendingIntent) {
+        AlarmManager alarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+
+        if (pendingIntent == null) {
+            return;
+        }
+
+        if (SDK_INT < Build.VERSION_CODES.KITKAT) {
+            alarmManager.set(AlarmManager.RTC_WAKEUP, time, pendingIntent);
+        } else if (Build.VERSION_CODES.KITKAT <= SDK_INT && SDK_INT < Build.VERSION_CODES.M) {
+            alarmManager.setWindow(AlarmManager.RTC_WAKEUP, time, time + 60000, pendingIntent);
+        } else if (SDK_INT >= Build.VERSION_CODES.M) {
+            alarmManager.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, time, pendingIntent);
+        }
+    }
+
+    @Subscribe
+    public void onEvent(TaskSaveEvent event) {
+        Task task = event.task;
+        this.setAlarmsForTask(task);
+    }
+
+    @Subscribe
+    public void onEvent(TaskDeleteEvent event) {
+        Task task = event.task;
+        this.removeAlarmsForTask(task);
+    }
+
+    @Subscribe
+    public void onEvent(ReminderDeleteEvent event) {
+        RemindersItem remindersItem = event.reminder;
+        this.removeAlarmForRemindersItem(remindersItem);
+    }
+
+    void setAlarmsForTask(Task task) {
+        List<RemindersItem> reminders = task.getReminders();
+        for (RemindersItem reminder : reminders) {
+            if (task.getType().equals(Task.TYPE_DAILY)) {
+                //Ensure that we set to the next available time
+                reminder = this.setTimeForDailyReminder(reminder, task);
+            }
+            this.setAlarmForRemindersItem(reminder);
+        }
+    }
+
+    private void removeAlarmsForTask(Task task) {
+        List<RemindersItem> reminders = task.getReminders();
+        for (RemindersItem reminder : reminders) {
+            this.removeAlarmForRemindersItem(reminder);
+        }
+    }
+
+    //This function is used from the TaskReceiver since we do not have access to the task
+    //We currently only use this function to schedule the next reminder for dailies
+    //We may be able to use repeating alarms instead of this in the future
+    public void addAlarmForTaskId(String taskId) {
+        taskRepository.getTask(taskId)
+                .filter(task -> Task.TYPE_DAILY.equals(task.type))
+                .subscribe(this::setAlarmsForTask, throwable -> {});
+    }
+
+    public void scheduleAllSavedAlarms() {
+        taskRepository.getTasks(userId).flatMap(Observable::from)
+                .doOnNext(this::setAlarmsForTask)
+                .subscribeOn(Schedulers.io())
+                .subscribe(task -> {
+                }, crashlyticsProxy::logException);
+
+        scheduleDailyReminder(context);
+        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
+        editor.putLong("lastReminderSchedule", new Date().getTime());
+        editor.apply();
+    }
+
+    private RemindersItem setTimeForDailyReminder(RemindersItem remindersItem, Task task) {
+        Date oldTime = remindersItem.getTime();
+        Date newTime = task.getNextReminderOccurence(oldTime);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(newTime);
+        calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DATE), oldTime.getHours(), oldTime.getMinutes(), 0);
+        remindersItem.setTime(calendar.getTime());
+        return remindersItem;
+    }
+
+    private void setAlarmForRemindersItem(RemindersItem remindersItem) {
+        Task reminderItemTask = remindersItem.getTask();
+
+        Date now = new Date();
+        if (remindersItem.getTime().before(now)) {
+            return;
+        }
+
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(remindersItem.getTime());
+
+        Intent intent = new Intent(context, TaskReceiver.class);
+        intent.setAction(remindersItem.getId());
+        intent.putExtra(TASK_NAME_INTENT_KEY, reminderItemTask.getText());
+        intent.putExtra(TASK_ID_INTENT_KEY, reminderItemTask.getId());
+
+        int intentId = remindersItem.getId().hashCode() & 0xfffffff;
+        //Cancel alarm if already exists
+        PendingIntent previousSender = PendingIntent.getBroadcast(context, intentId, intent, PendingIntent.FLAG_NO_CREATE);
+        if (previousSender != null) {
+            previousSender.cancel();
+            am.cancel(previousSender);
+        }
+
+        PendingIntent sender = PendingIntent.getBroadcast(context, intentId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        setAlarm(context, cal.getTimeInMillis(), sender);
+
+        remindersItem.save();
+    }
+
+    private void removeAlarmForRemindersItem(RemindersItem remindersItem) {
+        Intent intent = new Intent(context, TaskReceiver.class);
+        intent.setAction(remindersItem.getId());
+        int intentId = remindersItem.getId().hashCode() & 0xfffffff;
+        PendingIntent sender = PendingIntent.getBroadcast(context, intentId, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+        sender.cancel();
+        am.cancel(sender);
+
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java
index 39629ee8c..4c8029166 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java
@@ -1,107 +1,107 @@
-package com.habitrpg.android.habitica.helpers;
-
-import android.support.annotation.Nullable;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by magicmicky on 02/10/15.
- */
-public class TaskFilterHelper {
-    private List<String> tagsId;
-    private Map<String, String> activeFilters = new HashMap<>();
-
-    public TaskFilterHelper() {
-        tagsId = new ArrayList<>();
-
-    }
-
-    public void addTags(String tags) {
-        this.tagsId.add(tags);
-    }
-
-    public int howMany(@Nullable String type) {
-        return this.tagsId.size() + (isTaskFilterActive(type) ? 1 : 0);
-    }
-
-    private boolean isTaskFilterActive(@Nullable String type) {
-        if (activeFilters.get(type) == null) {
-            return false;
-        }
-        if (Task.TYPE_TODO.equals(type)) {
-            return !Task.FILTER_ACTIVE.equals(activeFilters.get(type));
-        } else {
-            return !Task.FILTER_ALL.equals(activeFilters.get(type));
-        }
-    }
-
-    public List<String> getTags() {
-        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) {
-        if (tasks.size() == 0) {
-            return tasks;
-        }
-        List<Task> filtered = new ArrayList<>();
-        String activeFilter = null;
-        if (activeFilters != null && activeFilters.size() > 0) {
-            activeFilter = activeFilters.get(tasks.get(0).type);
-        }
-        for (Task task : tasks) {
-            if (isFiltered(task, activeFilter)) {
-                filtered.add(task);
-            }
-        }
-
-        return filtered;
-    }
-
-    private boolean isFiltered(Task task, @Nullable String activeFilter) {
-        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 type, String activeFilter) {
-        activeFilters.put(type, activeFilter);
-    }
-
-    public String getActiveFilter(String type) {
-        return activeFilters.get(type);
-    }
-}
+package com.habitrpg.android.habitica.helpers;
+
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by magicmicky on 02/10/15.
+ */
+public class TaskFilterHelper {
+    private List<String> tagsId;
+    private Map<String, String> activeFilters = new HashMap<>();
+
+    public TaskFilterHelper() {
+        tagsId = new ArrayList<>();
+
+    }
+
+    public void addTags(String tags) {
+        this.tagsId.add(tags);
+    }
+
+    public int howMany(@Nullable String type) {
+        return this.tagsId.size() + (isTaskFilterActive(type) ? 1 : 0);
+    }
+
+    private boolean isTaskFilterActive(@Nullable String type) {
+        if (activeFilters.get(type) == null) {
+            return false;
+        }
+        if (Task.TYPE_TODO.equals(type)) {
+            return !Task.FILTER_ACTIVE.equals(activeFilters.get(type));
+        } else {
+            return !Task.FILTER_ALL.equals(activeFilters.get(type));
+        }
+    }
+
+    public List<String> getTags() {
+        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) {
+        if (tasks.size() == 0) {
+            return tasks;
+        }
+        List<Task> filtered = new ArrayList<>();
+        String activeFilter = null;
+        if (activeFilters != null && activeFilters.size() > 0) {
+            activeFilter = activeFilters.get(tasks.get(0).type);
+        }
+        for (Task task : tasks) {
+            if (isFiltered(task, activeFilter)) {
+                filtered.add(task);
+            }
+        }
+
+        return filtered;
+    }
+
+    private boolean isFiltered(Task task, @Nullable String activeFilter) {
+        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 type, String activeFilter) {
+        activeFilters.put(type, activeFilter);
+    }
+
+    public String getActiveFilter(String type) {
+        return activeFilters.get(type);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
index 2966892aa..1938f5dde 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
@@ -1,150 +1,150 @@
-package com.habitrpg.android.habitica.helpers;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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 ").append(str_).append(", ");
-            }
-            if (int_ != 0) {
-                sb.append("INT ").append(int_).append(", ");
-            }
-            if (con_ != 0) {
-                sb.append("CON ").append(con_).append(", ");
-            }
-            if (per_ != 0) {
-                sb.append("PER ").append(per_).append(", ");
-            }
-
-            // 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 == null || itemClass.isEmpty()) {
-                itemClass = itemSpecialClass;
-            }
-
-            if (itemClass != null) {
-                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;
-    }
-}
+package com.habitrpg.android.habitica.helpers;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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 ").append(str_).append(", ");
+            }
+            if (int_ != 0) {
+                sb.append("INT ").append(int_).append(", ");
+            }
+            if (con_ != 0) {
+                sb.append("CON ").append(con_).append(", ");
+            }
+            if (per_ != 0) {
+                sb.append("PER ").append(per_).append(", ");
+            }
+
+            // 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 == null || itemClass.isEmpty()) {
+                itemClass = itemSpecialClass;
+            }
+
+            if (itemClass != null) {
+                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/GuildInviteLocalNotification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.java
index d7dab613b..87d65af7f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/GuildInviteLocalNotification.java
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
-
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
+
 /**
  * Created by keithholliday on 7/1/16.
  */
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseInstanceIDService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseInstanceIDService.java
index 6f17488f4..c3e1f59b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseInstanceIDService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseInstanceIDService.java
@@ -1,24 +1,24 @@
-package com.habitrpg.android.habitica.helpers.notifications;
-
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.iid.FirebaseInstanceIdService;
-import com.habitrpg.android.habitica.HabiticaApplication;
-
-import javax.inject.Inject;
-
-/**
- * Created by keithholliday on 6/24/16.
- */
-public class HabiticaFirebaseInstanceIDService extends FirebaseInstanceIdService {
-
-    @Inject
-    public PushNotificationManager pushNotificationManager;
-
-    @Override
-    public void onTokenRefresh() {
-        HabiticaApplication.getComponent().inject(this);
-        String refreshedToken = FirebaseInstanceId.getInstance().getToken();
-        pushNotificationManager.setRefreshedToken(refreshedToken);
-    }
-
-}
+package com.habitrpg.android.habitica.helpers.notifications;
+
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.iid.FirebaseInstanceIdService;
+import com.habitrpg.android.habitica.HabiticaApplication;
+
+import javax.inject.Inject;
+
+/**
+ * Created by keithholliday on 6/24/16.
+ */
+public class HabiticaFirebaseInstanceIDService extends FirebaseInstanceIdService {
+
+    @Inject
+    public PushNotificationManager pushNotificationManager;
+
+    @Override
+    public void onTokenRefresh() {
+        HabiticaApplication.getComponent().inject(this);
+        String refreshedToken = FirebaseInstanceId.getInstance().getToken();
+        pushNotificationManager.setRefreshedToken(refreshedToken);
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.java
index 1cc4a49d8..f3b1ad009 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaFirebaseMessagingService.java
@@ -1,22 +1,22 @@
-package com.habitrpg.android.habitica.helpers.notifications;
-
-import com.google.firebase.messaging.FirebaseMessagingService;
-import com.google.firebase.messaging.RemoteMessage;
-import com.habitrpg.android.habitica.HabiticaApplication;
-
-import javax.inject.Inject;
-
-/**
- * Created by keithholliday on 6/24/16.
- */
-public class HabiticaFirebaseMessagingService extends FirebaseMessagingService {
-
-    @Inject
-    public PushNotificationManager pushNotificationManager;
-
-    @Override
-    public void onMessageReceived(RemoteMessage remoteMessage) {
-        HabiticaApplication.getComponent().inject(this);
-        pushNotificationManager.displayNotification(remoteMessage);
-    }
-}
+package com.habitrpg.android.habitica.helpers.notifications;
+
+import com.google.firebase.messaging.FirebaseMessagingService;
+import com.google.firebase.messaging.RemoteMessage;
+import com.habitrpg.android.habitica.HabiticaApplication;
+
+import javax.inject.Inject;
+
+/**
+ * Created by keithholliday on 6/24/16.
+ */
+public class HabiticaFirebaseMessagingService extends FirebaseMessagingService {
+
+    @Inject
+    public PushNotificationManager pushNotificationManager;
+
+    @Override
+    public void onMessageReceived(RemoteMessage remoteMessage) {
+        HabiticaApplication.getComponent().inject(this);
+        pushNotificationManager.displayNotification(remoteMessage);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.java
index 5e5b82cd0..550b5d8d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.java
@@ -1,13 +1,13 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import com.habitrpg.android.habitica.R;
-
 import android.content.Context;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.support.annotation.CallSuper;
 import android.support.v4.app.NotificationCompat;
 
+import com.habitrpg.android.habitica.R;
+
 import java.util.Map;
 
 /**
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.java
index cb47fcaed..e441d0ff3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PartyInviteLocalNotification.java
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
-
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
+
 /**
  * Created by keithholliday on 6/28/16.
  */
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 d483e8137..226e81f95 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,147 +1,143 @@
-package com.habitrpg.android.habitica.helpers.notifications;
-
-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.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.PushDevice;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-public class PushNotificationManager {
-
-    static final String PARTY_INVITE_PUSH_NOTIFICATION_KEY = "invitedParty";
-    static final String RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY = "newPM";
-    static final String RECEIVED_GEMS_PUSH_NOTIFICATION_KEY = "giftedGems";
-    static final String RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY = "giftedSubscription";
-    static final String GUILD_INVITE_PUSH_NOTIFICATION_KEY = "invitedGuild";
-    static final String QUEST_INVITE_PUSH_NOTIFICATION_KEY = "questInvitation";
-    static final String QUEST_BEGUN_PUSH_NOTIFICATION_KEY = "questStarted";
-    static final String WON_CHALLENGE_PUSH_NOTIFICATION_KEY = "wonChallenge";
-    private static final String DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference";
-    private final Context context;
-    public ApiClient apiClient;
-
-    private String refreshedToken;
-    private SharedPreferences sharedPreferences;
-    private HabitRPGUser user;
-
-    public PushNotificationManager(ApiClient apiClient, SharedPreferences sharedPreferences, Context context) {
-        this.apiClient = apiClient;
-        this.sharedPreferences = sharedPreferences;
-        this.context = context;
-    }
-
-    public void setUser(HabitRPGUser user) {
-        this.user = user;
-    }
-
-    void setRefreshedToken(String refreshedToken) {
-        if (this.refreshedToken == null) {
-            return;
-        }
-
-        this.refreshedToken = refreshedToken;
-        SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putString(DEVICE_TOKEN_PREFERENCE_KEY, refreshedToken);
-        editor.apply();
-    }
-
-    //@TODO: Use preferences
-    public void addPushDeviceUsingStoredToken() {
-        if (this.refreshedToken == null || this.refreshedToken.isEmpty()) {
-            this.refreshedToken = FirebaseInstanceId.getInstance().getToken();
-        }
-
-        if (this.refreshedToken == null || this.refreshedToken.isEmpty()) {
-            return;
-        }
-
-        if (this.user == null || this.userHasPushDevice()) {
-            return;
-        }
-
-        if (!this.userIsSubscribedToNotifications()) {
-            return;
-        }
-
-        Map<String, String> pushDeviceData = new HashMap<>();
-        pushDeviceData.put("regId", this.refreshedToken);
-        pushDeviceData.put("type", "android");
-        apiClient.addPushDevice(pushDeviceData)
-
-            .subscribe(aVoid -> {}, throwable -> {});
-    }
-
-    public void removePushDeviceUsingStoredToken() {
-        apiClient.deletePushDevice(this.refreshedToken)
-
-            .subscribe(aVoid -> {}, throwable -> {});
-    }
-
-    private Boolean userHasPushDevice() {
-        if (this.user.getPushDevices() == null) {
-            return true;
-        }
-
-        for (PushDevice pushDevice : this.user.getPushDevices()) {
-            if (pushDevice.getRegId().equals(this.refreshedToken)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    void displayNotification(RemoteMessage remoteMessage) {
-        String remoteMessageIdentifier = remoteMessage.getData().get("identifier");
-
-        HabiticaLocalNotificationFactory notificationFactory = new HabiticaLocalNotificationFactory();
-        HabiticaLocalNotification notification = notificationFactory.build(remoteMessageIdentifier);
-        if (userIsSubscribedToNotificationType(remoteMessageIdentifier) && notification != null) {
-            notification.setExtras(remoteMessage.getData());
-            notification.notifyLocally(this.context, remoteMessage.getData().get("title"), remoteMessage.getData().get("body"));
-        }
-    }
-
-    private boolean userIsSubscribedToNotifications() {
-        return sharedPreferences.getBoolean("pushNotifications", true);
-    }
-
-    private boolean userIsSubscribedToNotificationType(String type) {
-        String key = "";
-
-        //@TODO: If user has push turned off to send
-
-        if (type == null) {
-            return true;
-        }
-
-        if (type.equals(PARTY_INVITE_PUSH_NOTIFICATION_KEY)) {
-            key = "preference_push_invited_to_party";
-        } else if (type.contains(RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY)) {
-            key = "preference_push_received_a_private_message";
-        } else if (type.contains(RECEIVED_GEMS_PUSH_NOTIFICATION_KEY)) {
-            key = "preference_push_gifted_gems";
-        } else if (type.contains(RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY)) {
-            key = "preference_push_gifted_subscription";
-        } else if (type.contains(GUILD_INVITE_PUSH_NOTIFICATION_KEY)) {
-            key = "preference_push_invited_to_guild";
-        } else if (type.contains(QUEST_INVITE_PUSH_NOTIFICATION_KEY)) {
-            key = "preference_push_invited_to_quest";
-        } else if (type.contains(QUEST_BEGUN_PUSH_NOTIFICATION_KEY)) {
-            key = "preference_push_your_quest_has_begun";
-        } else if (type.contains(WON_CHALLENGE_PUSH_NOTIFICATION_KEY)) {
-            key = "preference_push_you_won_challenge";
-        }
-
-        return sharedPreferences.getBoolean(key, true);
-    }
-}
+package com.habitrpg.android.habitica.helpers.notifications;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.messaging.RemoteMessage;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.PushDevice;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PushNotificationManager {
+
+    static final String PARTY_INVITE_PUSH_NOTIFICATION_KEY = "invitedParty";
+    static final String RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY = "newPM";
+    static final String RECEIVED_GEMS_PUSH_NOTIFICATION_KEY = "giftedGems";
+    static final String RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY = "giftedSubscription";
+    static final String GUILD_INVITE_PUSH_NOTIFICATION_KEY = "invitedGuild";
+    static final String QUEST_INVITE_PUSH_NOTIFICATION_KEY = "questInvitation";
+    static final String QUEST_BEGUN_PUSH_NOTIFICATION_KEY = "questStarted";
+    static final String WON_CHALLENGE_PUSH_NOTIFICATION_KEY = "wonChallenge";
+    private static final String DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference";
+    private final Context context;
+    public ApiClient apiClient;
+
+    private String refreshedToken;
+    private SharedPreferences sharedPreferences;
+    private HabitRPGUser user;
+
+    public PushNotificationManager(ApiClient apiClient, SharedPreferences sharedPreferences, Context context) {
+        this.apiClient = apiClient;
+        this.sharedPreferences = sharedPreferences;
+        this.context = context;
+    }
+
+    public void setUser(HabitRPGUser user) {
+        this.user = user;
+    }
+
+    void setRefreshedToken(String refreshedToken) {
+        if (this.refreshedToken == null) {
+            return;
+        }
+
+        this.refreshedToken = refreshedToken;
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putString(DEVICE_TOKEN_PREFERENCE_KEY, refreshedToken);
+        editor.apply();
+    }
+
+    //@TODO: Use preferences
+    public void addPushDeviceUsingStoredToken() {
+        if (this.refreshedToken == null || this.refreshedToken.isEmpty()) {
+            this.refreshedToken = FirebaseInstanceId.getInstance().getToken();
+        }
+
+        if (this.refreshedToken == null || this.refreshedToken.isEmpty()) {
+            return;
+        }
+
+        if (this.user == null || this.userHasPushDevice()) {
+            return;
+        }
+
+        if (!this.userIsSubscribedToNotifications()) {
+            return;
+        }
+
+        Map<String, String> pushDeviceData = new HashMap<>();
+        pushDeviceData.put("regId", this.refreshedToken);
+        pushDeviceData.put("type", "android");
+        apiClient.addPushDevice(pushDeviceData)
+
+            .subscribe(aVoid -> {}, throwable -> {});
+    }
+
+    public void removePushDeviceUsingStoredToken() {
+        apiClient.deletePushDevice(this.refreshedToken)
+
+            .subscribe(aVoid -> {}, throwable -> {});
+    }
+
+    private Boolean userHasPushDevice() {
+        if (this.user.getPushDevices() == null) {
+            return true;
+        }
+
+        for (PushDevice pushDevice : this.user.getPushDevices()) {
+            if (pushDevice.getRegId().equals(this.refreshedToken)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    void displayNotification(RemoteMessage remoteMessage) {
+        String remoteMessageIdentifier = remoteMessage.getData().get("identifier");
+
+        HabiticaLocalNotificationFactory notificationFactory = new HabiticaLocalNotificationFactory();
+        HabiticaLocalNotification notification = notificationFactory.build(remoteMessageIdentifier);
+        if (userIsSubscribedToNotificationType(remoteMessageIdentifier) && notification != null) {
+            notification.setExtras(remoteMessage.getData());
+            notification.notifyLocally(this.context, remoteMessage.getData().get("title"), remoteMessage.getData().get("body"));
+        }
+    }
+
+    private boolean userIsSubscribedToNotifications() {
+        return sharedPreferences.getBoolean("pushNotifications", true);
+    }
+
+    private boolean userIsSubscribedToNotificationType(String type) {
+        String key = "";
+
+        //@TODO: If user has push turned off to send
+
+        if (type == null) {
+            return true;
+        }
+
+        if (type.equals(PARTY_INVITE_PUSH_NOTIFICATION_KEY)) {
+            key = "preference_push_invited_to_party";
+        } else if (type.contains(RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY)) {
+            key = "preference_push_received_a_private_message";
+        } else if (type.contains(RECEIVED_GEMS_PUSH_NOTIFICATION_KEY)) {
+            key = "preference_push_gifted_gems";
+        } else if (type.contains(RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY)) {
+            key = "preference_push_gifted_subscription";
+        } else if (type.contains(GUILD_INVITE_PUSH_NOTIFICATION_KEY)) {
+            key = "preference_push_invited_to_guild";
+        } else if (type.contains(QUEST_INVITE_PUSH_NOTIFICATION_KEY)) {
+            key = "preference_push_invited_to_quest";
+        } else if (type.contains(QUEST_BEGUN_PUSH_NOTIFICATION_KEY)) {
+            key = "preference_push_your_quest_has_begun";
+        } else if (type.contains(WON_CHALLENGE_PUSH_NOTIFICATION_KEY)) {
+            key = "preference_push_you_won_challenge";
+        }
+
+        return sharedPreferences.getBoolean(key, true);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.java
index 3f008495c..a454af5ef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestBegunLocalNotification.java
@@ -1,12 +1,12 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
 /**
  * Created by keithholliday on 7/1/16.
  */
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.java
index 5be497247..6813577f7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/QuestInviteLocalNotification.java
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
-
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
+
 /**
  * Created by keithholliday on 7/1/16.
  */
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.java
index 9a3e2e4b6..e3c81c2d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedGemsGiftLocalNotification.java
@@ -1,12 +1,12 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
 /**
  * Created by keithholliday on 7/1/16.
  */
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.java
index 61494dd7b..d236ef612 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedPrivateMessageLocalNotification.java
@@ -1,12 +1,12 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
 /**
  * Created by keithholliday on 7/1/16.
  */
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.java
index ada3643a1..bf4cfc192 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/ReceivedSubscriptionGiftLocalNotification.java
@@ -1,12 +1,12 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
 /**
  * Created by keithholliday on 7/1/16.
  */
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.java
index d771614be..0d25f873f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/WonChallengeLocalNotification.java
@@ -1,12 +1,12 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
 /**
  * Created by keithholliday on 7/2/16.
  */
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java
index a1bc2573f..631b827b8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java
@@ -1,42 +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.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.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;
-        }
-    }
-}
+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.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.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
index 3f9466bca..7f630e2eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java
@@ -1,78 +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.habitrpg.android.habitica.models.user.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;
-        }
-    }
-}
+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.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
+
+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
index 50cbd55d1..ffccd3ed4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ChecklistCheckUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ChecklistCheckUseCase.java
@@ -1,38 +1,38 @@
-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.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;
-        }
-    }
-}
+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.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
index c7196da3d..69ec0a7ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java
@@ -1,46 +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.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.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;
-        }
-    }
-}
+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.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.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
index 47d5d5be4..1b95de4fe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
@@ -1,61 +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.habitrpg.android.habitica.models.responses.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;
-        }
-    }
+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.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+
+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
index 0f13ac041..a5e2537f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java
@@ -1,46 +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.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.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;
-        }
-    }
-}
+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.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.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
index 90b2a7d6a..6a2714c74 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
@@ -1,105 +1,105 @@
-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.models.user.Stats;
-import com.habitrpg.android.habitica.ui.AvatarView;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.SuppressedModals;
-
-import org.greenrobot.eventbus.EventBus;
-
-import javax.inject.Inject;
-
-import rx.Observable;
-
-public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Stats> {
-
-    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<Stats> buildUseCaseObservable(RequestValues requestValues) {
-        return Observable.defer(() -> {
-            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 Observable.just(requestValues.user.getStats());
-                }
-            }
-
-            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 Observable.just(requestValues.user.getStats());
-
-        });
-    }
-
-    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;
-        }
-    }
-}
+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.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.models.user.SuppressedModals;
+import com.habitrpg.android.habitica.ui.AvatarView;
+
+import org.greenrobot.eventbus.EventBus;
+
+import javax.inject.Inject;
+
+import rx.Observable;
+
+public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Stats> {
+
+    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<Stats> buildUseCaseObservable(RequestValues requestValues) {
+        return Observable.defer(() -> {
+            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 Observable.just(requestValues.user.getStats());
+                }
+            }
+
+            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 Observable.just(requestValues.user.getStats());
+
+        });
+    }
+
+    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
index 98a76f93d..a33b1dd3e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
@@ -1,109 +1,109 @@
-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.data.UserRepository;
-import com.habitrpg.android.habitica.executors.PostExecutionThread;
-import com.habitrpg.android.habitica.executors.ThreadExecutor;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.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, Stats> {
-
-    public static final int MIN_LEVEL_FOR_SKILLS = 11;
-    private final UserRepository userRepository;
-    private LevelUpUseCase levelUpUseCase;
-
-    @Inject
-    public NotifyUserUseCase(ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread,
-                             LevelUpUseCase levelUpUseCase, UserRepository userRepository) {
-        super(threadExecutor, postExecutionThread);
-        this.levelUpUseCase = levelUpUseCase;
-        this.userRepository = userRepository;
-    }
-
-    @Override
-    protected Observable<Stats> buildUseCaseObservable(RequestValues requestValues) {
-        return Observable.defer(() -> {
-            Stats stats = requestValues.user.getStats();
-
-            if (requestValues.lvl > stats.getLvl()) {
-                return levelUpUseCase.observable(new LevelUpUseCase.RequestValues(requestValues.user, requestValues.lvl, requestValues.context))
-                        .flatMap(aVoid -> userRepository.retrieveUser(false))
-                        .map(HabitRPGUser::getStats);
-            } else {
-                Pair<String, UiUtils.SnackbarDisplayType> pair = getNotificationAndAddStatsToUser(requestValues.user, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp);
-                showSnackbar(requestValues.context, requestValues.snackbarTargetView, pair.first, pair.second);
-                return Observable.just(stats);
-            }
-        });
-    }
-
-    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;
-        }
-    }
-}
+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.data.UserRepository;
+import com.habitrpg.android.habitica.executors.PostExecutionThread;
+import com.habitrpg.android.habitica.executors.ThreadExecutor;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+
+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, Stats> {
+
+    public static final int MIN_LEVEL_FOR_SKILLS = 11;
+    private final UserRepository userRepository;
+    private LevelUpUseCase levelUpUseCase;
+
+    @Inject
+    public NotifyUserUseCase(ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread,
+                             LevelUpUseCase levelUpUseCase, UserRepository userRepository) {
+        super(threadExecutor, postExecutionThread);
+        this.levelUpUseCase = levelUpUseCase;
+        this.userRepository = userRepository;
+    }
+
+    @Override
+    protected Observable<Stats> buildUseCaseObservable(RequestValues requestValues) {
+        return Observable.defer(() -> {
+            Stats stats = requestValues.user.getStats();
+
+            if (requestValues.lvl > stats.getLvl()) {
+                return levelUpUseCase.observable(new LevelUpUseCase.RequestValues(requestValues.user, requestValues.lvl, requestValues.context))
+                        .flatMap(aVoid -> userRepository.retrieveUser(false))
+                        .map(HabitRPGUser::getStats);
+            } else {
+                Pair<String, UiUtils.SnackbarDisplayType> pair = getNotificationAndAddStatsToUser(requestValues.user, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp);
+                showSnackbar(requestValues.context, requestValues.snackbarTargetView, pair.first, pair.second);
+                return Observable.just(stats);
+            }
+        });
+    }
+
+    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
index 2ec2dd8a3..b0eb5a41e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java
@@ -1,46 +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.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.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;
-        }
-    }
-}
+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.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.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/models/Achievement.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Achievement.java
index 8ffa6bbcc..c0e957f31 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Achievement.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Achievement.java
@@ -1,14 +1,14 @@
-package com.habitrpg.android.habitica.models;
-
-public class Achievement {
-    public String type;
-    public String title;
-    public String text;
-    public String icon;
-    public String category;
-    public String key;
-    public String value;
-    public boolean earned;
-    public int index;
-    public Integer optionalCount;
-}
+package com.habitrpg.android.habitica.models;
+
+public class Achievement {
+    public String type;
+    public String title;
+    public String text;
+    public String icon;
+    public String category;
+    public String key;
+    public String value;
+    public boolean earned;
+    public int index;
+    public Integer optionalCount;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.java
index c38cc2853..f07d72f0e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementGroup.java
@@ -1,8 +1,8 @@
-package com.habitrpg.android.habitica.models;
-
-import java.util.HashMap;
-
-public class AchievementGroup {
-    public String label;
-    public HashMap<String, Achievement> achievements;
-}
+package com.habitrpg.android.habitica.models;
+
+import java.util.HashMap;
+
+public class AchievementGroup {
+    public String label;
+    public HashMap<String, Achievement> achievements;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.java
index af31891a7..ba12b0a31 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/AchievementResult.java
@@ -1,7 +1,7 @@
-package com.habitrpg.android.habitica.models;
-
-public class AchievementResult {
-    public AchievementGroup basic;
-    public AchievementGroup seasonal;
-    public AchievementGroup special;
+package com.habitrpg.android.habitica.models;
+
+public class AchievementResult {
+    public AchievementGroup basic;
+    public AchievementGroup seasonal;
+    public AchievementGroup special;
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
index 654fcda88..d1de77ba1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
@@ -1,11 +1,11 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-
-import java.util.List;
-
-public class ContentGear {
-
-    public List<ItemData> flat;
-
-}
+package com.habitrpg.android.habitica.models;
+
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+
+import java.util.List;
+
+public class ContentGear {
+
+    public List<ItemData> flat;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
index d828b2bfb..811397f28 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
@@ -1,48 +1,48 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.habitrpg.android.habitica.models.inventory.Egg;
-import com.habitrpg.android.habitica.models.inventory.Food;
-import com.habitrpg.android.habitica.models.inventory.Mount;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * Created by Negue on 15.07.2015.
- */
-public class ContentResult {
-
-    public ItemData potion;
-
-    public ItemData armoire;
-
-    public ContentGear gear;
-
-    public List<QuestContent> quests;
-    public List<Egg> eggs;
-    public List<Food> food;
-    public List<HatchingPotion> hatchingPotions;
-
-    public HashMap<String, Pet> pets;
-    public HashMap<String, Pet> specialPets;
-    public HashMap<String, Pet> premiumPets;
-    public HashMap<String, Pet> questPets;
-
-    public HashMap<String, Mount> mounts;
-    public HashMap<String, Mount> specialMounts;
-    public HashMap<String, Mount> premiumMounts;
-    public HashMap<String, Mount> questMounts;
-
-    public List<Skill> spells;
-
-    public List<Customization> appearances;
-    public List<Customization> backgrounds;
-
-    public List<FAQArticle> faq;
-}
-
+package com.habitrpg.android.habitica.models;
+
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * Created by Negue on 15.07.2015.
+ */
+public class ContentResult {
+
+    public ItemData potion;
+
+    public ItemData armoire;
+
+    public ContentGear gear;
+
+    public List<QuestContent> quests;
+    public List<Egg> eggs;
+    public List<Food> food;
+    public List<HatchingPotion> hatchingPotions;
+
+    public HashMap<String, Pet> pets;
+    public HashMap<String, Pet> specialPets;
+    public HashMap<String, Pet> premiumPets;
+    public HashMap<String, Pet> questPets;
+
+    public HashMap<String, Mount> mounts;
+    public HashMap<String, Mount> specialMounts;
+    public HashMap<String, Mount> premiumMounts;
+    public HashMap<String, Mount> questMounts;
+
+    public List<Skill> spells;
+
+    public List<Customization> appearances;
+    public List<Customization> backgrounds;
+
+    public List<FAQArticle> faq;
+}
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
index 6c7717e1e..8942bf232 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
@@ -1,45 +1,45 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by viirus on 22/01/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class FAQArticle extends BaseModel {
-
-    @PrimaryKey
-    @Column
-    private Integer position;
-
-    @Column
-    private String question, answer;
-
-    public Integer getPosition() {
-        return position;
-    }
-
-    public void setPosition(Integer position) {
-        this.position = position;
-    }
-
-    public String getQuestion() {
-        return question;
-    }
-
-    public void setQuestion(String question) {
-        this.question = question;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
-}
+package com.habitrpg.android.habitica.models;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+/**
+ * Created by viirus on 22/01/16.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class FAQArticle extends BaseModel {
+
+    @PrimaryKey
+    @Column
+    private Integer position;
+
+    @Column
+    private String question, answer;
+
+    public Integer getPosition() {
+        return position;
+    }
+
+    public void setPosition(Integer position) {
+        this.position = position;
+    }
+
+    public String getQuestion() {
+        return question;
+    }
+
+    public void setQuestion(String question) {
+        this.question = question;
+    }
+
+    public String getAnswer() {
+        return answer;
+    }
+
+    public void setAnswer(String answer) {
+        this.answer = answer;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/HabitRpgClass.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/HabitRpgClass.java
index c6bb1702a..d7004f308 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/HabitRpgClass.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/HabitRpgClass.java
@@ -1,13 +1,13 @@
-package com.habitrpg.android.habitica.models;
-
-/**
- * Created by MagicMicky on 16/03/14.
- */
-public enum HabitRpgClass {
-    rogue,
-    wizard,
-    warrior,
-    healer,
-    base
-
-}
+package com.habitrpg.android.habitica.models;
+
+/**
+ * Created by MagicMicky on 16/03/14.
+ */
+public enum HabitRpgClass {
+    rogue,
+    wizard,
+    warrior,
+    healer,
+    base
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.java
index 30ce46289..5d2504240 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/LeaveChallengeBody.java
@@ -1,11 +1,11 @@
-package com.habitrpg.android.habitica.models;
-
-public class LeaveChallengeBody {
-
-    public String keep;
-
-    public LeaveChallengeBody(String keep) {
-        this.keep = keep;
-    }
-
-}
+package com.habitrpg.android.habitica.models;
+
+public class LeaveChallengeBody {
+
+    public String keep;
+
+    public LeaveChallengeBody(String keep) {
+        this.keep = keep;
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.java
index d3494c9a9..e3f995c74 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Notification.java
@@ -1,88 +1,88 @@
-package com.habitrpg.android.habitica.models;
-
-/**
- * Created by krh12 on 11/28/2016.
- */
-
-import com.habitrpg.android.habitica.models.notifications.NotificationData;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class Notification {
-
-    public NotificationData data;
-    private String type;
-    private String createdAt;
-    private String id;
-    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
-
-    /**
-     * @return The type
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * @param type The type
-     */
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    /**
-     * @return The createdAt
-     */
-    public String getCreatedAt() {
-        return createdAt;
-    }
-
-    /**
-     * @param createdAt The createdAt
-     */
-    public void setCreatedAt(String createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    /**
-     *
-     * @return
-     * The data
-     */
-//    public T getData() {
-//        return data;
-//    }
-
-    /**
-     *
-     * @param data
-     * The data
-     */
-//    public void setData(T data) {
-//        this.data = data;
-//    }
-
-    /**
-     * @return The id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id The id
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Map<String, Object> getAdditionalProperties() {
-        return this.additionalProperties;
-    }
-
-    public void setAdditionalProperty(String name, Object value) {
-        this.additionalProperties.put(name, value);
-    }
-
+package com.habitrpg.android.habitica.models;
+
+/**
+ * Created by krh12 on 11/28/2016.
+ */
+
+import com.habitrpg.android.habitica.models.notifications.NotificationData;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Notification {
+
+    public NotificationData data;
+    private String type;
+    private String createdAt;
+    private String id;
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    /**
+     * @return The type
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * @param type The type
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * @return The createdAt
+     */
+    public String getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * @param createdAt The createdAt
+     */
+    public void setCreatedAt(String createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    /**
+     *
+     * @return
+     * The data
+     */
+//    public T getData() {
+//        return data;
+//    }
+
+    /**
+     *
+     * @param data
+     * The data
+     */
+//    public void setData(T data) {
+//        this.data = data;
+//    }
+
+    /**
+     * @return The id
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @param id The id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationRequest.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationRequest.java
index a2ef8b81e..3f63daafc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationRequest.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationRequest.java
@@ -1,9 +1,9 @@
-package com.habitrpg.android.habitica.models;
-
-/**
- * Created by Negue on 26.11.2015.
- */
-public class PurchaseValidationRequest {
-    public Transaction transaction;
-}
-
+package com.habitrpg.android.habitica.models;
+
+/**
+ * Created by Negue on 26.11.2015.
+ */
+public class PurchaseValidationRequest {
+    public Transaction transaction;
+}
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java
index b74789428..fa673580f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PurchaseValidationResult.java
@@ -1,6 +1,6 @@
-package com.habitrpg.android.habitica.models;
-
-public class PurchaseValidationResult {
-    public boolean ok;
-    public Object data;
-}
+package com.habitrpg.android.habitica.models;
+
+public class PurchaseValidationResult {
+    public boolean ok;
+    public Object data;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.java
index 2216f48e6..7b5c1c1a0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/PushDevice.java
@@ -1,34 +1,34 @@
-package com.habitrpg.android.habitica.models;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-/**
- * Created by keithholliday on 7/5/16.
- */
-public class PushDevice {
-
-    @SerializedName("regId")
-    @Expose
-    private String regId;
-
-    @SerializedName("type")
-    @Expose
-    private String type;
-
-    public String getRegId() {
-        return this.regId;
-    }
-
-    public void setRegId(String regId) {
-        this.regId = regId;
-    }
-
-    public String getType() {
-        return this.type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-}
+package com.habitrpg.android.habitica.models;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by keithholliday on 7/5/16.
+ */
+public class PushDevice {
+
+    @SerializedName("regId")
+    @Expose
+    private String regId;
+
+    @SerializedName("type")
+    @Expose
+    private String type;
+
+    public String getRegId() {
+        return this.regId;
+    }
+
+    public void setRegId(String regId) {
+        this.regId = regId;
+    }
+
+    public String getType() {
+        return this.type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java
index bd0109e01..36c15f000 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SetupCustomization.java
@@ -1,111 +1,111 @@
-package com.habitrpg.android.habitica.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;
-    }
-}
+package com.habitrpg.android.habitica.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/habitrpg/android/habitica/models/Skill.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
index 47af1926f..a5280d43c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
@@ -1,24 +1,24 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Skill extends BaseModel {
-
-    @Column
-    @PrimaryKey()
-    public String key;
-
-    @Column
-    public String text, notes, target, habitClass;
-
-    @Column
-    public Integer mana, lvl;
-
-    public boolean isSpecialItem;
-}
+package com.habitrpg.android.habitica.models;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Skill extends BaseModel {
+
+    @Column
+    @PrimaryKey()
+    public String key;
+
+    @Column
+    public String text, notes, target, habitClass;
+
+    @Column
+    public Integer mana, lvl;
+
+    public boolean isSpecialItem;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/SubscriptionValidationRequest.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SubscriptionValidationRequest.java
index 9b88f69f4..aebaf9630 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/SubscriptionValidationRequest.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/SubscriptionValidationRequest.java
@@ -1,9 +1,9 @@
-package com.habitrpg.android.habitica.models;
-
-
-public class SubscriptionValidationRequest {
-
-    public Transaction transaction;
-    public String sku;
-
-}
+package com.habitrpg.android.habitica.models;
+
+
+public class SubscriptionValidationRequest {
+
+    public Transaction transaction;
+    public String sku;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
index f3c627180..c8498046c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
@@ -1,100 +1,100 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ModelContainer;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.List;
-
-/**
- * Description of a Tag in HabitRPG
- * Created by MagicMicky on 16/03/14.
- */
-
-@ModelContainer
-@Table(databaseName = HabitDatabase.NAME)
-public class Tag extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    public String id;
-
-    @Column
-    @NotNull
-    public String user_id;
-    public List<TaskTag> tasks;
-    @Column
-    String name;
-
-    public Tag() {
-        this(null, null);
-    }
-
-    public Tag(String id, String name) {
-        this.setId(id);
-        this.setName(name);
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tasks")
-    public List<TaskTag> getTasks() {
-        if (tasks == null) {
-            tasks = new Select()
-                    .from(TaskTag.class)
-                    .where(Condition.column("tag_id").eq(this.id)).and(Condition.column("task_id").isNotNull())
-                    .queryList();
-        }
-        return tasks;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    @Override
-    public void delete() {
-        if (getTasks() != null) {
-            for (TaskTag tt : getTasks()) {
-                tt.delete();
-            }
-        }
-        super.delete();
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (o.getClass().equals(Tag.class)) {
-            Tag otherTag = (Tag) o;
-            return this.getId().equals(otherTag.getId());
-        }
-        return super.equals(o);
-    }
-
-    @Override
-    public void save() {
-        if (user_id == null) {
-            return;
-        }
-        super.save();
-    }
-}
+package com.habitrpg.android.habitica.models;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ModelContainer;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.OneToMany;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.List;
+
+/**
+ * Description of a Tag in HabitRPG
+ * Created by MagicMicky on 16/03/14.
+ */
+
+@ModelContainer
+@Table(databaseName = HabitDatabase.NAME)
+public class Tag extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    public String id;
+
+    @Column
+    @NotNull
+    public String user_id;
+    public List<TaskTag> tasks;
+    @Column
+    String name;
+
+    public Tag() {
+        this(null, null);
+    }
+
+    public Tag(String id, String name) {
+        this.setId(id);
+        this.setName(name);
+    }
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tasks")
+    public List<TaskTag> getTasks() {
+        if (tasks == null) {
+            tasks = new Select()
+                    .from(TaskTag.class)
+                    .where(Condition.column("tag_id").eq(this.id)).and(Condition.column("task_id").isNotNull())
+                    .queryList();
+        }
+        return tasks;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public void delete() {
+        if (getTasks() != null) {
+            for (TaskTag tt : getTasks()) {
+                tt.delete();
+            }
+        }
+        super.delete();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o.getClass().equals(Tag.class)) {
+            Tag otherTag = (Tag) o;
+            return this.getId().equals(otherTag.getId());
+        }
+        return super.equals(o);
+    }
+
+    @Override
+    public void save() {
+        if (user_id == null) {
+            return;
+        }
+        super.save();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.java
index a8d15e63a..aef45d7aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Transaction.java
@@ -1,7 +1,7 @@
-package com.habitrpg.android.habitica.models;
-
-public class Transaction {
-    public String receipt;
-
-    public String signature;
-}
+package com.habitrpg.android.habitica.models;
+
+public class Transaction {
+    public String receipt;
+
+    public String signature;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java
index 8b0601de8..56ec521df 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java
@@ -1,81 +1,81 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.Date;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class TutorialStep extends BaseModel {
-
-    @Column
-    public String user_id;
-    @PrimaryKey
-    @Column
-    private String key;
-    @Column
-    private String tutorialGroup, identifier;
-
-    @Column
-    private boolean wasCompleted;
-
-    @Column
-    private Date displayedOn;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getUser_id() {
-        return user_id;
-    }
-
-    public void setUser_id(String user_id) {
-        this.user_id = user_id;
-    }
-
-    public String getTutorialGroup() {
-        return tutorialGroup;
-    }
-
-    public void setTutorialGroup(String group) {
-        this.tutorialGroup = group;
-        this.key = group + "_" + this.identifier;
-    }
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-        this.key = this.tutorialGroup + "_" + identifier;
-    }
-
-    public boolean getWasCompleted() {
-        return wasCompleted;
-    }
-
-    public void setWasCompleted(boolean wasCompleted) {
-        this.wasCompleted = wasCompleted;
-    }
-
-    public Date getDisplayedOn() {
-        return displayedOn;
-    }
-
-    public void setDisplayedOn(Date displayedOn) {
-        this.displayedOn = displayedOn;
-    }
-
-    public boolean shouldDisplay() {
-        return  !this.getWasCompleted() && (this.getDisplayedOn() == null || (new Date().getTime() - this.getDisplayedOn().getTime()) > 86400000);
-    }
-}
+package com.habitrpg.android.habitica.models;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.Date;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class TutorialStep extends BaseModel {
+
+    @Column
+    public String user_id;
+    @PrimaryKey
+    @Column
+    private String key;
+    @Column
+    private String tutorialGroup, identifier;
+
+    @Column
+    private boolean wasCompleted;
+
+    @Column
+    private Date displayedOn;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    public String getTutorialGroup() {
+        return tutorialGroup;
+    }
+
+    public void setTutorialGroup(String group) {
+        this.tutorialGroup = group;
+        this.key = group + "_" + this.identifier;
+    }
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+        this.key = this.tutorialGroup + "_" + identifier;
+    }
+
+    public boolean getWasCompleted() {
+        return wasCompleted;
+    }
+
+    public void setWasCompleted(boolean wasCompleted) {
+        this.wasCompleted = wasCompleted;
+    }
+
+    public Date getDisplayedOn() {
+        return displayedOn;
+    }
+
+    public void setDisplayedOn(Date displayedOn) {
+        this.displayedOn = displayedOn;
+    }
+
+    public boolean shouldDisplay() {
+        return  !this.getWasCompleted() && (this.getDisplayedOn() == null || (new Date().getTime() - this.getDisplayedOn().getTime()) > 86400000);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java
index df4b08b3d..25bb23f52 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java
@@ -1,40 +1,40 @@
-package com.habitrpg.android.habitica.models.auth;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by admin on 18/11/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class LocalAuthentication extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    public
-    String user_id;
-
-    @Column
-    String email, username;
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-}
+package com.habitrpg.android.habitica.models.auth;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+/**
+ * Created by admin on 18/11/15.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class LocalAuthentication extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    public
+    String user_id;
+
+    @Column
+    String email, username;
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java
index f3bf6ef6e..e2e45a657 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuth.java
@@ -1,43 +1,43 @@
-package com.habitrpg.android.habitica.models.auth;
-
-/**
- * Created by magicmicky on 04/02/15.
- */
-public class UserAuth {
-    private String username;
-    private String password;
-    private String confirmPassword;
-    private String email;
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getConfirmPassword() {
-        return confirmPassword;
-    }
-
-    public void setConfirmPassword(String confirmPassword) {
-        this.confirmPassword = confirmPassword;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-}
+package com.habitrpg.android.habitica.models.auth;
+
+/**
+ * Created by magicmicky on 04/02/15.
+ */
+public class UserAuth {
+    private String username;
+    private String password;
+    private String confirmPassword;
+    private String email;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getConfirmPassword() {
+        return confirmPassword;
+    }
+
+    public void setConfirmPassword(String confirmPassword) {
+        this.confirmPassword = confirmPassword;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthResponse.java
index 3779a8fe9..a1cd8bc9a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthResponse.java
@@ -1,48 +1,48 @@
-package com.habitrpg.android.habitica.models.auth;
-
-/**
- * Created by magicmicky on 04/02/15.
- */
-public class UserAuthResponse {
-    //we need apiToken and token, as both are possible returns
-    private String apiToken;
-    private String token;
-    private Boolean newUser = false;
-    private String id;
-
-    public String getToken() {
-        if (this.token == null) {
-            return this.apiToken;
-        } else {
-            return this.token;
-        }
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getApiToken() {
-        return apiToken;
-    }
-
-    public void setApiToken(String apiToken) {
-        this.apiToken = apiToken;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Boolean getNewUser() {
-        return newUser;
-    }
-
-    public void setNewUser(Boolean newUser) {
-        this.newUser = newUser;
-    }
-}
+package com.habitrpg.android.habitica.models.auth;
+
+/**
+ * Created by magicmicky on 04/02/15.
+ */
+public class UserAuthResponse {
+    //we need apiToken and token, as both are possible returns
+    private String apiToken;
+    private String token;
+    private Boolean newUser = false;
+    private String id;
+
+    public String getToken() {
+        if (this.token == null) {
+            return this.apiToken;
+        } else {
+            return this.token;
+        }
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getApiToken() {
+        return apiToken;
+    }
+
+    public void setApiToken(String apiToken) {
+        this.apiToken = apiToken;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Boolean getNewUser() {
+        return newUser;
+    }
+
+    public void setNewUser(Boolean newUser) {
+        this.newUser = newUser;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java
index 20c75c2ac..89caecc85 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocial.java
@@ -1,26 +1,26 @@
-package com.habitrpg.android.habitica.models.auth;
-
-/**
- * Created by viirus on 13/11/15.
- */
-public class UserAuthSocial {
-    private String network;
-    private UserAuthSocialTokens authResponse;
-
-    public String getNetwork() {
-        return network;
-    }
-
-    public void setNetwork(String network) {
-        this.network = network;
-    }
-
-    public UserAuthSocialTokens getAuthResponse() {
-        return authResponse;
-    }
-
-    public void setAuthResponse(UserAuthSocialTokens authResponse) {
-        this.authResponse = authResponse;
-    }
-
-}
+package com.habitrpg.android.habitica.models.auth;
+
+/**
+ * Created by viirus on 13/11/15.
+ */
+public class UserAuthSocial {
+    private String network;
+    private UserAuthSocialTokens authResponse;
+
+    public String getNetwork() {
+        return network;
+    }
+
+    public void setNetwork(String network) {
+        this.network = network;
+    }
+
+    public UserAuthSocialTokens getAuthResponse() {
+        return authResponse;
+    }
+
+    public void setAuthResponse(UserAuthSocialTokens authResponse) {
+        this.authResponse = authResponse;
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java
index 5e2d38dd1..e19dc2dd3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/UserAuthSocialTokens.java
@@ -1,25 +1,25 @@
-package com.habitrpg.android.habitica.models.auth;
-
-/**
- * Created by viirus on 13/11/15.
- */
-public class UserAuthSocialTokens {
-    private String client_id;
-    private String access_token;
-
-    public String getClient_id() {
-        return client_id;
-    }
-
-    public void setClient_id(String client_id) {
-        this.client_id = client_id;
-    }
-
-    public String getAccess_token() {
-        return access_token;
-    }
-
-    public void setAccess_token(String access_token) {
-        this.access_token = access_token;
-    }
-}
+package com.habitrpg.android.habitica.models.auth;
+
+/**
+ * Created by viirus on 13/11/15.
+ */
+public class UserAuthSocialTokens {
+    private String client_id;
+    private String access_token;
+
+    public String getClient_id() {
+        return client_id;
+    }
+
+    public void setClient_id(String client_id) {
+        this.client_id = client_id;
+    }
+
+    public String getAccess_token() {
+        return access_token;
+    }
+
+    public void setAccess_token(String access_token) {
+        this.access_token = access_token;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
index 9e4ffdb1c..b9122303c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
@@ -1,101 +1,101 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-public class Animal extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    String key;
-
-    @Column
-    String animal, color, animalGroup, animalText, colorText;
-
-    @Column
-    Boolean premium, limited;
-
-    Integer numberOwned;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getAnimal() {
-        return animal;
-    }
-
-    public void setAnimal(String animal) {
-        this.animal = animal;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public String getAnimalGroup() {
-        return animalGroup;
-    }
-
-    public void setAnimalGroup(String group) {
-        this.animalGroup = group;
-    }
-
-    public String getAnimalText() {
-        if (animalText == null) {
-            return animal;
-        }
-        return animalText;
-    }
-
-    public void setAnimalText(String animalText) {
-        this.animalText = animalText;
-    }
-
-    public String getColorText() {
-        if (colorText == null) {
-            return color;
-        }
-        return colorText;
-    }
-
-    public void setColorText(String colorText) {
-        this.colorText = colorText;
-    }
-
-    public Boolean getPremium() {
-        return premium;
-    }
-
-    public void setPremium(Boolean premium) {
-        this.premium = premium;
-    }
-
-    public Boolean getLimited() {
-        return limited;
-    }
-
-    public void setLimited(Boolean limited) {
-        this.limited = limited;
-    }
-
-    public Integer getNumberOwned() {
-        if (numberOwned == null) {
-            return 0;
-        }
-        return numberOwned;
-    }
-
-    public void setNumberOwned(Integer numberOwned) {
-        this.numberOwned = numberOwned;
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+public class Animal extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    String key;
+
+    @Column
+    String animal, color, animalGroup, animalText, colorText;
+
+    @Column
+    Boolean premium, limited;
+
+    Integer numberOwned;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAnimal() {
+        return animal;
+    }
+
+    public void setAnimal(String animal) {
+        this.animal = animal;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getAnimalGroup() {
+        return animalGroup;
+    }
+
+    public void setAnimalGroup(String group) {
+        this.animalGroup = group;
+    }
+
+    public String getAnimalText() {
+        if (animalText == null) {
+            return animal;
+        }
+        return animalText;
+    }
+
+    public void setAnimalText(String animalText) {
+        this.animalText = animalText;
+    }
+
+    public String getColorText() {
+        if (colorText == null) {
+            return color;
+        }
+        return colorText;
+    }
+
+    public void setColorText(String colorText) {
+        this.colorText = colorText;
+    }
+
+    public Boolean getPremium() {
+        return premium;
+    }
+
+    public void setPremium(Boolean premium) {
+        this.premium = premium;
+    }
+
+    public Boolean getLimited() {
+        return limited;
+    }
+
+    public void setLimited(Boolean limited) {
+        this.limited = limited;
+    }
+
+    public Integer getNumberOwned() {
+        if (numberOwned == null) {
+            return 0;
+        }
+        return numberOwned;
+    }
+
+    public void setNumberOwned(Integer numberOwned) {
+        this.numberOwned = numberOwned;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
index 37ea875f7..558ee1f91 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
@@ -1,209 +1,209 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import android.support.annotation.Nullable;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.Date;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Customization extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    private String id;
-
-    @Column
-    private String identifier, category, type, notes, customizationSet, customizationSetName, text;
-
-    @Column
-    private boolean purchased, isBuyable;
-
-    @Column
-    private Integer price, setPrice;
-
-    @Column
-    private Date availableFrom, availableUntil;
-
-    private void updateID() {
-        this.id = this.identifier + "_" + this.type + "_" + this.category;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getIdentifier() {
-        return this.identifier;
-    }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-        this.updateID();
-    }
-
-    public String getCategory() {
-        return this.category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-        this.updateID();
-    }
-
-    public String getType() {
-        return this.type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-        this.updateID();
-    }
-
-    public String getNotes() {
-        return this.notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public String getCustomizationSet() {
-        return this.customizationSet;
-    }
-
-    public void setCustomizationSet(String customizationSet) {
-        this.customizationSet = customizationSet;
-    }
-
-    public String getCustomizationSetName() {
-        return this.customizationSetName;
-    }
-
-    public void setCustomizationSetName(@Nullable String customizationSetName) {
-        this.customizationSetName = customizationSetName;
-    }
-
-    public String getText() {
-        return this.text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    @SuppressWarnings("RedundantIfStatement")
-    public boolean getPurchasable() {
-        Date today = new Date();
-        if (this.availableFrom != null && !this.availableFrom.before(today)) {
-            //Not released yet
-            return false;
-        }
-
-        if (this.availableUntil != null && !this.availableUntil.after(today)) {
-            //Discontinued
-            return false;
-        }
-
-        return true;
-    }
-
-    public boolean getPurchased() {
-        return this.purchased;
-    }
-
-    public void setPurchased(boolean purchased) {
-        this.purchased = purchased;
-    }
-
-    public Integer getPrice() {
-        return this.price;
-    }
-
-    public void setPrice(Integer price) {
-        this.price = price;
-    }
-
-    public Integer getSetPrice() {
-        return this.setPrice;
-    }
-
-    public void setSetPrice(Integer setPrice) {
-        this.setPrice = setPrice;
-    }
-
-    public Date getAvailableFrom() {
-        return this.availableFrom;
-    }
-
-    public void setAvailableFrom(Date availableFrom) {
-        this.availableFrom = availableFrom;
-    }
-
-    public Date getAvailableUntil() {
-        return this.availableUntil;
-    }
-
-    public void setAvailableUntil(Date availableUntil) {
-        this.availableUntil = availableUntil;
-    }
-
-    public String getImageName(String userSize, String hairColor) {
-
-        switch (this.type) {
-            case "skin":
-                return "skin_" + this.identifier;
-            case "shirt":
-                return userSize + "_shirt_" + this.identifier;
-            case "hair":
-                if (this.identifier.equals("0")) {
-                    return "head_0";
-                }
-
-                switch (this.category) {
-                    case "color":
-                        return "hair_bangs_1_" + this.identifier;
-                    case "flower":
-                        return "hair_flower_" + this.identifier;
-                    default:
-                        return "hair_" + this.category + "_" + this.identifier + "_" + hairColor;
-                }
-            case "background":
-                return "background_" + this.identifier;
-        }
-        return "";
-    }
-
-    public boolean isUsable() {
-        return this.price == null || this.price == 0 || this.purchased;
-    }
-
-    public String getPath() {
-        String path = this.type;
-
-        if (this.category != null) {
-            path = path + "." + this.category;
-        }
-
-        path = path + "." + this.identifier;
-
-        return path;
-
-    }
-
-    public boolean getIsBuyable() {
-        return isBuyable;
-    }
-
-    public void setIsBuyable(boolean buyable) {
-        isBuyable = buyable;
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.Date;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Customization extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    private String id;
+
+    @Column
+    private String identifier, category, type, notes, customizationSet, customizationSetName, text;
+
+    @Column
+    private boolean purchased, isBuyable;
+
+    @Column
+    private Integer price, setPrice;
+
+    @Column
+    private Date availableFrom, availableUntil;
+
+    private void updateID() {
+        this.id = this.identifier + "_" + this.type + "_" + this.category;
+    }
+
+    public String getId() {
+        return this.id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getIdentifier() {
+        return this.identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+        this.updateID();
+    }
+
+    public String getCategory() {
+        return this.category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+        this.updateID();
+    }
+
+    public String getType() {
+        return this.type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+        this.updateID();
+    }
+
+    public String getNotes() {
+        return this.notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public String getCustomizationSet() {
+        return this.customizationSet;
+    }
+
+    public void setCustomizationSet(String customizationSet) {
+        this.customizationSet = customizationSet;
+    }
+
+    public String getCustomizationSetName() {
+        return this.customizationSetName;
+    }
+
+    public void setCustomizationSetName(@Nullable String customizationSetName) {
+        this.customizationSetName = customizationSetName;
+    }
+
+    public String getText() {
+        return this.text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    @SuppressWarnings("RedundantIfStatement")
+    public boolean getPurchasable() {
+        Date today = new Date();
+        if (this.availableFrom != null && !this.availableFrom.before(today)) {
+            //Not released yet
+            return false;
+        }
+
+        if (this.availableUntil != null && !this.availableUntil.after(today)) {
+            //Discontinued
+            return false;
+        }
+
+        return true;
+    }
+
+    public boolean getPurchased() {
+        return this.purchased;
+    }
+
+    public void setPurchased(boolean purchased) {
+        this.purchased = purchased;
+    }
+
+    public Integer getPrice() {
+        return this.price;
+    }
+
+    public void setPrice(Integer price) {
+        this.price = price;
+    }
+
+    public Integer getSetPrice() {
+        return this.setPrice;
+    }
+
+    public void setSetPrice(Integer setPrice) {
+        this.setPrice = setPrice;
+    }
+
+    public Date getAvailableFrom() {
+        return this.availableFrom;
+    }
+
+    public void setAvailableFrom(Date availableFrom) {
+        this.availableFrom = availableFrom;
+    }
+
+    public Date getAvailableUntil() {
+        return this.availableUntil;
+    }
+
+    public void setAvailableUntil(Date availableUntil) {
+        this.availableUntil = availableUntil;
+    }
+
+    public String getImageName(String userSize, String hairColor) {
+
+        switch (this.type) {
+            case "skin":
+                return "skin_" + this.identifier;
+            case "shirt":
+                return userSize + "_shirt_" + this.identifier;
+            case "hair":
+                if (this.identifier.equals("0")) {
+                    return "head_0";
+                }
+
+                switch (this.category) {
+                    case "color":
+                        return "hair_bangs_1_" + this.identifier;
+                    case "flower":
+                        return "hair_flower_" + this.identifier;
+                    default:
+                        return "hair_" + this.category + "_" + this.identifier + "_" + hairColor;
+                }
+            case "background":
+                return "background_" + this.identifier;
+        }
+        return "";
+    }
+
+    public boolean isUsable() {
+        return this.price == null || this.price == 0 || this.purchased;
+    }
+
+    public String getPath() {
+        String path = this.type;
+
+        if (this.category != null) {
+            path = path + "." + this.category;
+        }
+
+        path = path + "." + this.identifier;
+
+        return path;
+
+    }
+
+    public boolean getIsBuyable() {
+        return isBuyable;
+    }
+
+    public void setIsBuyable(boolean buyable) {
+        isBuyable = buyable;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
index 90acdd63b..e5fe371a5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
@@ -1,13 +1,13 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-/**
- * Created by viirus on 19/01/16.
- */
-public class CustomizationSet {
-
-    public String text;
-    public String identifier;
-    public Integer price;
-    public boolean hasPurchasable;
-
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+/**
+ * Created by viirus on 19/01/16.
+ */
+public class CustomizationSet {
+
+    public String text;
+    public String identifier;
+    public Integer price;
+    public boolean hasPurchasable;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
index 74292b73c..4490619e9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
@@ -1,54 +1,54 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Egg extends Item {
-
-    @Column
-    String adjective, mountText;
-
-    Integer stableOwned, stableTotal;
-
-    public String getAdjective() {
-        return adjective;
-    }
-
-    public void setAdjective(String adjective) {
-        this.adjective = adjective;
-    }
-
-    public String getMountText() {
-        return mountText;
-    }
-
-    public void setMountText(String mountText) {
-        this.mountText = mountText;
-    }
-
-    public Integer getStableOwned() {
-        if (stableOwned == null) {
-            stableOwned = 0;
-        }
-        return stableOwned;
-    }
-
-    public void setStableOwned(Integer stableOwned) {
-        this.stableOwned = stableOwned;
-    }
-
-    public Integer getStableTotal() {
-        return stableTotal;
-    }
-
-    public void setStableTotal(Integer stableTotal) {
-        this.stableTotal = stableTotal;
-    }
-
-    @Override
-    public String getType() {
-        return "eggs";
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Egg extends Item {
+
+    @Column
+    String adjective, mountText;
+
+    Integer stableOwned, stableTotal;
+
+    public String getAdjective() {
+        return adjective;
+    }
+
+    public void setAdjective(String adjective) {
+        this.adjective = adjective;
+    }
+
+    public String getMountText() {
+        return mountText;
+    }
+
+    public void setMountText(String mountText) {
+        this.mountText = mountText;
+    }
+
+    public Integer getStableOwned() {
+        if (stableOwned == null) {
+            stableOwned = 0;
+        }
+        return stableOwned;
+    }
+
+    public void setStableOwned(Integer stableOwned) {
+        this.stableOwned = stableOwned;
+    }
+
+    public Integer getStableTotal() {
+        return stableTotal;
+    }
+
+    public void setStableTotal(Integer stableTotal) {
+        this.stableTotal = stableTotal;
+    }
+
+    @Override
+    public String getType() {
+        return "eggs";
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
index 8c78c8fdb..eef32282d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
@@ -1,43 +1,43 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Food extends Item {
-
-    @Column
-    String target, article;
-
-    @Column
-    Boolean canDrop;
-
-    public String getTarget() {
-        return target;
-    }
-
-    public void setTarget(String target) {
-        this.target = target;
-    }
-
-    public String getArticle() {
-        return article;
-    }
-
-    public void setArticle(String article) {
-        this.article = article;
-    }
-
-    public Boolean getCanDrop() {
-        return canDrop;
-    }
-
-    public void setCanDrop(Boolean canDrop) {
-        this.canDrop = canDrop;
-    }
-
-    public String getType() {
-        return "food";
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Food extends Item {
+
+    @Column
+    String target, article;
+
+    @Column
+    Boolean canDrop;
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public String getArticle() {
+        return article;
+    }
+
+    public void setArticle(String article) {
+        this.article = article;
+    }
+
+    public Boolean getCanDrop() {
+        return canDrop;
+    }
+
+    public void setCanDrop(Boolean canDrop) {
+        this.canDrop = canDrop;
+    }
+
+    public String getType() {
+        return "food";
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
index 83f080970..1ed9bd923 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
@@ -1,33 +1,33 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class HatchingPotion extends Item {
-
-    @Column
-    Boolean limited, premium;
-
-    public Boolean getLimited() {
-        return limited;
-    }
-
-    public void setLimited(Boolean limited) {
-        this.limited = limited;
-    }
-
-    public Boolean getPremium() {
-        return premium;
-    }
-
-    public void setPremium(Boolean premium) {
-        this.premium = premium;
-    }
-
-    @Override
-    public String getType() {
-        return "hatchingPotions";
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class HatchingPotion extends Item {
+
+    @Column
+    Boolean limited, premium;
+
+    public Boolean getLimited() {
+        return limited;
+    }
+
+    public void setLimited(Boolean limited) {
+        this.limited = limited;
+    }
+
+    public Boolean getPremium() {
+        return premium;
+    }
+
+    public void setPremium(Boolean premium) {
+        this.premium = premium;
+    }
+
+    @Override
+    public String getType() {
+        return "hatchingPotions";
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
index 013e603de..6cdcda61e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
@@ -1,63 +1,63 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-public abstract class Item extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    String key;
-
-    @Column
-    String text, notes;
-
-    @Column
-    Integer value, owned;
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    public void setValue(Integer value) {
-        this.value = value;
-    }
-
-    public Integer getOwned() {
-        if (owned == null) {
-            return 0;
-        }
-        return owned;
-    }
-
-    public void setOwned(Integer owned) {
-        this.owned = owned;
-    }
-
-    public abstract String getType();
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+public abstract class Item extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    String key;
+
+    @Column
+    String text, notes;
+
+    @Column
+    Integer value, owned;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public Integer getOwned() {
+        if (owned == null) {
+            return 0;
+        }
+        return owned;
+    }
+
+    public void setOwned(Integer owned) {
+        this.owned = owned;
+    }
+
+    public abstract String getType();
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ItemData.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/ItemData.java
similarity index 92%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ItemData.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/ItemData.java
index 9f17f994c..d41fa0441 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ItemData.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/ItemData.java
@@ -1,153 +1,152 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by Negue on 13.07.2015.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class ItemData extends BaseModel {
-    public static final String UNIQUE_IDENTIFIER = "key";
-
-    @Column
-    public double value;
-    @Column
-    public String type;
-    @PrimaryKey
-    @Column
-    public String key;
-
-    @Column
-    public String klass;
-
-    @Column
-    public String specialClass;
-
-    @Column(name = "_index")
-    public String index;
-    @Column
-    public String text;
-    @Column
-    public String notes;
-    @Column
-    public float con, str, per;
-    @Column
-    @SerializedName("int")
-    public float _int;
-    @Column
-    public Boolean owned;
-
-    public ItemData() {
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-    public void setValue(double value) {
-        this.value = value;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getKlass() {
-        return klass;
-    }
-
-    public void setKlass(String klass) {
-        this.klass = klass;
-    }
-
-    public String getSpecialClass() {
-        return specialClass;
-    }
-
-    public void setSpecialClass(String specialClass) {
-        this.specialClass = specialClass;
-    }
-
-
-    public String getIndex() {
-        return index;
-    }
-
-    public void setIndex(String index) {
-        this.index = index;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public float getCon() {
-        return con;
-    }
-
-    public void setCon(float con) {
-        this.con = con;
-    }
-
-    public float getStr() {
-        return str;
-    }
-
-    public void setStr(float str) {
-        this.str = str;
-    }
-
-    public float getPer() {
-        return per;
-    }
-
-    public void setPer(float per) {
-        this.per = per;
-    }
-
-    public float get_int() {
-        return _int;
-    }
-
-    public void set_int(float _int) {
-        this._int = _int;
-    }
-
-    public Boolean getOwned() {
-        return owned;
-    }
-
-    public void setOwned(Boolean owned) {
-        this.owned = owned;
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+/**
+ * Created by Negue on 13.07.2015.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class ItemData extends BaseModel {
+    public static final String UNIQUE_IDENTIFIER = "key";
+
+    @Column
+    public double value;
+    @Column
+    public String type;
+    @PrimaryKey
+    @Column
+    public String key;
+
+    @Column
+    public String klass;
+
+    @Column
+    public String specialClass;
+
+    @Column(name = "_index")
+    public String index;
+    @Column
+    public String text;
+    @Column
+    public String notes;
+    @Column
+    public float con, str, per;
+    @Column
+    @SerializedName("int")
+    public float _int;
+    @Column
+    public Boolean owned;
+
+    public ItemData() {
+    }
+
+    public double getValue() {
+        return value;
+    }
+
+    public void setValue(double value) {
+        this.value = value;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getKlass() {
+        return klass;
+    }
+
+    public void setKlass(String klass) {
+        this.klass = klass;
+    }
+
+    public String getSpecialClass() {
+        return specialClass;
+    }
+
+    public void setSpecialClass(String specialClass) {
+        this.specialClass = specialClass;
+    }
+
+
+    public String getIndex() {
+        return index;
+    }
+
+    public void setIndex(String index) {
+        this.index = index;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public float getCon() {
+        return con;
+    }
+
+    public void setCon(float con) {
+        this.con = con;
+    }
+
+    public float getStr() {
+        return str;
+    }
+
+    public void setStr(float str) {
+        this.str = str;
+    }
+
+    public float getPer() {
+        return per;
+    }
+
+    public void setPer(float per) {
+        this.per = per;
+    }
+
+    public float get_int() {
+        return _int;
+    }
+
+    public void set_int(float _int) {
+        this._int = _int;
+    }
+
+    public Boolean getOwned() {
+        return owned;
+    }
+
+    public void setOwned(Boolean owned) {
+        this.owned = owned;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
index ed1d1a355..b8bc28fd8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
@@ -1,20 +1,20 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Mount extends Animal {
-
-    @Column
-    Boolean owned;
-
-    public Boolean getOwned() {
-        return owned;
-    }
-
-    public void setOwned(Boolean owned) {
-        this.owned = owned;
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Mount extends Animal {
+
+    @Column
+    Boolean owned;
+
+    public Boolean getOwned() {
+        return owned;
+    }
+
+    public void setOwned(Boolean owned) {
+        this.owned = owned;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
index 657ed459f..7ef32ba8f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
@@ -1,21 +1,21 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Pet extends Animal {
-
-
-    @Column
-    Integer trained;
-
-    public Integer getTrained() {
-        return trained;
-    }
-
-    public void setTrained(Integer trained) {
-        this.trained = trained;
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Pet extends Animal {
+
+
+    @Column
+    Integer trained;
+
+    public Integer getTrained() {
+        return trained;
+    }
+
+    public void setTrained(Integer trained) {
+        this.trained = trained;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java
index ccefa5d92..91056be9c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java
@@ -1,61 +1,61 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.HashMap;
-
-/**
- * Created by viirus on 06/07/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Quest extends BaseModel {
-    @Column
-    @PrimaryKey
-    public String key;
-
-    @Column
-    public boolean active;
-
-    @Column
-    public String leader;
-
-    @Column
-    public boolean RSVPNeeded;
-
-    public HashMap<String, Boolean> members;
-
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "progress_id",
-            columnType = Long.class,
-            foreignColumnName = "id")})
-    private QuestProgress progress;
-
-    private Quest(String key, QuestProgress progress) {
-        this.key = key;
-        this.progress = progress;
-    }
-
-    public Quest() {
-    }
-
-    public QuestProgress getProgress() {
-        return progress;
-    }
-
-    public void setProgress(QuestProgress progress) {
-        this.progress = progress;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.HashMap;
+
+/**
+ * Created by viirus on 06/07/15.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class Quest extends BaseModel {
+    @Column
+    @PrimaryKey
+    public String key;
+
+    @Column
+    public boolean active;
+
+    @Column
+    public String leader;
+
+    @Column
+    public boolean RSVPNeeded;
+
+    public HashMap<String, Boolean> members;
+
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "progress_id",
+            columnType = Long.class,
+            foreignColumnName = "id")})
+    private QuestProgress progress;
+
+    private Quest(String key, QuestProgress progress) {
+        this.key = key;
+        this.progress = progress;
+    }
+
+    public Quest() {
+    }
+
+    public QuestProgress getProgress() {
+        return progress;
+    }
+
+    public void setProgress(QuestProgress progress) {
+        this.progress = progress;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java
index cd5061c4e..5c8a88dc6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java
@@ -1,78 +1,78 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class QuestBoss extends BaseModel {
-
-    @PrimaryKey
-    @Column
-    public String key;
-
-    @Column
-    public String name;
-
-    @Column
-    public double hp;
-
-    @Column
-    public double str;
-
-    @Column
-    public double def;
-
-    /* Boss Columns */
-
-    @Column
-    public String rage_title;
-
-    @Column
-    public String rage_description;
-
-    @Column
-    public double rage_value;
-
-    @Column
-    public String rage_tavern;
-
-    @Column
-    public String rage_stables;
-
-    @Column
-    public String rage_market;
-    public QuestBossRage rage;
-
-    @Override
-    public void save() {
-        // Just to save the Json-Object as DB-Columns
-
-        if (rage != null && rage.title != null && !rage.title.isEmpty()) {
-            rage_title = rage.title;
-            rage_description = rage.description;
-            rage_value = rage.value;
-            rage_tavern = rage.tavern;
-            rage_stables = rage.stables;
-            rage_market = rage.market;
-        }
-
-        super.save();
-    }
-
-    public class QuestBossRage {
-        public String title;
-
-        public String description;
-
-        public double value;
-
-        public String tavern;
-
-        public String stables;
-
-        public String market;
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class QuestBoss extends BaseModel {
+
+    @PrimaryKey
+    @Column
+    public String key;
+
+    @Column
+    public String name;
+
+    @Column
+    public double hp;
+
+    @Column
+    public double str;
+
+    @Column
+    public double def;
+
+    /* Boss Columns */
+
+    @Column
+    public String rage_title;
+
+    @Column
+    public String rage_description;
+
+    @Column
+    public double rage_value;
+
+    @Column
+    public String rage_tavern;
+
+    @Column
+    public String rage_stables;
+
+    @Column
+    public String rage_market;
+    public QuestBossRage rage;
+
+    @Override
+    public void save() {
+        // Just to save the Json-Object as DB-Columns
+
+        if (rage != null && rage.title != null && !rage.title.isEmpty()) {
+            rage_title = rage.title;
+            rage_description = rage.description;
+            rage_value = rage.value;
+            rage_tavern = rage.tavern;
+            rage_stables = rage.stables;
+            rage_market = rage.market;
+        }
+
+        super.save();
+    }
+
+    public class QuestBossRage {
+        public String title;
+
+        public String description;
+
+        public double value;
+
+        public String tavern;
+
+        public String stables;
+
+        public String market;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java
index 1a33a47d3..678d5f252 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java
@@ -1,23 +1,23 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class QuestCollect extends BaseModel {
-    @Column
-    public String key;
-
-    @Column
-    public String quest_key;
-    @Column
-    public String text;
-    @Column
-    public int count;
-    @Column
-    @PrimaryKey(autoincrement = true)
-    long id;
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class QuestCollect extends BaseModel {
+    @Column
+    public String key;
+
+    @Column
+    public String quest_key;
+    @Column
+    public String text;
+    @Column
+    public int count;
+    @Column
+    @PrimaryKey(autoincrement = true)
+    long id;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
index f0211a1c6..db84cbb90 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
@@ -1,122 +1,122 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class QuestContent extends Item {
-
-    @Column
-    public String previous;
-
-    @Column
-    public int lvl;
-
-    @Column
-    public boolean canBuy;
-
-    @Column
-    public String category;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "boss_id",
-            columnType = String.class,
-            foreignColumnName = "key")})
-    public QuestBoss boss;
-
-    HashMap<String, QuestCollect> collect;
-
-    public String getPrevious() {
-        return previous;
-    }
-
-    public void setPrevious(String previous) {
-        this.previous = previous;
-    }
-
-    public int getLvl() {
-        return lvl;
-    }
-
-    public void setLvl(int lvl) {
-        this.lvl = lvl;
-    }
-
-    public boolean isCanBuy() {
-        return canBuy;
-    }
-
-    public void setCanBuy(boolean canBuy) {
-        this.canBuy = canBuy;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public QuestBoss getBoss() {
-        return boss;
-    }
-
-    public void setBoss(QuestBoss boss) {
-        this.boss = boss;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "collect")
-    public Collection<QuestCollect> getCollectCollection() {
-        return getCollect().values();
-    }
-
-    public HashMap<String, QuestCollect> getCollect() {
-        if (collect == null) {
-            List<QuestCollect> collectList = new Select()
-                    .from(QuestCollect.class)
-                    .where(Condition.column("quest_key").eq(this.key))
-                    .queryList();
-            collect = new HashMap<>();
-            for (QuestCollect c : collectList) {
-                collect.put(c.key, c);
-            }
-        }
-        return collect;
-    }
-
-    public void setCollect(HashMap<String, QuestCollect> collect) {
-        this.collect = collect;
-    }
-
-    public void save() {
-
-        if (boss != null) {
-            boss.key = key;
-        }
-
-        if (collect != null) {
-            for (Map.Entry<String, QuestCollect> kv : collect.entrySet()) {
-                kv.getValue().quest_key = key;
-                kv.getValue().key = kv.getKey();
-            }
-        }
-        super.save();
-    }
-
-    @Override
-    public String getType() {
-        return "quests";
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.OneToMany;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class QuestContent extends Item {
+
+    @Column
+    public String previous;
+
+    @Column
+    public int lvl;
+
+    @Column
+    public boolean canBuy;
+
+    @Column
+    public String category;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "boss_id",
+            columnType = String.class,
+            foreignColumnName = "key")})
+    public QuestBoss boss;
+
+    HashMap<String, QuestCollect> collect;
+
+    public String getPrevious() {
+        return previous;
+    }
+
+    public void setPrevious(String previous) {
+        this.previous = previous;
+    }
+
+    public int getLvl() {
+        return lvl;
+    }
+
+    public void setLvl(int lvl) {
+        this.lvl = lvl;
+    }
+
+    public boolean isCanBuy() {
+        return canBuy;
+    }
+
+    public void setCanBuy(boolean canBuy) {
+        this.canBuy = canBuy;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public QuestBoss getBoss() {
+        return boss;
+    }
+
+    public void setBoss(QuestBoss boss) {
+        this.boss = boss;
+    }
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "collect")
+    public Collection<QuestCollect> getCollectCollection() {
+        return getCollect().values();
+    }
+
+    public HashMap<String, QuestCollect> getCollect() {
+        if (collect == null) {
+            List<QuestCollect> collectList = new Select()
+                    .from(QuestCollect.class)
+                    .where(Condition.column("quest_key").eq(this.key))
+                    .queryList();
+            collect = new HashMap<>();
+            for (QuestCollect c : collectList) {
+                collect.put(c.key, c);
+            }
+        }
+        return collect;
+    }
+
+    public void setCollect(HashMap<String, QuestCollect> collect) {
+        this.collect = collect;
+    }
+
+    public void save() {
+
+        if (boss != null) {
+            boss.key = key;
+        }
+
+        if (collect != null) {
+            for (Map.Entry<String, QuestCollect> kv : collect.entrySet()) {
+                kv.getValue().quest_key = key;
+                kv.getValue().key = kv.getKey();
+            }
+        }
+        super.save();
+    }
+
+    @Override
+    public String getType() {
+        return "quests";
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java
index b9e5b8d9a..947a02b2a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java
@@ -1,49 +1,49 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.HashMap;
-
-/**
- * Created by viirus on 06/07/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class QuestProgress extends BaseModel {
-
-    @Column
-    public double hp, rage;
-    public HashMap<String, Integer> collect;
-    @Column
-    @PrimaryKey(autoincrement = true)
-    long id;
-    @Column
-    private float down, up;
-
-    private QuestProgress(float down, float up) {
-        this.down = down;
-        this.up = up;
-    }
-
-    public QuestProgress() {
-    }
-
-    public float getDown() {
-        return down;
-    }
-
-    public void setDown(float down) {
-        this.down = down;
-    }
-
-    public float getUp() {
-        return up;
-    }
-
-    public void setUp(float up) {
-        this.up = up;
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.HashMap;
+
+/**
+ * Created by viirus on 06/07/15.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class QuestProgress extends BaseModel {
+
+    @Column
+    public double hp, rage;
+    public HashMap<String, Integer> collect;
+    @Column
+    @PrimaryKey(autoincrement = true)
+    long id;
+    @Column
+    private float down, up;
+
+    private QuestProgress(float down, float up) {
+        this.down = down;
+        this.up = up;
+    }
+
+    public QuestProgress() {
+    }
+
+    public float getDown() {
+        return down;
+    }
+
+    public void setDown(float down) {
+        this.down = down;
+    }
+
+    public float getUp() {
+        return up;
+    }
+
+    public void setUp(float up) {
+        this.up = up;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java
index d53ee2915..acaa4da4b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java
@@ -1,30 +1,30 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-
-import com.habitrpg.android.habitica.R;
-
-import android.content.Context;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class SpecialItem extends Item {
-
-    public boolean isMysteryItem;
-
-    public static Item makeMysteryItem(Context context) {
-        SpecialItem item = new SpecialItem();
-        item.text = context.getString(R.string.mystery_item);
-        item.notes = context.getString(R.string.myster_item_notes);
-        SimpleDateFormat sdf = new SimpleDateFormat("MM");
-        String month = sdf.format(new Date());
-        item.key = "inventory_present_" + month;
-        item.isMysteryItem = true;
-        return item;
-    }
-
-    @Override
-    public String getType() {
-        return "special";
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+
+import android.content.Context;
+
+import com.habitrpg.android.habitica.R;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class SpecialItem extends Item {
+
+    public boolean isMysteryItem;
+
+    public static Item makeMysteryItem(Context context) {
+        SpecialItem item = new SpecialItem();
+        item.text = context.getString(R.string.mystery_item);
+        item.notes = context.getString(R.string.myster_item_notes);
+        SimpleDateFormat sdf = new SimpleDateFormat("MM");
+        String month = sdf.format(new Date());
+        item.key = "inventory_present_" + month;
+        item.isMysteryItem = true;
+        return item;
+    }
+
+    @Override
+    public String getType() {
+        return "special";
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java
index 30809350a..429e0f70f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java
@@ -1,64 +1,64 @@
-package com.habitrpg.android.habitica.models.invitations;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-/**
- * Created by keithholliday on 7/2/16.
- */
-public class GuildInvite {
-
-    @SerializedName("inviter")
-    @Expose
-    private String inviter;
-
-    @SerializedName("name")
-    @Expose
-    private String name;
-
-    @SerializedName("id")
-    @Expose
-    private String id;
-
-    /**
-     * @return The inviter
-     */
-    public String getInviter() {
-        return inviter;
-    }
-
-    /**
-     * @param inviter The inviter
-     */
-    public void setInviter(String inviter) {
-        this.inviter = inviter;
-    }
-
-    /**
-     * @return The name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @param name The name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * @return The id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id The id
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-}
+package com.habitrpg.android.habitica.models.invitations;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by keithholliday on 7/2/16.
+ */
+public class GuildInvite {
+
+    @SerializedName("inviter")
+    @Expose
+    private String inviter;
+
+    @SerializedName("name")
+    @Expose
+    private String name;
+
+    @SerializedName("id")
+    @Expose
+    private String id;
+
+    /**
+     * @return The inviter
+     */
+    public String getInviter() {
+        return inviter;
+    }
+
+    /**
+     * @param inviter The inviter
+     */
+    public void setInviter(String inviter) {
+        this.inviter = inviter;
+    }
+
+    /**
+     * @return The name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name The name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return The id
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @param id The id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
index 5da091282..131236ca3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
@@ -1,62 +1,61 @@
-package com.habitrpg.android.habitica.models.invitations;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by keithholliday on 7/2/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Invitations extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    public String user_id;
-
-    @SerializedName("party")
-    @Expose
-    private PartyInvite party;
-
-    @SerializedName("guilds")
-    @Expose
-    private List<GuildInvite> guilds = new ArrayList<GuildInvite>();
-
-    /**
-     * @return The party invite
-     */
-    public PartyInvite getParty() {
-        return party;
-    }
-
-    /**
-     * @param party The party
-     */
-    public void setParty(PartyInvite party) {
-        this.party = party;
-    }
-
-    /**
-     * @return The guilds invite
-     */
-    public List<GuildInvite> getGuilds() {
-        return guilds;
-    }
-
-    /**
-     * @param guilds The guilds
-     */
-    public void setGuilds(List<GuildInvite> guilds) {
-        this.guilds = guilds;
-    }
-}
+package com.habitrpg.android.habitica.models.invitations;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by keithholliday on 7/2/16.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class Invitations extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    public String user_id;
+
+    @SerializedName("party")
+    @Expose
+    private PartyInvite party;
+
+    @SerializedName("guilds")
+    @Expose
+    private List<GuildInvite> guilds = new ArrayList<GuildInvite>();
+
+    /**
+     * @return The party invite
+     */
+    public PartyInvite getParty() {
+        return party;
+    }
+
+    /**
+     * @param party The party
+     */
+    public void setParty(PartyInvite party) {
+        this.party = party;
+    }
+
+    /**
+     * @return The guilds invite
+     */
+    public List<GuildInvite> getGuilds() {
+        return guilds;
+    }
+
+    /**
+     * @param guilds The guilds
+     */
+    public void setGuilds(List<GuildInvite> guilds) {
+        this.guilds = guilds;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java
index b4d4f0267..e13b5cddd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java
@@ -1,61 +1,61 @@
-package com.habitrpg.android.habitica.models.invitations;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-/**
- * Created by keithholliday on 7/2/16.
- */
-public class PartyInvite {
-    @SerializedName("id")
-    @Expose
-    private String id;
-    @SerializedName("name")
-    @Expose
-    private String name;
-    @SerializedName("inviter")
-    @Expose
-    private String inviter;
-
-    /**
-     * @return The id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id The id
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * @return The name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @param name The name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * @return The inviter
-     */
-    public String getInviter() {
-        return inviter;
-    }
-
-    /**
-     * @param inviter The inviter
-     */
-    public void setInviter(String inviter) {
-        this.inviter = inviter;
-    }
-}
+package com.habitrpg.android.habitica.models.invitations;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by keithholliday on 7/2/16.
+ */
+public class PartyInvite {
+    @SerializedName("id")
+    @Expose
+    private String id;
+    @SerializedName("name")
+    @Expose
+    private String name;
+    @SerializedName("inviter")
+    @Expose
+    private String inviter;
+
+    /**
+     * @return The id
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @param id The id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * @return The name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name The name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return The inviter
+     */
+    public String getInviter() {
+        return inviter;
+    }
+
+    /**
+     * @param inviter The inviter
+     */
+    public void setInviter(String inviter) {
+        this.inviter = inviter;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/NotificationData.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/NotificationData.java
index be459a232..235816ad5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/NotificationData.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/NotificationData.java
@@ -1,18 +1,18 @@
-package com.habitrpg.android.habitica.models.notifications;
-
-import java.util.List;
-
-/**
- * Created by krh12 on 11/30/2016.
- */
-
-public class NotificationData {
-
-    public String groupId;
-    public String message;
-    public Integer nextRewardAt;
-    public String rewardText;
-    public List<String> rewardKey;
-    public List<Reward> reward;
-
-}
+package com.habitrpg.android.habitica.models.notifications;
+
+import java.util.List;
+
+/**
+ * Created by krh12 on 11/30/2016.
+ */
+
+public class NotificationData {
+
+    public String groupId;
+    public String message;
+    public Integer nextRewardAt;
+    public String rewardText;
+    public List<String> rewardKey;
+    public List<Reward> reward;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.java
index 9e295c9f6..e44e08293 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/notifications/Reward.java
@@ -1,9 +1,9 @@
-package com.habitrpg.android.habitica.models.notifications;
-
-/**
- * Created by krh12 on 12/1/2016.
- */
-
-public class Reward {
-    public String key;
-}
+package com.habitrpg.android.habitica.models.notifications;
+
+/**
+ * Created by krh12 on 12/1/2016.
+ */
+
+public class Reward {
+    public String key;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/BuyResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/BuyResponse.java
index 5dfd22495..cc576f68a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/BuyResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/BuyResponse.java
@@ -1,16 +1,16 @@
-package com.habitrpg.android.habitica.models.responses;
-
-import com.habitrpg.android.habitica.models.user.Items;
-
-import java.util.HashMap;
-
-public class BuyResponse {
-
-    public Items items;
-
-    public HashMap<String, String> armoire;
-
-    public Integer lvl;
-    public Double gp, exp, mp, hp;
-
-}
+package com.habitrpg.android.habitica.models.responses;
+
+import com.habitrpg.android.habitica.models.user.Items;
+
+import java.util.HashMap;
+
+public class BuyResponse {
+
+    public Items items;
+
+    public HashMap<String, String> armoire;
+
+    public Integer lvl;
+    public Double gp, exp, mp, hp;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/FeedResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/FeedResponse.java
index fe2e9be21..3ba84ced1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/FeedResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/FeedResponse.java
@@ -1,7 +1,7 @@
-package com.habitrpg.android.habitica.models.responses;
-
-public class FeedResponse {
-
-    public Integer value;
-
-}
+package com.habitrpg.android.habitica.models.responses;
+
+public class FeedResponse {
+
+    public Integer value;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabitResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabitResponse.java
index 24f7a647c..478ade392 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabitResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabitResponse.java
@@ -1,38 +1,38 @@
-package com.habitrpg.android.habitica.models.responses;
-
-import com.habitrpg.android.habitica.models.Notification;
-
-import java.util.List;
-
-/**
- * Created by krh12 on 11/23/2016.
- */
-
-public class HabitResponse<T> {
-
-    public T data;
-    public List<Notification> notifications;
-    private Boolean success;
-
-    /**
-     * @return The success
-     */
-    public Boolean getSuccess() {
-        return success;
-    }
-
-    /**
-     * @param success The success
-     */
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-
-    /**
-     * @return The data
-     */
-    public T getData() {
-        return data;
-    }
-}
-
+package com.habitrpg.android.habitica.models.responses;
+
+import com.habitrpg.android.habitica.models.Notification;
+
+import java.util.List;
+
+/**
+ * Created by krh12 on 11/23/2016.
+ */
+
+public class HabitResponse<T> {
+
+    public T data;
+    public List<Notification> notifications;
+    private Boolean success;
+
+    /**
+     * @return The success
+     */
+    public Boolean getSuccess() {
+        return success;
+    }
+
+    /**
+     * @param success The success
+     */
+    public void setSuccess(Boolean success) {
+        this.success = success;
+    }
+
+    /**
+     * @return The data
+     */
+    public T getData() {
+        return data;
+    }
+}
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabiticaError.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabiticaError.java
index 827af108d..7dade7f87 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabiticaError.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/HabiticaError.java
@@ -1,7 +1,7 @@
-package com.habitrpg.android.habitica.models.responses;
-
-public class HabiticaError {
-    public String message;
-    public String param;
-    public String value;
-}
+package com.habitrpg.android.habitica.models.responses;
+
+public class HabiticaError {
+    public String message;
+    public String param;
+    public String value;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/MaintenanceResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/MaintenanceResponse.java
index c1dcbacb6..ce6417ee2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/MaintenanceResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/MaintenanceResponse.java
@@ -1,10 +1,10 @@
-package com.habitrpg.android.habitica.models.responses;
-
-public class MaintenanceResponse {
-
-    public Boolean activeMaintenance;
-    public Integer minBuild;
-    public String title;
-    public String imageUrl;
-    public String description;
-}
+package com.habitrpg.android.habitica.models.responses;
+
+public class MaintenanceResponse {
+
+    public Boolean activeMaintenance;
+    public Integer minBuild;
+    public String title;
+    public String imageUrl;
+    public String description;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/PostChatMessageResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/PostChatMessageResult.java
index 285469fb9..d39900467 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/PostChatMessageResult.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/PostChatMessageResult.java
@@ -1,10 +1,10 @@
-package com.habitrpg.android.habitica.models.responses;
-
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-
-/**
- * Created by Negue on 30.08.2015.
- */
-public class PostChatMessageResult {
-    public ChatMessage message;
-}
+package com.habitrpg.android.habitica.models.responses;
+
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+
+/**
+ * Created by Negue on 30.08.2015.
+ */
+public class PostChatMessageResult {
+    public ChatMessage message;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
index 4c7470dd4..9e9c19d5c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
@@ -1,14 +1,14 @@
-package com.habitrpg.android.habitica.models.responses;
-
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import java.util.List;
-
-public class SkillResponse {
-
-    public HabitRPGUser user;
-    public List<HabitRPGUser> partyMembers;
-    public Task task;
-
-}
+package com.habitrpg.android.habitica.models.responses;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.List;
+
+public class SkillResponse {
+
+    public HabitRPGUser user;
+    public List<HabitRPGUser> partyMembers;
+    public Task task;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.java
index 6413a0c6a..c63a76879 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/Status.java
@@ -1,16 +1,16 @@
-package com.habitrpg.android.habitica.models.responses;
-
-/**
- * Created by MagicMicky on 10/06/2014.
- */
-public class Status {
-    private String status;
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-}
+package com.habitrpg.android.habitica.models.responses;
+
+/**
+ * Created by MagicMicky on 10/06/2014.
+ */
+public class Status {
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirection.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirection.java
index b4c38c3a4..3ff70a5da 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirection.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirection.java
@@ -1,19 +1,19 @@
-package com.habitrpg.android.habitica.models.responses;
-
-/**
- * Created by MagicMicky on 16/03/14.
- */
-public enum TaskDirection {
-    up("up"),
-    down("down");
-    private final String dir;
-
-    TaskDirection(String dir) {
-        this.dir = dir;
-    }
-
-    public String toString() {
-        return this.dir;
-    }
-
-}
+package com.habitrpg.android.habitica.models.responses;
+
+/**
+ * Created by MagicMicky on 16/03/14.
+ */
+public enum TaskDirection {
+    up("up"),
+    down("down");
+    private final String dir;
+
+    TaskDirection(String dir) {
+        this.dir = dir;
+    }
+
+    public String toString() {
+        return this.dir;
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
index e30036d3e..e9f10a1d2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
@@ -1,30 +1,30 @@
-package com.habitrpg.android.habitica.models.responses;
-
-import com.habitrpg.android.habitica.models.user.PlayerMinStats;
-
-/**
- * This class represent the data sent back from the API when calling /user/tasks/{id}/{direction}.
- * It holds almost the same thing as Stats, except toNextLevel & maxHealth & maxHP.
- * It also holds a delta, which represent the task value modification.
- * Created by MagicMicky on 12/06/2014.
- */
-public class TaskDirectionData extends PlayerMinStats {
-    private float delta;
-    private TaskDirectionDataTemp _tmp;
-
-    public float getDelta() {
-        return delta;
-    }
-
-    public void setDelta(float delta) {
-        this.delta = delta;
-    }
-
-    public TaskDirectionDataTemp get_tmp() {
-        return _tmp;
-    }
-
-    public void set_tmp(TaskDirectionDataTemp tmp) {
-        this._tmp = tmp;
-    }
-}
+package com.habitrpg.android.habitica.models.responses;
+
+import com.habitrpg.android.habitica.models.user.PlayerMinStats;
+
+/**
+ * This class represent the data sent back from the API when calling /user/tasks/{id}/{direction}.
+ * It holds almost the same thing as Stats, except toNextLevel & maxHealth & maxHP.
+ * It also holds a delta, which represent the task value modification.
+ * Created by MagicMicky on 12/06/2014.
+ */
+public class TaskDirectionData extends PlayerMinStats {
+    private float delta;
+    private TaskDirectionDataTemp _tmp;
+
+    public float getDelta() {
+        return delta;
+    }
+
+    public void setDelta(float delta) {
+        this.delta = delta;
+    }
+
+    public TaskDirectionDataTemp get_tmp() {
+        return _tmp;
+    }
+
+    public void set_tmp(TaskDirectionDataTemp tmp) {
+        this._tmp = tmp;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataDrop.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataDrop.java
index d20470215..2d82a088c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataDrop.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataDrop.java
@@ -1,45 +1,45 @@
-package com.habitrpg.android.habitica.models.responses;
-
-/**
- * Created by viirus on 14/11/15.
- */
-public class TaskDirectionDataDrop {
-
-    private int value;
-    private String key;
-    private String type;
-    private String dialog;
-
-    public int getValue() {
-        return value;
-    }
-
-    public void setValue(int value) {
-        this.value = value;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getDialog() {
-        return dialog;
-    }
-
-    public void setDialog(String dialog) {
-        this.dialog = dialog;
-    }
-
-}
+package com.habitrpg.android.habitica.models.responses;
+
+/**
+ * Created by viirus on 14/11/15.
+ */
+public class TaskDirectionDataDrop {
+
+    private int value;
+    private String key;
+    private String type;
+    private String dialog;
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getDialog() {
+        return dialog;
+    }
+
+    public void setDialog(String dialog) {
+        this.dialog = dialog;
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.java
index 3425acf75..b4a540721 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionDataTemp.java
@@ -1,18 +1,18 @@
-package com.habitrpg.android.habitica.models.responses;
-
-/**
- * Created by viirus on 14/11/15.
- */
-public class TaskDirectionDataTemp {
-
-    private TaskDirectionDataDrop drop;
-
-    public TaskDirectionDataDrop getDrop() {
-        return this.drop;
-    }
-
-    public void setDrop(TaskDirectionDataDrop drop) {
-        this.drop = drop;
-    }
-
-}
+package com.habitrpg.android.habitica.models.responses;
+
+/**
+ * Created by viirus on 14/11/15.
+ */
+public class TaskDirectionDataTemp {
+
+    private TaskDirectionDataDrop drop;
+
+    public TaskDirectionDataDrop getDrop() {
+        return this.drop;
+    }
+
+    public void setDrop(TaskDirectionDataDrop drop) {
+        this.drop = drop;
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/UnlockResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/UnlockResponse.java
index 1d091381f..bc31b5dab 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/UnlockResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/UnlockResponse.java
@@ -1,18 +1,18 @@
-package com.habitrpg.android.habitica.models.responses;
-
-import com.habitrpg.android.habitica.models.user.Items;
-import com.habitrpg.android.habitica.models.user.Preferences;
-import com.habitrpg.android.habitica.models.user.Purchases;
-
-/**
- * Created by viirus on 16/01/16.
- */
-public class UnlockResponse {
-
-    public Preferences preferences;
-
-    public Purchases purchased;
-
-    public Items items;
-
-}
+package com.habitrpg.android.habitica.models.responses;
+
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.user.Preferences;
+import com.habitrpg.android.habitica.models.user.Purchases;
+
+/**
+ * Created by viirus on 16/01/16.
+ */
+public class UnlockResponse {
+
+    public Preferences preferences;
+
+    public Purchases purchased;
+
+    public Items items;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.java
index 72ff0d521..c2675da3f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/Shop.java
@@ -1,57 +1,57 @@
-package com.habitrpg.android.habitica.models.shops;
-
-import java.util.List;
-
-public class Shop {
-
-    public static final String MARKET = "market";
-    public static final String QUEST_SHOP = "questShop";
-    public static final String TIME_TRAVELERS_SHOP = "timeTravelersShop";
-    public static final String SEASONAL_SHOP = "seasonalShop";
-    public String identifier;
-    public String text;
-    public String notes;
-    public String imageName;
-
-    public List<ShopCategory> categories;
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public String getImageName() {
-        return imageName;
-    }
-
-    public void setImageName(String imageName) {
-        this.imageName = imageName;
-    }
-
-    public List<ShopCategory> getCategories() {
-        return categories;
-    }
-
-    public void setCategories(List<ShopCategory> categories) {
-        this.categories = categories;
-    }
-}
+package com.habitrpg.android.habitica.models.shops;
+
+import java.util.List;
+
+public class Shop {
+
+    public static final String MARKET = "market";
+    public static final String QUEST_SHOP = "questShop";
+    public static final String TIME_TRAVELERS_SHOP = "timeTravelersShop";
+    public static final String SEASONAL_SHOP = "seasonalShop";
+    public String identifier;
+    public String text;
+    public String notes;
+    public String imageName;
+
+    public List<ShopCategory> categories;
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public String getImageName() {
+        return imageName;
+    }
+
+    public void setImageName(String imageName) {
+        this.imageName = imageName;
+    }
+
+    public List<ShopCategory> getCategories() {
+        return categories;
+    }
+
+    public void setCategories(List<ShopCategory> categories) {
+        this.categories = categories;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.java
index d4617dd22..441b2bead 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopCategory.java
@@ -1,53 +1,53 @@
-package com.habitrpg.android.habitica.models.shops;
-
-import java.util.List;
-
-public class ShopCategory {
-
-    public String identifier;
-    public String text;
-    public String notes;
-    public Boolean purchaseAll;
-
-    public List<ShopItem> items;
-
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public void setIdentifier(String identifier) {
-        this.identifier = identifier;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public Boolean getPurchaseAll() {
-        return purchaseAll;
-    }
-
-    public void setPurchaseAll(Boolean purchaseAll) {
-        this.purchaseAll = purchaseAll;
-    }
-
-    public List<ShopItem> getItems() {
-        return items;
-    }
-
-    public void setItems(List<ShopItem> items) {
-        this.items = items;
-    }
-}
+package com.habitrpg.android.habitica.models.shops;
+
+import java.util.List;
+
+public class ShopCategory {
+
+    public String identifier;
+    public String text;
+    public String notes;
+    public Boolean purchaseAll;
+
+    public List<ShopItem> items;
+
+    public String getIdentifier() {
+        return identifier;
+    }
+
+    public void setIdentifier(String identifier) {
+        this.identifier = identifier;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public Boolean getPurchaseAll() {
+        return purchaseAll;
+    }
+
+    public void setPurchaseAll(Boolean purchaseAll) {
+        this.purchaseAll = purchaseAll;
+    }
+
+    public List<ShopItem> getItems() {
+        return items;
+    }
+
+    public void setItems(List<ShopItem> items) {
+        this.items = items;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
index df51c4908..435cec7d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
@@ -1,142 +1,141 @@
-package com.habitrpg.android.habitica.models.shops;
-
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import android.content.res.Resources;
-
-public class ShopItem {
-
-    public static final String GEM_FOR_GOLD = "gem";
-    public String key;
-    public String text;
-    public String notes;
-    @SerializedName("class")
-    public String imageName;
-    public Integer value;
-    public Boolean locked;
-    public String currency;
-    public String purchaseType;
-    public String categoryIdentifier;
-    public Integer limitedNumberLeft;
-    public ShopItemUnlockCondition unlockCondition;
-
-    public static ShopItem makeGemItem(Resources res) {
-        ShopItem item = new ShopItem();
-        item.key = GEM_FOR_GOLD;
-        item.text = res.getString(R.string.gem_shop);
-        item.notes = res.getString(R.string.gem_for_gold_description);
-        item.imageName = "gem_shop";
-        item.value = 20;
-        item.currency = "gold";
-        item.purchaseType = "gems";
-        return item;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public String getImageName() {
-        if (imageName != null) {
-            return imageName;
-        } else {
-            return "shop_" + key;
-        }
-    }
-
-    public void setImageName(String imageName) {
-        this.imageName = imageName;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    public void setValue(Integer value) {
-        this.value = value;
-    }
-
-    public Boolean getLocked() {
-        if (locked == null) {
-            return false;
-        }
-        return locked;
-    }
-
-    public void setLocked(Boolean locked) {
-        this.locked = locked;
-    }
-
-    public String getCurrency() {
-        return currency;
-    }
-
-    public void setCurrency(String currency) {
-        this.currency = currency;
-    }
-
-    public String getPurchaseType() {
-        return purchaseType;
-    }
-
-    public void setPurchaseType(String purchaseType) {
-        this.purchaseType = purchaseType;
-    }
-
-    public String getCategoryIdentifier() {
-        return categoryIdentifier;
-    }
-
-    public void setCategoryIdentifier(String categoryIdentifier) {
-        this.categoryIdentifier = categoryIdentifier;
-    }
-
-    public Integer getLimitedNumberLeft() {
-        return limitedNumberLeft;
-    }
-
-    public void setLimitedNumberLeft(Integer limitedNumberLeft) {
-        this.limitedNumberLeft = limitedNumberLeft;
-    }
-
-    public ShopItemUnlockCondition getUnlockCondition() {
-        return unlockCondition;
-    }
-
-    public void setUnlockCondition(ShopItemUnlockCondition unlockCondition) {
-        this.unlockCondition = unlockCondition;
-    }
-
-    public boolean canBuy(HabitRPGUser user) {
-        if (getCurrency().equals("gold")) {
-            return getValue() <= user.getStats().getGp();
-        } else if (getCurrency().equals("gems")) {
-            return getValue() <= (user.getBalance() * 4);
-        } else {
-            return false;
-        }
-    }
-}
+package com.habitrpg.android.habitica.models.shops;
+
+import android.content.res.Resources;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+public class ShopItem {
+
+    public static final String GEM_FOR_GOLD = "gem";
+    public String key;
+    public String text;
+    public String notes;
+    @SerializedName("class")
+    public String imageName;
+    public Integer value;
+    public Boolean locked;
+    public String currency;
+    public String purchaseType;
+    public String categoryIdentifier;
+    public Integer limitedNumberLeft;
+    public ShopItemUnlockCondition unlockCondition;
+
+    public static ShopItem makeGemItem(Resources res) {
+        ShopItem item = new ShopItem();
+        item.key = GEM_FOR_GOLD;
+        item.text = res.getString(R.string.gem_shop);
+        item.notes = res.getString(R.string.gem_for_gold_description);
+        item.imageName = "gem_shop";
+        item.value = 20;
+        item.currency = "gold";
+        item.purchaseType = "gems";
+        return item;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public String getImageName() {
+        if (imageName != null) {
+            return imageName;
+        } else {
+            return "shop_" + key;
+        }
+    }
+
+    public void setImageName(String imageName) {
+        this.imageName = imageName;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public Boolean getLocked() {
+        if (locked == null) {
+            return false;
+        }
+        return locked;
+    }
+
+    public void setLocked(Boolean locked) {
+        this.locked = locked;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public String getPurchaseType() {
+        return purchaseType;
+    }
+
+    public void setPurchaseType(String purchaseType) {
+        this.purchaseType = purchaseType;
+    }
+
+    public String getCategoryIdentifier() {
+        return categoryIdentifier;
+    }
+
+    public void setCategoryIdentifier(String categoryIdentifier) {
+        this.categoryIdentifier = categoryIdentifier;
+    }
+
+    public Integer getLimitedNumberLeft() {
+        return limitedNumberLeft;
+    }
+
+    public void setLimitedNumberLeft(Integer limitedNumberLeft) {
+        this.limitedNumberLeft = limitedNumberLeft;
+    }
+
+    public ShopItemUnlockCondition getUnlockCondition() {
+        return unlockCondition;
+    }
+
+    public void setUnlockCondition(ShopItemUnlockCondition unlockCondition) {
+        this.unlockCondition = unlockCondition;
+    }
+
+    public boolean canBuy(HabitRPGUser user) {
+        if (getCurrency().equals("gold")) {
+            return getValue() <= user.getStats().getGp();
+        } else if (getCurrency().equals("gems")) {
+            return getValue() <= (user.getBalance() * 4);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.java
index 2afdc498d..954e19e78 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItemUnlockCondition.java
@@ -1,18 +1,18 @@
-package com.habitrpg.android.habitica.models.shops;
-
-import com.habitrpg.android.habitica.R;
-
-public class ShopItemUnlockCondition {
-
-    String condition;
-
-    public int readableUnlockConditionId() {
-        switch (this.condition) {
-
-            case "party invite":
-                return R.string.party_invite;
-            default:
-                return 0;
-        }
-    }
-}
+package com.habitrpg.android.habitica.models.shops;
+
+import com.habitrpg.android.habitica.R;
+
+public class ShopItemUnlockCondition {
+
+    String condition;
+
+    public int readableUnlockConditionId() {
+        switch (this.condition) {
+
+            case "party invite":
+                return R.string.party_invite;
+            default:
+                return 0;
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
index 4a692860c..e8fef79b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
@@ -1,7 +1,7 @@
-package com.habitrpg.android.habitica.models.social;
-
-public class Backer {
-    public int level;
-
-    public String npc;
-}
+package com.habitrpg.android.habitica.models.social;
+
+public class Backer {
+    public int level;
+
+    public String npc;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
index 71f373348..1e372627b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
@@ -1,97 +1,96 @@
-package com.habitrpg.android.habitica.models.social;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.HashMap;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Challenge extends BaseModel {
-
-    public static final String TASK_ORDER_HABITS = "habits";
-    public static final String TASK_ORDER_TODOS = "todos";
-    public static final String TASK_ORDER_DAILYS = "dailys";
-    public static final String TASK_ORDER_REWARDS = "rewards";
-
-    @NotNull
-    @PrimaryKey
-    @Column
-    public String id;
-
-    @Column
-    public String name;
-
-    @Column
-    public String shortName;
-
-    @Column
-    public String description;
-
-    @Column
-    public String leaderName;
-
-    @Column
-    public String leaderId;
-
-    @Column
-    public String groupName;
-
-    @Column
-    public String groupId;
-
-    @Column
-    public int prize;
-
-    @Column
-    public boolean official;
-
-    @Column
-    public int memberCount;
-
-    @Column
-    public String user_id;
-
-    @Column
-    public String todoList;
-
-    @Column
-    public String habitList;
-
-    @Column
-    public String dailyList;
-
-    @Column
-    public String rewardList;
-
-    public Group group;
-
-    public HabitRPGUser leader;
-
-    public HashMap<String, String[]> getTasksOrder() {
-        HashMap<String, String[]> map = new HashMap();
-
-        if (!dailyList.isEmpty()) {
-            map.put(TASK_ORDER_DAILYS, dailyList.split(","));
-        }
-
-        if (!habitList.isEmpty()) {
-            map.put(TASK_ORDER_HABITS, habitList.split(","));
-        }
-
-        if (!rewardList.isEmpty()) {
-            map.put(TASK_ORDER_REWARDS, rewardList.split(","));
-        }
-
-        if (!todoList.isEmpty()) {
-            map.put(TASK_ORDER_TODOS, todoList.split(","));
-        }
-
-        return map;
-    }
-}
+package com.habitrpg.android.habitica.models.social;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.HashMap;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Challenge extends BaseModel {
+
+    public static final String TASK_ORDER_HABITS = "habits";
+    public static final String TASK_ORDER_TODOS = "todos";
+    public static final String TASK_ORDER_DAILYS = "dailys";
+    public static final String TASK_ORDER_REWARDS = "rewards";
+
+    @NotNull
+    @PrimaryKey
+    @Column
+    public String id;
+
+    @Column
+    public String name;
+
+    @Column
+    public String shortName;
+
+    @Column
+    public String description;
+
+    @Column
+    public String leaderName;
+
+    @Column
+    public String leaderId;
+
+    @Column
+    public String groupName;
+
+    @Column
+    public String groupId;
+
+    @Column
+    public int prize;
+
+    @Column
+    public boolean official;
+
+    @Column
+    public int memberCount;
+
+    @Column
+    public String user_id;
+
+    @Column
+    public String todoList;
+
+    @Column
+    public String habitList;
+
+    @Column
+    public String dailyList;
+
+    @Column
+    public String rewardList;
+
+    public Group group;
+
+    public HabitRPGUser leader;
+
+    public HashMap<String, String[]> getTasksOrder() {
+        HashMap<String, String[]> map = new HashMap();
+
+        if (!dailyList.isEmpty()) {
+            map.put(TASK_ORDER_DAILYS, dailyList.split(","));
+        }
+
+        if (!habitList.isEmpty()) {
+            map.put(TASK_ORDER_HABITS, habitList.split(","));
+        }
+
+        if (!rewardList.isEmpty()) {
+            map.put(TASK_ORDER_REWARDS, rewardList.split(","));
+        }
+
+        if (!todoList.isEmpty()) {
+            map.put(TASK_ORDER_TODOS, todoList.split(","));
+        }
+
+        return map;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java
index cc6ef34bf..f1d3880a6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java
@@ -1,95 +1,95 @@
-package com.habitrpg.android.habitica.models.social;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.user.ContributorInfo;
-
-import android.content.res.Resources;
-
-import java.util.Date;
-import java.util.HashMap;
-
-
-/**
- * Created by Negue on 22.08.2015.
- */
-public class ChatMessage {
-
-    public String id;
-
-    public String text;
-
-    public CharSequence parsedText;
-
-    public Long timestamp;
-
-    public HashMap<String, Boolean> likes;
-
-    public int flagCount;
-
-    public String uuid;
-
-    public Contributor contributor;
-
-    public Backer backer;
-
-    public String user;
-
-    public String sent;
-
-    public int getContributorColor() {
-        int rColor = android.R.color.black;
-
-
-        if (contributor != null) {
-            if (ContributorInfo.CONTRIBUTOR_COLOR_DICT.containsKey(contributor.level)) {
-                rColor = ContributorInfo.CONTRIBUTOR_COLOR_DICT.get(contributor.level);
-            }
-        }
-
-        if (backer != null) {
-            if (backer.npc != null) {
-                rColor = android.R.color.black;
-            }
-        }
-
-        return rColor;
-    }
-
-    public int getContributorForegroundColor() {
-        int rColor = android.R.color.white;
-
-        if (backer != null && backer.npc != null) {
-            rColor = R.color.contributor_npc_font;
-        }
-
-        return rColor;
-    }
-
-    public String getAgoString(Resources res) {
-        long diff = new Date().getTime() - timestamp;
-
-        long diffMinutes = diff / (60 * 1000) % 60;
-        long diffHours = diff / (60 * 60 * 1000) % 24;
-        long diffDays = diff / (24 * 60 * 60 * 1000);
-
-        if (diffDays != 0) {
-            if (diffDays == 1) {
-                return res.getString(R.string.ago_1day);
-            }
-            return res.getString(R.string.ago_days, diffDays);
-        }
-
-        if (diffHours != 0) {
-            if (diffHours == 1) {
-                return res.getString(R.string.ago_1hour);
-            }
-            return res.getString(R.string.ago_hours, diffHours);
-        }
-
-        if (diffMinutes == 1) {
-            return res.getString(R.string.ago_1Minute);
-        }
-        return res.getString(R.string.ago_minutes, diffMinutes);
-    }
-}
-
+package com.habitrpg.android.habitica.models.social;
+
+import android.content.res.Resources;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.user.ContributorInfo;
+
+import java.util.Date;
+import java.util.HashMap;
+
+
+/**
+ * Created by Negue on 22.08.2015.
+ */
+public class ChatMessage {
+
+    public String id;
+
+    public String text;
+
+    public CharSequence parsedText;
+
+    public Long timestamp;
+
+    public HashMap<String, Boolean> likes;
+
+    public int flagCount;
+
+    public String uuid;
+
+    public Contributor contributor;
+
+    public Backer backer;
+
+    public String user;
+
+    public String sent;
+
+    public int getContributorColor() {
+        int rColor = android.R.color.black;
+
+
+        if (contributor != null) {
+            if (ContributorInfo.CONTRIBUTOR_COLOR_DICT.containsKey(contributor.level)) {
+                rColor = ContributorInfo.CONTRIBUTOR_COLOR_DICT.get(contributor.level);
+            }
+        }
+
+        if (backer != null) {
+            if (backer.npc != null) {
+                rColor = android.R.color.black;
+            }
+        }
+
+        return rColor;
+    }
+
+    public int getContributorForegroundColor() {
+        int rColor = android.R.color.white;
+
+        if (backer != null && backer.npc != null) {
+            rColor = R.color.contributor_npc_font;
+        }
+
+        return rColor;
+    }
+
+    public String getAgoString(Resources res) {
+        long diff = new Date().getTime() - timestamp;
+
+        long diffMinutes = diff / (60 * 1000) % 60;
+        long diffHours = diff / (60 * 60 * 1000) % 24;
+        long diffDays = diff / (24 * 60 * 60 * 1000);
+
+        if (diffDays != 0) {
+            if (diffDays == 1) {
+                return res.getString(R.string.ago_1day);
+            }
+            return res.getString(R.string.ago_days, diffDays);
+        }
+
+        if (diffHours != 0) {
+            if (diffHours == 1) {
+                return res.getString(R.string.ago_1hour);
+            }
+            return res.getString(R.string.ago_hours, diffHours);
+        }
+
+        if (diffMinutes == 1) {
+            return res.getString(R.string.ago_1Minute);
+        }
+        return res.getString(R.string.ago_minutes, diffMinutes);
+    }
+}
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java
index 1770d450c..59b54ef3d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java
@@ -1,11 +1,11 @@
-package com.habitrpg.android.habitica.models.social;
-
-public class Contributor {
-    public boolean admin;
-
-    public String contributions;
-
-    public int level;
-
-    public String text;
-}
+package com.habitrpg.android.habitica.models.social;
+
+public class Contributor {
+    public boolean admin;
+
+    public String contributions;
+
+    public int level;
+
+    public String text;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
index dccc4d78e..7a1caa4cc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
@@ -1,71 +1,70 @@
-package com.habitrpg.android.habitica.models.social;
-
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.List;
-
-/**
- * Created by Negue on 16.09.2015.
- */
-public class Group extends BaseModel {
-
-    @SerializedName("_id")
-    public String id;
-
-    public double balance;
-
-    public String description;
-
-    public String leaderID;
-
-    public String leaderName;
-
-    public String name;
-
-    public int memberCount;
-
-    public Boolean isMember;
-
-    public String type;
-
-    public String logo;
-
-    public Quest quest;
-
-    public String privacy;
-
-    public List<ChatMessage> chat;
-
-    public List<HabitRPGUser> members;
-
-    public int challengeCount;
-
-    public String leaderMessage;
-
-    // TODO Challenges
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Group group = (Group) o;
-
-        return id != null ? id.equals(group.id) : group.id == null;
-
-    }
-
-    @Override
-    public int hashCode() {
-        return id != null ? id.hashCode() : 0;
-    }
-}
+package com.habitrpg.android.habitica.models.social;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.List;
+
+/**
+ * Created by Negue on 16.09.2015.
+ */
+public class Group extends BaseModel {
+
+    @SerializedName("_id")
+    public String id;
+
+    public double balance;
+
+    public String description;
+
+    public String leaderID;
+
+    public String leaderName;
+
+    public String name;
+
+    public int memberCount;
+
+    public Boolean isMember;
+
+    public String type;
+
+    public String logo;
+
+    public Quest quest;
+
+    public String privacy;
+
+    public List<ChatMessage> chat;
+
+    public List<HabitRPGUser> members;
+
+    public int challengeCount;
+
+    public String leaderMessage;
+
+    // TODO Challenges
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        Group group = (Group) o;
+
+        return id != null ? id.equals(group.id) : group.id == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        return id != null ? id.hashCode() : 0;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java
index 5372965e1..a0b8564af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java
@@ -1,79 +1,78 @@
-package com.habitrpg.android.habitica.models.social;
-
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by Negue on 16.09.2015.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class UserParty extends BaseModel {
-    @Column
-    @PrimaryKey
-    @SerializedName("_id")
-    public String id; //id
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "quest_id",
-            columnType = String.class,
-            foreignColumnName = "key")})
-    private Quest quest;
-
-    @Column
-    @SerializedName("order")
-    private String partyOrder;//Order to display ppl
-
-    @Column
-    private String orderAscending;//Order type
-
-    public UserParty() {
-
-    }
-
-    public UserParty(String id, Quest quest, String partyOrder, String orderAscending) {
-        this.id = id;
-        this.quest = quest;
-        this.partyOrder = partyOrder;
-        this.orderAscending = orderAscending;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getPartyOrder() {
-        return partyOrder;
-    }
-
-    public void setPartyOrder(String partyOrder) {
-        this.partyOrder = partyOrder;
-    }
-
-    public String getOrderAscending() {
-        return orderAscending;
-    }
-
-    public void setOrderAscending(String order) {
-        this.orderAscending = order;
-    }
-
-    public Quest getQuest() {
-        return quest;
-    }
-
-    public void setQuest(Quest quest) {
-        this.quest = quest;
-    }
-}
+package com.habitrpg.android.habitica.models.social;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+/**
+ * Created by Negue on 16.09.2015.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class UserParty extends BaseModel {
+    @Column
+    @PrimaryKey
+    @SerializedName("_id")
+    public String id; //id
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "quest_id",
+            columnType = String.class,
+            foreignColumnName = "key")})
+    private Quest quest;
+
+    @Column
+    @SerializedName("order")
+    private String partyOrder;//Order to display ppl
+
+    @Column
+    private String orderAscending;//Order type
+
+    public UserParty() {
+
+    }
+
+    public UserParty(String id, Quest quest, String partyOrder, String orderAscending) {
+        this.id = id;
+        this.quest = quest;
+        this.partyOrder = partyOrder;
+        this.orderAscending = orderAscending;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getPartyOrder() {
+        return partyOrder;
+    }
+
+    public void setPartyOrder(String partyOrder) {
+        this.partyOrder = partyOrder;
+    }
+
+    public String getOrderAscending() {
+        return orderAscending;
+    }
+
+    public void setOrderAscending(String order) {
+        this.orderAscending = order;
+    }
+
+    public Quest getQuest() {
+        return quest;
+    }
+
+    public void setQuest(Quest quest) {
+        this.quest = quest;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java
index d7e28c0ef..c3ff5255c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java
@@ -1,114 +1,114 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.database.ExcludeCheckListItem;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-import com.raizlabs.android.dbflow.structure.container.ForeignKeyContainer;
-
-/**
- * Created by viirus on 06/07/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class ChecklistItem extends BaseModel {
-
-    @Column
-    @ForeignKey(
-            references = {@ForeignKeyReference(columnName = "task_id",
-                    columnType = String.class,
-                    foreignColumnName = "id")},
-            saveForeignKeyModel = false)
-    @ExcludeCheckListItem
-    ForeignKeyContainer<Task> task;
-    @Column
-    @PrimaryKey
-    private String id;
-    @Column
-    private String text;
-    @Column
-    private boolean completed;
-    @Column
-    private int position;
-
-    public ChecklistItem() {
-        this(null, null);
-    }
-
-    public ChecklistItem(String id, String text) {
-        this(id, text, false);
-    }
-
-    public ChecklistItem(String id, String text, boolean completed) {
-        this.setText(text);
-        this.setId(id);
-        this.setCompleted(completed);
-    }
-
-    public ChecklistItem(String text) {
-        this(null, text);
-    }
-
-    public ChecklistItem(ChecklistItem item) {
-        this.text = item.getText();
-        this.id = item.getId();
-        this.completed = item.getCompleted();
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public boolean getCompleted() {
-        return completed;
-    }
-
-    public void setCompleted(boolean completed) {
-        this.completed = completed;
-    }
-
-    public int getPosition() {
-        return this.position;
-    }
-
-    public void setPosition(int position) {
-        this.position = position;
-    }
-
-    public Task getTask() {
-        if (task != null) {
-            return task.toModel();
-        } else {
-            return null;
-        }
-    }
-
-    public void setTask(Task task) {
-        this.task = new ForeignKeyContainer<>(Task.class);
-        this.task.setModel(task);
-        this.task.put("id", task.id);
-    }
-
-    @Override
-    public void save() {
-        if (this.getId() == null || this.getId().isEmpty()) {
-            return;
-        }
-        super.save();
-    }
-}
+package com.habitrpg.android.habitica.models.tasks;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.database.ExcludeCheckListItem;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+import com.raizlabs.android.dbflow.structure.container.ForeignKeyContainer;
+
+/**
+ * Created by viirus on 06/07/15.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class ChecklistItem extends BaseModel {
+
+    @Column
+    @ForeignKey(
+            references = {@ForeignKeyReference(columnName = "task_id",
+                    columnType = String.class,
+                    foreignColumnName = "id")},
+            saveForeignKeyModel = false)
+    @ExcludeCheckListItem
+    ForeignKeyContainer<Task> task;
+    @Column
+    @PrimaryKey
+    private String id;
+    @Column
+    private String text;
+    @Column
+    private boolean completed;
+    @Column
+    private int position;
+
+    public ChecklistItem() {
+        this(null, null);
+    }
+
+    public ChecklistItem(String id, String text) {
+        this(id, text, false);
+    }
+
+    public ChecklistItem(String id, String text, boolean completed) {
+        this.setText(text);
+        this.setId(id);
+        this.setCompleted(completed);
+    }
+
+    public ChecklistItem(String text) {
+        this(null, text);
+    }
+
+    public ChecklistItem(ChecklistItem item) {
+        this.text = item.getText();
+        this.id = item.getId();
+        this.completed = item.getCompleted();
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public boolean getCompleted() {
+        return completed;
+    }
+
+    public void setCompleted(boolean completed) {
+        this.completed = completed;
+    }
+
+    public int getPosition() {
+        return this.position;
+    }
+
+    public void setPosition(int position) {
+        this.position = position;
+    }
+
+    public Task getTask() {
+        if (task != null) {
+            return task.toModel();
+        } else {
+            return null;
+        }
+    }
+
+    public void setTask(Task task) {
+        this.task = new ForeignKeyContainer<>(Task.class);
+        this.task.setModel(task);
+        this.task.put("id", task.id);
+    }
+
+    @Override
+    public void save() {
+        if (this.getId() == null || this.getId().isEmpty()) {
+            return;
+        }
+        super.save();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
index 823803a21..81334fd5e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
@@ -1,111 +1,111 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ModelContainer;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by viirus on 06/07/15.
- */
-@ModelContainer
-@Table(databaseName = HabitDatabase.NAME)
-public class Days extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    String task_id;
-
-    @Column
-    private boolean m, t, w, th, f, s, su;
-
-    public Days() {
-        this.m = false;
-        this.t = false;
-        this.w = false;
-        this.th = false;
-        this.f = false;
-        this.s = true;
-        this.su = true;
-    }
-
-    public boolean getT() {
-        return t;
-    }
-
-    public void setT(boolean t) {
-        this.t = t;
-    }
-
-    public boolean getW() {
-        return w;
-    }
-
-    public void setW(boolean w) {
-        this.w = w;
-    }
-
-    public boolean getTh() {
-        return th;
-    }
-
-    public void setTh(boolean th) {
-        this.th = th;
-    }
-
-    public boolean getF() {
-        return f;
-    }
-
-    public void setF(boolean f) {
-        this.f = f;
-    }
-
-    public boolean getS() {
-        return s;
-    }
-
-    public void setS(boolean s) {
-        this.s = s;
-    }
-
-    public boolean getSu() {
-        return su;
-    }
-
-    public void setSu(boolean su) {
-        this.su = su;
-    }
-
-    public boolean getM() {
-        return m;
-    }
-
-    public void setM(boolean m) {
-        this.m = m;
-    }
-
-    public boolean getForDay(int day) {
-        switch (day) {
-            case 2:
-                return this.getM();
-            case 3:
-                return this.getT();
-            case 4:
-                return this.getW();
-            case 5:
-                return this.getTh();
-            case 6:
-                return this.getF();
-            case 7:
-                return this.getS();
-            case 1:
-                return this.getSu();
-        }
-        return false;
-    }
-}
+package com.habitrpg.android.habitica.models.tasks;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ModelContainer;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+/**
+ * Created by viirus on 06/07/15.
+ */
+@ModelContainer
+@Table(databaseName = HabitDatabase.NAME)
+public class Days extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    String task_id;
+
+    @Column
+    private boolean m, t, w, th, f, s, su;
+
+    public Days() {
+        this.m = false;
+        this.t = false;
+        this.w = false;
+        this.th = false;
+        this.f = false;
+        this.s = true;
+        this.su = true;
+    }
+
+    public boolean getT() {
+        return t;
+    }
+
+    public void setT(boolean t) {
+        this.t = t;
+    }
+
+    public boolean getW() {
+        return w;
+    }
+
+    public void setW(boolean w) {
+        this.w = w;
+    }
+
+    public boolean getTh() {
+        return th;
+    }
+
+    public void setTh(boolean th) {
+        this.th = th;
+    }
+
+    public boolean getF() {
+        return f;
+    }
+
+    public void setF(boolean f) {
+        this.f = f;
+    }
+
+    public boolean getS() {
+        return s;
+    }
+
+    public void setS(boolean s) {
+        this.s = s;
+    }
+
+    public boolean getSu() {
+        return su;
+    }
+
+    public void setSu(boolean su) {
+        this.su = su;
+    }
+
+    public boolean getM() {
+        return m;
+    }
+
+    public void setM(boolean m) {
+        this.m = m;
+    }
+
+    public boolean getForDay(int day) {
+        switch (day) {
+            case 2:
+                return this.getM();
+            case 3:
+                return this.getT();
+            case 4:
+                return this.getW();
+            case 5:
+                return this.getTh();
+            case 6:
+                return this.getF();
+            case 7:
+                return this.getS();
+            case 1:
+                return this.getSu();
+        }
+        return false;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java
index a07870ebd..ae849056c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java
@@ -1,128 +1,128 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.database.ExcludeCheckListItem;
-import com.habitrpg.android.habitica.events.ReminderDeleteEvent;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-import com.raizlabs.android.dbflow.structure.container.ForeignKeyContainer;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by keithholliday on 5/31/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class RemindersItem extends BaseModel {
-    @Column
-    @ForeignKey(
-            references = {@ForeignKeyReference(columnName = "task_id",
-                    columnType = String.class,
-                    foreignColumnName = "id")},
-            saveForeignKeyModel = false)
-    @ExcludeCheckListItem
-    ForeignKeyContainer<Task> task;
-    @Column
-    @PrimaryKey
-    private String id;
-    @Column
-    private Date startDate;
-    @Column
-    private Date time;
-    @Column
-    private Integer alarmId;
-
-    //Use to store task type before a task is created
-    private String type;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Integer getAlarmId() {
-        return this.alarmId;
-    }
-
-    public void setAlarmId(Integer alarmId) {
-        this.alarmId = alarmId;
-    }
-
-    public Date getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(Date startDate) {
-        this.startDate = startDate;
-    }
-
-    public Date getTime() {
-        return time;
-    }
-
-    public void setTime(Date time) {
-        this.time = time;
-    }
-
-    public Task getTask() {
-        if (task != null) {
-            //This will get all the task info
-            Task taskModel = task.toModel();
-
-            if (taskModel.getId() == null) {
-                return taskModel;
-            }
-
-            List<Task> task = new Select()
-                    .from(Task.class)
-                    .where(Condition.column("id").eq(taskModel.getId()))
-                    .queryList();
-
-            return task.get(0);
-        } else {
-            return null;
-        }
-    }
-
-    public void setTask(Task task) {
-        this.task = new ForeignKeyContainer<>(Task.class);
-        this.task.setModel(task);
-        this.task.put("id", task.getId());
-    }
-
-    public String getType() {
-        return this.type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @Override
-    public void save() {
-        if (this.getId() == null) {
-            return;
-        }
-        super.save();
-    }
-
-    @Override
-    public void delete() {
-        ReminderDeleteEvent event = new ReminderDeleteEvent();
-        event.reminder = this;
-        EventBus.getDefault().post(event);
-        super.delete();
-    }
-}
+package com.habitrpg.android.habitica.models.tasks;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.database.ExcludeCheckListItem;
+import com.habitrpg.android.habitica.events.ReminderDeleteEvent;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+import com.raizlabs.android.dbflow.structure.container.ForeignKeyContainer;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by keithholliday on 5/31/16.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class RemindersItem extends BaseModel {
+    @Column
+    @ForeignKey(
+            references = {@ForeignKeyReference(columnName = "task_id",
+                    columnType = String.class,
+                    foreignColumnName = "id")},
+            saveForeignKeyModel = false)
+    @ExcludeCheckListItem
+    ForeignKeyContainer<Task> task;
+    @Column
+    @PrimaryKey
+    private String id;
+    @Column
+    private Date startDate;
+    @Column
+    private Date time;
+    @Column
+    private Integer alarmId;
+
+    //Use to store task type before a task is created
+    private String type;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Integer getAlarmId() {
+        return this.alarmId;
+    }
+
+    public void setAlarmId(Integer alarmId) {
+        this.alarmId = alarmId;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getTime() {
+        return time;
+    }
+
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    public Task getTask() {
+        if (task != null) {
+            //This will get all the task info
+            Task taskModel = task.toModel();
+
+            if (taskModel.getId() == null) {
+                return taskModel;
+            }
+
+            List<Task> task = new Select()
+                    .from(Task.class)
+                    .where(Condition.column("id").eq(taskModel.getId()))
+                    .queryList();
+
+            return task.get(0);
+        } else {
+            return null;
+        }
+    }
+
+    public void setTask(Task task) {
+        this.task = new ForeignKeyContainer<>(Task.class);
+        this.task.setModel(task);
+        this.task.put("id", task.getId());
+    }
+
+    public String getType() {
+        return this.type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public void save() {
+        if (this.getId() == null) {
+            return;
+        }
+        super.save();
+    }
+
+    @Override
+    public void delete() {
+        ReminderDeleteEvent event = new ReminderDeleteEvent();
+        event.reminder = this;
+        EventBus.getDefault().post(event);
+        super.delete();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
index 4324e6f80..4bd93b30d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
@@ -1,689 +1,688 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.TaskDeleteEvent;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.ModelContainer;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.support.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by viirus on 10/08/15.
- */
-@ModelContainer
-@Table(databaseName = HabitDatabase.NAME)
-public class Task extends BaseModel {
-    public static final String TYPE_HABIT = "habit";
-    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";
-    public static final String ATTRIBUTE_CONSTITUTION = "con";
-    public static final String ATTRIBUTE_INTELLIGENCE = "int";
-    public static final String ATTRIBUTE_PERCEPTION = "per";
-    @Column
-    @SerializedName("userId")
-    public String user_id;
-    @Column
-    public Float priority;
-    @Column
-    public String text, notes, attribute, type;
-    @Column
-    public double value;
-    public List<TaskTag> tags;
-    @Column
-    public Date dateCreated;
-    @Column
-    public int position;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "group_id",
-            columnType = String.class,
-            foreignColumnName = "task_id")})
-    public TaskGroupPlan group;
-    //Habits
-    @Column
-    public Boolean up, down;
-    //todos/dailies
-    @Column
-    public boolean completed;
-    public List<ChecklistItem> checklist;
-    public List<RemindersItem> reminders;
-    //dailies
-    @Column
-    public String frequency;
-    @Column
-    public Integer everyX, streak;
-    @Column
-    public
-    Date startDate;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "days_id",
-            columnType = String.class,
-            foreignColumnName = "task_id")})
-    public Days repeat;
-    //todos
-    @Column
-    @SerializedName("date")
-    public Date duedate;
-    //TODO: private String lastCompleted;
-    // used for buyable items
-    public String specialTag;
-    public CharSequence parsedText;
-    public CharSequence parsedNotes;
-    @Column
-    @PrimaryKey
-    @NotNull
-    @SerializedName("_id")
-    String id;
-
-    /**
-     * @return the id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id the id to set
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    /**
-     * @return the notes
-     */
-    public String getNotes() {
-        return notes;
-    }
-
-    /**
-     * @param notes the notes to set
-     */
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    /**
-     * @return the priority
-     */
-    public Float getPriority() {
-        return priority;
-    }
-
-    /**
-     * @param i the priority to set
-     */
-    public void setPriority(Float i) {
-        this.priority = i;
-    }
-
-    /**
-     * @return the text
-     */
-    public String getText() {
-        return text;
-    }
-
-    /**
-     * @param text the text to set
-     */
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    /**
-     * @return the value
-     */
-    public double getValue() {
-        return value;
-    }
-
-    /**
-     * @param value the value to set
-     */
-    public void setValue(Double value) {
-        this.value = value;
-    }
-
-    /**
-     * To be allowed to set int value without problems
-     *
-     * @param value the value to set
-     */
-    public void setValue(double value) {
-        this.setValue(Double.valueOf(value));
-    }
-
-    /**
-     * Returns a string of the type of the Task
-     *
-     * @return the string of the Item type
-     */
-    public String getType() {
-        return this.type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tags")
-    public List<TaskTag> getTags() {
-        if (tags == null) {
-            tags = new Select()
-                    .from(TaskTag.class)
-                    .where(Condition.column("task_id").eq(this.id))
-                    .queryList();
-        }
-        return tags;
-    }
-
-    public void setTags(List<TaskTag> tags) {
-        for (TaskTag tag : tags) {
-            tag.setTask(this);
-        }
-        this.tags = tags;
-    }
-
-    public boolean containsAnyTagId(ArrayList<String> tagIdList) {
-        getTags();
-
-        for (TaskTag t : tags) {
-            if (tagIdList.contains(t.getTag().getId())) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public boolean containsAllTagIds(List<String> tagIdList) {
-        getTags();
-
-        ArrayList<String> allTagIds = new ArrayList<String>();
-
-        for (TaskTag t : tags) {
-            allTagIds.add(t.getTag().getId());
-        }
-
-        return allTagIds.containsAll(tagIdList);
-    }
-
-    /**
-     * @return whether or not the habit can be "upped"
-     */
-    public boolean getUp() {
-        if (up == null) {
-            return false;
-        }
-        return up;
-    }
-
-    /**
-     * Set the Up value
-     */
-    public void setUp(Boolean up) {
-        this.up = up;
-    }
-
-    /**
-     * @return whether or not the habit can be "down"
-     */
-    public boolean getDown() {
-        if (down == null) {
-            return false;
-        }
-        return down;
-    }
-
-    /**
-     * Set the Down value
-     */
-    public void setDown(Boolean down) {
-        this.down = down;
-    }
-
-
-    public boolean getCompleted() {
-        return completed;
-    }
-
-    /**
-     * Set whether or not the daily is completed
-     */
-    public void setCompleted(Boolean completed) {
-        this.completed = completed;
-    }
-
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "checklist")
-    public List<ChecklistItem> getChecklist() {
-        if (this.checklist == null) {
-            this.checklist = new Select()
-                    .from(ChecklistItem.class)
-                    .where(Condition.column("task_id").eq(this.id))
-                    .orderBy(true, "position")
-                    .queryList();
-        }
-        return this.checklist;
-    }
-
-    public void setChecklist(List<ChecklistItem> checklist) {
-        for (ChecklistItem checklistItem : checklist) {
-            checklistItem.setTask(this);
-        }
-        this.checklist = checklist;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "reminders")
-    public List<RemindersItem> getReminders() {
-        if (this.reminders == null) {
-            this.reminders = new Select()
-                    .from(RemindersItem.class)
-                    .where(Condition.column("task_id").eq(this.id))
-                    .orderBy(true, "time")
-                    .queryList();
-        }
-        return this.reminders;
-    }
-
-    public void setReminders(List<RemindersItem> reminders) {
-        for (RemindersItem remindersItem : reminders) {
-            remindersItem.setTask(this);
-        }
-        this.reminders = reminders;
-    }
-
-    public Integer getCompletedChecklistCount() {
-        Integer count = 0;
-        for (ChecklistItem item : this.getChecklist()) {
-            if (item.getCompleted()) {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    public String getFrequency() {
-        if (frequency == null) {
-            return FREQUENCY_WEEKLY;
-        }
-        return frequency;
-    }
-
-    public void setFrequency(String frequency) {
-        this.frequency = frequency;
-    }
-
-    public Integer getEveryX() {
-        if (everyX == null) {
-            return 1;
-        }
-        return everyX;
-    }
-
-    public void setEveryX(Integer everyX) {
-        this.everyX = everyX;
-    }
-
-    public Date getStartDate() {
-        if (startDate == null) {
-            return new Date();
-        }
-        return startDate;
-    }
-
-    public void setStartDate(Date startDate) {
-        this.startDate = startDate;
-    }
-
-    /**
-     * @return the repeat array.<br/>
-     * This array contains 7 values, one for each days, starting from monday.
-     */
-    public Days getRepeat() {
-        if (repeat == null) {
-            repeat = new Days();
-        }
-        return repeat;
-    }
-
-    /**
-     * @param repeat the repeat array to set
-     */
-    public void setRepeat(Days repeat) {
-        this.repeat = repeat;
-    }
-
-    /**
-     * @return the streak
-     */
-    public int getStreak() {
-        if (streak == null) {
-            return 0;
-        }
-        return streak;
-    }
-
-    /**
-     * @param streak the streak to set
-     */
-    public void setStreak(Integer streak) {
-        this.streak = streak;
-    }
-
-
-    /**
-     * @return the due date
-     */
-    public Date getDueDate() {
-        return this.duedate;
-    }
-
-    /**
-     * Set the due date
-     *
-     * @param duedate the date to set
-     */
-    public void setDueDate(@Nullable Date duedate) {
-        this.duedate = duedate;
-    }
-
-    /**
-     * @return the attribute
-     */
-    public String getAttribute() {
-        return attribute;
-    }
-
-    /**
-     * @param attribute the attribute to set
-     */
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-
-    @Override
-    public void save() {
-        if (this.getId() == null || this.getId().length() == 0) {
-            return;
-        }
-
-        List<TaskTag> tmpTags = tags;
-        List<ChecklistItem> tmpChecklist = checklist;
-        List<RemindersItem> tmpReminders = reminders;
-
-        // remove them, so that the database don't add empty entries
-
-        tags = null;
-        checklist = null;
-        reminders = null;
-
-        if (repeat != null) {
-            repeat.task_id = this.id;
-        }
-
-        if (group != null) {
-            group.task_id = this.id;
-        }
-
-        super.save();
-
-        tags = tmpTags;
-        checklist = tmpChecklist;
-        reminders = tmpReminders;
-
-        if (this.tags != null) {
-            for (TaskTag tag : this.tags) {
-                tag.setTask(this);
-                tag.async().save();
-            }
-        }
-
-        int position = 0;
-        if (this.checklist != null) {
-            for (ChecklistItem item : this.checklist) {
-                if (item.getTask() == null) {
-                    item.setTask(this);
-                }
-                item.setPosition(position);
-                item.async().save();
-                position++;
-            }
-        }
-
-        int index = 0;
-        if (this.reminders != null) {
-            for (RemindersItem item : this.reminders) {
-                if (item.getTask() == null) {
-                    item.setTask(this);
-                }
-                if (item.getId() == null) {
-                    item.setId(this.id + "task-reminder" + index);
-                }
-                item.async().save();
-                index++;
-            }
-        }
-    }
-
-    @Override
-    public void update() {
-        if (this.getId() == null || this.getId().length() == 0) {
-            return;
-        }
-        super.update();
-    }
-
-    public int getLightTaskColor() {
-        if (this.value < -20)
-            return R.color.worst_100;
-        if (this.value < -10)
-            return R.color.worse_100;
-        if (this.value < -1)
-            return R.color.bad_100;
-        if (this.value < 1)
-            return R.color.neutral_100;
-        if (this.value < 5)
-            return R.color.good_100;
-        if (this.value < 10)
-            return R.color.better_100;
-        return R.color.best_100;
-    }
-
-    /**
-     * Get the button color resources depending on a certain score
-     *
-     * @return the color resource id
-     */
-    public int getMediumTaskColor() {
-        if (this.value < -20)
-            return R.color.worst_50;
-        if (this.value < -10)
-            return R.color.worse_50;
-        if (this.value < -1)
-            return R.color.bad_50;
-        if (this.value < 1)
-            return R.color.neutral_50;
-        if (this.value < 5)
-            return R.color.good_50;
-        if (this.value < 10)
-            return R.color.better_50;
-
-        return R.color.best_50;
-    }
-
-    /**
-     * Get the button color resources depending on a certain score
-     *
-     * @return the color resource id
-     */
-    public int getDarkTaskColor() {
-        if (this.value < -20)
-            return R.color.worst_10;
-        if (this.value < -10)
-            return R.color.worse_10;
-        if (this.value < -1)
-            return R.color.bad_10;
-        if (this.value < 1)
-            return R.color.neutral_10;
-        if (this.value < 5)
-            return R.color.good_10;
-        if (this.value < 10)
-            return R.color.better_10;
-
-        return R.color.best_10;
-    }
-
-    public Boolean isDue(int offset) {
-        if (this.getCompleted()) {
-            return true;
-        }
-
-        Calendar today = new GregorianCalendar();
-        today.add(Calendar.HOUR, -offset);
-
-        Calendar startDate = new GregorianCalendar();
-        Calendar startDateAtMidnight;
-        if (this.getStartDate() != null) {
-            startDate.setTime(this.getStartDate());
-            startDateAtMidnight = new GregorianCalendar(startDate.get(Calendar.YEAR),
-                    startDate.get(Calendar.MONTH),
-                    startDate.get(Calendar.DAY_OF_MONTH));
-
-            if (startDateAtMidnight.after(today)) {
-                return false;
-            }
-        } else {
-            startDateAtMidnight = new GregorianCalendar(startDate.get(Calendar.YEAR),
-                    startDate.get(Calendar.MONTH),
-                    startDate.get(Calendar.DAY_OF_MONTH));
-        }
-
-        if (this.getFrequency().equals(FREQUENCY_DAILY)) {
-            if (getEveryX() == 0) {
-                return false;
-            }
-
-            TimeUnit timeUnit = TimeUnit.DAYS;
-            long diffInMillies = startDateAtMidnight.getTimeInMillis() - today.getTimeInMillis();
-            long daySinceStart = timeUnit.convert(diffInMillies, TimeUnit.MILLISECONDS);
-            return (daySinceStart % this.getEveryX() == 0);
-        } else {
-            return this.getRepeat().getForDay(today.get(Calendar.DAY_OF_WEEK));
-        }
-    }
-
-    public Boolean isDisplayedActive(int offset) {
-        return this.isDue(offset) && !this.completed;
-    }
-
-    public Boolean isChecklistDisplayActive(int offset) {
-        return this.isDisplayedActive(offset) && (this.checklist.size() != this.getCompletedChecklistCount());
-    }
-
-    public Date getNextReminderOccurence(Date oldTime) {
-        Calendar today = Calendar.getInstance();
-
-        Calendar newTime = new GregorianCalendar();
-        newTime.setTime(oldTime);
-        newTime.set(today.get(Calendar.YEAR), today.get(Calendar.MONTH), today.get(Calendar.DAY_OF_MONTH));
-        if (today.before(newTime)) {
-            today.add(Calendar.DAY_OF_MONTH, -1);
-        }
-
-        if (this.getFrequency().equals(FREQUENCY_DAILY)) {
-            Calendar startDate = new GregorianCalendar();
-            startDate.setTime(this.getStartDate());
-
-            TimeUnit timeUnit = TimeUnit.DAYS;
-            long diffInMillies = today.getTimeInMillis() - startDate.getTimeInMillis();
-            long daySinceStart = timeUnit.convert(diffInMillies, TimeUnit.MILLISECONDS);
-            long daysUntilNextReminder = this.getEveryX() - (daySinceStart % this.getEveryX());
-
-            today.add(Calendar.DATE, (int) daysUntilNextReminder);
-            newTime.setTime(today.getTime());
-        } else {
-            int nextActiveDayOfTheWeek = newTime.get(Calendar.DAY_OF_WEEK);
-            while (!this.getRepeat().getForDay(nextActiveDayOfTheWeek) || newTime.before(today) || newTime.equals(today)) {
-                if (nextActiveDayOfTheWeek == 6) nextActiveDayOfTheWeek = 0;
-                nextActiveDayOfTheWeek += 1;
-                newTime.add(Calendar.DATE, 1);
-            }
-        }
-
-        return newTime.getTime();
-    }
-
-    @Override
-    public void delete() {
-        TaskDeleteEvent event = new TaskDeleteEvent();
-        event.task = this;
-        EventBus.getDefault().post(event);
-        super.delete();
-    }
-
-    public boolean isGroupTask() {
-        if (group != null) {
-            if (group.approvalRequired) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public boolean isPendingApproval() {
-        if (group != null) {
-            if (group.approvalRequired && group.approvalRequested && !group.approvalApproved) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void parseMarkdown() {
-        try {
-            this.parsedText = MarkdownParser.parseMarkdown(this.getText());
-        } catch (NullPointerException e) {
-            this.parsedText = this.getText();
-        }
-        try {
-            this.parsedNotes = MarkdownParser.parseMarkdown(this.getNotes());
-        } catch (NullPointerException e) {
-            this.parsedNotes = this.getNotes();
-        }
-    }
-}
+package com.habitrpg.android.habitica.models.tasks;
+
+import android.support.annotation.Nullable;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.TaskDeleteEvent;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.ModelContainer;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.OneToMany;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by viirus on 10/08/15.
+ */
+@ModelContainer
+@Table(databaseName = HabitDatabase.NAME)
+public class Task extends BaseModel {
+    public static final String TYPE_HABIT = "habit";
+    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";
+    public static final String ATTRIBUTE_CONSTITUTION = "con";
+    public static final String ATTRIBUTE_INTELLIGENCE = "int";
+    public static final String ATTRIBUTE_PERCEPTION = "per";
+    @Column
+    @SerializedName("userId")
+    public String user_id;
+    @Column
+    public Float priority;
+    @Column
+    public String text, notes, attribute, type;
+    @Column
+    public double value;
+    public List<TaskTag> tags;
+    @Column
+    public Date dateCreated;
+    @Column
+    public int position;
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "group_id",
+            columnType = String.class,
+            foreignColumnName = "task_id")})
+    public TaskGroupPlan group;
+    //Habits
+    @Column
+    public Boolean up, down;
+    //todos/dailies
+    @Column
+    public boolean completed;
+    public List<ChecklistItem> checklist;
+    public List<RemindersItem> reminders;
+    //dailies
+    @Column
+    public String frequency;
+    @Column
+    public Integer everyX, streak;
+    @Column
+    public
+    Date startDate;
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "days_id",
+            columnType = String.class,
+            foreignColumnName = "task_id")})
+    public Days repeat;
+    //todos
+    @Column
+    @SerializedName("date")
+    public Date duedate;
+    //TODO: private String lastCompleted;
+    // used for buyable items
+    public String specialTag;
+    public CharSequence parsedText;
+    public CharSequence parsedNotes;
+    @Column
+    @PrimaryKey
+    @NotNull
+    @SerializedName("_id")
+    String id;
+
+    /**
+     * @return the id
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @param id the id to set
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * @return the notes
+     */
+    public String getNotes() {
+        return notes;
+    }
+
+    /**
+     * @param notes the notes to set
+     */
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    /**
+     * @return the priority
+     */
+    public Float getPriority() {
+        return priority;
+    }
+
+    /**
+     * @param i the priority to set
+     */
+    public void setPriority(Float i) {
+        this.priority = i;
+    }
+
+    /**
+     * @return the text
+     */
+    public String getText() {
+        return text;
+    }
+
+    /**
+     * @param text the text to set
+     */
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    /**
+     * @return the value
+     */
+    public double getValue() {
+        return value;
+    }
+
+    /**
+     * @param value the value to set
+     */
+    public void setValue(Double value) {
+        this.value = value;
+    }
+
+    /**
+     * To be allowed to set int value without problems
+     *
+     * @param value the value to set
+     */
+    public void setValue(double value) {
+        this.setValue(Double.valueOf(value));
+    }
+
+    /**
+     * Returns a string of the type of the Task
+     *
+     * @return the string of the Item type
+     */
+    public String getType() {
+        return this.type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tags")
+    public List<TaskTag> getTags() {
+        if (tags == null) {
+            tags = new Select()
+                    .from(TaskTag.class)
+                    .where(Condition.column("task_id").eq(this.id))
+                    .queryList();
+        }
+        return tags;
+    }
+
+    public void setTags(List<TaskTag> tags) {
+        for (TaskTag tag : tags) {
+            tag.setTask(this);
+        }
+        this.tags = tags;
+    }
+
+    public boolean containsAnyTagId(ArrayList<String> tagIdList) {
+        getTags();
+
+        for (TaskTag t : tags) {
+            if (tagIdList.contains(t.getTag().getId())) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public boolean containsAllTagIds(List<String> tagIdList) {
+        getTags();
+
+        ArrayList<String> allTagIds = new ArrayList<String>();
+
+        for (TaskTag t : tags) {
+            allTagIds.add(t.getTag().getId());
+        }
+
+        return allTagIds.containsAll(tagIdList);
+    }
+
+    /**
+     * @return whether or not the habit can be "upped"
+     */
+    public boolean getUp() {
+        if (up == null) {
+            return false;
+        }
+        return up;
+    }
+
+    /**
+     * Set the Up value
+     */
+    public void setUp(Boolean up) {
+        this.up = up;
+    }
+
+    /**
+     * @return whether or not the habit can be "down"
+     */
+    public boolean getDown() {
+        if (down == null) {
+            return false;
+        }
+        return down;
+    }
+
+    /**
+     * Set the Down value
+     */
+    public void setDown(Boolean down) {
+        this.down = down;
+    }
+
+
+    public boolean getCompleted() {
+        return completed;
+    }
+
+    /**
+     * Set whether or not the daily is completed
+     */
+    public void setCompleted(Boolean completed) {
+        this.completed = completed;
+    }
+
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "checklist")
+    public List<ChecklistItem> getChecklist() {
+        if (this.checklist == null) {
+            this.checklist = new Select()
+                    .from(ChecklistItem.class)
+                    .where(Condition.column("task_id").eq(this.id))
+                    .orderBy(true, "position")
+                    .queryList();
+        }
+        return this.checklist;
+    }
+
+    public void setChecklist(List<ChecklistItem> checklist) {
+        for (ChecklistItem checklistItem : checklist) {
+            checklistItem.setTask(this);
+        }
+        this.checklist = checklist;
+    }
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "reminders")
+    public List<RemindersItem> getReminders() {
+        if (this.reminders == null) {
+            this.reminders = new Select()
+                    .from(RemindersItem.class)
+                    .where(Condition.column("task_id").eq(this.id))
+                    .orderBy(true, "time")
+                    .queryList();
+        }
+        return this.reminders;
+    }
+
+    public void setReminders(List<RemindersItem> reminders) {
+        for (RemindersItem remindersItem : reminders) {
+            remindersItem.setTask(this);
+        }
+        this.reminders = reminders;
+    }
+
+    public Integer getCompletedChecklistCount() {
+        Integer count = 0;
+        for (ChecklistItem item : this.getChecklist()) {
+            if (item.getCompleted()) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    public String getFrequency() {
+        if (frequency == null) {
+            return FREQUENCY_WEEKLY;
+        }
+        return frequency;
+    }
+
+    public void setFrequency(String frequency) {
+        this.frequency = frequency;
+    }
+
+    public Integer getEveryX() {
+        if (everyX == null) {
+            return 1;
+        }
+        return everyX;
+    }
+
+    public void setEveryX(Integer everyX) {
+        this.everyX = everyX;
+    }
+
+    public Date getStartDate() {
+        if (startDate == null) {
+            return new Date();
+        }
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    /**
+     * @return the repeat array.<br/>
+     * This array contains 7 values, one for each days, starting from monday.
+     */
+    public Days getRepeat() {
+        if (repeat == null) {
+            repeat = new Days();
+        }
+        return repeat;
+    }
+
+    /**
+     * @param repeat the repeat array to set
+     */
+    public void setRepeat(Days repeat) {
+        this.repeat = repeat;
+    }
+
+    /**
+     * @return the streak
+     */
+    public int getStreak() {
+        if (streak == null) {
+            return 0;
+        }
+        return streak;
+    }
+
+    /**
+     * @param streak the streak to set
+     */
+    public void setStreak(Integer streak) {
+        this.streak = streak;
+    }
+
+
+    /**
+     * @return the due date
+     */
+    public Date getDueDate() {
+        return this.duedate;
+    }
+
+    /**
+     * Set the due date
+     *
+     * @param duedate the date to set
+     */
+    public void setDueDate(@Nullable Date duedate) {
+        this.duedate = duedate;
+    }
+
+    /**
+     * @return the attribute
+     */
+    public String getAttribute() {
+        return attribute;
+    }
+
+    /**
+     * @param attribute the attribute to set
+     */
+    public void setAttribute(String attribute) {
+        this.attribute = attribute;
+    }
+
+
+    @Override
+    public void save() {
+        if (this.getId() == null || this.getId().length() == 0) {
+            return;
+        }
+
+        List<TaskTag> tmpTags = tags;
+        List<ChecklistItem> tmpChecklist = checklist;
+        List<RemindersItem> tmpReminders = reminders;
+
+        // remove them, so that the database don't add empty entries
+
+        tags = null;
+        checklist = null;
+        reminders = null;
+
+        if (repeat != null) {
+            repeat.task_id = this.id;
+        }
+
+        if (group != null) {
+            group.task_id = this.id;
+        }
+
+        super.save();
+
+        tags = tmpTags;
+        checklist = tmpChecklist;
+        reminders = tmpReminders;
+
+        if (this.tags != null) {
+            for (TaskTag tag : this.tags) {
+                tag.setTask(this);
+                tag.async().save();
+            }
+        }
+
+        int position = 0;
+        if (this.checklist != null) {
+            for (ChecklistItem item : this.checklist) {
+                if (item.getTask() == null) {
+                    item.setTask(this);
+                }
+                item.setPosition(position);
+                item.async().save();
+                position++;
+            }
+        }
+
+        int index = 0;
+        if (this.reminders != null) {
+            for (RemindersItem item : this.reminders) {
+                if (item.getTask() == null) {
+                    item.setTask(this);
+                }
+                if (item.getId() == null) {
+                    item.setId(this.id + "task-reminder" + index);
+                }
+                item.async().save();
+                index++;
+            }
+        }
+    }
+
+    @Override
+    public void update() {
+        if (this.getId() == null || this.getId().length() == 0) {
+            return;
+        }
+        super.update();
+    }
+
+    public int getLightTaskColor() {
+        if (this.value < -20)
+            return R.color.worst_100;
+        if (this.value < -10)
+            return R.color.worse_100;
+        if (this.value < -1)
+            return R.color.bad_100;
+        if (this.value < 1)
+            return R.color.neutral_100;
+        if (this.value < 5)
+            return R.color.good_100;
+        if (this.value < 10)
+            return R.color.better_100;
+        return R.color.best_100;
+    }
+
+    /**
+     * Get the button color resources depending on a certain score
+     *
+     * @return the color resource id
+     */
+    public int getMediumTaskColor() {
+        if (this.value < -20)
+            return R.color.worst_50;
+        if (this.value < -10)
+            return R.color.worse_50;
+        if (this.value < -1)
+            return R.color.bad_50;
+        if (this.value < 1)
+            return R.color.neutral_50;
+        if (this.value < 5)
+            return R.color.good_50;
+        if (this.value < 10)
+            return R.color.better_50;
+
+        return R.color.best_50;
+    }
+
+    /**
+     * Get the button color resources depending on a certain score
+     *
+     * @return the color resource id
+     */
+    public int getDarkTaskColor() {
+        if (this.value < -20)
+            return R.color.worst_10;
+        if (this.value < -10)
+            return R.color.worse_10;
+        if (this.value < -1)
+            return R.color.bad_10;
+        if (this.value < 1)
+            return R.color.neutral_10;
+        if (this.value < 5)
+            return R.color.good_10;
+        if (this.value < 10)
+            return R.color.better_10;
+
+        return R.color.best_10;
+    }
+
+    public Boolean isDue(int offset) {
+        if (this.getCompleted()) {
+            return true;
+        }
+
+        Calendar today = new GregorianCalendar();
+        today.add(Calendar.HOUR, -offset);
+
+        Calendar startDate = new GregorianCalendar();
+        Calendar startDateAtMidnight;
+        if (this.getStartDate() != null) {
+            startDate.setTime(this.getStartDate());
+            startDateAtMidnight = new GregorianCalendar(startDate.get(Calendar.YEAR),
+                    startDate.get(Calendar.MONTH),
+                    startDate.get(Calendar.DAY_OF_MONTH));
+
+            if (startDateAtMidnight.after(today)) {
+                return false;
+            }
+        } else {
+            startDateAtMidnight = new GregorianCalendar(startDate.get(Calendar.YEAR),
+                    startDate.get(Calendar.MONTH),
+                    startDate.get(Calendar.DAY_OF_MONTH));
+        }
+
+        if (this.getFrequency().equals(FREQUENCY_DAILY)) {
+            if (getEveryX() == 0) {
+                return false;
+            }
+
+            TimeUnit timeUnit = TimeUnit.DAYS;
+            long diffInMillies = startDateAtMidnight.getTimeInMillis() - today.getTimeInMillis();
+            long daySinceStart = timeUnit.convert(diffInMillies, TimeUnit.MILLISECONDS);
+            return (daySinceStart % this.getEveryX() == 0);
+        } else {
+            return this.getRepeat().getForDay(today.get(Calendar.DAY_OF_WEEK));
+        }
+    }
+
+    public Boolean isDisplayedActive(int offset) {
+        return this.isDue(offset) && !this.completed;
+    }
+
+    public Boolean isChecklistDisplayActive(int offset) {
+        return this.isDisplayedActive(offset) && (this.checklist.size() != this.getCompletedChecklistCount());
+    }
+
+    public Date getNextReminderOccurence(Date oldTime) {
+        Calendar today = Calendar.getInstance();
+
+        Calendar newTime = new GregorianCalendar();
+        newTime.setTime(oldTime);
+        newTime.set(today.get(Calendar.YEAR), today.get(Calendar.MONTH), today.get(Calendar.DAY_OF_MONTH));
+        if (today.before(newTime)) {
+            today.add(Calendar.DAY_OF_MONTH, -1);
+        }
+
+        if (this.getFrequency().equals(FREQUENCY_DAILY)) {
+            Calendar startDate = new GregorianCalendar();
+            startDate.setTime(this.getStartDate());
+
+            TimeUnit timeUnit = TimeUnit.DAYS;
+            long diffInMillies = today.getTimeInMillis() - startDate.getTimeInMillis();
+            long daySinceStart = timeUnit.convert(diffInMillies, TimeUnit.MILLISECONDS);
+            long daysUntilNextReminder = this.getEveryX() - (daySinceStart % this.getEveryX());
+
+            today.add(Calendar.DATE, (int) daysUntilNextReminder);
+            newTime.setTime(today.getTime());
+        } else {
+            int nextActiveDayOfTheWeek = newTime.get(Calendar.DAY_OF_WEEK);
+            while (!this.getRepeat().getForDay(nextActiveDayOfTheWeek) || newTime.before(today) || newTime.equals(today)) {
+                if (nextActiveDayOfTheWeek == 6) nextActiveDayOfTheWeek = 0;
+                nextActiveDayOfTheWeek += 1;
+                newTime.add(Calendar.DATE, 1);
+            }
+        }
+
+        return newTime.getTime();
+    }
+
+    @Override
+    public void delete() {
+        TaskDeleteEvent event = new TaskDeleteEvent();
+        event.task = this;
+        EventBus.getDefault().post(event);
+        super.delete();
+    }
+
+    public boolean isGroupTask() {
+        if (group != null) {
+            if (group.approvalRequired) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean isPendingApproval() {
+        if (group != null) {
+            if (group.approvalRequired && group.approvalRequested && !group.approvalApproved) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void parseMarkdown() {
+        try {
+            this.parsedText = MarkdownParser.parseMarkdown(this.getText());
+        } catch (NullPointerException e) {
+            this.parsedText = this.getText();
+        }
+        try {
+            this.parsedNotes = MarkdownParser.parseMarkdown(this.getNotes());
+        } catch (NullPointerException e) {
+            this.parsedNotes = this.getNotes();
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java
index 2d90cbf3e..ccd58bbee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java
@@ -1,23 +1,23 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ModelContainer;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-@ModelContainer
-@Table(databaseName = HabitDatabase.NAME)
-public class TaskGroupPlan extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    String task_id;
-
-    @Column
-    public boolean approvalRequested, approvalApproved, approvalRequired;
-}
+package com.habitrpg.android.habitica.models.tasks;
+
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ModelContainer;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+@ModelContainer
+@Table(databaseName = HabitDatabase.NAME)
+public class TaskGroupPlan extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    String task_id;
+
+    @Column
+    public boolean approvalRequested, approvalApproved, approvalRequired;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.java
index 8eb291a71..9cb9c6ffa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskList.java
@@ -1,9 +1,9 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-import java.util.Map;
-
-public class TaskList {
-
-    public Map<String, Task> tasks;
-
-}
+package com.habitrpg.android.habitica.models.tasks;
+
+import java.util.Map;
+
+public class TaskList {
+
+    public Map<String, Task> tasks;
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
index 6c9b5a093..736c8ac84 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
@@ -1,76 +1,76 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.Tag;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-import com.raizlabs.android.dbflow.structure.container.ForeignKeyContainer;
-
-
-/**
- * Created by viirus on 08/08/15.
- */
-
-@Table(databaseName = HabitDatabase.NAME)
-public class TaskTag extends BaseModel {
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "tag_id",
-            columnType = String.class,
-            foreignColumnName = "id")},
-            saveForeignKeyModel = false)
-    public ForeignKeyContainer<Tag> tag;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "task_id",
-            columnType = String.class,
-            foreignColumnName = "id")},
-            saveForeignKeyModel = false)
-    public ForeignKeyContainer<Task> task;
-    @Column
-    @PrimaryKey
-    String id;
-    private String tagId = "";
-    private String taskId = "";
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Tag getTag() {
-        return tag.toModel();
-    }
-
-    public void setTag(Tag tag) {
-        this.tag = new ForeignKeyContainer<>(Tag.class);
-        this.tag.setModel(tag);
-        this.tag.put("id", tag.id);
-
-        tagId = tag.id;
-        updatePrimaryKey();
-    }
-
-    public Task getTask() {
-        return task.toModel();
-    }
-
-    public void setTask(Task task) {
-        this.task = new ForeignKeyContainer<>(Task.class);
-        this.task.setModel(task);
-        this.task.put("id", task.id);
-
-        taskId = task.id;
-        updatePrimaryKey();
-    }
-
-    private void updatePrimaryKey() {
-        this.id = taskId + "_" + tagId;
-    }
-}
+package com.habitrpg.android.habitica.models.tasks;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.Tag;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+import com.raizlabs.android.dbflow.structure.container.ForeignKeyContainer;
+
+
+/**
+ * Created by viirus on 08/08/15.
+ */
+
+@Table(databaseName = HabitDatabase.NAME)
+public class TaskTag extends BaseModel {
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "tag_id",
+            columnType = String.class,
+            foreignColumnName = "id")},
+            saveForeignKeyModel = false)
+    public ForeignKeyContainer<Tag> tag;
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "task_id",
+            columnType = String.class,
+            foreignColumnName = "id")},
+            saveForeignKeyModel = false)
+    public ForeignKeyContainer<Task> task;
+    @Column
+    @PrimaryKey
+    String id;
+    private String tagId = "";
+    private String taskId = "";
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Tag getTag() {
+        return tag.toModel();
+    }
+
+    public void setTag(Tag tag) {
+        this.tag = new ForeignKeyContainer<>(Tag.class);
+        this.tag.setModel(tag);
+        this.tag.put("id", tag.id);
+
+        tagId = tag.id;
+        updatePrimaryKey();
+    }
+
+    public Task getTask() {
+        return task.toModel();
+    }
+
+    public void setTask(Task task) {
+        this.task = new ForeignKeyContainer<>(Task.class);
+        this.task.setModel(task);
+        this.task.put("id", task.id);
+
+        taskId = task.id;
+        updatePrimaryKey();
+    }
+
+    private void updatePrimaryKey() {
+        this.id = taskId + "_" + tagId;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.java
index 34d23af9e..227566ab8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TasksOrder.java
@@ -1,43 +1,43 @@
-package com.habitrpg.android.habitica.models.tasks;
-
-import java.util.List;
-
-public class TasksOrder {
-
-    List<String> habits;
-    List<String> dailys;
-    List<String> todos;
-    List<String> rewards;
-
-    public List<String> getHabits() {
-        return habits;
-    }
-
-    public void setHabits(List<String> habits) {
-        this.habits = habits;
-    }
-
-    public List<String> getDailys() {
-        return dailys;
-    }
-
-    public void setDailys(List<String> dailys) {
-        this.dailys = dailys;
-    }
-
-    public List<String> getTodos() {
-        return todos;
-    }
-
-    public void setTodos(List<String> todos) {
-        this.todos = todos;
-    }
-
-    public List<String> getRewards() {
-        return rewards;
-    }
-
-    public void setRewards(List<String> rewards) {
-        this.rewards = rewards;
-    }
-}
+package com.habitrpg.android.habitica.models.tasks;
+
+import java.util.List;
+
+public class TasksOrder {
+
+    List<String> habits;
+    List<String> dailys;
+    List<String> todos;
+    List<String> rewards;
+
+    public List<String> getHabits() {
+        return habits;
+    }
+
+    public void setHabits(List<String> habits) {
+        this.habits = habits;
+    }
+
+    public List<String> getDailys() {
+        return dailys;
+    }
+
+    public void setDailys(List<String> dailys) {
+        this.dailys = dailys;
+    }
+
+    public List<String> getTodos() {
+        return todos;
+    }
+
+    public void setTodos(List<String> todos) {
+        this.todos = todos;
+    }
+
+    public List<String> getRewards() {
+        return rewards;
+    }
+
+    public void setRewards(List<String> rewards) {
+        this.rewards = rewards;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
index ddfcc3b2a..90ac4c2b3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
@@ -1,48 +1,47 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.auth.LocalAuthentication;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by admin on 18/11/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Authentication extends BaseModel {
-
-    @SerializedName("local")
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "localauthentication_user_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    public LocalAuthentication localAuthentication;
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-
-    public LocalAuthentication getLocalAuthentication() {
-        return localAuthentication;
-    }
-
-    public void setLocalAuthentication(LocalAuthentication LocalAuthentication) {
-        this.localAuthentication = LocalAuthentication;
-    }
-
-    @Override
-    public void save() {
-
-        if (localAuthentication != null)
-            localAuthentication.user_id = user_id;
-
-        super.save();
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.auth.LocalAuthentication;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+/**
+ * Created by admin on 18/11/15.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class Authentication extends BaseModel {
+
+    @SerializedName("local")
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "localauthentication_user_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    public LocalAuthentication localAuthentication;
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_id;
+
+    public LocalAuthentication getLocalAuthentication() {
+        return localAuthentication;
+    }
+
+    public void setLocalAuthentication(LocalAuthentication LocalAuthentication) {
+        this.localAuthentication = LocalAuthentication;
+    }
+
+    @Override
+    public void save() {
+
+        if (localAuthentication != null)
+            localAuthentication.user_id = user_id;
+
+        super.save();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/BasicStats.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/BasicStats.java
index b417a4fdc..0a7db1349 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/BasicStats.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/BasicStats.java
@@ -1,72 +1,71 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by MagicMicky on 10/06/2014.
- */
-
-@Table(databaseName = HabitDatabase.NAME)
-public class BasicStats extends BaseModel {
-
-    @Column
-    public Float con, str, per;
-    @Column
-    @SerializedName("int")
-    public Float _int;
-    @Column
-    @PrimaryKey
-    @NotNull
-    protected
-    String id;
-
-    public Float getCon() {
-        return con != null ? con : Float.valueOf(0);
-    }
-
-    public void setCon(Float con) {
-        this.con = con;
-    }
-
-    public Float getStr() {
-        return str != null ? str : Float.valueOf(0);
-    }
-
-    public void setStr(Float str) {
-        this.str = str;
-    }
-
-    public Float getPer() {
-        return per != null ? per : Float.valueOf(0);
-    }
-
-    public void setPer(Float per) {
-        this.per = per;
-    }
-
-    public Float get_int() {
-        return _int != null ? _int : Float.valueOf(0);
-    }
-
-    public void set_int(Float _int) {
-        this._int = _int;
-    }
-
-    public void merge(BasicStats stats) {
-        if (stats == null) {
-            return;
-        }
-        this.con = stats.con != null ? stats.con : this.con;
-        this.str = stats.str != null ? stats.str : this.str;
-        this.per = stats.per != null ? stats.per : this.per;
-        this._int = stats._int != null ? stats._int : this._int;
-    }
-}
-
+package com.habitrpg.android.habitica.models.user;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+/**
+ * Created by MagicMicky on 10/06/2014.
+ */
+
+@Table(databaseName = HabitDatabase.NAME)
+public class BasicStats extends BaseModel {
+
+    @Column
+    public Float con, str, per;
+    @Column
+    @SerializedName("int")
+    public Float _int;
+    @Column
+    @PrimaryKey
+    @NotNull
+    protected
+    String id;
+
+    public Float getCon() {
+        return con != null ? con : Float.valueOf(0);
+    }
+
+    public void setCon(Float con) {
+        this.con = con;
+    }
+
+    public Float getStr() {
+        return str != null ? str : Float.valueOf(0);
+    }
+
+    public void setStr(Float str) {
+        this.str = str;
+    }
+
+    public Float getPer() {
+        return per != null ? per : Float.valueOf(0);
+    }
+
+    public void setPer(Float per) {
+        this.per = per;
+    }
+
+    public Float get_int() {
+        return _int != null ? _int : Float.valueOf(0);
+    }
+
+    public void set_int(Float _int) {
+        this._int = _int;
+    }
+
+    public void merge(BasicStats stats) {
+        if (stats == null) {
+            return;
+        }
+        this.con = stats.con != null ? stats.con : this.con;
+        this.str = stats.str != null ? stats.str : this.str;
+        this.per = stats.per != null ? stats.per : this.per;
+        this._int = stats._int != null ? stats._int : this._int;
+    }
+}
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
index ed48a7261..7d6d6c04e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
@@ -1,88 +1,88 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
-
-/**
- * Created by viirus on 06/07/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Buffs extends BasicStats {
-
-    @Column
-    private Boolean snowball;
-
-    @Column
-    private Boolean streaks;
-
-    @Column
-    private Boolean seafoam;
-
-    @Column
-    private Boolean spookySparkles;
-
-    @Column
-    private Boolean shinySeed;
-
-    public Buffs() {
-        this(false, false);
-    }
-
-    public Buffs(Boolean snowball, Boolean streaks) {
-        this.snowball = snowball;
-        this.streaks = streaks;
-    }
-
-    public Boolean getSnowball() {
-        return snowball != null ? snowball : Boolean.FALSE;
-    }
-
-    public void setSnowball(Boolean snowball) {
-        this.snowball = snowball;
-    }
-
-    public Boolean getSeafoam() {
-        return seafoam != null ? seafoam : Boolean.FALSE;
-    }
-
-    public void setSeafoam(Boolean seafoam) {
-        this.seafoam = seafoam;
-    }
-
-    public Boolean getSpookySparkles() {
-        return spookySparkles != null ? spookySparkles : Boolean.FALSE;
-    }
-
-    public void setSpookySparkles(Boolean spookySparkles) {
-        this.spookySparkles = spookySparkles;
-    }
-
-    public Boolean getShinySeed() {
-        return shinySeed != null ? shinySeed : Boolean.FALSE;
-    }
-
-    public void setShinySeed(Boolean shinySeed) {
-        this.shinySeed = shinySeed;
-    }
-
-    public Boolean getStreaks() {
-        return streaks != null ? streaks : Boolean.FALSE;
-    }
-
-    public void setStreaks(Boolean streaks) {
-        this.streaks = streaks;
-    }
-
-    public void merge(Buffs stats) {
-        if (stats == null) {
-            return;
-        }
-        super.merge(stats);
-        this.snowball = stats.snowball != null ? stats.snowball : this.snowball;
-        this.streaks = stats.streaks != null ? stats.streaks : this.streaks;
-        this.seafoam = stats.seafoam != null ? stats.seafoam : this.seafoam;
-        this.shinySeed = stats.shinySeed != null ? stats.shinySeed : this.shinySeed;
-        this.spookySparkles = stats.spookySparkles != null ? stats.spookySparkles : this.spookySparkles;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+/**
+ * Created by viirus on 06/07/15.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class Buffs extends BasicStats {
+
+    @Column
+    private Boolean snowball;
+
+    @Column
+    private Boolean streaks;
+
+    @Column
+    private Boolean seafoam;
+
+    @Column
+    private Boolean spookySparkles;
+
+    @Column
+    private Boolean shinySeed;
+
+    public Buffs() {
+        this(false, false);
+    }
+
+    public Buffs(Boolean snowball, Boolean streaks) {
+        this.snowball = snowball;
+        this.streaks = streaks;
+    }
+
+    public Boolean getSnowball() {
+        return snowball != null ? snowball : Boolean.FALSE;
+    }
+
+    public void setSnowball(Boolean snowball) {
+        this.snowball = snowball;
+    }
+
+    public Boolean getSeafoam() {
+        return seafoam != null ? seafoam : Boolean.FALSE;
+    }
+
+    public void setSeafoam(Boolean seafoam) {
+        this.seafoam = seafoam;
+    }
+
+    public Boolean getSpookySparkles() {
+        return spookySparkles != null ? spookySparkles : Boolean.FALSE;
+    }
+
+    public void setSpookySparkles(Boolean spookySparkles) {
+        this.spookySparkles = spookySparkles;
+    }
+
+    public Boolean getShinySeed() {
+        return shinySeed != null ? shinySeed : Boolean.FALSE;
+    }
+
+    public void setShinySeed(Boolean shinySeed) {
+        this.shinySeed = shinySeed;
+    }
+
+    public Boolean getStreaks() {
+        return streaks != null ? streaks : Boolean.FALSE;
+    }
+
+    public void setStreaks(Boolean streaks) {
+        this.streaks = streaks;
+    }
+
+    public void merge(Buffs stats) {
+        if (stats == null) {
+            return;
+        }
+        super.merge(stats);
+        this.snowball = stats.snowball != null ? stats.snowball : this.snowball;
+        this.streaks = stats.streaks != null ? stats.streaks : this.streaks;
+        this.seafoam = stats.seafoam != null ? stats.seafoam : this.seafoam;
+        this.shinySeed = stats.shinySeed != null ? stats.shinySeed : this.shinySeed;
+        this.spookySparkles = stats.spookySparkles != null ? stats.spookySparkles : this.spookySparkles;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
index 8ff5fd2fe..33572ac83 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
@@ -1,106 +1,105 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.R;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.HashMap;
-
-/**
- * Created by keithholliday on 7/6/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class ContributorInfo extends BaseModel {
-
-    public static final HashMap<Integer, Integer> CONTRIBUTOR_COLOR_DICT;
-
-    static {
-        CONTRIBUTOR_COLOR_DICT = new HashMap<>();
-        CONTRIBUTOR_COLOR_DICT.put(0, R.color.contributor_0);
-        CONTRIBUTOR_COLOR_DICT.put(1, R.color.contributor_1);
-        CONTRIBUTOR_COLOR_DICT.put(2, R.color.contributor_2);
-        CONTRIBUTOR_COLOR_DICT.put(3, R.color.contributor_3);
-        CONTRIBUTOR_COLOR_DICT.put(4, R.color.contributor_4);
-        CONTRIBUTOR_COLOR_DICT.put(5, R.color.contributor_5);
-        CONTRIBUTOR_COLOR_DICT.put(6, R.color.contributor_6);
-        CONTRIBUTOR_COLOR_DICT.put(7, R.color.contributor_7);
-        CONTRIBUTOR_COLOR_DICT.put(8, R.color.contributor_mod);
-        CONTRIBUTOR_COLOR_DICT.put(9, R.color.contributor_staff);
-    }
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    public String user_id;
-
-    @SerializedName("admin")
-    @Expose
-    private boolean admin;
-
-    @SerializedName("contributions")
-    @Expose
-    private String contributions;
-
-    @SerializedName("level")
-    @Expose
-    private int level;
-
-    @SerializedName("text")
-    @Expose
-    private String text;
-
-    public Boolean getAdmin() {
-        return this.admin;
-    }
-
-    public void setAdmin(Boolean admin) {
-        this.admin = admin;
-    }
-
-    public String getContributions() {
-        return this.contributions;
-    }
-
-    public void setContributions(String contributions) {
-        this.contributions = contributions;
-    }
-
-    public int getLevel() {
-        return this.level;
-    }
-
-    public void setLevel(int level) {
-        this.level = level;
-    }
-
-    public String getText() {
-        return this.text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public int getContributorColor() {
-        int rColor = android.R.color.black;
-
-
-        if (CONTRIBUTOR_COLOR_DICT.containsKey(this.level)) {
-            rColor = CONTRIBUTOR_COLOR_DICT.get(this.level);
-        }
-
-        return rColor;
-    }
-
-    public int getContributorForegroundColor() {
-        int rColor = android.R.color.white;
-        return rColor;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.R;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.HashMap;
+
+/**
+ * Created by keithholliday on 7/6/16.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class ContributorInfo extends BaseModel {
+
+    public static final HashMap<Integer, Integer> CONTRIBUTOR_COLOR_DICT;
+
+    static {
+        CONTRIBUTOR_COLOR_DICT = new HashMap<>();
+        CONTRIBUTOR_COLOR_DICT.put(0, R.color.contributor_0);
+        CONTRIBUTOR_COLOR_DICT.put(1, R.color.contributor_1);
+        CONTRIBUTOR_COLOR_DICT.put(2, R.color.contributor_2);
+        CONTRIBUTOR_COLOR_DICT.put(3, R.color.contributor_3);
+        CONTRIBUTOR_COLOR_DICT.put(4, R.color.contributor_4);
+        CONTRIBUTOR_COLOR_DICT.put(5, R.color.contributor_5);
+        CONTRIBUTOR_COLOR_DICT.put(6, R.color.contributor_6);
+        CONTRIBUTOR_COLOR_DICT.put(7, R.color.contributor_7);
+        CONTRIBUTOR_COLOR_DICT.put(8, R.color.contributor_mod);
+        CONTRIBUTOR_COLOR_DICT.put(9, R.color.contributor_staff);
+    }
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    public String user_id;
+
+    @SerializedName("admin")
+    @Expose
+    private boolean admin;
+
+    @SerializedName("contributions")
+    @Expose
+    private String contributions;
+
+    @SerializedName("level")
+    @Expose
+    private int level;
+
+    @SerializedName("text")
+    @Expose
+    private String text;
+
+    public Boolean getAdmin() {
+        return this.admin;
+    }
+
+    public void setAdmin(Boolean admin) {
+        this.admin = admin;
+    }
+
+    public String getContributions() {
+        return this.contributions;
+    }
+
+    public void setContributions(String contributions) {
+        this.contributions = contributions;
+    }
+
+    public int getLevel() {
+        return this.level;
+    }
+
+    public void setLevel(int level) {
+        this.level = level;
+    }
+
+    public String getText() {
+        return this.text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public int getContributorColor() {
+        int rColor = android.R.color.black;
+
+
+        if (CONTRIBUTOR_COLOR_DICT.containsKey(this.level)) {
+            rColor = CONTRIBUTOR_COLOR_DICT.get(this.level);
+        }
+
+        return rColor;
+    }
+
+    public int getContributorForegroundColor() {
+        int rColor = android.R.color.white;
+        return rColor;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
index 3027f3e4e..e17668b8d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
@@ -1,147 +1,147 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.TutorialStep;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.List;
-
-/**
- * Created by viirus on 22/01/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Flags extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-    List<TutorialStep> tutorial;
-    @Column
-    private boolean showTour, dropsEnabled, itemsEnabled, newStuff, classSelected, rebirthEnabled, welcomed, armoireEnabled, armoireOpened, armoireEmpty;
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tutorial")
-    public List<TutorialStep> getTutorial() {
-        if (tutorial == null) {
-            tutorial = new Select()
-                    .from(TutorialStep.class)
-                    .where(Condition.column("user_id").eq(this.user_id))
-                    .queryList();
-        }
-        return tutorial;
-    }
-
-    public void setTutorial(List<TutorialStep> tutorial) {
-        this.tutorial = tutorial;
-    }
-
-    public String getUser_id() {
-        return user_id;
-    }
-
-    public void setUser_id(String user_id) {
-        this.user_id = user_id;
-    }
-
-    public boolean getShowTour() {
-        return showTour;
-    }
-
-    public void setShowTour(boolean showTour) {
-        this.showTour = showTour;
-    }
-
-    public boolean getDropsEnabled() {
-        return dropsEnabled;
-    }
-
-    public void setDropsEnabled(boolean dropsEnabled) {
-        this.dropsEnabled = dropsEnabled;
-    }
-
-    public boolean getItemsEnabled() {
-        return itemsEnabled;
-    }
-
-    public void setItemsEnabled(boolean itemsEnabled) {
-        this.itemsEnabled = itemsEnabled;
-    }
-
-    public boolean getNewStuff() {
-        return newStuff;
-    }
-
-    public void setNewStuff(boolean newStuff) {
-        this.newStuff = newStuff;
-    }
-
-    public boolean getClassSelected() {
-        return classSelected;
-    }
-
-    public void setClassSelected(boolean classSelected) {
-        this.classSelected = classSelected;
-    }
-
-    public boolean getRebirthEnabled() {
-        return rebirthEnabled;
-    }
-
-    public void setRebirthEnabled(boolean rebirthEnabled) {
-        this.rebirthEnabled = rebirthEnabled;
-    }
-
-    public boolean getWelcomed() {
-        return welcomed;
-    }
-
-    public void setWelcomed(boolean welcomed) {
-        this.welcomed = welcomed;
-    }
-
-    public boolean getArmoireEnabled() {
-        return armoireEnabled;
-    }
-
-    public void setArmoireEnabled(boolean armoireEnabled) {
-        this.armoireEnabled = armoireEnabled;
-    }
-
-    public boolean getArmoireOpened() {
-        return armoireOpened;
-    }
-
-    public void setArmoireOpened(boolean armoireOpened) {
-        this.armoireOpened = armoireOpened;
-    }
-
-    public boolean getArmoireEmpty() {
-        return armoireEmpty;
-    }
-
-    public void setArmoireEmpty(boolean armoireEmpty) {
-        this.armoireEmpty = armoireEmpty;
-    }
-
-    @Override
-    public void save() {
-
-        if (user_id == null) {
-            return;
-        }
-
-        for (TutorialStep step : this.getTutorial()) {
-            step.user_id = user_id;
-        }
-
-        super.save();
-    }
-
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.OneToMany;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.List;
+
+/**
+ * Created by viirus on 22/01/16.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class Flags extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_id;
+    List<TutorialStep> tutorial;
+    @Column
+    private boolean showTour, dropsEnabled, itemsEnabled, newStuff, classSelected, rebirthEnabled, welcomed, armoireEnabled, armoireOpened, armoireEmpty;
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tutorial")
+    public List<TutorialStep> getTutorial() {
+        if (tutorial == null) {
+            tutorial = new Select()
+                    .from(TutorialStep.class)
+                    .where(Condition.column("user_id").eq(this.user_id))
+                    .queryList();
+        }
+        return tutorial;
+    }
+
+    public void setTutorial(List<TutorialStep> tutorial) {
+        this.tutorial = tutorial;
+    }
+
+    public String getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    public boolean getShowTour() {
+        return showTour;
+    }
+
+    public void setShowTour(boolean showTour) {
+        this.showTour = showTour;
+    }
+
+    public boolean getDropsEnabled() {
+        return dropsEnabled;
+    }
+
+    public void setDropsEnabled(boolean dropsEnabled) {
+        this.dropsEnabled = dropsEnabled;
+    }
+
+    public boolean getItemsEnabled() {
+        return itemsEnabled;
+    }
+
+    public void setItemsEnabled(boolean itemsEnabled) {
+        this.itemsEnabled = itemsEnabled;
+    }
+
+    public boolean getNewStuff() {
+        return newStuff;
+    }
+
+    public void setNewStuff(boolean newStuff) {
+        this.newStuff = newStuff;
+    }
+
+    public boolean getClassSelected() {
+        return classSelected;
+    }
+
+    public void setClassSelected(boolean classSelected) {
+        this.classSelected = classSelected;
+    }
+
+    public boolean getRebirthEnabled() {
+        return rebirthEnabled;
+    }
+
+    public void setRebirthEnabled(boolean rebirthEnabled) {
+        this.rebirthEnabled = rebirthEnabled;
+    }
+
+    public boolean getWelcomed() {
+        return welcomed;
+    }
+
+    public void setWelcomed(boolean welcomed) {
+        this.welcomed = welcomed;
+    }
+
+    public boolean getArmoireEnabled() {
+        return armoireEnabled;
+    }
+
+    public void setArmoireEnabled(boolean armoireEnabled) {
+        this.armoireEnabled = armoireEnabled;
+    }
+
+    public boolean getArmoireOpened() {
+        return armoireOpened;
+    }
+
+    public void setArmoireOpened(boolean armoireOpened) {
+        this.armoireOpened = armoireOpened;
+    }
+
+    public boolean getArmoireEmpty() {
+        return armoireEmpty;
+    }
+
+    public void setArmoireEmpty(boolean armoireEmpty) {
+        this.armoireEmpty = armoireEmpty;
+    }
+
+    @Override
+    public void save() {
+
+        if (user_id == null) {
+            return;
+        }
+
+        for (TutorialStep step : this.getTutorial()) {
+            step.user_id = user_id;
+        }
+
+        super.save();
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
index dce2c0d55..0bfcb58e9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
@@ -1,60 +1,60 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.HashMap;
-
-/**
- * Created by viirus on 20/07/15.
- */
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Gear extends BaseModel {
-
-    public HashMap<String, Boolean> owned;
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "equipped_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Outfit equipped;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "costume_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Outfit costume;
-
-    public Outfit getCostume() {
-        return costume;
-    }
-
-    public void setCostume(Outfit costume) {
-        this.costume = costume;
-    }
-
-    public Outfit getEquipped() {
-        return equipped;
-    }
-
-    public void setEquipped(Outfit equipped) {
-        this.equipped = equipped;
-    }
-
-    @Override
-    public void save() {
-        equipped.user_id = user_id + "_equipped";
-        costume.user_id = user_id + "_costume";
-
-        super.save();
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.HashMap;
+
+/**
+ * Created by viirus on 20/07/15.
+ */
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Gear extends BaseModel {
+
+    public HashMap<String, Boolean> owned;
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_id;
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "equipped_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private Outfit equipped;
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "costume_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private Outfit costume;
+
+    public Outfit getCostume() {
+        return costume;
+    }
+
+    public void setCostume(Outfit costume) {
+        this.costume = costume;
+    }
+
+    public Outfit getEquipped() {
+        return equipped;
+    }
+
+    public void setEquipped(Outfit equipped) {
+        this.equipped = equipped;
+    }
+
+    @Override
+    public void save() {
+        equipped.user_id = user_id + "_equipped";
+        costume.user_id = user_id + "_costume";
+
+        super.save();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
index c694b66c4..37f8fc547 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
@@ -1,642 +1,641 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.PushDevice;
-import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.invitations.Invitations;
-import com.habitrpg.android.habitica.models.social.UserParty;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.ui.AvatarView;
-import com.habitrpg.android.habitica.models.tasks.TasksOrder;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import android.database.sqlite.SQLiteException;
-import android.text.TextUtils;
-
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class HabitRPGUser extends BaseModel {
-
-    List<Task> dailys;
-    List<Task> todos;
-    List<Task> rewards;
-    List<Task> habits;
-    List<Challenge> challengeList;
-
-    List<Tag> tags;
-    @Column
-    @PrimaryKey
-    @SerializedName("_id")
-    private String id;
-    @Column
-    private double balance;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "stats_id",
-            columnType = String.class,
-            foreignColumnName = "id")})
-    private Stats stats;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "inbox_id",
-            columnType = String.class,
-            foreignColumnName = "user_Id")})
-    private Inbox inbox;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "preferences_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Preferences preferences;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "profile_id",
-            columnType = String.class,
-            foreignColumnName = "user_Id")})
-    private Profile profile;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "party_id",
-            columnType = String.class,
-            foreignColumnName = "id")})
-    private UserParty party;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "items_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Items items;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "authentication_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    @SerializedName("auth")
-    private Authentication authentication;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "flags_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Flags flags;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "contributor_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private ContributorInfo contributor;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "invitations_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Invitations invitations;
-
-    private List<PushDevice> pushDevices;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "purchased_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Purchases purchased;
-
-    private TasksOrder tasksOrder;
-
-    private List<String> challenges;
-
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "challengeList")
-    public List<Challenge> getChallengeList() {
-        if (challengeList == null) {
-            try {
-                challengeList = new Select()
-                        .from(Challenge.class)
-                        .where(Condition.column("user_id").eq(this.id))
-                        .queryList();
-            } catch (SQLiteException exception) {
-                challengeList = new ArrayList<>();
-            }
-        }
-        return challengeList;
-    }
-
-    public void setChallengeList(List<Challenge> challenges) {
-        this.challengeList = challenges;
-    }
-
-    public void resetChallengeList() {
-        challengeList = null;
-    }
-
-    public Preferences getPreferences() {
-        return preferences;
-    }
-
-    public void setPreferences(Preferences preferences) {
-        this.preferences = preferences;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Stats getStats() {
-        return stats;
-    }
-
-    public void setStats(Stats stats) {
-        this.stats = stats;
-    }
-
-    public Inbox getInbox() {
-        return inbox;
-    }
-
-    public void setInbox(Inbox inbox) {
-        this.inbox = inbox;
-    }
-
-    public Profile getProfile() {
-        return profile;
-    }
-
-    public void setProfile(Profile profile) {
-        this.profile = profile;
-    }
-
-    public ContributorInfo getContributor() {
-        return contributor;
-    }
-
-    public void setContributor(ContributorInfo contributor) {
-        this.contributor = contributor;
-    }
-
-    public Invitations getInvitations() {
-        return invitations;
-    }
-
-    public void setInvitations(Invitations invitations) {
-        this.invitations = invitations;
-    }
-
-    public UserParty getParty() {
-        return party;
-    }
-
-    public void setParty(UserParty party) {
-        this.party = party;
-    }
-
-    public Items getItems() {
-        return items;
-    }
-
-    public void setItems(Items items) {
-        this.items = items;
-        this.items.user_id = id;
-    }
-
-    public double getBalance() {
-        return this.balance;
-    }
-
-    public void setBalance(double balance) {
-        this.balance = balance;
-    }
-
-    public Authentication getAuthentication() {
-        return authentication;
-    }
-
-    public void setAuthentication(Authentication authentication) {
-        this.authentication = authentication;
-    }
-
-    public Purchases getPurchased() {
-        return purchased;
-    }
-
-    public void setPurchased(Purchases purchased) {
-        this.purchased = purchased;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "habits")
-    public List<Task> getHabits() {
-        if (habits == null) {
-            habits = new Select()
-                    .from(Task.class)
-                    .where(Condition.column("type").eq("habit"))
-                    .and(Condition.column("user_id").eq(this.id))
-                    .queryList();
-        }
-        return habits;
-    }
-
-    public void setHabits(List<Task> habits) {
-        this.habits = habits;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "dailys")
-    public List<Task> getDailys() {
-        if (dailys == null) {
-            dailys = new Select()
-                    .from(Task.class)
-                    .where(Condition.column("type").eq("daily"))
-                    .and(Condition.column("user_id").eq(this.id))
-                    .queryList();
-        }
-        return dailys;
-    }
-
-    public void setDailys(List<Task> dailys) {
-        this.dailys = dailys;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "todos")
-    public List<Task> getTodos() {
-        if (todos == null) {
-            todos = new Select()
-                    .from(Task.class)
-                    .where(Condition.column("type").eq("todo"))
-                    .and(Condition.column("user_id").eq(this.id))
-                    .queryList();
-        }
-        return todos;
-    }
-
-    public void setTodos(List<Task> todos) {
-        this.todos = todos;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "rewards")
-    public List<Task> getRewards() {
-        if (rewards == null) {
-            rewards = new Select()
-                    .from(Task.class)
-                    .where(Condition.column("type").eq("reward"))
-                    .and(Condition.column("user_id").eq(this.id))
-                    .queryList();
-        }
-        return rewards;
-    }
-
-    public void setRewards(List<Task> rewards) {
-        this.rewards = rewards;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tags")
-    public List<Tag> getTags() {
-        if (tags == null) {
-            tags = new Select()
-                    .from(Tag.class)
-                    .where(Condition.column("user_id").eq(this.id))
-                    .queryList();
-        }
-        return tags;
-    }
-
-    public void setTags(List<Tag> tags) {
-        this.tags = tags;
-    }
-
-    public Flags getFlags() {
-        return flags;
-    }
-
-    public void setFlags(Flags flags) {
-        this.flags = flags;
-    }
-
-    public TasksOrder getTasksOrder() {
-        return tasksOrder;
-    }
-
-    public void setTasksOrder(TasksOrder tasksOrder) {
-        this.tasksOrder = tasksOrder;
-    }
-
-    public List<PushDevice> getPushDevices() {
-        return this.pushDevices;
-    }
-
-    public void setPushDevices(List<PushDevice> pushDevices) {
-        this.pushDevices = pushDevices;
-    }
-
-    public List<String> getChallenges() {
-        return challenges;
-    }
-
-    public void setChallenges(List<String> challenges) {
-        this.challenges = challenges;
-    }
-
-
-    @Override
-    public void save() {
-        // We need to set the user_id to all other objects
-        if (id == null) {
-            return;
-        }
-        preferences.user_id = id;
-        stats.id = id;
-        profile.user_Id = id;
-        if (inbox != null) {
-            inbox.user_Id = id;
-        }
-        items.user_id = id;
-        authentication.user_id = id;
-        flags.user_id = id;
-        if (purchased != null) {
-            purchased.user_id = id;
-        }
-        if (contributor != null) {
-            contributor.user_id = id;
-        }
-        if (invitations != null) {
-            invitations.user_id = id;
-        }
-
-
-        ArrayList<Task> allTasks = new ArrayList<Task>();
-        if (dailys != null) {
-            allTasks.addAll(dailys);
-        }
-        if (todos != null) {
-            allTasks.addAll(todos);
-        }
-        if (habits != null) {
-            allTasks.addAll(habits);
-        }
-        if (rewards != null) {
-            allTasks.addAll(rewards);
-        }
-
-        for (Task t : allTasks) {
-            t.user_id = id;
-        }
-
-        if (tags != null) {
-            for (Tag t : tags) {
-                t.user_id = id;
-            }
-        }
-
-        List<Challenge> challenges = getChallengeList();
-        List<Challenge> newChallenges = new ArrayList<>();
-        if (getChallenges() != null) {
-            for (String s : getChallenges()) {
-
-                boolean challengeExistInDatabase = false;
-
-                for (Challenge challenge : challenges) {
-                    if (challenge.id.equals(s)) {
-                        challengeExistInDatabase = true;
-                        challenges.remove(challenge);
-                        newChallenges.add(challenge);
-                        break;
-                    }
-                }
-
-                if (!challengeExistInDatabase) {
-                    Challenge challenge = new Challenge();
-                    challenge.id = s;
-                    challenge.user_id = id;
-
-                    newChallenges.add(challenge);
-                }
-            }
-            for (Challenge challenge : challenges) {
-                challenge.user_id = null;
-            }
-        }
-
-        setChallengeList(newChallenges);
-
-        super.save();
-    }
-
-    public List<String> getAvatarLayerNames() {
-        List<String> layerNames = new ArrayList<String>();
-
-        Preferences prefs = this.getPreferences();
-
-        if (prefs.getChair() != null) {
-            layerNames.add(prefs.getChair());
-        }
-
-        Outfit outfit = null;
-        if (this.getItems() != null) {
-            if (prefs.getCostume()) {
-                outfit = this.getItems().getGear().getCostume();
-            } else {
-                outfit = this.getItems().getGear().getEquipped();
-            }
-        }
-
-        if (outfit != null) {
-            if (outfit.getBack() != null) {
-                layerNames.add(outfit.getBack());
-            }
-        }
-
-        if (prefs.getSleep()) {
-            layerNames.add("skin_" + prefs.getSkin() + "_sleep");
-        } else {
-            layerNames.add("skin_" + prefs.getSkin());
-        }
-        layerNames.add(prefs.getSize() + "_shirt_" + prefs.getShirt());
-        layerNames.add("head_0");
-
-        if (outfit != null) {
-            String armor = outfit.getArmor();
-
-            if (armor != null && !armor.equals("armor_base_0")) {
-                layerNames.add(prefs.getSize() + "_" + armor);
-            }
-            if (outfit.getBody() != null && !outfit.getBody().equals("body_base_0")) {
-                layerNames.add(outfit.getBody());
-            }
-        }
-
-        Hair hair = prefs.getHair();
-        if (hair != null) {
-            String hairColor = hair.getColor();
-
-            if (hair.getBase() > 0) {
-                layerNames.add("hair_base_" + hair.getBase() + "_" + hairColor);
-            }
-            if (hair.getBangs() > 0) {
-                layerNames.add("hair_bangs_" + hair.getBangs() + "_" + hairColor);
-            }
-            if (hair.getMustache() > 0) {
-                layerNames.add("hair_mustache_" + hair.getMustache() + "_" + hairColor);
-            }
-            if (hair.getBeard() > 0) {
-                layerNames.add("hair_beard_" + hair.getBeard() + "_" + hairColor);
-            }
-        }
-
-        if (outfit != null) {
-            if (outfit.getEyeWear() != null && !outfit.getEyeWear().equals("eyewear_base_0")) {
-                layerNames.add(outfit.getEyeWear());
-            }
-            if (outfit.getHead() != null && !outfit.getHead().equals("head_base_0")) {
-                layerNames.add(outfit.getHead());
-            }
-            if (outfit.getHeadAccessory() != null && !outfit.getHeadAccessory().equals("headAccessory_base_0")) {
-                layerNames.add(outfit.getHeadAccessory());
-            }
-            if (outfit.getShield() != null && !outfit.getShield().equals("shield_base_0")) {
-                layerNames.add(outfit.getShield());
-            }
-            if (outfit.getWeapon() != null && !outfit.getWeapon().equals("weapon_base_0")) {
-                layerNames.add(outfit.getWeapon());
-            }
-        }
-
-        if (prefs.getSleep()) {
-            layerNames.add("zzz");
-        }
-
-        return layerNames;
-    }
-
-    public EnumMap<AvatarView.LayerType, String> getAvatarLayerMap() {
-        EnumMap<AvatarView.LayerType, String> layerMap = new EnumMap<>(AvatarView.LayerType.class);
-
-        Preferences prefs = getPreferences();
-        Outfit outfit = (prefs.getCostume()) ? getItems().getGear().getCostume() : getItems().getGear().getEquipped();
-
-        boolean hasVisualBuffs = false;
-
-        if (stats != null && stats.getBuffs() != null) {
-            Buffs buffs = stats.getBuffs();
-
-            if (buffs.getSnowball()) {
-                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "snowman");
-                hasVisualBuffs = true;
-            }
-
-            if (buffs.getSeafoam()) {
-                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "seafoam_star");
-                hasVisualBuffs = true;
-            }
-
-            if (buffs.getShinySeed()) {
-                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "avatar_floral_" + stats.get_class());
-                hasVisualBuffs = true;
-            }
-
-            if (buffs.getSpookySparkles()) {
-                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "ghost");
-                hasVisualBuffs = true;
-            }
-        }
-
-        if (!hasVisualBuffs) {
-            if (!TextUtils.isEmpty(prefs.getChair())) {
-                layerMap.put(AvatarView.LayerType.CHAIR, prefs.getChair());
-            }
-
-            if (outfit != null) {
-                if (!TextUtils.isEmpty(outfit.getBack())) {
-                    layerMap.put(AvatarView.LayerType.BACK, outfit.getBack());
-                }
-                if (outfit.isAvailable(outfit.getArmor())) {
-                    layerMap.put(AvatarView.LayerType.ARMOR, prefs.getSize() + "_" + outfit.getArmor());
-                }
-                if (outfit.isAvailable(outfit.getBody())) {
-                    layerMap.put(AvatarView.LayerType.BODY, outfit.getBody());
-                }
-                if (outfit.isAvailable(outfit.getEyeWear())) {
-                    layerMap.put(AvatarView.LayerType.EYEWEAR, outfit.getEyeWear());
-                }
-                if (outfit.isAvailable(outfit.getHead())) {
-                    layerMap.put(AvatarView.LayerType.HEAD, outfit.getHead());
-                }
-                if (outfit.isAvailable(outfit.getHeadAccessory())) {
-                    layerMap.put(AvatarView.LayerType.HEAD_ACCESSORY, outfit.getHeadAccessory());
-                }
-                if (outfit.isAvailable(outfit.getShield())) {
-                    layerMap.put(AvatarView.LayerType.SHIELD, outfit.getShield());
-                }
-                if (outfit.isAvailable(outfit.getWeapon())) {
-                    layerMap.put(AvatarView.LayerType.WEAPON, outfit.getWeapon());
-                }
-            }
-
-            layerMap.put(AvatarView.LayerType.SKIN, "skin_" + prefs.getSkin() + ((prefs.getSleep()) ? "_sleep" : ""));
-            layerMap.put(AvatarView.LayerType.SHIRT, prefs.getSize() + "_shirt_" + prefs.getShirt());
-            layerMap.put(AvatarView.LayerType.HEAD_0, "head_0");
-
-            Hair hair = prefs.getHair();
-            if (hair != null) {
-                String hairColor = hair.getColor();
-
-                if (hair.isAvailable(hair.getBase())) {
-                    layerMap.put(AvatarView.LayerType.HAIR_BASE, "hair_base_" + hair.getBase() + "_" + hairColor);
-                }
-                if (hair.isAvailable(hair.getBangs())) {
-                    layerMap.put(AvatarView.LayerType.HAIR_BANGS, "hair_bangs_" + hair.getBangs() + "_" + hairColor);
-                }
-                if (hair.isAvailable(hair.getMustache())) {
-                    layerMap.put(AvatarView.LayerType.HAIR_MUSTACHE, "hair_mustache_" + hair.getMustache() + "_" + hairColor);
-                }
-                if (hair.isAvailable(hair.getBeard())) {
-                    layerMap.put(AvatarView.LayerType.HAIR_BEARD, "hair_beard_" + hair.getBeard() + "_" + hairColor);
-                }
-                if (hair.isAvailable(hair.getFlower())) {
-                    layerMap.put(AvatarView.LayerType.HAIR_FLOWER, "hair_flower_" + hair.getFlower());
-                }
-            }
-        } else {
-            Hair hair = prefs.getHair();
-
-            // Show flower all the time!
-            if (hair != null && hair.isAvailable(hair.getFlower())) {
-                layerMap.put(AvatarView.LayerType.HAIR_FLOWER, "hair_flower_" + hair.getFlower());
-            }
-        }
-
-        return layerMap;
-    }
-
-    public int getPetsFoundCount() {
-        return getNullableMapSize(items.getPets());
-    }
-
-    public int getMountsTamedCount() {
-        return getNullableMapSize(items.getMounts());
-    }
-
-    private int getNullableMapSize(Map map) {
-        int mapSize = 0;
-
-        if (map != null) {
-            mapSize = map.size();
-        }
-
-        return mapSize;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import android.database.sqlite.SQLiteException;
+import android.text.TextUtils;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.PushDevice;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.invitations.Invitations;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.UserParty;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+import com.habitrpg.android.habitica.ui.AvatarView;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.OneToMany;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class HabitRPGUser extends BaseModel {
+
+    List<Task> dailys;
+    List<Task> todos;
+    List<Task> rewards;
+    List<Task> habits;
+    List<Challenge> challengeList;
+
+    List<Tag> tags;
+    @Column
+    @PrimaryKey
+    @SerializedName("_id")
+    private String id;
+    @Column
+    private double balance;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "stats_id",
+            columnType = String.class,
+            foreignColumnName = "id")})
+    private Stats stats;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "inbox_id",
+            columnType = String.class,
+            foreignColumnName = "user_Id")})
+    private Inbox inbox;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "preferences_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private Preferences preferences;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "profile_id",
+            columnType = String.class,
+            foreignColumnName = "user_Id")})
+    private Profile profile;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "party_id",
+            columnType = String.class,
+            foreignColumnName = "id")})
+    private UserParty party;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "items_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private Items items;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "authentication_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    @SerializedName("auth")
+    private Authentication authentication;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "flags_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private Flags flags;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "contributor_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private ContributorInfo contributor;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "invitations_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private Invitations invitations;
+
+    private List<PushDevice> pushDevices;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "purchased_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private Purchases purchased;
+
+    private TasksOrder tasksOrder;
+
+    private List<String> challenges;
+
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "challengeList")
+    public List<Challenge> getChallengeList() {
+        if (challengeList == null) {
+            try {
+                challengeList = new Select()
+                        .from(Challenge.class)
+                        .where(Condition.column("user_id").eq(this.id))
+                        .queryList();
+            } catch (SQLiteException exception) {
+                challengeList = new ArrayList<>();
+            }
+        }
+        return challengeList;
+    }
+
+    public void setChallengeList(List<Challenge> challenges) {
+        this.challengeList = challenges;
+    }
+
+    public void resetChallengeList() {
+        challengeList = null;
+    }
+
+    public Preferences getPreferences() {
+        return preferences;
+    }
+
+    public void setPreferences(Preferences preferences) {
+        this.preferences = preferences;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Stats getStats() {
+        return stats;
+    }
+
+    public void setStats(Stats stats) {
+        this.stats = stats;
+    }
+
+    public Inbox getInbox() {
+        return inbox;
+    }
+
+    public void setInbox(Inbox inbox) {
+        this.inbox = inbox;
+    }
+
+    public Profile getProfile() {
+        return profile;
+    }
+
+    public void setProfile(Profile profile) {
+        this.profile = profile;
+    }
+
+    public ContributorInfo getContributor() {
+        return contributor;
+    }
+
+    public void setContributor(ContributorInfo contributor) {
+        this.contributor = contributor;
+    }
+
+    public Invitations getInvitations() {
+        return invitations;
+    }
+
+    public void setInvitations(Invitations invitations) {
+        this.invitations = invitations;
+    }
+
+    public UserParty getParty() {
+        return party;
+    }
+
+    public void setParty(UserParty party) {
+        this.party = party;
+    }
+
+    public Items getItems() {
+        return items;
+    }
+
+    public void setItems(Items items) {
+        this.items = items;
+        this.items.user_id = id;
+    }
+
+    public double getBalance() {
+        return this.balance;
+    }
+
+    public void setBalance(double balance) {
+        this.balance = balance;
+    }
+
+    public Authentication getAuthentication() {
+        return authentication;
+    }
+
+    public void setAuthentication(Authentication authentication) {
+        this.authentication = authentication;
+    }
+
+    public Purchases getPurchased() {
+        return purchased;
+    }
+
+    public void setPurchased(Purchases purchased) {
+        this.purchased = purchased;
+    }
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "habits")
+    public List<Task> getHabits() {
+        if (habits == null) {
+            habits = new Select()
+                    .from(Task.class)
+                    .where(Condition.column("type").eq("habit"))
+                    .and(Condition.column("user_id").eq(this.id))
+                    .queryList();
+        }
+        return habits;
+    }
+
+    public void setHabits(List<Task> habits) {
+        this.habits = habits;
+    }
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "dailys")
+    public List<Task> getDailys() {
+        if (dailys == null) {
+            dailys = new Select()
+                    .from(Task.class)
+                    .where(Condition.column("type").eq("daily"))
+                    .and(Condition.column("user_id").eq(this.id))
+                    .queryList();
+        }
+        return dailys;
+    }
+
+    public void setDailys(List<Task> dailys) {
+        this.dailys = dailys;
+    }
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "todos")
+    public List<Task> getTodos() {
+        if (todos == null) {
+            todos = new Select()
+                    .from(Task.class)
+                    .where(Condition.column("type").eq("todo"))
+                    .and(Condition.column("user_id").eq(this.id))
+                    .queryList();
+        }
+        return todos;
+    }
+
+    public void setTodos(List<Task> todos) {
+        this.todos = todos;
+    }
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "rewards")
+    public List<Task> getRewards() {
+        if (rewards == null) {
+            rewards = new Select()
+                    .from(Task.class)
+                    .where(Condition.column("type").eq("reward"))
+                    .and(Condition.column("user_id").eq(this.id))
+                    .queryList();
+        }
+        return rewards;
+    }
+
+    public void setRewards(List<Task> rewards) {
+        this.rewards = rewards;
+    }
+
+    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tags")
+    public List<Tag> getTags() {
+        if (tags == null) {
+            tags = new Select()
+                    .from(Tag.class)
+                    .where(Condition.column("user_id").eq(this.id))
+                    .queryList();
+        }
+        return tags;
+    }
+
+    public void setTags(List<Tag> tags) {
+        this.tags = tags;
+    }
+
+    public Flags getFlags() {
+        return flags;
+    }
+
+    public void setFlags(Flags flags) {
+        this.flags = flags;
+    }
+
+    public TasksOrder getTasksOrder() {
+        return tasksOrder;
+    }
+
+    public void setTasksOrder(TasksOrder tasksOrder) {
+        this.tasksOrder = tasksOrder;
+    }
+
+    public List<PushDevice> getPushDevices() {
+        return this.pushDevices;
+    }
+
+    public void setPushDevices(List<PushDevice> pushDevices) {
+        this.pushDevices = pushDevices;
+    }
+
+    public List<String> getChallenges() {
+        return challenges;
+    }
+
+    public void setChallenges(List<String> challenges) {
+        this.challenges = challenges;
+    }
+
+
+    @Override
+    public void save() {
+        // We need to set the user_id to all other objects
+        if (id == null) {
+            return;
+        }
+        preferences.user_id = id;
+        stats.id = id;
+        profile.user_Id = id;
+        if (inbox != null) {
+            inbox.user_Id = id;
+        }
+        items.user_id = id;
+        authentication.user_id = id;
+        flags.user_id = id;
+        if (purchased != null) {
+            purchased.user_id = id;
+        }
+        if (contributor != null) {
+            contributor.user_id = id;
+        }
+        if (invitations != null) {
+            invitations.user_id = id;
+        }
+
+
+        ArrayList<Task> allTasks = new ArrayList<Task>();
+        if (dailys != null) {
+            allTasks.addAll(dailys);
+        }
+        if (todos != null) {
+            allTasks.addAll(todos);
+        }
+        if (habits != null) {
+            allTasks.addAll(habits);
+        }
+        if (rewards != null) {
+            allTasks.addAll(rewards);
+        }
+
+        for (Task t : allTasks) {
+            t.user_id = id;
+        }
+
+        if (tags != null) {
+            for (Tag t : tags) {
+                t.user_id = id;
+            }
+        }
+
+        List<Challenge> challenges = getChallengeList();
+        List<Challenge> newChallenges = new ArrayList<>();
+        if (getChallenges() != null) {
+            for (String s : getChallenges()) {
+
+                boolean challengeExistInDatabase = false;
+
+                for (Challenge challenge : challenges) {
+                    if (challenge.id.equals(s)) {
+                        challengeExistInDatabase = true;
+                        challenges.remove(challenge);
+                        newChallenges.add(challenge);
+                        break;
+                    }
+                }
+
+                if (!challengeExistInDatabase) {
+                    Challenge challenge = new Challenge();
+                    challenge.id = s;
+                    challenge.user_id = id;
+
+                    newChallenges.add(challenge);
+                }
+            }
+            for (Challenge challenge : challenges) {
+                challenge.user_id = null;
+            }
+        }
+
+        setChallengeList(newChallenges);
+
+        super.save();
+    }
+
+    public List<String> getAvatarLayerNames() {
+        List<String> layerNames = new ArrayList<String>();
+
+        Preferences prefs = this.getPreferences();
+
+        if (prefs.getChair() != null) {
+            layerNames.add(prefs.getChair());
+        }
+
+        Outfit outfit = null;
+        if (this.getItems() != null) {
+            if (prefs.getCostume()) {
+                outfit = this.getItems().getGear().getCostume();
+            } else {
+                outfit = this.getItems().getGear().getEquipped();
+            }
+        }
+
+        if (outfit != null) {
+            if (outfit.getBack() != null) {
+                layerNames.add(outfit.getBack());
+            }
+        }
+
+        if (prefs.getSleep()) {
+            layerNames.add("skin_" + prefs.getSkin() + "_sleep");
+        } else {
+            layerNames.add("skin_" + prefs.getSkin());
+        }
+        layerNames.add(prefs.getSize() + "_shirt_" + prefs.getShirt());
+        layerNames.add("head_0");
+
+        if (outfit != null) {
+            String armor = outfit.getArmor();
+
+            if (armor != null && !armor.equals("armor_base_0")) {
+                layerNames.add(prefs.getSize() + "_" + armor);
+            }
+            if (outfit.getBody() != null && !outfit.getBody().equals("body_base_0")) {
+                layerNames.add(outfit.getBody());
+            }
+        }
+
+        Hair hair = prefs.getHair();
+        if (hair != null) {
+            String hairColor = hair.getColor();
+
+            if (hair.getBase() > 0) {
+                layerNames.add("hair_base_" + hair.getBase() + "_" + hairColor);
+            }
+            if (hair.getBangs() > 0) {
+                layerNames.add("hair_bangs_" + hair.getBangs() + "_" + hairColor);
+            }
+            if (hair.getMustache() > 0) {
+                layerNames.add("hair_mustache_" + hair.getMustache() + "_" + hairColor);
+            }
+            if (hair.getBeard() > 0) {
+                layerNames.add("hair_beard_" + hair.getBeard() + "_" + hairColor);
+            }
+        }
+
+        if (outfit != null) {
+            if (outfit.getEyeWear() != null && !outfit.getEyeWear().equals("eyewear_base_0")) {
+                layerNames.add(outfit.getEyeWear());
+            }
+            if (outfit.getHead() != null && !outfit.getHead().equals("head_base_0")) {
+                layerNames.add(outfit.getHead());
+            }
+            if (outfit.getHeadAccessory() != null && !outfit.getHeadAccessory().equals("headAccessory_base_0")) {
+                layerNames.add(outfit.getHeadAccessory());
+            }
+            if (outfit.getShield() != null && !outfit.getShield().equals("shield_base_0")) {
+                layerNames.add(outfit.getShield());
+            }
+            if (outfit.getWeapon() != null && !outfit.getWeapon().equals("weapon_base_0")) {
+                layerNames.add(outfit.getWeapon());
+            }
+        }
+
+        if (prefs.getSleep()) {
+            layerNames.add("zzz");
+        }
+
+        return layerNames;
+    }
+
+    public EnumMap<AvatarView.LayerType, String> getAvatarLayerMap() {
+        EnumMap<AvatarView.LayerType, String> layerMap = new EnumMap<>(AvatarView.LayerType.class);
+
+        Preferences prefs = getPreferences();
+        Outfit outfit = (prefs.getCostume()) ? getItems().getGear().getCostume() : getItems().getGear().getEquipped();
+
+        boolean hasVisualBuffs = false;
+
+        if (stats != null && stats.getBuffs() != null) {
+            Buffs buffs = stats.getBuffs();
+
+            if (buffs.getSnowball()) {
+                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "snowman");
+                hasVisualBuffs = true;
+            }
+
+            if (buffs.getSeafoam()) {
+                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "seafoam_star");
+                hasVisualBuffs = true;
+            }
+
+            if (buffs.getShinySeed()) {
+                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "avatar_floral_" + stats.get_class());
+                hasVisualBuffs = true;
+            }
+
+            if (buffs.getSpookySparkles()) {
+                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "ghost");
+                hasVisualBuffs = true;
+            }
+        }
+
+        if (!hasVisualBuffs) {
+            if (!TextUtils.isEmpty(prefs.getChair())) {
+                layerMap.put(AvatarView.LayerType.CHAIR, prefs.getChair());
+            }
+
+            if (outfit != null) {
+                if (!TextUtils.isEmpty(outfit.getBack())) {
+                    layerMap.put(AvatarView.LayerType.BACK, outfit.getBack());
+                }
+                if (outfit.isAvailable(outfit.getArmor())) {
+                    layerMap.put(AvatarView.LayerType.ARMOR, prefs.getSize() + "_" + outfit.getArmor());
+                }
+                if (outfit.isAvailable(outfit.getBody())) {
+                    layerMap.put(AvatarView.LayerType.BODY, outfit.getBody());
+                }
+                if (outfit.isAvailable(outfit.getEyeWear())) {
+                    layerMap.put(AvatarView.LayerType.EYEWEAR, outfit.getEyeWear());
+                }
+                if (outfit.isAvailable(outfit.getHead())) {
+                    layerMap.put(AvatarView.LayerType.HEAD, outfit.getHead());
+                }
+                if (outfit.isAvailable(outfit.getHeadAccessory())) {
+                    layerMap.put(AvatarView.LayerType.HEAD_ACCESSORY, outfit.getHeadAccessory());
+                }
+                if (outfit.isAvailable(outfit.getShield())) {
+                    layerMap.put(AvatarView.LayerType.SHIELD, outfit.getShield());
+                }
+                if (outfit.isAvailable(outfit.getWeapon())) {
+                    layerMap.put(AvatarView.LayerType.WEAPON, outfit.getWeapon());
+                }
+            }
+
+            layerMap.put(AvatarView.LayerType.SKIN, "skin_" + prefs.getSkin() + ((prefs.getSleep()) ? "_sleep" : ""));
+            layerMap.put(AvatarView.LayerType.SHIRT, prefs.getSize() + "_shirt_" + prefs.getShirt());
+            layerMap.put(AvatarView.LayerType.HEAD_0, "head_0");
+
+            Hair hair = prefs.getHair();
+            if (hair != null) {
+                String hairColor = hair.getColor();
+
+                if (hair.isAvailable(hair.getBase())) {
+                    layerMap.put(AvatarView.LayerType.HAIR_BASE, "hair_base_" + hair.getBase() + "_" + hairColor);
+                }
+                if (hair.isAvailable(hair.getBangs())) {
+                    layerMap.put(AvatarView.LayerType.HAIR_BANGS, "hair_bangs_" + hair.getBangs() + "_" + hairColor);
+                }
+                if (hair.isAvailable(hair.getMustache())) {
+                    layerMap.put(AvatarView.LayerType.HAIR_MUSTACHE, "hair_mustache_" + hair.getMustache() + "_" + hairColor);
+                }
+                if (hair.isAvailable(hair.getBeard())) {
+                    layerMap.put(AvatarView.LayerType.HAIR_BEARD, "hair_beard_" + hair.getBeard() + "_" + hairColor);
+                }
+                if (hair.isAvailable(hair.getFlower())) {
+                    layerMap.put(AvatarView.LayerType.HAIR_FLOWER, "hair_flower_" + hair.getFlower());
+                }
+            }
+        } else {
+            Hair hair = prefs.getHair();
+
+            // Show flower all the time!
+            if (hair != null && hair.isAvailable(hair.getFlower())) {
+                layerMap.put(AvatarView.LayerType.HAIR_FLOWER, "hair_flower_" + hair.getFlower());
+            }
+        }
+
+        return layerMap;
+    }
+
+    public int getPetsFoundCount() {
+        return getNullableMapSize(items.getPets());
+    }
+
+    public int getMountsTamedCount() {
+        return getNullableMapSize(items.getMounts());
+    }
+
+    private int getNullableMapSize(Map map) {
+        int mapSize = 0;
+
+        if (map != null) {
+            mapSize = map.size();
+        }
+
+        return mapSize;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
index 25518d7ec..2435e8166 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
@@ -1,87 +1,87 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Hair extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    public String userId;
-
-    @Column
-    private int mustache, beard, bangs, base, flower;
-
-    @Column
-    private String color;
-
-    public Hair() {
-    }
-
-    public Hair(int mustache, int beard, int bangs, int base, String color, int flower) {
-        this.mustache = mustache;
-        this.beard = beard;
-        this.bangs = bangs;
-        this.base = base;
-        this.color = color;
-        this.flower = flower;
-    }
-
-    public int getMustache() {
-        return mustache;
-    }
-
-    public void setMustache(int mustache) {
-        this.mustache = mustache;
-    }
-
-    public int getBeard() {
-        return beard;
-    }
-
-    public void setBeard(int beard) {
-        this.beard = beard;
-    }
-
-    public int getBangs() {
-        return bangs;
-    }
-
-    public void setBangs(int bangs) {
-        this.bangs = bangs;
-    }
-
-    public int getBase() {
-        return base;
-    }
-
-    public void setBase(int base) {
-        this.base = base;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public int getFlower() {
-        return flower;
-    }
-
-    public void setFlower(int flower) {
-        this.flower = flower;
-    }
-
-    public boolean isAvailable(int hairId) {
-        return hairId > 0;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Hair extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    public String userId;
+
+    @Column
+    private int mustache, beard, bangs, base, flower;
+
+    @Column
+    private String color;
+
+    public Hair() {
+    }
+
+    public Hair(int mustache, int beard, int bangs, int base, String color, int flower) {
+        this.mustache = mustache;
+        this.beard = beard;
+        this.bangs = bangs;
+        this.base = base;
+        this.color = color;
+        this.flower = flower;
+    }
+
+    public int getMustache() {
+        return mustache;
+    }
+
+    public void setMustache(int mustache) {
+        this.mustache = mustache;
+    }
+
+    public int getBeard() {
+        return beard;
+    }
+
+    public void setBeard(int beard) {
+        this.beard = beard;
+    }
+
+    public int getBangs() {
+        return bangs;
+    }
+
+    public void setBangs(int bangs) {
+        this.bangs = bangs;
+    }
+
+    public int getBase() {
+        return base;
+    }
+
+    public void setBase(int base) {
+        this.base = base;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public int getFlower() {
+        return flower;
+    }
+
+    public void setFlower(int flower) {
+        this.flower = flower;
+    }
+
+    public boolean isAvailable(int hairId) {
+        return hairId > 0;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
index 7018f6109..a8081e3b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
@@ -1,100 +1,99 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by keithholliday on 6/20/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Inbox extends BaseModel {
-
-    @Column
-    @PrimaryKey
-//    @NotNull
-            String user_Id;
-
-    @SerializedName("optOut")
-    @Expose
-    private Boolean optOut;
-
-    @SerializedName("messages")
-    @Expose
-    private Map<String, ChatMessage> messages;
-
-    @SerializedName("blocks")
-    @Expose
-    private List<Object> blocks = new ArrayList<Object>();
-
-    @SerializedName("newMessages")
-    @Expose
-    private Integer newMessages;
-
-    /**
-     * @return The optOut
-     */
-    public Boolean getOptOut() {
-        return optOut;
-    }
-
-    /**
-     * @param optOut The optOut
-     */
-    public void setOptOut(Boolean optOut) {
-        this.optOut = optOut;
-    }
-
-    /**
-     * @return The messages
-     */
-    public Map<String, ChatMessage> getMessages() {
-        return messages;
-    }
-
-    /**
-     * @param messages The messages
-     */
-    public void setMessages(Map<String, ChatMessage> messages) {
-        this.messages = messages;
-    }
-
-    /**
-     * @return The blocks
-     */
-    public List<Object> getBlocks() {
-        return blocks;
-    }
-
-    /**
-     * @param blocks The blocks
-     */
-    public void setBlocks(List<Object> blocks) {
-        this.blocks = blocks;
-    }
-
-    /**
-     * @return The newMessages
-     */
-    public Integer getNewMessages() {
-        return newMessages;
-    }
-
-    /**
-     * @param newMessages The newMessages
-     */
-    public void setNewMessages(Integer newMessages) {
-        this.newMessages = newMessages;
-    }
-
+package com.habitrpg.android.habitica.models.user;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by keithholliday on 6/20/16.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class Inbox extends BaseModel {
+
+    @Column
+    @PrimaryKey
+//    @NotNull
+            String user_Id;
+
+    @SerializedName("optOut")
+    @Expose
+    private Boolean optOut;
+
+    @SerializedName("messages")
+    @Expose
+    private Map<String, ChatMessage> messages;
+
+    @SerializedName("blocks")
+    @Expose
+    private List<Object> blocks = new ArrayList<Object>();
+
+    @SerializedName("newMessages")
+    @Expose
+    private Integer newMessages;
+
+    /**
+     * @return The optOut
+     */
+    public Boolean getOptOut() {
+        return optOut;
+    }
+
+    /**
+     * @param optOut The optOut
+     */
+    public void setOptOut(Boolean optOut) {
+        this.optOut = optOut;
+    }
+
+    /**
+     * @return The messages
+     */
+    public Map<String, ChatMessage> getMessages() {
+        return messages;
+    }
+
+    /**
+     * @param messages The messages
+     */
+    public void setMessages(Map<String, ChatMessage> messages) {
+        this.messages = messages;
+    }
+
+    /**
+     * @return The blocks
+     */
+    public List<Object> getBlocks() {
+        return blocks;
+    }
+
+    /**
+     * @param blocks The blocks
+     */
+    public void setBlocks(List<Object> blocks) {
+        this.blocks = blocks;
+    }
+
+    /**
+     * @return The newMessages
+     */
+    public Integer getNewMessages() {
+        return newMessages;
+    }
+
+    /**
+     * @param newMessages The newMessages
+     */
+    public void setNewMessages(Integer newMessages) {
+        this.newMessages = newMessages;
+    }
+
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
index f32f26da0..8e3f104c8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
@@ -1,175 +1,175 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.Date;
-import java.util.HashMap;
-
-/**
- * Created by MagicMicky on 16/03/14.
- */
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Items extends BaseModel {
-
-    public HashMap<String, Integer> eggs;
-    public HashMap<String, Integer> food;
-    public HashMap<String, Integer> hatchingPotions;
-    public HashMap<String, Integer> quests;
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-    HashMap<String, Integer> pets;
-    HashMap<String, Boolean> mounts;
-    @Column
-    private String currentMount;
-    @Column
-    private String currentPet;
-    @Column
-    private int lastDrop_count;
-    @Column
-    private Date lastDrop_date;
-
-    //private QuestContent quest;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "gear_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Gear gear;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "special_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private SpecialItems special;
-
-    public Items(String currentMount, String currentPet, int lastDrop_count, Date lastDrop_date) {
-        this.currentMount = currentMount;
-        this.currentPet = currentPet;
-        this.lastDrop_count = lastDrop_count;
-        this.lastDrop_date = lastDrop_date;
-    }
-
-    public Items() {
-    }
-
-    public String getCurrentMount() {
-        return currentMount;
-    }
-
-    public void setCurrentMount(String currentMount) {
-        this.currentMount = currentMount;
-    }
-
-    public String getCurrentPet() {
-        return currentPet;
-    }
-
-    public void setCurrentPet(String currentPet) {
-        this.currentPet = currentPet;
-    }
-
-    public int getLastDrop_count() {
-        return lastDrop_count;
-    }
-
-    public void setLastDrop_count(int lastDrop_count) {
-        this.lastDrop_count = lastDrop_count;
-    }
-
-    public Date getLastDrop_date() {
-        return lastDrop_date;
-    }
-
-    public void setLastDrop_date(Date lastDrop_date) {
-        this.lastDrop_date = lastDrop_date;
-    }
-
-    public Gear getGear() {
-        return gear;
-    }
-
-    public void setGear(Gear gear) {
-        this.gear = gear;
-    }
-
-    public SpecialItems getSpecial() {
-        return special;
-    }
-
-    public void setSpecial(SpecialItems specialItems) {
-        this.special = specialItems;
-    }
-
-    public String getUser_id() {
-        return user_id;
-    }
-
-    public void setUser_id(String user_id) {
-        this.user_id = user_id;
-    }
-
-    public HashMap<String, Integer> getEggs() {
-        return eggs;
-    }
-
-    public void setEggs(HashMap<String, Integer> eggs) {
-        this.eggs = eggs;
-    }
-
-    public HashMap<String, Integer> getFood() {
-        return food;
-    }
-
-    public void setFood(HashMap<String, Integer> food) {
-        this.food = food;
-    }
-
-    public HashMap<String, Integer> getHatchingPotions() {
-        return hatchingPotions;
-    }
-
-    public void setHatchingPotions(HashMap<String, Integer> hatchingPotions) {
-        this.hatchingPotions = hatchingPotions;
-    }
-
-    public HashMap<String, Integer> getQuests() {
-        return quests;
-    }
-
-    public void setQuests(HashMap<String, Integer> quests) {
-        this.quests = quests;
-    }
-
-    public HashMap<String, Integer> getPets() {
-        return pets;
-    }
-
-    public void setPets(HashMap<String, Integer> pets) {
-        this.pets = pets;
-    }
-
-    public HashMap<String, Boolean> getMounts() {
-        return mounts;
-    }
-
-    public void setMounts(HashMap<String, Boolean> mounts) {
-        this.mounts = mounts;
-    }
-
-    @Override
-    public void save() {
-        gear.user_id = user_id;
-        special.user_id = user_id;
-
-        super.save();
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.Date;
+import java.util.HashMap;
+
+/**
+ * Created by MagicMicky on 16/03/14.
+ */
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Items extends BaseModel {
+
+    public HashMap<String, Integer> eggs;
+    public HashMap<String, Integer> food;
+    public HashMap<String, Integer> hatchingPotions;
+    public HashMap<String, Integer> quests;
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_id;
+    HashMap<String, Integer> pets;
+    HashMap<String, Boolean> mounts;
+    @Column
+    private String currentMount;
+    @Column
+    private String currentPet;
+    @Column
+    private int lastDrop_count;
+    @Column
+    private Date lastDrop_date;
+
+    //private QuestContent quest;
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "gear_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private Gear gear;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "special_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private SpecialItems special;
+
+    public Items(String currentMount, String currentPet, int lastDrop_count, Date lastDrop_date) {
+        this.currentMount = currentMount;
+        this.currentPet = currentPet;
+        this.lastDrop_count = lastDrop_count;
+        this.lastDrop_date = lastDrop_date;
+    }
+
+    public Items() {
+    }
+
+    public String getCurrentMount() {
+        return currentMount;
+    }
+
+    public void setCurrentMount(String currentMount) {
+        this.currentMount = currentMount;
+    }
+
+    public String getCurrentPet() {
+        return currentPet;
+    }
+
+    public void setCurrentPet(String currentPet) {
+        this.currentPet = currentPet;
+    }
+
+    public int getLastDrop_count() {
+        return lastDrop_count;
+    }
+
+    public void setLastDrop_count(int lastDrop_count) {
+        this.lastDrop_count = lastDrop_count;
+    }
+
+    public Date getLastDrop_date() {
+        return lastDrop_date;
+    }
+
+    public void setLastDrop_date(Date lastDrop_date) {
+        this.lastDrop_date = lastDrop_date;
+    }
+
+    public Gear getGear() {
+        return gear;
+    }
+
+    public void setGear(Gear gear) {
+        this.gear = gear;
+    }
+
+    public SpecialItems getSpecial() {
+        return special;
+    }
+
+    public void setSpecial(SpecialItems specialItems) {
+        this.special = specialItems;
+    }
+
+    public String getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    public HashMap<String, Integer> getEggs() {
+        return eggs;
+    }
+
+    public void setEggs(HashMap<String, Integer> eggs) {
+        this.eggs = eggs;
+    }
+
+    public HashMap<String, Integer> getFood() {
+        return food;
+    }
+
+    public void setFood(HashMap<String, Integer> food) {
+        this.food = food;
+    }
+
+    public HashMap<String, Integer> getHatchingPotions() {
+        return hatchingPotions;
+    }
+
+    public void setHatchingPotions(HashMap<String, Integer> hatchingPotions) {
+        this.hatchingPotions = hatchingPotions;
+    }
+
+    public HashMap<String, Integer> getQuests() {
+        return quests;
+    }
+
+    public void setQuests(HashMap<String, Integer> quests) {
+        this.quests = quests;
+    }
+
+    public HashMap<String, Integer> getPets() {
+        return pets;
+    }
+
+    public void setPets(HashMap<String, Integer> pets) {
+        this.pets = pets;
+    }
+
+    public HashMap<String, Boolean> getMounts() {
+        return mounts;
+    }
+
+    public void setMounts(HashMap<String, Boolean> mounts) {
+        this.mounts = mounts;
+    }
+
+    @Override
+    public void save() {
+        gear.user_id = user_id;
+        special.user_id = user_id;
+
+        super.save();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
index afd02ff2f..f29844c79 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
@@ -1,102 +1,101 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import android.text.TextUtils;
-
-/**
- * Created by viirus on 20/07/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Outfit extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-
-    @Column
-    String armor, back, body, head, shield, weapon;
-
-    @Column
-    @SerializedName("eyewear")
-    String eyeWear;
-
-    @Column
-    String headAccessory;
-
-    public String getArmor() {
-        return armor;
-    }
-
-    public void setArmor(String armor) {
-        this.armor = armor;
-    }
-
-    public String getBack() {
-        return back;
-    }
-
-    public void setBack(String back) {
-        this.back = back;
-    }
-
-    public String getBody() {
-        return body;
-    }
-
-    public void setBody(String body) {
-        this.body = body;
-    }
-
-    public String getEyeWear() {
-        return eyeWear;
-    }
-
-    public void setEyeWear(String eyeWear) {
-        this.eyeWear = eyeWear;
-    }
-
-    public String getHead() {
-        return head;
-    }
-
-    public void setHead(String head) {
-        this.head = head;
-    }
-
-    public String getHeadAccessory() {
-        return headAccessory;
-    }
-
-    public void setHeadAccessory(String headAccessory) {
-        this.headAccessory = headAccessory;
-    }
-
-    public String getShield() {
-        return shield;
-    }
-
-    public void setShield(String shield) {
-        this.shield = shield;
-    }
-
-    public String getWeapon() {
-        return weapon;
-    }
-
-    public void setWeapon(String weapon) {
-        this.weapon = weapon;
-    }
-
-    public boolean isAvailable(String outfit) {
-        return !TextUtils.isEmpty(outfit) && !outfit.endsWith("base_0");
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import android.text.TextUtils;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+/**
+ * Created by viirus on 20/07/15.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class Outfit extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_id;
+
+    @Column
+    String armor, back, body, head, shield, weapon;
+
+    @Column
+    @SerializedName("eyewear")
+    String eyeWear;
+
+    @Column
+    String headAccessory;
+
+    public String getArmor() {
+        return armor;
+    }
+
+    public void setArmor(String armor) {
+        this.armor = armor;
+    }
+
+    public String getBack() {
+        return back;
+    }
+
+    public void setBack(String back) {
+        this.back = back;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public void setBody(String body) {
+        this.body = body;
+    }
+
+    public String getEyeWear() {
+        return eyeWear;
+    }
+
+    public void setEyeWear(String eyeWear) {
+        this.eyeWear = eyeWear;
+    }
+
+    public String getHead() {
+        return head;
+    }
+
+    public void setHead(String head) {
+        this.head = head;
+    }
+
+    public String getHeadAccessory() {
+        return headAccessory;
+    }
+
+    public void setHeadAccessory(String headAccessory) {
+        this.headAccessory = headAccessory;
+    }
+
+    public String getShield() {
+        return shield;
+    }
+
+    public void setShield(String shield) {
+        this.shield = shield;
+    }
+
+    public String getWeapon() {
+        return weapon;
+    }
+
+    public void setWeapon(String weapon) {
+        this.weapon = weapon;
+    }
+
+    public boolean isAvailable(String outfit) {
+        return !TextUtils.isEmpty(outfit) && !outfit.endsWith("base_0");
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java
index c3890bed6..9813ecea6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java
@@ -1,152 +1,151 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.google.gson.annotations.SerializedName;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.HabitRpgClass;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-
-import android.content.Context;
-
-/**
- * Created by MagicMicky on 12/06/2014.
- */
-
-public abstract class PlayerMinStats extends BasicStats {
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "trainingstats_id",
-            columnType = String.class,
-            foreignColumnName = "id")})
-    public BasicStats training;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "buffs_id",
-            columnType = String.class,
-            foreignColumnName = "id")})
-    public Buffs buffs;
-
-    @Column
-    public Integer points, lvl;
-
-    @Column
-    @SerializedName("class")
-    public HabitRpgClass _class;
-
-    @Column
-    public Double gp, exp, mp, hp;
-
-
-    public BasicStats getTraining() {
-        return training;
-    }
-
-    public void setTraining(BasicStats training) {
-        this.training = training;
-    }
-
-    public Buffs getBuffs() {
-        return buffs;
-    }
-
-    public void setBuffs(Buffs buffs) {
-        this.buffs = buffs;
-    }
-
-    public Integer getPoints() {
-        return points != null ? points : Integer.valueOf(0);
-    }
-
-    public void setPoints(Integer points) {
-        this.points = points;
-    }
-
-    public Integer getLvl() {
-        return lvl != null ? lvl : Integer.valueOf(0);
-    }
-
-    public void setLvl(Integer lvl) {
-        this.lvl = lvl;
-    }
-
-    public HabitRpgClass get_class() {
-        return _class;
-    }
-
-    public void set_class(HabitRpgClass _class) {
-        this._class = _class;
-    }
-
-    public String getTranslatedClassName(Context context) {
-        switch (_class) {
-            case healer:
-                return context.getString(R.string.healer);
-            case rogue:
-                return context.getString(R.string.rogue);
-            case warrior:
-                return context.getString(R.string.warrior);
-            case wizard:
-                return context.getString(R.string.mage);
-            default:
-                return context.getString(R.string.warrior);
-        }
-    }
-
-    public Double getGp() {
-        return gp != null ? gp : Double.valueOf(0);
-    }
-
-    public void setGp(Double gp) {
-        this.gp = gp;
-    }
-
-    public Double getExp() {
-        return exp != null ? exp : Double.valueOf(0);
-    }
-
-    public void setExp(Double exp) {
-        this.exp = exp;
-    }
-
-    public Double getMp() {
-        return mp != null ? mp : Double.valueOf(0);
-    }
-
-    public void setMp(Double mp) {
-        this.mp = mp;
-    }
-
-    public Double getHp() {
-        return hp != null ? hp : Double.valueOf(0);
-    }
-
-    public void setHp(Double hp) {
-        this.hp = hp;
-    }
-
-    @Override
-    public void save() {
-        training.id = id + "_training";
-        buffs.id = id;
-
-        super.save();
-    }
-
-    public void merge(PlayerMinStats stats) {
-        if (stats == null) {
-            return;
-        }
-        super.merge(stats);
-        this.training.merge(stats.getTraining());
-        this.buffs.merge(stats.buffs);
-        this.points = stats.points != null ? stats.points : this.points;
-        this.lvl = stats.lvl != null ? stats.lvl : this.lvl;
-        this._class = stats._class != null ? stats._class : this._class;
-        this.gp = stats.gp != null ? stats.gp : this.gp;
-        this.exp = stats.exp != null ? stats.exp : this.exp;
-        this.hp = stats.hp != null ? stats.hp : this.hp;
-        this.mp = stats.mp != null ? stats.mp : this.mp;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import android.content.Context;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.HabitRpgClass;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+
+/**
+ * Created by MagicMicky on 12/06/2014.
+ */
+
+public abstract class PlayerMinStats extends BasicStats {
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "trainingstats_id",
+            columnType = String.class,
+            foreignColumnName = "id")})
+    public BasicStats training;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "buffs_id",
+            columnType = String.class,
+            foreignColumnName = "id")})
+    public Buffs buffs;
+
+    @Column
+    public Integer points, lvl;
+
+    @Column
+    @SerializedName("class")
+    public HabitRpgClass _class;
+
+    @Column
+    public Double gp, exp, mp, hp;
+
+
+    public BasicStats getTraining() {
+        return training;
+    }
+
+    public void setTraining(BasicStats training) {
+        this.training = training;
+    }
+
+    public Buffs getBuffs() {
+        return buffs;
+    }
+
+    public void setBuffs(Buffs buffs) {
+        this.buffs = buffs;
+    }
+
+    public Integer getPoints() {
+        return points != null ? points : Integer.valueOf(0);
+    }
+
+    public void setPoints(Integer points) {
+        this.points = points;
+    }
+
+    public Integer getLvl() {
+        return lvl != null ? lvl : Integer.valueOf(0);
+    }
+
+    public void setLvl(Integer lvl) {
+        this.lvl = lvl;
+    }
+
+    public HabitRpgClass get_class() {
+        return _class;
+    }
+
+    public void set_class(HabitRpgClass _class) {
+        this._class = _class;
+    }
+
+    public String getTranslatedClassName(Context context) {
+        switch (_class) {
+            case healer:
+                return context.getString(R.string.healer);
+            case rogue:
+                return context.getString(R.string.rogue);
+            case warrior:
+                return context.getString(R.string.warrior);
+            case wizard:
+                return context.getString(R.string.mage);
+            default:
+                return context.getString(R.string.warrior);
+        }
+    }
+
+    public Double getGp() {
+        return gp != null ? gp : Double.valueOf(0);
+    }
+
+    public void setGp(Double gp) {
+        this.gp = gp;
+    }
+
+    public Double getExp() {
+        return exp != null ? exp : Double.valueOf(0);
+    }
+
+    public void setExp(Double exp) {
+        this.exp = exp;
+    }
+
+    public Double getMp() {
+        return mp != null ? mp : Double.valueOf(0);
+    }
+
+    public void setMp(Double mp) {
+        this.mp = mp;
+    }
+
+    public Double getHp() {
+        return hp != null ? hp : Double.valueOf(0);
+    }
+
+    public void setHp(Double hp) {
+        this.hp = hp;
+    }
+
+    @Override
+    public void save() {
+        training.id = id + "_training";
+        buffs.id = id;
+
+        super.save();
+    }
+
+    public void merge(PlayerMinStats stats) {
+        if (stats == null) {
+            return;
+        }
+        super.merge(stats);
+        this.training.merge(stats.getTraining());
+        this.buffs.merge(stats.buffs);
+        this.points = stats.points != null ? stats.points : this.points;
+        this.lvl = stats.lvl != null ? stats.lvl : this.lvl;
+        this._class = stats._class != null ? stats._class : this._class;
+        this.gp = stats.gp != null ? stats.gp : this.gp;
+        this.exp = stats.exp != null ? stats.exp : this.exp;
+        this.hp = stats.hp != null ? stats.hp : this.hp;
+        this.mp = stats.mp != null ? stats.mp : this.mp;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
index 15d495d18..04fcd343b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
@@ -1,246 +1,246 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by MagicMicky on 16/03/14.
- */
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Preferences extends BaseModel {
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "hair_user_id",
-            columnType = String.class,
-            foreignColumnName = "userId")})
-    public Hair hair;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "suppressedModals_user_id",
-            columnType = String.class,
-            foreignColumnName = "userId")})
-    SuppressedModals suppressModals;
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-    @Column
-    private boolean costume, toolbarCollapsed, advancedCollapsed, tagsCollapsed, newTaskEdit, disableClasses, stickyHeader, sleep, hideHeader, dailyDueDefaultView;
-    @Column
-    private String allocationMode, shirt, skin, size, background, chair, language, sound;
-    @Column
-    private int dayStart, timezoneOffset;
-
-    public Preferences() {
-    }
-
-    public String getBackground() {
-        return background;
-    }
-
-    public void setBackground(String background) {
-        this.background = background;
-    }
-
-    public int getDayStart() {
-        return dayStart;
-    }
-
-    public void setDayStart(int dayStart) {
-        this.dayStart = dayStart;
-    }
-
-    public boolean getCostume() {
-        return costume;
-    }
-
-    public void setCostume(boolean costume) {
-        this.costume = costume;
-    }
-
-    public boolean getToolbarCollapsed() {
-        return toolbarCollapsed;
-    }
-
-    public void setToolbarCollapsed(boolean toolbarCollapsed) {
-        this.toolbarCollapsed = toolbarCollapsed;
-    }
-
-    public boolean getAdvancedCollapsed() {
-        return advancedCollapsed;
-    }
-
-    public void setAdvancedCollapsed(boolean advancedCollapsed) {
-        this.advancedCollapsed = advancedCollapsed;
-    }
-
-    public boolean getTagsCollapsed() {
-        return tagsCollapsed;
-    }
-
-    public void setTagsCollapsed(boolean tagsCollapsed) {
-        this.tagsCollapsed = tagsCollapsed;
-    }
-
-    public boolean getNewTaskEdit() {
-        return newTaskEdit;
-    }
-
-    public void setNewTaskEdit(boolean newTaskEdit) {
-        this.newTaskEdit = newTaskEdit;
-    }
-
-    public boolean getDisableClasses() {
-        return disableClasses;
-    }
-
-    public boolean getStickyHeader() {
-        return stickyHeader;
-    }
-
-    public void setStickyHeader(boolean stickyHeader) {
-        this.stickyHeader = stickyHeader;
-    }
-
-    public boolean getSleep() {
-        return sleep;
-    }
-
-    public boolean getHideHeader() {
-        return hideHeader;
-    }
-
-    public void setHideHeader(boolean hideHeader) {
-        this.hideHeader = hideHeader;
-    }
-
-    public String getAllocationMode() {
-        return allocationMode;
-    }
-
-    public void setAllocationMode(String allocationMode) {
-        this.allocationMode = allocationMode;
-    }
-
-    public String getShirt() {
-        return shirt;
-    }
-
-    public void setShirt(String shirt) {
-        this.shirt = shirt;
-    }
-
-    public String getSkin() {
-        return skin;
-    }
-
-    public void setSkin(String skin) {
-        this.skin = skin;
-    }
-
-    public String getSize() {
-        return size;
-    }
-
-    public void setSize(String size) {
-        this.size = size;
-    }
-
-    public String getSound() {
-        return sound;
-    }
-
-    public void setSound(String sound) {
-        this.sound = sound;
-    }
-
-    public int getTimezoneOffset() {
-        return timezoneOffset;
-    }
-
-    public void setTimezoneOffset(int timezoneOffset) {
-        this.timezoneOffset = timezoneOffset;
-    }
-
-    public Hair getHair() {
-        return hair;
-    }
-
-    public void setHair(Hair hair) {
-        this.hair = hair;
-    }
-
-    public SuppressedModals getSuppressModals() {
-        return suppressModals;
-    }
-
-    public void setSuppressModals(SuppressedModals suppressModals) {
-        this.suppressModals = suppressModals;
-    }
-
-    public String getChair() {
-        if (chair != null && !chair.equals("none")) {
-            if (chair.length() > 5 && !chair.substring(0, 6).equals("chair_")) {
-                return chair;
-            } else {
-                return "chair_" +chair;
-            }
-        }
-        return null;
-    }
-
-    public void setChair(String chair) {
-        this.chair = chair;
-    }
-
-    public boolean isSleep() {
-        return sleep;
-    }
-
-    public void setSleep(boolean sleep) {
-        this.sleep = sleep;
-    }
-
-    public boolean isDisableClasses() {
-        return disableClasses;
-    }
-
-    public void setDisableClasses(boolean disableClasses) {
-        this.disableClasses = disableClasses;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    @Override
-    public void save() {
-        if (user_id == null) {
-            return;
-        }
-        hair.userId = user_id;
-
-        if (suppressModals != null)
-            suppressModals.userId = user_id;
-
-        super.save();
-    }
-
-    public boolean getDailyDueDefaultView() {
-        return dailyDueDefaultView;
-    }
-
-    public void setDailyDueDefaultView(boolean dailyDueDefaultView) {
-        this.dailyDueDefaultView = dailyDueDefaultView;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+/**
+ * Created by MagicMicky on 16/03/14.
+ */
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Preferences extends BaseModel {
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "hair_user_id",
+            columnType = String.class,
+            foreignColumnName = "userId")})
+    public Hair hair;
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "suppressedModals_user_id",
+            columnType = String.class,
+            foreignColumnName = "userId")})
+    SuppressedModals suppressModals;
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_id;
+    @Column
+    private boolean costume, toolbarCollapsed, advancedCollapsed, tagsCollapsed, newTaskEdit, disableClasses, stickyHeader, sleep, hideHeader, dailyDueDefaultView;
+    @Column
+    private String allocationMode, shirt, skin, size, background, chair, language, sound;
+    @Column
+    private int dayStart, timezoneOffset;
+
+    public Preferences() {
+    }
+
+    public String getBackground() {
+        return background;
+    }
+
+    public void setBackground(String background) {
+        this.background = background;
+    }
+
+    public int getDayStart() {
+        return dayStart;
+    }
+
+    public void setDayStart(int dayStart) {
+        this.dayStart = dayStart;
+    }
+
+    public boolean getCostume() {
+        return costume;
+    }
+
+    public void setCostume(boolean costume) {
+        this.costume = costume;
+    }
+
+    public boolean getToolbarCollapsed() {
+        return toolbarCollapsed;
+    }
+
+    public void setToolbarCollapsed(boolean toolbarCollapsed) {
+        this.toolbarCollapsed = toolbarCollapsed;
+    }
+
+    public boolean getAdvancedCollapsed() {
+        return advancedCollapsed;
+    }
+
+    public void setAdvancedCollapsed(boolean advancedCollapsed) {
+        this.advancedCollapsed = advancedCollapsed;
+    }
+
+    public boolean getTagsCollapsed() {
+        return tagsCollapsed;
+    }
+
+    public void setTagsCollapsed(boolean tagsCollapsed) {
+        this.tagsCollapsed = tagsCollapsed;
+    }
+
+    public boolean getNewTaskEdit() {
+        return newTaskEdit;
+    }
+
+    public void setNewTaskEdit(boolean newTaskEdit) {
+        this.newTaskEdit = newTaskEdit;
+    }
+
+    public boolean getDisableClasses() {
+        return disableClasses;
+    }
+
+    public boolean getStickyHeader() {
+        return stickyHeader;
+    }
+
+    public void setStickyHeader(boolean stickyHeader) {
+        this.stickyHeader = stickyHeader;
+    }
+
+    public boolean getSleep() {
+        return sleep;
+    }
+
+    public boolean getHideHeader() {
+        return hideHeader;
+    }
+
+    public void setHideHeader(boolean hideHeader) {
+        this.hideHeader = hideHeader;
+    }
+
+    public String getAllocationMode() {
+        return allocationMode;
+    }
+
+    public void setAllocationMode(String allocationMode) {
+        this.allocationMode = allocationMode;
+    }
+
+    public String getShirt() {
+        return shirt;
+    }
+
+    public void setShirt(String shirt) {
+        this.shirt = shirt;
+    }
+
+    public String getSkin() {
+        return skin;
+    }
+
+    public void setSkin(String skin) {
+        this.skin = skin;
+    }
+
+    public String getSize() {
+        return size;
+    }
+
+    public void setSize(String size) {
+        this.size = size;
+    }
+
+    public String getSound() {
+        return sound;
+    }
+
+    public void setSound(String sound) {
+        this.sound = sound;
+    }
+
+    public int getTimezoneOffset() {
+        return timezoneOffset;
+    }
+
+    public void setTimezoneOffset(int timezoneOffset) {
+        this.timezoneOffset = timezoneOffset;
+    }
+
+    public Hair getHair() {
+        return hair;
+    }
+
+    public void setHair(Hair hair) {
+        this.hair = hair;
+    }
+
+    public SuppressedModals getSuppressModals() {
+        return suppressModals;
+    }
+
+    public void setSuppressModals(SuppressedModals suppressModals) {
+        this.suppressModals = suppressModals;
+    }
+
+    public String getChair() {
+        if (chair != null && !chair.equals("none")) {
+            if (chair.length() > 5 && !chair.substring(0, 6).equals("chair_")) {
+                return chair;
+            } else {
+                return "chair_" +chair;
+            }
+        }
+        return null;
+    }
+
+    public void setChair(String chair) {
+        this.chair = chair;
+    }
+
+    public boolean isSleep() {
+        return sleep;
+    }
+
+    public void setSleep(boolean sleep) {
+        this.sleep = sleep;
+    }
+
+    public boolean isDisableClasses() {
+        return disableClasses;
+    }
+
+    public void setDisableClasses(boolean disableClasses) {
+        this.disableClasses = disableClasses;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    @Override
+    public void save() {
+        if (user_id == null) {
+            return;
+        }
+        hair.userId = user_id;
+
+        if (suppressModals != null)
+            suppressModals.userId = user_id;
+
+        super.save();
+    }
+
+    public boolean getDailyDueDefaultView() {
+        return dailyDueDefaultView;
+    }
+
+    public void setDailyDueDefaultView(boolean dailyDueDefaultView) {
+        this.dailyDueDefaultView = dailyDueDefaultView;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
index c023af8e2..935510ce5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
@@ -1,65 +1,65 @@
-package com.habitrpg.android.habitica.models.user;
-
-/**
- * Created by MagicMicky on 16/03/14.
- */
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class Profile extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_Id;
-
-    @Column
-    private String name;
-
-    @Column
-    private String blurb, imageUrl;
-
-    public Profile(String name) {
-        this(name, "", "");
-    }
-
-    public Profile(String name, String blurb, String imageUrl) {
-        this.name = name;
-        this.blurb = blurb;
-        this.imageUrl = imageUrl;
-    }
-
-    public Profile() {
-
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getBlurb() {
-        return blurb;
-    }
-
-    public void setBlurb(String blurb) {
-        this.blurb = blurb;
-    }
-
-    public String getImageUrl() {
-        return imageUrl;
-    }
-
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+/**
+ * Created by MagicMicky on 16/03/14.
+ */
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class Profile extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_Id;
+
+    @Column
+    private String name;
+
+    @Column
+    private String blurb, imageUrl;
+
+    public Profile(String name) {
+        this(name, "", "");
+    }
+
+    public Profile(String name, String blurb, String imageUrl) {
+        this.name = name;
+        this.blurb = blurb;
+        this.imageUrl = imageUrl;
+    }
+
+    public Profile() {
+
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getBlurb() {
+        return blurb;
+    }
+
+    public void setBlurb(String blurb) {
+        this.blurb = blurb;
+    }
+
+    public String getImageUrl() {
+        return imageUrl;
+    }
+
+    public void setImageUrl(String imageUrl) {
+        this.imageUrl = imageUrl;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
index 40497c68d..85383b781 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
@@ -1,48 +1,48 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.List;
-
-/**
- * Created by viirus on 14/01/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Purchases extends BaseModel {
-
-
-    public List<Customization> customizations;
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "plan_user_id",
-            columnType = String.class,
-            foreignColumnName = "customerId")})
-    private SubscriptionPlan plan;
-
-    public List<Customization> getCustomizations() {
-        return customizations;
-    }
-
-    public void setCustomizations(List<Customization> customizations) {
-        this.customizations = customizations;
-    }
-
-    public SubscriptionPlan getPlan() {
-        return plan;
-    }
-
-    public void setPlan(SubscriptionPlan plan) {
-        this.plan = plan;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.List;
+
+/**
+ * Created by viirus on 14/01/16.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class Purchases extends BaseModel {
+
+
+    public List<Customization> customizations;
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_id;
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "plan_user_id",
+            columnType = String.class,
+            foreignColumnName = "customerId")})
+    private SubscriptionPlan plan;
+
+    public List<Customization> getCustomizations() {
+        return customizations;
+    }
+
+    public void setCustomizations(List<Customization> customizations) {
+        this.customizations = customizations;
+    }
+
+    public SubscriptionPlan getPlan() {
+        return plan;
+    }
+
+    public void setPlan(SubscriptionPlan plan) {
+        this.plan = plan;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
index 5d7039ec1..054dec14f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
@@ -1,65 +1,65 @@
-package com.habitrpg.android.habitica.models.user;
-
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class SpecialItems extends BaseModel {
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-
-    @Column
-    @NotNull
-    int seafoam, shinySeed, snowball, spookySparkles;
-
-    public String getUser_id() {
-        return user_id;
-    }
-
-    public void setUser_id(String user_id) {
-        this.user_id = user_id;
-    }
-
-    public int getSeafoam() {
-        return seafoam;
-    }
-
-    public void setSeafoam(int seafoam) {
-        this.seafoam = seafoam;
-    }
-
-    public int getShinySeed() {
-        return shinySeed;
-    }
-
-    public void setShinySeed(int shinySeed) {
-        this.shinySeed = shinySeed;
-    }
-
-    public int getSnowball() {
-        return snowball;
-    }
-
-    public void setSnowball(int snowball) {
-        this.snowball = snowball;
-    }
-
-    public int getSpookySparkles() {
-        return spookySparkles;
-    }
-
-    public void setSpookySparkles(int spookySparkles) {
-        this.spookySparkles = spookySparkles;
-    }
-
-    public Boolean hasSpecialItems() {
-        return seafoam > 0 || shinySeed > 0 || snowball > 0 || spookySparkles > 0;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class SpecialItems extends BaseModel {
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_id;
+
+    @Column
+    @NotNull
+    int seafoam, shinySeed, snowball, spookySparkles;
+
+    public String getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    public int getSeafoam() {
+        return seafoam;
+    }
+
+    public void setSeafoam(int seafoam) {
+        this.seafoam = seafoam;
+    }
+
+    public int getShinySeed() {
+        return shinySeed;
+    }
+
+    public void setShinySeed(int shinySeed) {
+        this.shinySeed = shinySeed;
+    }
+
+    public int getSnowball() {
+        return snowball;
+    }
+
+    public void setSnowball(int snowball) {
+        this.snowball = snowball;
+    }
+
+    public int getSpookySparkles() {
+        return spookySparkles;
+    }
+
+    public void setSpookySparkles(int spookySparkles) {
+        this.spookySparkles = spookySparkles;
+    }
+
+    public Boolean hasSpecialItems() {
+        return seafoam > 0 || shinySeed > 0 || snowball > 0 || spookySparkles > 0;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
index f6c29e276..16a5f20de 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
@@ -1,55 +1,55 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
-
-/**
- * Created by MagicMicky on 16/03/14.
- */
-
-@Table(databaseName = HabitDatabase.NAME, allFields = true)
-public class Stats extends PlayerMinStats {
-
-    @Column
-    private Integer toNextLevel, maxHealth, maxMP;
-
-
-    public Integer getToNextLevel() {
-        return toNextLevel != null ? toNextLevel : Integer.valueOf(0);
-    }
-
-    public void setToNextLevel(Integer toNextLevel) {
-        if (toNextLevel != 0) {
-            this.toNextLevel = toNextLevel;
-        }
-    }
-
-    public Integer getMaxHealth() {
-        return maxHealth != null ? maxHealth : Integer.valueOf(50);
-    }
-
-    public void setMaxHealth(Integer maxHealth) {
-        this.maxHealth = maxHealth;
-    }
-
-    public Integer getMaxMP() {
-        return maxMP != null ? maxMP : Integer.valueOf(0);
-    }
-
-    public void setMaxMP(Integer maxMP) {
-        if (maxMP != 0) {
-            this.maxMP = maxMP;
-        }
-    }
-
-    public void merge(Stats stats) {
-        if (stats == null) {
-            return;
-        }
-        super.merge(stats);
-        this.toNextLevel = stats.toNextLevel != null ? stats.toNextLevel : this.toNextLevel;
-        this.maxHealth = stats.maxHealth != null ? stats.maxHealth : this.maxHealth;
-        this.maxMP = stats.maxMP != null ? stats.maxMP : this.maxMP;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.Table;
+
+/**
+ * Created by MagicMicky on 16/03/14.
+ */
+
+@Table(databaseName = HabitDatabase.NAME, allFields = true)
+public class Stats extends PlayerMinStats {
+
+    @Column
+    private Integer toNextLevel, maxHealth, maxMP;
+
+
+    public Integer getToNextLevel() {
+        return toNextLevel != null ? toNextLevel : Integer.valueOf(0);
+    }
+
+    public void setToNextLevel(Integer toNextLevel) {
+        if (toNextLevel != 0) {
+            this.toNextLevel = toNextLevel;
+        }
+    }
+
+    public Integer getMaxHealth() {
+        return maxHealth != null ? maxHealth : Integer.valueOf(50);
+    }
+
+    public void setMaxHealth(Integer maxHealth) {
+        this.maxHealth = maxHealth;
+    }
+
+    public Integer getMaxMP() {
+        return maxMP != null ? maxMP : Integer.valueOf(0);
+    }
+
+    public void setMaxMP(Integer maxMP) {
+        if (maxMP != 0) {
+            this.maxMP = maxMP;
+        }
+    }
+
+    public void merge(Stats stats) {
+        if (stats == null) {
+            return;
+        }
+        super.merge(stats);
+        this.toNextLevel = stats.toNextLevel != null ? stats.toNextLevel : this.toNextLevel;
+        this.maxHealth = stats.maxHealth != null ? stats.maxHealth : this.maxHealth;
+        this.maxMP = stats.maxMP != null ? stats.maxMP : this.maxMP;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
index d9c86e1a3..44dfe7eb6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
@@ -1,79 +1,79 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import android.support.annotation.Nullable;
-
-import java.util.Date;
-import java.util.List;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class SubscriptionPlan extends BaseModel {
-
-    public static String PLANID_BASIC = "basic";
-    public static String PLANID_BASICEARNED = "basic_earned";
-    public static String PLANID_BASIC3MONTH = "basic_3mo";
-    public static String PLANID_BASIC6MONTH = "basic_6mo";
-    public static String PLANID_GOOGLE6MONTH = "google_6mo";
-    public static String PLANID_BASIC12MONTH = "basic_12mo";
-
-    @Column
-    @PrimaryKey
-    public String customerId;
-    @Column
-    public Date dateCreated;
-    @Column
-    public Date dateUpdated;
-    @Column
-    @Nullable
-    public Date dateTerminated;
-    @Column
-    @Nullable
-    public String paymentMethod;
-    @Column
-    @Nullable
-    public String planId;
-    @Column
-    public Integer gemsBought;
-    @Column
-    public Integer extraMonths;
-    @Column
-    public Integer quantity;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "consecutive_user_id",
-            columnType = String.class,
-            foreignColumnName = "customerId")})
-    public SubscriptionPlanConsecutive consecutive;
-
-    public List<String> mysteryItems;
-
-    public boolean isActive() {
-        Date today = new Date();
-        return planId != null && (this.dateTerminated == null || this.dateTerminated.after(today));
-    }
-
-    @Override
-    public void save() {
-
-        if (consecutive != null) {
-            consecutive.customerId = customerId;
-        }
-
-        super.save();
-    }
-
-    public Integer numberOfGemsLeft() {
-        if (customerId == null) {
-            return 0;
-        }
-        return 25 + consecutive.getGemCapExtra() - gemsBought;
-    }
-
-
-}
+package com.habitrpg.android.habitica.models.user;
+
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.util.Date;
+import java.util.List;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class SubscriptionPlan extends BaseModel {
+
+    public static String PLANID_BASIC = "basic";
+    public static String PLANID_BASICEARNED = "basic_earned";
+    public static String PLANID_BASIC3MONTH = "basic_3mo";
+    public static String PLANID_BASIC6MONTH = "basic_6mo";
+    public static String PLANID_GOOGLE6MONTH = "google_6mo";
+    public static String PLANID_BASIC12MONTH = "basic_12mo";
+
+    @Column
+    @PrimaryKey
+    public String customerId;
+    @Column
+    public Date dateCreated;
+    @Column
+    public Date dateUpdated;
+    @Column
+    @Nullable
+    public Date dateTerminated;
+    @Column
+    @Nullable
+    public String paymentMethod;
+    @Column
+    @Nullable
+    public String planId;
+    @Column
+    public Integer gemsBought;
+    @Column
+    public Integer extraMonths;
+    @Column
+    public Integer quantity;
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "consecutive_user_id",
+            columnType = String.class,
+            foreignColumnName = "customerId")})
+    public SubscriptionPlanConsecutive consecutive;
+
+    public List<String> mysteryItems;
+
+    public boolean isActive() {
+        Date today = new Date();
+        return planId != null && (this.dateTerminated == null || this.dateTerminated.after(today));
+    }
+
+    @Override
+    public void save() {
+
+        if (consecutive != null) {
+            consecutive.customerId = customerId;
+        }
+
+        super.save();
+    }
+
+    public Integer numberOfGemsLeft() {
+        if (customerId == null) {
+            return 0;
+        }
+        return 25 + consecutive.getGemCapExtra() - gemsBought;
+    }
+
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
index e436a9ce9..5757af47b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
@@ -1,63 +1,63 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class SubscriptionPlanConsecutive extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    public String customerId;
-    @Column
-    private int trinkets;
-    @Column
-    private int gemCapExtra;
-    @Column
-    private int offset;
-    @Column
-    private int count;
-
-    public int getTrinkets() {
-        return trinkets;
-    }
-
-    public void setTrinkets(int trinkets) {
-        this.trinkets = trinkets;
-    }
-
-    public int getGemCapExtra() {
-        return gemCapExtra;
-    }
-
-    public void setGemCapExtra(int gemCapExtra) {
-        this.gemCapExtra = gemCapExtra;
-    }
-
-    public int getOffset() {
-        return offset;
-    }
-
-    public void setOffset(int offset) {
-        this.offset = offset;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public void setCount(int count) {
-        this.count = count;
-    }
-
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class SubscriptionPlanConsecutive extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    public String customerId;
+    @Column
+    private int trinkets;
+    @Column
+    private int gemCapExtra;
+    @Column
+    private int offset;
+    @Column
+    private int count;
+
+    public int getTrinkets() {
+        return trinkets;
+    }
+
+    public void setTrinkets(int trinkets) {
+        this.trinkets = trinkets;
+    }
+
+    public int getGemCapExtra() {
+        return gemCapExtra;
+    }
+
+    public void setGemCapExtra(int gemCapExtra) {
+        this.gemCapExtra = gemCapExtra;
+    }
+
+    public int getOffset() {
+        return offset;
+    }
+
+    public void setOffset(int offset) {
+        this.offset = offset;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
index b342688b3..015c0034f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
@@ -1,55 +1,55 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by viirus on 15/11/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class SuppressedModals extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    public String userId;
-
-    @Column
-    private Boolean streak, raisePet, hatchPet, levelUp;
-
-    public Boolean getStreak() {
-        return streak;
-    }
-
-    public void setStreak(Boolean streak) {
-        this.streak = streak;
-    }
-
-    public Boolean getRaisePet() {
-        return raisePet;
-    }
-
-    public void setRaisePet(Boolean raisePet) {
-        this.raisePet = raisePet;
-    }
-
-    public Boolean getHatchPet() {
-        return hatchPet;
-    }
-
-    public void setHatchPet(Boolean hatchPet) {
-        this.hatchPet = hatchPet;
-    }
-
-    public Boolean getLevelUp() {
-        return levelUp;
-    }
-
-    public void setLevelUp(Boolean levelUp) {
-        this.levelUp = levelUp;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+/**
+ * Created by viirus on 15/11/15.
+ */
+@Table(databaseName = HabitDatabase.NAME)
+public class SuppressedModals extends BaseModel {
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    public String userId;
+
+    @Column
+    private Boolean streak, raisePet, hatchPet, levelUp;
+
+    public Boolean getStreak() {
+        return streak;
+    }
+
+    public void setStreak(Boolean streak) {
+        this.streak = streak;
+    }
+
+    public Boolean getRaisePet() {
+        return raisePet;
+    }
+
+    public void setRaisePet(Boolean raisePet) {
+        this.raisePet = raisePet;
+    }
+
+    public Boolean getHatchPet() {
+        return hatchPet;
+    }
+
+    public void setHatchPet(Boolean hatchPet) {
+        this.hatchPet = hatchPet;
+    }
+
+    public Boolean getLevelUp() {
+        return levelUp;
+    }
+
+    public void setLevelUp(Boolean levelUp) {
+        this.levelUp = levelUp;
+    }
+}
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 b26c3e40e..5b9160d0c 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,63 +1,56 @@
-package com.habitrpg.android.habitica.modules;
-
-import com.habitrpg.android.habitica.data.implementation.ApiClientImpl;
-import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
-import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.ContentCache;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.api.MaintenanceApiService;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
-import retrofit2.converter.gson.GsonConverterFactory;
-
-@Module
-public class ApiModule {
-
-    @Provides
-    @Singleton
-    public HostConfig providesHostConfig(SharedPreferences sharedPreferences, Context context) {
-        return new HostConfig(sharedPreferences, context);
-    }
-
-    @Provides
-    public GsonConverterFactory providesGsonConverterFactory() {
-        return ApiClientImpl.createGsonFactory();
-    }
-
-    @Provides
-    @Singleton
-    public PopupNotificationsManager providesPopupNotificationsManager(Context context) {
-        return new PopupNotificationsManager(context);
-    }
-
-    @Provides
-    @Singleton
-    public ApiClient providesApiHelper(GsonConverterFactory gsonConverter, HostConfig hostConfig, CrashlyticsProxy crashlyticsProxy, PopupNotificationsManager popupNotificationsManager, Context context) {
-        return new ApiClientImpl(gsonConverter, hostConfig, crashlyticsProxy, popupNotificationsManager, context);
-    }
-
-    @Provides
-    @Singleton
-    public ContentCache providesContentCache(ApiClient client){
-        return new ContentCache(client);
-    }
-
-    @Provides
-    public MaintenanceApiService providesMaintenanceApiService(GsonConverterFactory gsonConverter, HostConfig hostConfig) {
-        Retrofit adapter = new Retrofit.Builder()
-                .baseUrl("https://habitica-assets.s3.amazonaws.com/mobileApp/endpoint/")
-                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
-                .addConverterFactory(gsonConverter)
-                .build();
-        return adapter.create(MaintenanceApiService.class);
-    }
-}
+package com.habitrpg.android.habitica.modules;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.api.MaintenanceApiService;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.implementation.ApiClientImpl;
+import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+@Module
+public class ApiModule {
+
+    @Provides
+    @Singleton
+    public HostConfig providesHostConfig(SharedPreferences sharedPreferences, Context context) {
+        return new HostConfig(sharedPreferences, context);
+    }
+
+    @Provides
+    public GsonConverterFactory providesGsonConverterFactory() {
+        return ApiClientImpl.createGsonFactory();
+    }
+
+    @Provides
+    @Singleton
+    public PopupNotificationsManager providesPopupNotificationsManager(Context context) {
+        return new PopupNotificationsManager(context);
+    }
+
+    @Provides
+    @Singleton
+    public ApiClient providesApiHelper(GsonConverterFactory gsonConverter, HostConfig hostConfig, CrashlyticsProxy crashlyticsProxy, PopupNotificationsManager popupNotificationsManager, Context context) {
+        return new ApiClientImpl(gsonConverter, hostConfig, crashlyticsProxy, popupNotificationsManager, context);
+    }
+
+    @Provides
+    public MaintenanceApiService providesMaintenanceApiService(GsonConverterFactory gsonConverter, HostConfig hostConfig) {
+        Retrofit adapter = new Retrofit.Builder()
+                .baseUrl("https://habitica-assets.s3.amazonaws.com/mobileApp/endpoint/")
+                .addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+                .addConverterFactory(gsonConverter)
+                .build();
+        return adapter.create(MaintenanceApiService.class);
+    }
+}
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 04c6d18d2..9c93caaa2 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,103 +1,103 @@
-package com.habitrpg.android.habitica.modules;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.executors.JobExecutor;
-import com.habitrpg.android.habitica.executors.PostExecutionThread;
-import com.habitrpg.android.habitica.executors.ThreadExecutor;
-import com.habitrpg.android.habitica.executors.UIThread;
-import com.habitrpg.android.habitica.helpers.SoundFileLoader;
-import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
-import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
-
-import android.app.Application;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.support.v7.preference.PreferenceManager;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class AppModule {
-    public static final String NAMED_USER_ID = "userId";
-
-
-    private Application application;
-
-    public AppModule(Application application) {
-        this.application = application;
-    }
-
-    @Provides
-    @Singleton
-    public Context providesContext() {
-        return application;
-    }
-
-    @Provides
-    @Singleton
-    public SharedPreferences provideSharedPreferences(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context);
-    }
-
-    @Provides
-    @Named(NAMED_USER_ID)
-    public String providesUserID(SharedPreferences sharedPreferences) {
-        return sharedPreferences.getString(application.getString(R.string.SP_userID), "");
-    }
-
-    @Provides
-    @Singleton
-    public TaskFilterHelper providesTagsHelper() {
-        return new TaskFilterHelper();
-    }
-
-    @Provides
-    public Resources providesResources(Context context) {
-        return context.getResources();
-    }
-
-    @Provides
-    public SoundFileLoader providesSoundFileLoader(Context context) {
-        return new SoundFileLoader(context);
-    }
-
-    @Provides
-    @Singleton
-    public SoundManager providesSoundManager() {
-        return new SoundManager();
-    }
-
-
-    @Provides
-    @Singleton
-    ThreadExecutor provideThreadExecutor(JobExecutor jobExecutor) {
-        return jobExecutor;
-    }
-
-
-    @Provides
-    @Singleton
-    PostExecutionThread providePostExecutionThread(UIThread uiThread) {
-        return uiThread;
-    }
-
-    @Provides
-    @Singleton
-    TaskAlarmManager providesTaskAlarmManager(Context context) {
-        return new TaskAlarmManager(context);
-    }
-
-    @Provides
-    @Singleton
-    PushNotificationManager pushNotificationManager(ApiClient apiClient, SharedPreferences sharedPreferences, Context context) {
-        return new PushNotificationManager(apiClient, sharedPreferences, context);
-    }
-}
+package com.habitrpg.android.habitica.modules;
+
+import android.app.Application;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.support.v7.preference.PreferenceManager;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.executors.JobExecutor;
+import com.habitrpg.android.habitica.executors.PostExecutionThread;
+import com.habitrpg.android.habitica.executors.ThreadExecutor;
+import com.habitrpg.android.habitica.executors.UIThread;
+import com.habitrpg.android.habitica.helpers.SoundFileLoader;
+import com.habitrpg.android.habitica.helpers.SoundManager;
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class AppModule {
+    public static final String NAMED_USER_ID = "userId";
+
+
+    private Application application;
+
+    public AppModule(Application application) {
+        this.application = application;
+    }
+
+    @Provides
+    @Singleton
+    public Context providesContext() {
+        return application;
+    }
+
+    @Provides
+    @Singleton
+    public SharedPreferences provideSharedPreferences(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context);
+    }
+
+    @Provides
+    @Named(NAMED_USER_ID)
+    public String providesUserID(SharedPreferences sharedPreferences) {
+        return sharedPreferences.getString(application.getString(R.string.SP_userID), "");
+    }
+
+    @Provides
+    @Singleton
+    public TaskFilterHelper providesTagsHelper() {
+        return new TaskFilterHelper();
+    }
+
+    @Provides
+    public Resources providesResources(Context context) {
+        return context.getResources();
+    }
+
+    @Provides
+    public SoundFileLoader providesSoundFileLoader(Context context) {
+        return new SoundFileLoader(context);
+    }
+
+    @Provides
+    @Singleton
+    public SoundManager providesSoundManager() {
+        return new SoundManager();
+    }
+
+
+    @Provides
+    @Singleton
+    ThreadExecutor provideThreadExecutor(JobExecutor jobExecutor) {
+        return jobExecutor;
+    }
+
+
+    @Provides
+    @Singleton
+    PostExecutionThread providePostExecutionThread(UIThread uiThread) {
+        return uiThread;
+    }
+
+    @Provides
+    @Singleton
+    TaskAlarmManager providesTaskAlarmManager(Context context) {
+        return new TaskAlarmManager(context);
+    }
+
+    @Provides
+    @Singleton
+    PushNotificationManager pushNotificationManager(ApiClient apiClient, SharedPreferences sharedPreferences, Context context) {
+        return new PushNotificationManager(apiClient, sharedPreferences, context);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
index c7ad53fec..47227826b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
@@ -1,80 +1,136 @@
-package com.habitrpg.android.habitica.modules;
-
-
-import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.data.TagRepository;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.data.implementation.SetupCustomizationRepositoryImpl;
-import com.habitrpg.android.habitica.data.implementation.SocialRepositoryImpl;
-import com.habitrpg.android.habitica.data.implementation.TagRepositoryImpl;
-import com.habitrpg.android.habitica.data.implementation.TaskRepositoryImpl;
-import com.habitrpg.android.habitica.data.implementation.UserRepositoryImpl;
-import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
-import com.habitrpg.android.habitica.data.local.TagLocalRepository;
-import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
-import com.habitrpg.android.habitica.data.local.UserLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowSocialLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowTaskLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowTagLocalRepository;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowUserLocalRepository;
-
-import android.content.Context;
-
-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 DbFlowTagLocalRepository();
-    }
-
-    @Provides
-    TagRepository providesTagRepository(TagLocalRepository localRepository, ApiClient apiClient) {
-        return new TagRepositoryImpl(localRepository, apiClient);
-    }
-
-    @Provides
-    UserLocalRepository providesUserLocalRepository() {
-        return new DbFlowUserLocalRepository();
-    }
-
-    @Provides
-    UserRepository providesUserRepository(UserLocalRepository localRepository, ApiClient apiClient) {
-        return new UserRepositoryImpl(localRepository, apiClient);
-    }
-
-    @Provides
-    SocialLocalRepository providesSocialLocalRepository() {
-        return new DbFlowSocialLocalRepository();
-    }
-
-    @Provides
-    SocialRepository providesSocialRepository(SocialLocalRepository localRepository, ApiClient apiClient) {
-        return new SocialRepositoryImpl(localRepository, apiClient);
-    }
-}
+package com.habitrpg.android.habitica.modules;
+
+
+import android.content.Context;
+
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.CustomizationRepository;
+import com.habitrpg.android.habitica.data.FAQRepository;
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.data.TagRepository;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.data.TutorialRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.data.implementation.CustomizationRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.FAQRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.InventoryRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.SetupCustomizationRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.SocialRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.TagRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.TaskRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.TutorialRepositoryImpl;
+import com.habitrpg.android.habitica.data.implementation.UserRepositoryImpl;
+import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository;
+import com.habitrpg.android.habitica.data.local.FAQLocalRepository;
+import com.habitrpg.android.habitica.data.local.InventoryLocalRepository;
+import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
+import com.habitrpg.android.habitica.data.local.TagLocalRepository;
+import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
+import com.habitrpg.android.habitica.data.local.TutorialLocalRepository;
+import com.habitrpg.android.habitica.data.local.UserLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowCustomizationLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowFAQLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowInventoryLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowSocialLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowTagLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowTaskLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowTutorialLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.DbFlowUserLocalRepository;
+
+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 DbFlowTagLocalRepository();
+    }
+
+    @Provides
+    TagRepository providesTagRepository(TagLocalRepository localRepository, ApiClient apiClient) {
+        return new TagRepositoryImpl(localRepository, apiClient);
+    }
+
+    @Provides
+    UserLocalRepository providesUserLocalRepository() {
+        return new DbFlowUserLocalRepository();
+    }
+
+    @Provides
+    UserRepository providesUserRepository(UserLocalRepository localRepository, ApiClient apiClient) {
+        return new UserRepositoryImpl(localRepository, apiClient);
+    }
+
+    @Provides
+    SocialLocalRepository providesSocialLocalRepository() {
+        return new DbFlowSocialLocalRepository();
+    }
+
+    @Provides
+    SocialRepository providesSocialRepository(SocialLocalRepository localRepository, ApiClient apiClient) {
+        return new SocialRepositoryImpl(localRepository, apiClient);
+    }
+
+    @Provides
+    InventoryLocalRepository providesInventoryLocalRepository() {
+        return new DbFlowInventoryLocalRepository();
+    }
+
+    @Provides
+    InventoryRepository providesInventoryRepository(InventoryLocalRepository localRepository, ApiClient apiClient) {
+        return new InventoryRepositoryImpl(localRepository, apiClient);
+    }
+
+    @Provides
+    FAQLocalRepository providesFAQLocalRepository() {
+        return new DbFlowFAQLocalRepository();
+    }
+
+    @Provides
+    FAQRepository providesFAQRepository(FAQLocalRepository localRepository, ApiClient apiClient) {
+        return new FAQRepositoryImpl(localRepository, apiClient);
+    }
+
+    @Provides
+    TutorialLocalRepository providesTutorialLocalRepository() {
+        return new DbFlowTutorialLocalRepository();
+    }
+
+    @Provides
+    TutorialRepository providesTutorialRepository(TutorialLocalRepository localRepository, ApiClient apiClient) {
+        return new TutorialRepositoryImpl(localRepository, apiClient);
+    }
+
+    @Provides
+    CustomizationLocalRepository providesCustomizationLocalRepository() {
+        return new DbFlowCustomizationLocalRepository();
+    }
+
+    @Provides
+    CustomizationRepository providesCustomizationRepository(CustomizationLocalRepository localRepository, ApiClient apiClient) {
+        return new CustomizationRepositoryImpl(localRepository, apiClient);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/impl/EmptyCrashlyticsProxy.java b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/impl/EmptyCrashlyticsProxy.java
index a2dd161a7..bf8ac1c82 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/impl/EmptyCrashlyticsProxy.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/proxy/impl/EmptyCrashlyticsProxy.java
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.proxy.impl;
 
 
-import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-
 import android.content.Context;
 
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+
 public class EmptyCrashlyticsProxy implements CrashlyticsProxy {
     @Override
     public void init(Context context) {
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 5e1ef2580..c62238e7e 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,108 +1,108 @@
-package com.habitrpg.android.habitica.receivers;
-
-import android.app.NotificationManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.os.Bundle;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import javax.inject.Inject;
-
-/**
- * Created by keithholliday on 6/30/16.
- */
-public class LocalNotificationActionReceiver extends BroadcastReceiver implements HabitRPGUserCallback.OnUserReceived {
-    @Inject
-    public ApiClient apiClient;
-
-    private HabitRPGUser user;
-    private String action;
-    private Resources resources;
-    private Intent intent;
-    private Context context;
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        HabiticaBaseApplication.getComponent().inject(this);
-        this.resources = context.getResources();
-
-        this.action = intent.getAction();
-        this.intent = intent;
-        this.context = context;
-
-        this.apiClient.getUser()
-                .subscribe(new HabitRPGUserCallback(this), throwable -> {
-                });
-    }
-
-    @Override
-    public void onUserReceived(HabitRPGUser user) {
-        this.user = user;
-        this.handleLocalNotificationAction(action);
-    }
-
-    private void handleLocalNotificationAction(String action) {
-        NotificationManager notificationManager = (NotificationManager) this.context.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.cancelAll();
-
-        //@TODO: This is a good place for a factory and event emitter pattern
-        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();
-            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();
-            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();
-            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();
-            apiClient.rejectQuest(partyId)
-
-                    .subscribe(aVoid -> {
-                    }, throwable -> {
-                    });
-        } else if (action.equals(this.resources.getString(R.string.accept_guild_invite))) {
-            Bundle extras = this.intent.getExtras();
-            String guildId = extras.getString("groupID");
-            if (guildId == null) return;
-            apiClient.joinGroup(guildId)
-
-                    .subscribe(aVoid -> {
-                    }, throwable -> {
-                    });
-        } else if (action.equals(this.resources.getString(R.string.reject_guild_invite))) {
-            Bundle extras = this.intent.getExtras();
-            String guildId = extras.getString("groupID");
-            if (guildId == null) return;
-            apiClient.rejectGroupInvite(guildId)
-
-                    .subscribe(aVoid -> {
-                    }, throwable -> {
-                    });
-        }
-    }
-}
+package com.habitrpg.android.habitica.receivers;
+
+import android.app.NotificationManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.os.Bundle;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import javax.inject.Inject;
+
+/**
+ * Created by keithholliday on 6/30/16.
+ */
+public class LocalNotificationActionReceiver extends BroadcastReceiver implements HabitRPGUserCallback.OnUserReceived {
+    @Inject
+    public ApiClient apiClient;
+
+    private HabitRPGUser user;
+    private String action;
+    private Resources resources;
+    private Intent intent;
+    private Context context;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        HabiticaBaseApplication.getComponent().inject(this);
+        this.resources = context.getResources();
+
+        this.action = intent.getAction();
+        this.intent = intent;
+        this.context = context;
+
+        this.apiClient.getUser()
+                .subscribe(new HabitRPGUserCallback(this), throwable -> {
+                });
+    }
+
+    @Override
+    public void onUserReceived(HabitRPGUser user) {
+        this.user = user;
+        this.handleLocalNotificationAction(action);
+    }
+
+    private void handleLocalNotificationAction(String action) {
+        NotificationManager notificationManager = (NotificationManager) this.context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancelAll();
+
+        //@TODO: This is a good place for a factory and event emitter pattern
+        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();
+            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();
+            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();
+            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();
+            apiClient.rejectQuest(partyId)
+
+                    .subscribe(aVoid -> {
+                    }, throwable -> {
+                    });
+        } else if (action.equals(this.resources.getString(R.string.accept_guild_invite))) {
+            Bundle extras = this.intent.getExtras();
+            String guildId = extras.getString("groupID");
+            if (guildId == null) return;
+            apiClient.joinGroup(guildId)
+
+                    .subscribe(aVoid -> {
+                    }, throwable -> {
+                    });
+        } else if (action.equals(this.resources.getString(R.string.reject_guild_invite))) {
+            Bundle extras = this.intent.getExtras();
+            String guildId = extras.getString("groupID");
+            if (guildId == null) return;
+            apiClient.rejectGroupInvite(guildId)
+
+                    .subscribe(aVoid -> {
+                    }, throwable -> {
+                    });
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java
index a2489fcb8..70be45d24 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java
@@ -1,23 +1,23 @@
-package com.habitrpg.android.habitica.receivers;
-
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-import javax.inject.Inject;
-
-public class TaskAlarmBootReceiver extends BroadcastReceiver {
-
-    @Inject
-    TaskAlarmManager taskAlarmManager;
-
-    @Override
-    public void onReceive(Context context, Intent arg1) {
-        HabiticaApplication.getComponent().inject(this);
-        taskAlarmManager.scheduleAllSavedAlarms();
-    }
-
-}
+package com.habitrpg.android.habitica.receivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
+
+import javax.inject.Inject;
+
+public class TaskAlarmBootReceiver extends BroadcastReceiver {
+
+    @Inject
+    TaskAlarmManager taskAlarmManager;
+
+    @Override
+    public void onReceive(Context context, Intent arg1) {
+        HabiticaApplication.getComponent().inject(this);
+        taskAlarmManager.scheduleAllSavedAlarms();
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java
index 6fef0b0d1..d6a9a2d88 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java
@@ -1,66 +1,66 @@
-package com.habitrpg.android.habitica.receivers;
-
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
-
-import javax.inject.Inject;
-
-/**
- * Created by keithholliday on 5/29/16.
- */
-public class TaskReceiver extends BroadcastReceiver {
-
-    private Context context;
-
-    private String taskId;
-    private String taskTitle;
-    @Inject
-    TaskAlarmManager taskAlarmManager;
-
-    @Override
-    public void onReceive(Context arg0, Intent arg1) {
-        context = arg0;
-        HabiticaApplication.getComponent().inject(this);
-
-        Bundle extras = arg1.getExtras();
-
-        if (extras != null) {
-            taskTitle = extras.getString(TaskAlarmManager.TASK_NAME_INTENT_KEY);
-            taskId = extras.getString(TaskAlarmManager.TASK_ID_INTENT_KEY);
-            //This will set up the next reminders for dailies
-            if (taskId != null) {
-                taskAlarmManager.addAlarmForTaskId(taskId);
-            }
-            createNotification();
-        }
-    }
-
-    public void createNotification() {
-        Intent intent = new Intent(context, MainActivity.class);
-        PendingIntent pendingIntent = PendingIntent.getActivity(context, (int) System.currentTimeMillis(), intent, 0);
-        Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-
-        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context)
-                .setSmallIcon(R.drawable.ic_gryphon_white)
-                .setContentTitle(taskTitle)
-                .setContentText(taskTitle)
-                .setSound(soundUri)
-                .setAutoCancel(true)
-                .setContentIntent(pendingIntent);
-
-        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify((int) System.currentTimeMillis(), notificationBuilder.build());
-    }
+package com.habitrpg.android.habitica.receivers;
+
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.app.NotificationCompat;
+
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
+import javax.inject.Inject;
+
+/**
+ * Created by keithholliday on 5/29/16.
+ */
+public class TaskReceiver extends BroadcastReceiver {
+
+    private Context context;
+
+    private String taskId;
+    private String taskTitle;
+    @Inject
+    TaskAlarmManager taskAlarmManager;
+
+    @Override
+    public void onReceive(Context arg0, Intent arg1) {
+        context = arg0;
+        HabiticaApplication.getComponent().inject(this);
+
+        Bundle extras = arg1.getExtras();
+
+        if (extras != null) {
+            taskTitle = extras.getString(TaskAlarmManager.TASK_NAME_INTENT_KEY);
+            taskId = extras.getString(TaskAlarmManager.TASK_ID_INTENT_KEY);
+            //This will set up the next reminders for dailies
+            if (taskId != null) {
+                taskAlarmManager.addAlarmForTaskId(taskId);
+            }
+            createNotification();
+        }
+    }
+
+    public void createNotification() {
+        Intent intent = new Intent(context, MainActivity.class);
+        PendingIntent pendingIntent = PendingIntent.getActivity(context, (int) System.currentTimeMillis(), intent, 0);
+        Uri soundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+
+        NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(context)
+                .setSmallIcon(R.drawable.ic_gryphon_white)
+                .setContentTitle(taskTitle)
+                .setContentText(taskTitle)
+                .setSound(soundUri)
+                .setAutoCancel(true)
+                .setContentIntent(pendingIntent);
+
+        NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify((int) System.currentTimeMillis(), notificationBuilder.build());
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
index 36f969e01..550fc7e1b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
@@ -1,481 +1,481 @@
-package com.habitrpg.android.habitica.ui;
-
-import com.facebook.drawee.backends.pipeline.Fresco;
-import com.facebook.drawee.controller.BaseControllerListener;
-import com.facebook.drawee.generic.GenericDraweeHierarchy;
-import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
-import com.facebook.drawee.interfaces.DraweeController;
-import com.facebook.drawee.view.DraweeHolder;
-import com.facebook.drawee.view.MultiDraweeHolder;
-import com.facebook.imagepipeline.image.ImageInfo;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.PointF;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.drawable.Animatable;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class AvatarView extends View {
-    public static final String IMAGE_URI_ROOT = "https://habitica-assets.s3.amazonaws.com/mobileApp/images/";
-    private static final String TAG = "AvatarView";
-    private static final Map<String, String> FILENAME_MAP;
-    private static final Rect FULL_HERO_RECT = new Rect(0, 0, 140, 147);
-    private static final Rect COMPACT_HERO_RECT = new Rect(0, 0, 114, 114);
-    private static final Rect HERO_ONLY_RECT = new Rect(0, 0, 90, 90);
-
-    static {
-        Map<String, String> tempMap = new HashMap<>();
-        tempMap.put("head_special_1", "ContributorOnly-Equip-CrystalHelmet.gif");
-        tempMap.put("armor_special_1", "ContributorOnly-Equip-CrystalArmor.gif");
-        tempMap.put("weapon_special_critical", "weapon_special_critical.gif");
-        tempMap.put("Pet-Wolf-Cerberus", "Pet-Wolf-Cerberus.gif");
-        FILENAME_MAP = Collections.unmodifiableMap(tempMap);
-    }
-
-    private boolean showBackground = true;
-    private boolean showMount = true;
-    private boolean showPet = true;
-    private boolean showSleeping = true;
-    private boolean hasBackground;
-    private boolean hasMount;
-    private boolean hasPet;
-    private boolean isOrphan;
-    private MultiDraweeHolder<GenericDraweeHierarchy> multiDraweeHolder = new MultiDraweeHolder<>();
-    private HabitRPGUser user;
-    private RectF avatarRectF;
-    private Matrix matrix = new Matrix();
-    private AtomicInteger numberLayersInProcess = new AtomicInteger(0);
-    private Consumer<Bitmap> avatarImageConsumer;
-    private Bitmap avatarBitmap;
-    private Canvas avatarCanvas;
-    private Map<LayerType, String> currentLayers;
-
-    public AvatarView(Context context) {
-        super(context);
-        init(null, 0);
-    }
-
-    public AvatarView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(attrs, 0);
-    }
-
-    public AvatarView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init(attrs, defStyle);
-    }
-
-    public AvatarView(Context context, boolean showBackground, boolean showMount, boolean showPet) {
-        super(context);
-
-        this.showBackground = showBackground;
-        this.showMount = showMount;
-        this.showPet = showPet;
-        isOrphan = true;
-    }
-
-    public void configureView(boolean showBackground, boolean showMount, boolean showPet) {
-        this.showBackground = showBackground;
-        this.showMount = showMount;
-        this.showPet = showPet;
-    }
-
-    private void init(AttributeSet attrs, int defStyle) {
-        // Load attributes
-        final TypedArray a = getContext().obtainStyledAttributes(
-                attrs, R.styleable.AvatarView, defStyle, 0);
-
-        try {
-            showBackground = a.getBoolean(R.styleable.AvatarView_showBackground, true);
-            showMount = a.getBoolean(R.styleable.AvatarView_showMount, true);
-            showPet = a.getBoolean(R.styleable.AvatarView_showPet, true);
-            showSleeping = a.getBoolean(R.styleable.AvatarView_showSleeping, true);
-        } finally {
-            a.recycle();
-        }
-    }
-
-    private void showLayers(@NonNull Map<LayerType, String> layerMap) {
-        if (multiDraweeHolder.size() > 0) return;
-        int i = 0;
-
-        currentLayers = layerMap;
-
-        numberLayersInProcess.set(layerMap.size());
-
-        for (Map.Entry<LayerType, String> entry : layerMap.entrySet()) {
-            final LayerType layerKey = entry.getKey();
-            final String layerName = entry.getValue();
-            final int layerNumber = i++;
-
-            GenericDraweeHierarchy hierarchy = new GenericDraweeHierarchyBuilder(getResources())
-                    .setFadeDuration(0)
-                    .build();
-
-            DraweeHolder<GenericDraweeHierarchy> draweeHolder = DraweeHolder.create(hierarchy, getContext());
-            draweeHolder.getTopLevelDrawable().setCallback(this);
-            multiDraweeHolder.add(draweeHolder);
-
-            DraweeController controller = Fresco.newDraweeControllerBuilder()
-                    .setUri(IMAGE_URI_ROOT + getFileName(layerName))
-                    .setControllerListener(new BaseControllerListener<ImageInfo>() {
-                        @Override
-                        public void onFinalImageSet(
-                                String id,
-                                ImageInfo imageInfo,
-                                Animatable anim) {
-                            if (imageInfo != null) {
-                                if (multiDraweeHolder.size() > layerNumber) {
-                                    multiDraweeHolder.get(layerNumber).getTopLevelDrawable().setBounds(getLayerBounds(layerKey, layerName, imageInfo));
-                                }
-                                onLayerComplete();
-                            }
-                        }
-
-                        @Override
-                        public void onFailure(String id, Throwable throwable) {
-                            Log.e(TAG, "Error loading layer: " + layerName, throwable);
-                            onLayerComplete();
-                        }
-                    })
-                    .setAutoPlayAnimations(!isOrphan)
-                    .build();
-            draweeHolder.setController(controller);
-        }
-
-        if (isOrphan) multiDraweeHolder.onAttach();
-    }
-
-    private Map<LayerType, String> getLayerMap() {
-        assert user != null;
-        return getLayerMap(user, true);
-    }
-
-    private Map<LayerType, String> getLayerMap(@NonNull HabitRPGUser user, boolean resetHasAttributes) {
-        EnumMap<LayerType, String> layerMap = user.getAvatarLayerMap();
-
-        if (resetHasAttributes) hasBackground = hasMount = hasPet = false;
-
-        String mountName = user.getItems().getCurrentMount();
-        if (showMount && !TextUtils.isEmpty(mountName)) {
-            layerMap.put(LayerType.MOUNT_BODY, "Mount_Body_" + mountName);
-            layerMap.put(LayerType.MOUNT_HEAD, "Mount_Head_" + mountName);
-            if (resetHasAttributes) hasMount = true;
-        }
-
-        String petName = user.getItems().getCurrentPet();
-        if (showPet && !TextUtils.isEmpty(petName)) {
-            layerMap.put(LayerType.PET, "Pet-" + petName);
-            if (resetHasAttributes) hasPet = true;
-        }
-
-        String backgroundName = user.getPreferences().getBackground();
-        if (showBackground && !TextUtils.isEmpty(backgroundName)) {
-            layerMap.put(LayerType.BACKGROUND, "background_" + backgroundName);
-            if (resetHasAttributes) hasBackground = true;
-        }
-
-        if (showSleeping && user.getPreferences().getSleep()) {
-            layerMap.put(AvatarView.LayerType.ZZZ, "zzz");
-        }
-
-        return layerMap;
-    }
-
-    private Rect getLayerBounds(@NonNull LayerType layerType, @NonNull String layerName, @NonNull ImageInfo layerImageInfo) {
-        PointF offset = null;
-        Rect bounds = new Rect(0, 0, layerImageInfo.getWidth(), layerImageInfo.getHeight());
-        RectF boundsF = new RectF(bounds);
-
-        // lookup layer specific offset
-        switch (layerName) {
-            case "weapon_special_critical":
-                if (showMount || showPet) {
-                    // full hero box
-                    if (hasMount) {
-                        offset = new PointF(13.0f, 12.0f);
-                    } else if (hasPet) {
-                        offset = new PointF(13.0f, 24.5f + 12.0f);
-                    } else {
-                        offset = new PointF(13.0f, 28.0f + 12.0f);
-                    }
-                } else if (showBackground) {
-                    // compact hero box
-                    offset = new PointF(-12.0f, 18.0f + 12.0f);
-                } else {
-                    // hero only box
-                    offset = new PointF(-12.0f, 12.0f);
-                }
-                break;
-            default:
-                break;
-        }
-
-        // otherwise lookup default layer type based offset
-        if (offset == null) {
-            switch (layerType) {
-                case BACKGROUND:
-                    if (!(showMount || showPet)) {
-                        offset = new PointF(-25.0f, 0.0f); // compact hero box
-                    }
-                    break;
-                case MOUNT_BODY:
-                case MOUNT_HEAD:
-                    offset = new PointF(25.0f, 18.0f); // full hero box
-                    break;
-                case CHAIR:
-                case BACK:
-                case SKIN:
-                case SHIRT:
-                case ARMOR:
-                case BODY:
-                case HEAD_0:
-                case HAIR_BASE:
-                case HAIR_BANGS:
-                case HAIR_MUSTACHE:
-                case HAIR_BEARD:
-                case EYEWEAR:
-                case VISUAL_BUFF:
-                case HEAD:
-                case HEAD_ACCESSORY:
-                case HAIR_FLOWER:
-                case SHIELD:
-                case WEAPON:
-                case ZZZ:
-                    if (showMount || showPet) {
-                        // full hero box
-                        if (hasMount) {
-                            offset = new PointF(25.0f, 0);
-                        } else if (hasPet) {
-                            offset = new PointF(25.0f, 24.5f);
-                        } else {
-                            offset = new PointF(25.0f, 28.0f);
-                        }
-                    } else if (showBackground) {
-                        // compact hero box
-                        offset = new PointF(0.0f, 18.0f);
-                    }
-                    break;
-                case PET:
-                    offset = new PointF(0, FULL_HERO_RECT.height() - layerImageInfo.getHeight());
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        if (offset != null) {
-            Matrix translateMatrix = new Matrix();
-            translateMatrix.setTranslate(offset.x, offset.y);
-            translateMatrix.mapRect(boundsF);
-        }
-
-        // resize bounds to fit and keep original aspect ratio
-        matrix.mapRect(boundsF);
-        boundsF.round(bounds);
-
-        return bounds;
-    }
-
-    private String getFileName(@NonNull String imageName) {
-        if (FILENAME_MAP.containsKey(imageName)) {
-            return FILENAME_MAP.get(imageName);
-        }
-
-        return imageName + ".png";
-    }
-
-    private void onLayerComplete() {
-        if (numberLayersInProcess.decrementAndGet() == 0) {
-            if (avatarImageConsumer != null) {
-                avatarImageConsumer.accept(getAvatarImage());
-            }
-        }
-    }
-
-    public void onAvatarImageReady(@NonNull Consumer<Bitmap> consumer) {
-        avatarImageConsumer = consumer;
-        if (multiDraweeHolder.size() > 0 && numberLayersInProcess.get() == 0) {
-            avatarImageConsumer.accept(getAvatarImage());
-        } else {
-            initAvatarRectMatrix();
-            showLayers(getLayerMap());
-        }
-    }
-
-    public void setUser(@NonNull HabitRPGUser user) {
-        HabitRPGUser oldUser = this.user;
-        this.user = user;
-
-        if (oldUser != null) {
-            Map<LayerType, String> newLayerMap = getLayerMap(user, false);
-
-            boolean equals = currentLayers != null && currentLayers.equals(newLayerMap);
-
-            if (!equals) {
-                multiDraweeHolder.clear();
-                numberLayersInProcess.set(0);
-            }
-        }
-        invalidate();
-    }
-
-    private Rect getOriginalRect() {
-        return (showMount || showPet) ? FULL_HERO_RECT : ((showBackground) ? COMPACT_HERO_RECT : HERO_ONLY_RECT);
-    }
-
-    private Bitmap getAvatarImage() {
-        assert user != null;
-        assert avatarRectF != null;
-        Rect canvasRect = new Rect();
-        avatarRectF.round(canvasRect);
-        avatarBitmap = Bitmap.createBitmap(canvasRect.width(), canvasRect.height(), Bitmap.Config.ARGB_8888);
-        avatarCanvas = new Canvas(avatarBitmap);
-        draw(avatarCanvas);
-
-        return avatarBitmap;
-    }
-
-    private void initAvatarRectMatrix() {
-        if (avatarRectF == null) {
-            Rect srcRect = getOriginalRect();
-
-            if (isOrphan) {
-                avatarRectF = new RectF(srcRect);
-
-                // change scale to not be 1:1
-                // a quick fix as fresco AnimatedDrawable/ScaleTypeDrawable
-                // will not translate matrix properly
-                matrix.setScale(1.2f, 1.2f);
-                matrix.mapRect(avatarRectF);
-            } else {
-                // full hero box when showMount and showPet is enabled (140w * 147h)
-                // compact hero box when only showBackground is enabled (114w * 114h)
-                // hero only box when all show settings disabled (90w * 90h)
-                avatarRectF = new RectF(0, 0, getWidth(), getHeight());
-                matrix.setRectToRect(new RectF(srcRect), avatarRectF, Matrix.ScaleToFit.START); // TODO support other ScaleToFit
-                avatarRectF = new RectF(srcRect);
-                matrix.mapRect(avatarRectF);
-            }
-        }
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        initAvatarRectMatrix();
-
-        // draw only when user is set
-        if (user == null) return;
-
-        // request image layers if not yet processed
-        if (multiDraweeHolder.size() == 0) {
-            showLayers(getLayerMap());
-        }
-
-        // manually call onAttach/onDetach if view is without parent as they will never be called otherwise
-        if (isOrphan) multiDraweeHolder.onAttach();
-        multiDraweeHolder.draw(canvas);
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        multiDraweeHolder.onDetach();
-    }
-
-    @Override
-    public void onStartTemporaryDetach() {
-        super.onStartTemporaryDetach();
-        multiDraweeHolder.onDetach();
-    }
-
-    @Override
-    protected void onAttachedToWindow() {
-        super.onAttachedToWindow();
-        multiDraweeHolder.onAttach();
-    }
-
-    @Override
-    public void onFinishTemporaryDetach() {
-        super.onFinishTemporaryDetach();
-        multiDraweeHolder.onAttach();
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        return multiDraweeHolder.onTouchEvent(event) || super.onTouchEvent(event);
-    }
-
-    @Override
-    public boolean performClick() {
-        return super.performClick();
-    }
-
-    @Override
-    protected boolean verifyDrawable(Drawable who) {
-        return multiDraweeHolder.verifyDrawable(who) || super.verifyDrawable(who);
-    }
-
-    @Override
-    public void invalidateDrawable(@NonNull Drawable drawable) {
-        invalidate();
-        if (avatarCanvas != null) draw(avatarCanvas);
-    }
-
-    public enum LayerType {
-        BACKGROUND(0),
-        MOUNT_BODY(1),
-        CHAIR(2),
-        BACK(3),
-        SKIN(4),
-        SHIRT(5),
-        ARMOR(6),
-        BODY(7),
-        HEAD_0(8),
-        HAIR_BASE(9),
-        HAIR_BANGS(10),
-        HAIR_MUSTACHE(11),
-        HAIR_BEARD(12),
-        EYEWEAR(13),
-        VISUAL_BUFF(14),
-        HEAD(15),
-        HEAD_ACCESSORY(16),
-        HAIR_FLOWER(17),
-        SHIELD(18),
-        WEAPON(19),
-        MOUNT_HEAD(20),
-        ZZZ(21),
-        PET(22);
-
-        final int order;
-
-        LayerType(int order) {
-            this.order = order;
-        }
-    }
-
-    public interface Consumer<T> {
-        void accept(T t);
-    }
-}
+package com.habitrpg.android.habitica.ui;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.PointF;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.facebook.drawee.backends.pipeline.Fresco;
+import com.facebook.drawee.controller.BaseControllerListener;
+import com.facebook.drawee.generic.GenericDraweeHierarchy;
+import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
+import com.facebook.drawee.interfaces.DraweeController;
+import com.facebook.drawee.view.DraweeHolder;
+import com.facebook.drawee.view.MultiDraweeHolder;
+import com.facebook.imagepipeline.image.ImageInfo;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class AvatarView extends View {
+    public static final String IMAGE_URI_ROOT = "https://habitica-assets.s3.amazonaws.com/mobileApp/images/";
+    private static final String TAG = "AvatarView";
+    private static final Map<String, String> FILENAME_MAP;
+    private static final Rect FULL_HERO_RECT = new Rect(0, 0, 140, 147);
+    private static final Rect COMPACT_HERO_RECT = new Rect(0, 0, 114, 114);
+    private static final Rect HERO_ONLY_RECT = new Rect(0, 0, 90, 90);
+
+    static {
+        Map<String, String> tempMap = new HashMap<>();
+        tempMap.put("head_special_1", "ContributorOnly-Equip-CrystalHelmet.gif");
+        tempMap.put("armor_special_1", "ContributorOnly-Equip-CrystalArmor.gif");
+        tempMap.put("weapon_special_critical", "weapon_special_critical.gif");
+        tempMap.put("Pet-Wolf-Cerberus", "Pet-Wolf-Cerberus.gif");
+        FILENAME_MAP = Collections.unmodifiableMap(tempMap);
+    }
+
+    private boolean showBackground = true;
+    private boolean showMount = true;
+    private boolean showPet = true;
+    private boolean showSleeping = true;
+    private boolean hasBackground;
+    private boolean hasMount;
+    private boolean hasPet;
+    private boolean isOrphan;
+    private MultiDraweeHolder<GenericDraweeHierarchy> multiDraweeHolder = new MultiDraweeHolder<>();
+    private HabitRPGUser user;
+    private RectF avatarRectF;
+    private Matrix matrix = new Matrix();
+    private AtomicInteger numberLayersInProcess = new AtomicInteger(0);
+    private Consumer<Bitmap> avatarImageConsumer;
+    private Bitmap avatarBitmap;
+    private Canvas avatarCanvas;
+    private Map<LayerType, String> currentLayers;
+
+    public AvatarView(Context context) {
+        super(context);
+        init(null, 0);
+    }
+
+    public AvatarView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs, 0);
+    }
+
+    public AvatarView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(attrs, defStyle);
+    }
+
+    public AvatarView(Context context, boolean showBackground, boolean showMount, boolean showPet) {
+        super(context);
+
+        this.showBackground = showBackground;
+        this.showMount = showMount;
+        this.showPet = showPet;
+        isOrphan = true;
+    }
+
+    public void configureView(boolean showBackground, boolean showMount, boolean showPet) {
+        this.showBackground = showBackground;
+        this.showMount = showMount;
+        this.showPet = showPet;
+    }
+
+    private void init(AttributeSet attrs, int defStyle) {
+        // Load attributes
+        final TypedArray a = getContext().obtainStyledAttributes(
+                attrs, R.styleable.AvatarView, defStyle, 0);
+
+        try {
+            showBackground = a.getBoolean(R.styleable.AvatarView_showBackground, true);
+            showMount = a.getBoolean(R.styleable.AvatarView_showMount, true);
+            showPet = a.getBoolean(R.styleable.AvatarView_showPet, true);
+            showSleeping = a.getBoolean(R.styleable.AvatarView_showSleeping, true);
+        } finally {
+            a.recycle();
+        }
+    }
+
+    private void showLayers(@NonNull Map<LayerType, String> layerMap) {
+        if (multiDraweeHolder.size() > 0) return;
+        int i = 0;
+
+        currentLayers = layerMap;
+
+        numberLayersInProcess.set(layerMap.size());
+
+        for (Map.Entry<LayerType, String> entry : layerMap.entrySet()) {
+            final LayerType layerKey = entry.getKey();
+            final String layerName = entry.getValue();
+            final int layerNumber = i++;
+
+            GenericDraweeHierarchy hierarchy = new GenericDraweeHierarchyBuilder(getResources())
+                    .setFadeDuration(0)
+                    .build();
+
+            DraweeHolder<GenericDraweeHierarchy> draweeHolder = DraweeHolder.create(hierarchy, getContext());
+            draweeHolder.getTopLevelDrawable().setCallback(this);
+            multiDraweeHolder.add(draweeHolder);
+
+            DraweeController controller = Fresco.newDraweeControllerBuilder()
+                    .setUri(IMAGE_URI_ROOT + getFileName(layerName))
+                    .setControllerListener(new BaseControllerListener<ImageInfo>() {
+                        @Override
+                        public void onFinalImageSet(
+                                String id,
+                                ImageInfo imageInfo,
+                                Animatable anim) {
+                            if (imageInfo != null) {
+                                if (multiDraweeHolder.size() > layerNumber) {
+                                    multiDraweeHolder.get(layerNumber).getTopLevelDrawable().setBounds(getLayerBounds(layerKey, layerName, imageInfo));
+                                }
+                                onLayerComplete();
+                            }
+                        }
+
+                        @Override
+                        public void onFailure(String id, Throwable throwable) {
+                            Log.e(TAG, "Error loading layer: " + layerName, throwable);
+                            onLayerComplete();
+                        }
+                    })
+                    .setAutoPlayAnimations(!isOrphan)
+                    .build();
+            draweeHolder.setController(controller);
+        }
+
+        if (isOrphan) multiDraweeHolder.onAttach();
+    }
+
+    private Map<LayerType, String> getLayerMap() {
+        assert user != null;
+        return getLayerMap(user, true);
+    }
+
+    private Map<LayerType, String> getLayerMap(@NonNull HabitRPGUser user, boolean resetHasAttributes) {
+        EnumMap<LayerType, String> layerMap = user.getAvatarLayerMap();
+
+        if (resetHasAttributes) hasBackground = hasMount = hasPet = false;
+
+        String mountName = user.getItems().getCurrentMount();
+        if (showMount && !TextUtils.isEmpty(mountName)) {
+            layerMap.put(LayerType.MOUNT_BODY, "Mount_Body_" + mountName);
+            layerMap.put(LayerType.MOUNT_HEAD, "Mount_Head_" + mountName);
+            if (resetHasAttributes) hasMount = true;
+        }
+
+        String petName = user.getItems().getCurrentPet();
+        if (showPet && !TextUtils.isEmpty(petName)) {
+            layerMap.put(LayerType.PET, "Pet-" + petName);
+            if (resetHasAttributes) hasPet = true;
+        }
+
+        String backgroundName = user.getPreferences().getBackground();
+        if (showBackground && !TextUtils.isEmpty(backgroundName)) {
+            layerMap.put(LayerType.BACKGROUND, "background_" + backgroundName);
+            if (resetHasAttributes) hasBackground = true;
+        }
+
+        if (showSleeping && user.getPreferences().getSleep()) {
+            layerMap.put(AvatarView.LayerType.ZZZ, "zzz");
+        }
+
+        return layerMap;
+    }
+
+    private Rect getLayerBounds(@NonNull LayerType layerType, @NonNull String layerName, @NonNull ImageInfo layerImageInfo) {
+        PointF offset = null;
+        Rect bounds = new Rect(0, 0, layerImageInfo.getWidth(), layerImageInfo.getHeight());
+        RectF boundsF = new RectF(bounds);
+
+        // lookup layer specific offset
+        switch (layerName) {
+            case "weapon_special_critical":
+                if (showMount || showPet) {
+                    // full hero box
+                    if (hasMount) {
+                        offset = new PointF(13.0f, 12.0f);
+                    } else if (hasPet) {
+                        offset = new PointF(13.0f, 24.5f + 12.0f);
+                    } else {
+                        offset = new PointF(13.0f, 28.0f + 12.0f);
+                    }
+                } else if (showBackground) {
+                    // compact hero box
+                    offset = new PointF(-12.0f, 18.0f + 12.0f);
+                } else {
+                    // hero only box
+                    offset = new PointF(-12.0f, 12.0f);
+                }
+                break;
+            default:
+                break;
+        }
+
+        // otherwise lookup default layer type based offset
+        if (offset == null) {
+            switch (layerType) {
+                case BACKGROUND:
+                    if (!(showMount || showPet)) {
+                        offset = new PointF(-25.0f, 0.0f); // compact hero box
+                    }
+                    break;
+                case MOUNT_BODY:
+                case MOUNT_HEAD:
+                    offset = new PointF(25.0f, 18.0f); // full hero box
+                    break;
+                case CHAIR:
+                case BACK:
+                case SKIN:
+                case SHIRT:
+                case ARMOR:
+                case BODY:
+                case HEAD_0:
+                case HAIR_BASE:
+                case HAIR_BANGS:
+                case HAIR_MUSTACHE:
+                case HAIR_BEARD:
+                case EYEWEAR:
+                case VISUAL_BUFF:
+                case HEAD:
+                case HEAD_ACCESSORY:
+                case HAIR_FLOWER:
+                case SHIELD:
+                case WEAPON:
+                case ZZZ:
+                    if (showMount || showPet) {
+                        // full hero box
+                        if (hasMount) {
+                            offset = new PointF(25.0f, 0);
+                        } else if (hasPet) {
+                            offset = new PointF(25.0f, 24.5f);
+                        } else {
+                            offset = new PointF(25.0f, 28.0f);
+                        }
+                    } else if (showBackground) {
+                        // compact hero box
+                        offset = new PointF(0.0f, 18.0f);
+                    }
+                    break;
+                case PET:
+                    offset = new PointF(0, FULL_HERO_RECT.height() - layerImageInfo.getHeight());
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        if (offset != null) {
+            Matrix translateMatrix = new Matrix();
+            translateMatrix.setTranslate(offset.x, offset.y);
+            translateMatrix.mapRect(boundsF);
+        }
+
+        // resize bounds to fit and keep original aspect ratio
+        matrix.mapRect(boundsF);
+        boundsF.round(bounds);
+
+        return bounds;
+    }
+
+    private String getFileName(@NonNull String imageName) {
+        if (FILENAME_MAP.containsKey(imageName)) {
+            return FILENAME_MAP.get(imageName);
+        }
+
+        return imageName + ".png";
+    }
+
+    private void onLayerComplete() {
+        if (numberLayersInProcess.decrementAndGet() == 0) {
+            if (avatarImageConsumer != null) {
+                avatarImageConsumer.accept(getAvatarImage());
+            }
+        }
+    }
+
+    public void onAvatarImageReady(@NonNull Consumer<Bitmap> consumer) {
+        avatarImageConsumer = consumer;
+        if (multiDraweeHolder.size() > 0 && numberLayersInProcess.get() == 0) {
+            avatarImageConsumer.accept(getAvatarImage());
+        } else {
+            initAvatarRectMatrix();
+            showLayers(getLayerMap());
+        }
+    }
+
+    public void setUser(@NonNull HabitRPGUser user) {
+        HabitRPGUser oldUser = this.user;
+        this.user = user;
+
+        if (oldUser != null) {
+            Map<LayerType, String> newLayerMap = getLayerMap(user, false);
+
+            boolean equals = currentLayers != null && currentLayers.equals(newLayerMap);
+
+            if (!equals) {
+                multiDraweeHolder.clear();
+                numberLayersInProcess.set(0);
+            }
+        }
+        invalidate();
+    }
+
+    private Rect getOriginalRect() {
+        return (showMount || showPet) ? FULL_HERO_RECT : ((showBackground) ? COMPACT_HERO_RECT : HERO_ONLY_RECT);
+    }
+
+    private Bitmap getAvatarImage() {
+        assert user != null;
+        assert avatarRectF != null;
+        Rect canvasRect = new Rect();
+        avatarRectF.round(canvasRect);
+        avatarBitmap = Bitmap.createBitmap(canvasRect.width(), canvasRect.height(), Bitmap.Config.ARGB_8888);
+        avatarCanvas = new Canvas(avatarBitmap);
+        draw(avatarCanvas);
+
+        return avatarBitmap;
+    }
+
+    private void initAvatarRectMatrix() {
+        if (avatarRectF == null) {
+            Rect srcRect = getOriginalRect();
+
+            if (isOrphan) {
+                avatarRectF = new RectF(srcRect);
+
+                // change scale to not be 1:1
+                // a quick fix as fresco AnimatedDrawable/ScaleTypeDrawable
+                // will not translate matrix properly
+                matrix.setScale(1.2f, 1.2f);
+                matrix.mapRect(avatarRectF);
+            } else {
+                // full hero box when showMount and showPet is enabled (140w * 147h)
+                // compact hero box when only showBackground is enabled (114w * 114h)
+                // hero only box when all show settings disabled (90w * 90h)
+                avatarRectF = new RectF(0, 0, getWidth(), getHeight());
+                matrix.setRectToRect(new RectF(srcRect), avatarRectF, Matrix.ScaleToFit.START); // TODO support other ScaleToFit
+                avatarRectF = new RectF(srcRect);
+                matrix.mapRect(avatarRectF);
+            }
+        }
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+
+        initAvatarRectMatrix();
+
+        // draw only when user is set
+        if (user == null) return;
+
+        // request image layers if not yet processed
+        if (multiDraweeHolder.size() == 0) {
+            showLayers(getLayerMap());
+        }
+
+        // manually call onAttach/onDetach if view is without parent as they will never be called otherwise
+        if (isOrphan) multiDraweeHolder.onAttach();
+        multiDraweeHolder.draw(canvas);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        multiDraweeHolder.onDetach();
+    }
+
+    @Override
+    public void onStartTemporaryDetach() {
+        super.onStartTemporaryDetach();
+        multiDraweeHolder.onDetach();
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        multiDraweeHolder.onAttach();
+    }
+
+    @Override
+    public void onFinishTemporaryDetach() {
+        super.onFinishTemporaryDetach();
+        multiDraweeHolder.onAttach();
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return multiDraweeHolder.onTouchEvent(event) || super.onTouchEvent(event);
+    }
+
+    @Override
+    public boolean performClick() {
+        return super.performClick();
+    }
+
+    @Override
+    protected boolean verifyDrawable(Drawable who) {
+        return multiDraweeHolder.verifyDrawable(who) || super.verifyDrawable(who);
+    }
+
+    @Override
+    public void invalidateDrawable(@NonNull Drawable drawable) {
+        invalidate();
+        if (avatarCanvas != null) draw(avatarCanvas);
+    }
+
+    public enum LayerType {
+        BACKGROUND(0),
+        MOUNT_BODY(1),
+        CHAIR(2),
+        BACK(3),
+        SKIN(4),
+        SHIRT(5),
+        ARMOR(6),
+        BODY(7),
+        HEAD_0(8),
+        HAIR_BASE(9),
+        HAIR_BANGS(10),
+        HAIR_MUSTACHE(11),
+        HAIR_BEARD(12),
+        EYEWEAR(13),
+        VISUAL_BUFF(14),
+        HEAD(15),
+        HEAD_ACCESSORY(16),
+        HAIR_FLOWER(17),
+        SHIELD(18),
+        WEAPON(19),
+        MOUNT_HEAD(20),
+        ZZZ(21),
+        PET(22);
+
+        final int order;
+
+        LayerType(int order) {
+            this.order = order;
+        }
+    }
+
+    public interface Consumer<T> {
+        void accept(T t);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index 7d15c9ef5..d8b4f4b9c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -1,217 +1,217 @@
-package com.habitrpg.android.habitica.ui;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.databinding.ValueBarBinding;
-import com.habitrpg.android.habitica.events.BoughtGemsEvent;
-import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
-import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
-import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Stats;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.res.ResourcesCompat;
-import android.util.Log;
-import android.view.View;
-import android.widget.TextView;
-
-import java.util.Locale;
-
-/**
- * Created by Negue on 14.06.2015.
- */
-public class AvatarWithBarsViewModel implements View.OnClickListener {
-    private ValueBarBinding hpBar;
-    private ValueBarBinding xpBar;
-    private ValueBarBinding mpBar;
-
-    private AvatarView avatarView;
-
-    private android.content.res.Resources res;
-
-    private Context context;
-
-    private TextView lvlText, goldText, silverText, gemsText;
-    private HabitRPGUser userObject;
-
-    private int cachedMaxHealth, cachedMaxExp, cachedMaxMana;
-
-    public AvatarWithBarsViewModel(Context context, View v) {
-        this.context = context;
-
-        res = context.getResources();
-
-        if (v == null) {
-            Log.w("AvatarWithBarsViewModel", "View is null");
-            return;
-        }
-
-        lvlText = (TextView) v.findViewById(R.id.lvl_tv);
-        goldText = (TextView) v.findViewById(R.id.gold_tv);
-        silverText = (TextView) v.findViewById(R.id.silver_tv);
-        gemsText = (TextView) v.findViewById(R.id.gems_tv);
-        View hpBarView = v.findViewById(R.id.hpBar);
-
-        avatarView = (AvatarView) v.findViewById(R.id.avatarView);
-        hpBar = DataBindingUtil.bind(hpBarView);
-        xpBar = DataBindingUtil.bind(v.findViewById(R.id.xpBar));
-        mpBar = DataBindingUtil.bind(v.findViewById(R.id.mpBar));
-
-        setHpBarData(0, 50);
-        setXpBarData(0, 1);
-        setMpBarData(0, 1);
-
-        gemsText.setClickable(true);
-        gemsText.setOnClickListener(this);
-
-        avatarView.setClickable(true);
-        avatarView.setOnClickListener(this);
-    }
-
-    public static void setHpBarData(ValueBarBinding valueBar, Stats stats, Context ctx) {
-        Integer maxHP = stats.getMaxHealth();
-        if (maxHP == null || maxHP == 0) {
-            maxHP = 50;
-        }
-
-        setValueBar(valueBar, (float) Math.ceil(stats.getHp().floatValue()), maxHP, ctx.getString(R.string.HP_default), ContextCompat.getColor(ctx, R.color.hpColor), R.drawable.ic_header_heart);
-    }
-
-    // Layout_Weight don't accepts 0.7/0.3 to have 70% filled instead it shows the 30% , so I had to switch the values
-    // but on a 1.0/0.0 which switches to 0.0/1.0 it shows the blank part full size...
-    private static void setValueBar(ValueBarBinding valueBar, float value, float valueMax, String description, int color, int icon) {
-        double percent = Math.min(1, value / valueMax);
-
-        valueBar.setWeightToShow((float) percent);
-        valueBar.setText((int) value + "/" + (int) valueMax);
-        valueBar.setDescription(description);
-        valueBar.setBarForegroundColor(color);
-        valueBar.icHeader.setImageResource(icon);
-    }
-
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-    public void updateData(HabitRPGUser user) {
-        userObject = user;
-
-        Stats stats = user.getStats();
-
-        String userClass = "";
-        int gp = (stats.getGp().intValue());
-        int sp = (int) ((stats.getGp() - gp) * 100);
-
-        avatarView.setUser(user);
-
-        if (stats.get_class() != null) {
-            userClass = stats.getTranslatedClassName(context);
-        }
-
-        mpBar.valueBarLayout.setVisibility((stats.get_class() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
-
-        if (user.getPreferences() != null && user.getFlags() != null && (user.getPreferences().getDisableClasses() || !user.getFlags().getClassSelected())) {
-            lvlText.setText(context.getString(R.string.user_level, user.getStats().getLvl()));
-            lvlText.setCompoundDrawables(null, null, null, null);
-        } else {
-            lvlText.setText(context.getString(R.string.user_level_with_class, user.getStats().getLvl(), userClass.substring(0, 1).toUpperCase(Locale.getDefault()) + userClass.substring(1)));
-            Drawable drawable;
-            switch (stats.get_class()) {
-                case warrior:
-                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_warrior, null);
-                    break;
-                case rogue:
-                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_rogue, null);
-                    break;
-                case wizard:
-                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_mage, null);
-                    break;
-                case healer:
-                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_healer, null);
-                    break;
-                case base:
-                default:
-                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_warrior, null);
-
-            }
-            if (drawable != null) {
-                drawable.setBounds(0, 0, drawable.getMinimumWidth(),
-                        drawable.getMinimumHeight());
-            }
-            lvlText.setCompoundDrawables(drawable, null, null, null);
-        }
-
-        setHpBarData(stats.getHp().floatValue(), stats.getMaxHealth());
-        setXpBarData(stats.getExp().floatValue(), stats.getToNextLevel());
-        setMpBarData(stats.getMp().floatValue(), stats.getMaxMP());
-
-        goldText.setText(String.valueOf(gp));
-        silverText.setText(String.valueOf(sp));
-
-        Double gems = user.getBalance() * 4;
-        gemsText.setText(String.valueOf(gems.intValue()));
-    }
-
-    public void setHpBarData(float value, int valueMax) {
-        if (valueMax == 0) {
-            valueMax = cachedMaxHealth;
-        } else {
-            cachedMaxHealth = valueMax;
-        }
-        setValueBar(hpBar, (float) Math.ceil(value), valueMax, context.getString(R.string.HP_default), ContextCompat.getColor(context, R.color.hpColor), R.drawable.ic_header_heart);
-    }
-
-    public void setXpBarData(float value, int valueMax) {
-        if (valueMax == 0) {
-            valueMax = cachedMaxExp;
-        } else {
-            cachedMaxExp = valueMax;
-        }
-        setValueBar(xpBar, (float) Math.floor(value), valueMax, context.getString(R.string.XP_default), ContextCompat.getColor(context, R.color.xpColor), R.drawable.ic_header_exp);
-    }
-
-    public void setMpBarData(float value, int valueMax) {
-        if (valueMax == 0) {
-            valueMax = cachedMaxMana;
-        } else {
-            cachedMaxMana = valueMax;
-        }
-        setValueBar(mpBar, (float) Math.floor(value), valueMax, context.getString(R.string.MP_default), ContextCompat.getColor(context, R.color.mpColor), R.drawable.ic_header_magic);
-    }
-
-    @Subscribe
-    public void onEvent(BoughtGemsEvent gemsEvent) {
-        Double gems = userObject.getBalance() * 4;
-        gems += gemsEvent.NewGemsToAdd;
-        gemsText.setText(String.valueOf(gems.intValue()));
-    }
-
-    @Override
-    public void onClick(View view) {
-        if (view == gemsText) {
-            // Gems Clicked
-
-            EventBus.getDefault().post(new OpenGemPurchaseFragmentCommand());
-        } else {
-            // Avatar overview
-            OpenMenuItemCommand event = new OpenMenuItemCommand();
-            event.identifier = MainDrawerBuilder.SIDEBAR_AVATAR;
-            EventBus.getDefault().post(event);
-        }
-    }
-
-    public void hideGems() {
-        gemsText.setVisibility(View.GONE);
-    }
-
-    public void valueBarLabelsToBlack() {
-        hpBar.setPartyMembers(true);
-        mpBar.setPartyMembers(true);
-        xpBar.setPartyMembers(true);
-    }
-}
+package com.habitrpg.android.habitica.ui;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.content.res.ResourcesCompat;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.databinding.ValueBarBinding;
+import com.habitrpg.android.habitica.events.BoughtGemsEvent;
+import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
+import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.Locale;
+
+/**
+ * Created by Negue on 14.06.2015.
+ */
+public class AvatarWithBarsViewModel implements View.OnClickListener {
+    private ValueBarBinding hpBar;
+    private ValueBarBinding xpBar;
+    private ValueBarBinding mpBar;
+
+    private AvatarView avatarView;
+
+    private android.content.res.Resources res;
+
+    private Context context;
+
+    private TextView lvlText, goldText, silverText, gemsText;
+    private HabitRPGUser userObject;
+
+    private int cachedMaxHealth, cachedMaxExp, cachedMaxMana;
+
+    public AvatarWithBarsViewModel(Context context, View v) {
+        this.context = context;
+
+        res = context.getResources();
+
+        if (v == null) {
+            Log.w("AvatarWithBarsViewModel", "View is null");
+            return;
+        }
+
+        lvlText = (TextView) v.findViewById(R.id.lvl_tv);
+        goldText = (TextView) v.findViewById(R.id.gold_tv);
+        silverText = (TextView) v.findViewById(R.id.silver_tv);
+        gemsText = (TextView) v.findViewById(R.id.gems_tv);
+        View hpBarView = v.findViewById(R.id.hpBar);
+
+        avatarView = (AvatarView) v.findViewById(R.id.avatarView);
+        hpBar = DataBindingUtil.bind(hpBarView);
+        xpBar = DataBindingUtil.bind(v.findViewById(R.id.xpBar));
+        mpBar = DataBindingUtil.bind(v.findViewById(R.id.mpBar));
+
+        setHpBarData(0, 50);
+        setXpBarData(0, 1);
+        setMpBarData(0, 1);
+
+        gemsText.setClickable(true);
+        gemsText.setOnClickListener(this);
+
+        avatarView.setClickable(true);
+        avatarView.setOnClickListener(this);
+    }
+
+    public static void setHpBarData(ValueBarBinding valueBar, Stats stats, Context ctx) {
+        Integer maxHP = stats.getMaxHealth();
+        if (maxHP == null || maxHP == 0) {
+            maxHP = 50;
+        }
+
+        setValueBar(valueBar, (float) Math.ceil(stats.getHp().floatValue()), maxHP, ctx.getString(R.string.HP_default), ContextCompat.getColor(ctx, R.color.hpColor), R.drawable.ic_header_heart);
+    }
+
+    // Layout_Weight don't accepts 0.7/0.3 to have 70% filled instead it shows the 30% , so I had to switch the values
+    // but on a 1.0/0.0 which switches to 0.0/1.0 it shows the blank part full size...
+    private static void setValueBar(ValueBarBinding valueBar, float value, float valueMax, String description, int color, int icon) {
+        double percent = Math.min(1, value / valueMax);
+
+        valueBar.setWeightToShow((float) percent);
+        valueBar.setText((int) value + "/" + (int) valueMax);
+        valueBar.setDescription(description);
+        valueBar.setBarForegroundColor(color);
+        valueBar.icHeader.setImageResource(icon);
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    public void updateData(HabitRPGUser user) {
+        userObject = user;
+
+        Stats stats = user.getStats();
+
+        String userClass = "";
+        int gp = (stats.getGp().intValue());
+        int sp = (int) ((stats.getGp() - gp) * 100);
+
+        avatarView.setUser(user);
+
+        if (stats.get_class() != null) {
+            userClass = stats.getTranslatedClassName(context);
+        }
+
+        mpBar.valueBarLayout.setVisibility((stats.get_class() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
+
+        if (user.getPreferences() != null && user.getFlags() != null && (user.getPreferences().getDisableClasses() || !user.getFlags().getClassSelected())) {
+            lvlText.setText(context.getString(R.string.user_level, user.getStats().getLvl()));
+            lvlText.setCompoundDrawables(null, null, null, null);
+        } else {
+            lvlText.setText(context.getString(R.string.user_level_with_class, user.getStats().getLvl(), userClass.substring(0, 1).toUpperCase(Locale.getDefault()) + userClass.substring(1)));
+            Drawable drawable;
+            switch (stats.get_class()) {
+                case warrior:
+                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_warrior, null);
+                    break;
+                case rogue:
+                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_rogue, null);
+                    break;
+                case wizard:
+                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_mage, null);
+                    break;
+                case healer:
+                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_healer, null);
+                    break;
+                case base:
+                default:
+                    drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_warrior, null);
+
+            }
+            if (drawable != null) {
+                drawable.setBounds(0, 0, drawable.getMinimumWidth(),
+                        drawable.getMinimumHeight());
+            }
+            lvlText.setCompoundDrawables(drawable, null, null, null);
+        }
+
+        setHpBarData(stats.getHp().floatValue(), stats.getMaxHealth());
+        setXpBarData(stats.getExp().floatValue(), stats.getToNextLevel());
+        setMpBarData(stats.getMp().floatValue(), stats.getMaxMP());
+
+        goldText.setText(String.valueOf(gp));
+        silverText.setText(String.valueOf(sp));
+
+        Double gems = user.getBalance() * 4;
+        gemsText.setText(String.valueOf(gems.intValue()));
+    }
+
+    public void setHpBarData(float value, int valueMax) {
+        if (valueMax == 0) {
+            valueMax = cachedMaxHealth;
+        } else {
+            cachedMaxHealth = valueMax;
+        }
+        setValueBar(hpBar, (float) Math.ceil(value), valueMax, context.getString(R.string.HP_default), ContextCompat.getColor(context, R.color.hpColor), R.drawable.ic_header_heart);
+    }
+
+    public void setXpBarData(float value, int valueMax) {
+        if (valueMax == 0) {
+            valueMax = cachedMaxExp;
+        } else {
+            cachedMaxExp = valueMax;
+        }
+        setValueBar(xpBar, (float) Math.floor(value), valueMax, context.getString(R.string.XP_default), ContextCompat.getColor(context, R.color.xpColor), R.drawable.ic_header_exp);
+    }
+
+    public void setMpBarData(float value, int valueMax) {
+        if (valueMax == 0) {
+            valueMax = cachedMaxMana;
+        } else {
+            cachedMaxMana = valueMax;
+        }
+        setValueBar(mpBar, (float) Math.floor(value), valueMax, context.getString(R.string.MP_default), ContextCompat.getColor(context, R.color.mpColor), R.drawable.ic_header_magic);
+    }
+
+    @Subscribe
+    public void onEvent(BoughtGemsEvent gemsEvent) {
+        Double gems = userObject.getBalance() * 4;
+        gems += gemsEvent.NewGemsToAdd;
+        gemsText.setText(String.valueOf(gems.intValue()));
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == gemsText) {
+            // Gems Clicked
+
+            EventBus.getDefault().post(new OpenGemPurchaseFragmentCommand());
+        } else {
+            // Avatar overview
+            OpenMenuItemCommand event = new OpenMenuItemCommand();
+            event.identifier = MainDrawerBuilder.SIDEBAR_AVATAR;
+            EventBus.getDefault().post(event);
+        }
+    }
+
+    public void hideGems() {
+        gemsText.setVisibility(View.GONE);
+    }
+
+    public void valueBarLabelsToBlack() {
+        hpBar.setPartyMembers(true);
+        mpBar.setPartyMembers(true);
+        xpBar.setPartyMembers(true);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.java
index 8f58b4f6c..6f670ad43 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/GemPurchaseOptionsView.java
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.ui;
 
-import com.habitrpg.android.habitica.R;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
@@ -13,6 +11,8 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java
index b2bfcdffc..03c90d023 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java
@@ -1,9 +1,5 @@
 package com.habitrpg.android.habitica.ui;
 
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
@@ -14,6 +10,10 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+
 public class ItemDetailDialog extends AlertDialog {
 
     private final SimpleDraweeView itemImageView;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.java
index 1d8f925a0..ccad736e4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MaxHeightLinearLayout.java
@@ -1,9 +1,6 @@
 package com.habitrpg.android.habitica.ui;
 
 
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.R;
-
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -13,6 +10,9 @@ import android.util.DisplayMetrics;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.R;
+
 public class MaxHeightLinearLayout extends LinearLayout {
 
     private final float defaultHeight = 0.9f;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java
index f4e8c8ab3..9466ded29 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SpeechBubbleView.java
@@ -1,21 +1,19 @@
 package com.habitrpg.android.habitica.ui;
 
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.views.Typewriter;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.ui.views.Typewriter;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.java
index 8c1fc3520..8df223858 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/TutorialView.java
@@ -1,108 +1,108 @@
-package com.habitrpg.android.habitica.ui;
-
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.TutorialStep;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-public class TutorialView extends FrameLayout {
-
-    public TutorialStep step;
-    @Nullable
-    public OnTutorialReaction onReaction;
-    @BindView(R.id.speech_bubble)
-    SpeechBubbleView speechBubbleView;
-    @BindView(R.id.background)
-    RelativeLayout background;
-    @BindView(R.id.dismissButton)
-    Button dismissButton;
-    @BindView(R.id.completeButton)
-    Button completeButton;
-
-    private List<String> tutorialTexts;
-    private int currentTextIndex;
-
-    public TutorialView(Context context, TutorialStep step, @Nullable OnTutorialReaction onReaction) {
-        super(context);
-        LayoutInflater mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        mInflater.inflate(R.layout.overlay_tutorial, this, true);
-        ButterKnife.bind(this);
-        speechBubbleView.setConfirmationButtonVisibility(View.GONE);
-        speechBubbleView.setShowNextListener(this::displayNextTutorialText);
-        this.step = step;
-        this.onReaction = onReaction;
-    }
-
-    public void setTutorialText(String text) {
-        this.speechBubbleView.animateText(text);
-        speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE);
-    }
-
-    public void setTutorialTexts(List<String> texts) {
-        tutorialTexts = texts;
-        currentTextIndex = -1;
-        displayNextTutorialText();
-    }
-
-    public void setCanBeDeferred(boolean canBeDeferred) {
-        dismissButton.setVisibility(canBeDeferred ? View.VISIBLE : View.GONE);
-    }
-
-    private void displayNextTutorialText() {
-        currentTextIndex++;
-        if (currentTextIndex < tutorialTexts.size()) {
-            speechBubbleView.animateText(tutorialTexts.get(currentTextIndex));
-            if (isDisplayingLastStep()) {
-                speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE);
-                speechBubbleView.setHasMoreContent(false);
-            } else {
-                speechBubbleView.setHasMoreContent(true);
-            }
-        } else {
-            if (this.onReaction != null) {
-                this.onReaction.onTutorialCompleted(this.step);
-            }
-        }
-    }
-
-    @OnClick(R.id.completeButton)
-    public void completeButtonClicked() {
-        if (this.onReaction != null) {
-            this.onReaction.onTutorialCompleted(this.step);
-        }
-    }
-
-    @OnClick(R.id.dismissButton)
-    public void dismissButtonClicked() {
-        if (this.onReaction != null) {
-            this.onReaction.onTutorialDeferred(this.step);
-        }
-    }
-
-    @OnClick(R.id.background)
-    public void backgroundClicked() {
-        speechBubbleView.onClick(speechBubbleView);
-    }
-
-    private boolean isDisplayingLastStep() {
-        return currentTextIndex == (tutorialTexts.size()-1);
-    }
-
-    public interface OnTutorialReaction {
-        void onTutorialCompleted(TutorialStep step);
-
-        void onTutorialDeferred(TutorialStep step);
-    }
-}
+package com.habitrpg.android.habitica.ui;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.RelativeLayout;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class TutorialView extends FrameLayout {
+
+    public TutorialStep step;
+    @Nullable
+    public OnTutorialReaction onReaction;
+    @BindView(R.id.speech_bubble)
+    SpeechBubbleView speechBubbleView;
+    @BindView(R.id.background)
+    RelativeLayout background;
+    @BindView(R.id.dismissButton)
+    Button dismissButton;
+    @BindView(R.id.completeButton)
+    Button completeButton;
+
+    private List<String> tutorialTexts;
+    private int currentTextIndex;
+
+    public TutorialView(Context context, TutorialStep step, @Nullable OnTutorialReaction onReaction) {
+        super(context);
+        LayoutInflater mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mInflater.inflate(R.layout.overlay_tutorial, this, true);
+        ButterKnife.bind(this);
+        speechBubbleView.setConfirmationButtonVisibility(View.GONE);
+        speechBubbleView.setShowNextListener(this::displayNextTutorialText);
+        this.step = step;
+        this.onReaction = onReaction;
+    }
+
+    public void setTutorialText(String text) {
+        this.speechBubbleView.animateText(text);
+        speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE);
+    }
+
+    public void setTutorialTexts(List<String> texts) {
+        tutorialTexts = texts;
+        currentTextIndex = -1;
+        displayNextTutorialText();
+    }
+
+    public void setCanBeDeferred(boolean canBeDeferred) {
+        dismissButton.setVisibility(canBeDeferred ? View.VISIBLE : View.GONE);
+    }
+
+    private void displayNextTutorialText() {
+        currentTextIndex++;
+        if (currentTextIndex < tutorialTexts.size()) {
+            speechBubbleView.animateText(tutorialTexts.get(currentTextIndex));
+            if (isDisplayingLastStep()) {
+                speechBubbleView.setConfirmationButtonVisibility(View.VISIBLE);
+                speechBubbleView.setHasMoreContent(false);
+            } else {
+                speechBubbleView.setHasMoreContent(true);
+            }
+        } else {
+            if (this.onReaction != null) {
+                this.onReaction.onTutorialCompleted(this.step);
+            }
+        }
+    }
+
+    @OnClick(R.id.completeButton)
+    public void completeButtonClicked() {
+        if (this.onReaction != null) {
+            this.onReaction.onTutorialCompleted(this.step);
+        }
+    }
+
+    @OnClick(R.id.dismissButton)
+    public void dismissButtonClicked() {
+        if (this.onReaction != null) {
+            this.onReaction.onTutorialDeferred(this.step);
+        }
+    }
+
+    @OnClick(R.id.background)
+    public void backgroundClicked() {
+        speechBubbleView.onClick(speechBubbleView);
+    }
+
+    private boolean isDisplayingLastStep() {
+        return currentTextIndex == (tutorialTexts.size()-1);
+    }
+
+    public interface OnTutorialReaction {
+        void onTutorialCompleted(TutorialStep step);
+
+        void onTutorialDeferred(TutorialStep step);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/WrapContentRecyclerViewLayoutManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/WrapContentRecyclerViewLayoutManager.java
index 58129be99..4913508aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/WrapContentRecyclerViewLayoutManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/WrapContentRecyclerViewLayoutManager.java
@@ -1,12 +1,12 @@
 package com.habitrpg.android.habitica.ui;
 
-import com.habitrpg.android.habitica.BuildConfig;
-
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 
+import com.habitrpg.android.habitica.BuildConfig;
+
 /**
  * http://stackoverflow.com/a/29945693/1315039
  */
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.java
index 0fa122de6..cc2601417 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.java
@@ -1,11 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.fragments.AboutFragment;
-import com.mikepenz.aboutlibraries.Libs;
-import com.mikepenz.aboutlibraries.LibsBuilder;
-
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
@@ -15,6 +9,12 @@ import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
 import android.view.MenuItem;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.ui.fragments.AboutFragment;
+import com.mikepenz.aboutlibraries.Libs;
+import com.mikepenz.aboutlibraries.LibsBuilder;
+
 import butterknife.BindView;
 
 public class AboutActivity extends BaseActivity {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.java
index d8fe7a92a..7c2541dfd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.java
@@ -1,79 +1,79 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.widget.AddTaskWidgetProvider;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import android.appwidget.AppWidgetManager;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.preference.PreferenceManager;
-
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-public class AddTaskWidgetActivity extends AppCompatActivity {
-
-    private int widgetId;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setResult(RESULT_CANCELED);
-        setContentView(R.layout.widget_configure_add_task);
-        ButterKnife.bind(this);
-
-        Intent intent = getIntent();
-        Bundle extras = intent.getExtras();
-        if (extras != null) {
-            widgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
-        }
-
-        // If this activity was started with an intent without an app widget ID,
-        // finish with an error.
-        if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
-            finish();
-        }
-    }
-
-    @OnClick(R.id.add_habit_button)
-    public void addHabitSelected() {
-        finishWithSelection(Task.TYPE_HABIT);
-    }
-
-    @OnClick(R.id.add_daily_button)
-    public void addDailySelected() {
-        finishWithSelection(Task.TYPE_DAILY);
-    }
-
-    @OnClick(R.id.add_todo_button)
-    public void addToDoSelected() {
-        finishWithSelection(Task.TYPE_TODO);
-    }
-
-    @OnClick(R.id.add_reward_button)
-    public void addRewardSelected() {
-        finishWithSelection(Task.TYPE_REWARD);
-    }
-
-    private void finishWithSelection(String selectedTaskType) {
-        storeSelectedTaskType(selectedTaskType);
-
-        Intent resultValue = new Intent();
-        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
-        setResult(RESULT_OK, resultValue);
-        finish();
-
-        Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, this, AddTaskWidgetProvider.class);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{widgetId});
-        sendBroadcast(intent);
-    }
-
-    private void storeSelectedTaskType(String selectedTaskType) {
-        SharedPreferences.Editor preferences = PreferenceManager.getDefaultSharedPreferences(this).edit();
-        preferences.putString("add_task_widget_" + widgetId, selectedTaskType);
-        preferences.apply();
-    }
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.appwidget.AppWidgetManager;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.preference.PreferenceManager;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.widget.AddTaskWidgetProvider;
+
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class AddTaskWidgetActivity extends AppCompatActivity {
+
+    private int widgetId;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setResult(RESULT_CANCELED);
+        setContentView(R.layout.widget_configure_add_task);
+        ButterKnife.bind(this);
+
+        Intent intent = getIntent();
+        Bundle extras = intent.getExtras();
+        if (extras != null) {
+            widgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+        }
+
+        // If this activity was started with an intent without an app widget ID,
+        // finish with an error.
+        if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
+            finish();
+        }
+    }
+
+    @OnClick(R.id.add_habit_button)
+    public void addHabitSelected() {
+        finishWithSelection(Task.TYPE_HABIT);
+    }
+
+    @OnClick(R.id.add_daily_button)
+    public void addDailySelected() {
+        finishWithSelection(Task.TYPE_DAILY);
+    }
+
+    @OnClick(R.id.add_todo_button)
+    public void addToDoSelected() {
+        finishWithSelection(Task.TYPE_TODO);
+    }
+
+    @OnClick(R.id.add_reward_button)
+    public void addRewardSelected() {
+        finishWithSelection(Task.TYPE_REWARD);
+    }
+
+    private void finishWithSelection(String selectedTaskType) {
+        storeSelectedTaskType(selectedTaskType);
+
+        Intent resultValue = new Intent();
+        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
+        setResult(RESULT_OK, resultValue);
+        finish();
+
+        Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, this, AddTaskWidgetProvider.class);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{widgetId});
+        sendBroadcast(intent);
+    }
+
+    private void storeSelectedTaskType(String selectedTaskType) {
+        SharedPreferences.Editor preferences = PreferenceManager.getDefaultSharedPreferences(this).edit();
+        preferences.putString("add_task_widget_" + widgetId, selectedTaskType);
+        preferences.apply();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.java
index 6d8ab42e0..cc544111d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.java
@@ -1,9 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.components.AppComponent;
-
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
@@ -12,6 +8,10 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.components.AppComponent;
+
 import butterknife.ButterKnife;
 
 public abstract class BaseActivity extends AppCompatActivity {
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 edd5e833a..7dc5579da 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,413 +1,419 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-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.ChallengeDetailDialogHolder;
-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.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-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;
-import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
-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;
-
-import java.util.ArrayList;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-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";
-
-    @BindView(R.id.detail_tabs)
-    TabLayout detail_tabs;
-    @BindView(R.id.toolbar)
-    Toolbar toolbar;
-
-    @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;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_challenge_detail;
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.menu_challenge_details, menu);
-        return true;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setupToolbar(toolbar);
-
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setTitle(R.string.challenge_details);
-        }
-        detail_tabs.setVisibility(View.GONE);
-
-        Bundle extras = getIntent().getExtras();
-
-        String challengeId = extras.getString(CHALLENGE_ID);
-
-        ObservableList<Task> fullList = new ObservableArrayList<>();
-
-        if (challengeId != null) {
-
-            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<>();
-
-                        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:
-
-                                    dailies.add(entry.getValue());
-                                    break;
-                                case Task.TYPE_REWARD:
-
-                                    rewards.add(entry.getValue());
-                                    break;
-                            }
-                        }
-
-
-                        if (!habits.isEmpty()) {
-                            Task dividerTask = new Task();
-                            dividerTask.setId("divhabits");
-                            dividerTask.type = "divider";
-                            dividerTask.text = "Challenge Habits";
-
-                            resultList.add(dividerTask);
-                            resultList.addAll(habits);
-                        }
-
-
-                        if (!dailies.isEmpty()) {
-                            Task dividerTask = new Task();
-                            dividerTask.setId("divdailies");
-                            dividerTask.type = "divider";
-                            dividerTask.text = "Challenge 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";
-
-                            resultList.add(dividerTask);
-                            resultList.addAll(todos);
-                        }
-
-                        if (!rewards.isEmpty()) {
-                            Task dividerTask = new Task();
-                            dividerTask.setId("divrewards");
-                            dividerTask.type = "divider";
-                            dividerTask.text = "Challenge Rewards";
-
-                            resultList.add(dividerTask);
-                            resultList.addAll(rewards);
-                        }
-
-
-                        fullList.addAll(resultList);
-                    }, Throwable::printStackTrace);
-        }
-
-        ChallengeTasksRecyclerViewFragment fragment = ChallengeTasksRecyclerViewFragment.newInstance(HabiticaApplication.User, fullList);
-
-        if (getSupportFragmentManager().getFragments() == null) {
-            getSupportFragmentManager().beginTransaction().add(R.id.fragment_container, fragment).commitAllowingStateLoss();
-        } else {
-            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out);
-            transaction.replace(R.id.fragment_container, fragment).addToBackStack(null).commitAllowingStateLoss();
-        }
-
-        challenge = new Select().from(Challenge.class).where(Condition.column("id").is(challengeId)).querySingle();
-
-        ChallengeViewHolder challengeViewHolder = new ChallengeViewHolder(findViewById(R.id.challenge_header));
-        challengeViewHolder.bind(challenge);
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_leave:
-                showChallengeLeaveDialog();
-
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    private void showChallengeLeaveDialog(){
-        new AlertDialog.Builder(this)
-                .setTitle(this.getString(R.string.challenge_leave_title))
-                .setMessage(this.getString(R.string.challenge_leave_text, challenge.name))
-                .setPositiveButton(this.getString(R.string.yes), (dialog, which) -> {
-                    dialog.dismiss();
-
-                    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();
-    }
-
-    // refactor as an UseCase later - see ChallengeDetailDialogHolder
-    private void showRemoveTasksDialog(Action1<String> callback){
-        new AlertDialog.Builder(this)
-                .setTitle(this.getString(R.string.challenge_remove_tasks_title))
-                .setMessage(this.getString(R.string.challenge_remove_tasks_text))
-                .setPositiveButton(this.getString(R.string.remove_tasks), (dialog, which) -> {
-                    callback.call("remove-all");
-                    dialog.dismiss();
-                })
-                .setNegativeButton(this.getString(R.string.keep_tasks), (dialog, which) -> {
-                    callback.call("keep-all");
-                    dialog.dismiss();
-                }).show();
-    }
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        finish();
-        return true;
-    }
-
-    @Override
-    public void onBackPressed() {
-        finish();
-    }
-
-    class ChallengeViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.challenge_name)
-        EmojiTextView challengeName;
-
-        @BindView(R.id.challenge_description)
-        EmojiTextView challengeDescription;
-
-        @BindView(R.id.challenge_member_count)
-        TextView memberCountTextView;
-
-        @BindView(R.id.gem_prize_layout)
-        LinearLayout gem_prize_layout;
-
-        @BindView(R.id.gem_amount)
-        TextView gemPrizeTextView;
-
-        private Challenge challenge;
-
-        ChallengeViewHolder(View itemView) {
-            super(itemView);
-
-            ButterKnife.bind(this, itemView);
-        }
-
-        public void bind(Challenge challenge) {
-            this.challenge = challenge;
-
-            if (challengeName != null) {
-                challengeName.setText(EmojiParser.parseEmojis(challenge.name));
-            }
-            challengeDescription.setText(MarkdownParser.parseMarkdown(challenge.description));
-
-            memberCountTextView.setText(String.valueOf(challenge.memberCount));
-
-            if (challenge.prize == 0) {
-                gem_prize_layout.setVisibility(View.GONE);
-            } else {
-                gem_prize_layout.setVisibility(View.VISIBLE);
-                gemPrizeTextView.setText(String.valueOf(challenge.prize));
-            }
-        }
-
-        @OnClick(R.id.btn_show_more)
-        void onShowMore() {
-
-            ChallengeDetailDialogHolder.showDialog(ChallengeDetailActivity.this, ChallengeDetailActivity.this.apiClient,
-                    HabiticaApplication.User, challenge,
-                    challenge1 -> {
-
-                    },
-                    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 -> {});
-        }
-    }
-
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.app.AlertDialog;
+import android.databinding.ObservableArrayList;
+import android.databinding.ObservableList;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+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;
+
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.SocialRepository;
+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.models.LeaveChallengeBody;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeDetailDialogHolder;
+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 net.pherth.android.emoji_library.EmojiParser;
+import net.pherth.android.emoji_library.EmojiTextView;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+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";
+
+    @BindView(R.id.detail_tabs)
+    TabLayout detail_tabs;
+    @BindView(R.id.toolbar)
+    Toolbar toolbar;
+
+    @Inject
+    public ApiClient apiClient;
+    @Inject
+    SocialRepository socialRepository;
+
+    @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
+
+    @Nullable
+    private Challenge challenge;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_challenge_detail;
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu_challenge_details, menu);
+        return true;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setupToolbar(toolbar);
+
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setTitle(R.string.challenge_details);
+        }
+        detail_tabs.setVisibility(View.GONE);
+
+        Bundle extras = getIntent().getExtras();
+
+        String challengeId = extras.getString(CHALLENGE_ID);
+
+        ObservableList<Task> fullList = new ObservableArrayList<>();
+
+        if (challengeId != null) {
+
+            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<>();
+
+                        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:
+
+                                    dailies.add(entry.getValue());
+                                    break;
+                                case Task.TYPE_REWARD:
+
+                                    rewards.add(entry.getValue());
+                                    break;
+                            }
+                        }
+
+
+                        if (!habits.isEmpty()) {
+                            Task dividerTask = new Task();
+                            dividerTask.setId("divhabits");
+                            dividerTask.type = "divider";
+                            dividerTask.text = "Challenge Habits";
+
+                            resultList.add(dividerTask);
+                            resultList.addAll(habits);
+                        }
+
+
+                        if (!dailies.isEmpty()) {
+                            Task dividerTask = new Task();
+                            dividerTask.setId("divdailies");
+                            dividerTask.type = "divider";
+                            dividerTask.text = "Challenge 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";
+
+                            resultList.add(dividerTask);
+                            resultList.addAll(todos);
+                        }
+
+                        if (!rewards.isEmpty()) {
+                            Task dividerTask = new Task();
+                            dividerTask.setId("divrewards");
+                            dividerTask.type = "divider";
+                            dividerTask.text = "Challenge Rewards";
+
+                            resultList.add(dividerTask);
+                            resultList.addAll(rewards);
+                        }
+
+
+                        fullList.addAll(resultList);
+                    }, Throwable::printStackTrace);
+        }
+
+        ChallengeTasksRecyclerViewFragment fragment = ChallengeTasksRecyclerViewFragment.newInstance(HabiticaApplication.User, fullList);
+
+        if (getSupportFragmentManager().getFragments() == null) {
+            getSupportFragmentManager().beginTransaction().add(R.id.fragment_container, fragment).commitAllowingStateLoss();
+        } else {
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out);
+            transaction.replace(R.id.fragment_container, fragment).addToBackStack(null).commitAllowingStateLoss();
+        }
+
+        if (challengeId != null) {
+            socialRepository.getChallenge(challengeId).subscribe(challenge -> {
+                ChallengeDetailActivity.this.challenge = challenge;
+                ChallengeViewHolder challengeViewHolder = new ChallengeViewHolder(findViewById(R.id.challenge_header));
+                challengeViewHolder.bind(challenge);
+            });
+        }
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_leave:
+                showChallengeLeaveDialog();
+
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    private void showChallengeLeaveDialog(){
+        new AlertDialog.Builder(this)
+                .setTitle(this.getString(R.string.challenge_leave_title))
+                .setMessage(this.getString(R.string.challenge_leave_text, challenge != null ? challenge.name : ""))
+                .setPositiveButton(this.getString(R.string.yes), (dialog, which) -> {
+                    dialog.dismiss();
+
+                    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();
+    }
+
+    // refactor as an UseCase later - see ChallengeDetailDialogHolder
+    private void showRemoveTasksDialog(Action1<String> callback){
+        new AlertDialog.Builder(this)
+                .setTitle(this.getString(R.string.challenge_remove_tasks_title))
+                .setMessage(this.getString(R.string.challenge_remove_tasks_text))
+                .setPositiveButton(this.getString(R.string.remove_tasks), (dialog, which) -> {
+                    callback.call("remove-all");
+                    dialog.dismiss();
+                })
+                .setNegativeButton(this.getString(R.string.keep_tasks), (dialog, which) -> {
+                    callback.call("keep-all");
+                    dialog.dismiss();
+                }).show();
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        finish();
+        return true;
+    }
+
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
+
+    class ChallengeViewHolder extends RecyclerView.ViewHolder {
+        @BindView(R.id.challenge_name)
+        EmojiTextView challengeName;
+
+        @BindView(R.id.challenge_description)
+        EmojiTextView challengeDescription;
+
+        @BindView(R.id.challenge_member_count)
+        TextView memberCountTextView;
+
+        @BindView(R.id.gem_prize_layout)
+        LinearLayout gem_prize_layout;
+
+        @BindView(R.id.gem_amount)
+        TextView gemPrizeTextView;
+
+        private Challenge challenge;
+
+        ChallengeViewHolder(View itemView) {
+            super(itemView);
+
+            ButterKnife.bind(this, itemView);
+        }
+
+        public void bind(Challenge challenge) {
+            this.challenge = challenge;
+
+            if (challengeName != null) {
+                challengeName.setText(EmojiParser.parseEmojis(challenge.name));
+            }
+            challengeDescription.setText(MarkdownParser.parseMarkdown(challenge.description));
+
+            memberCountTextView.setText(String.valueOf(challenge.memberCount));
+
+            if (challenge.prize == 0) {
+                gem_prize_layout.setVisibility(View.GONE);
+            } else {
+                gem_prize_layout.setVisibility(View.VISIBLE);
+                gemPrizeTextView.setText(String.valueOf(challenge.prize));
+            }
+        }
+
+        @OnClick(R.id.btn_show_more)
+        void onShowMore() {
+
+            ChallengeDetailDialogHolder.showDialog(ChallengeDetailActivity.this, ChallengeDetailActivity.this.apiClient,
+                    HabiticaApplication.User, challenge,
+                    challenge1 -> {
+
+                    },
+                    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 37892fc97..487bf81f5 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,235 +1,235 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.AvatarView;
-import com.habitrpg.android.habitica.models.user.Gear;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Hair;
-import com.habitrpg.android.habitica.models.user.Items;
-import com.habitrpg.android.habitica.models.user.Outfit;
-import com.habitrpg.android.habitica.models.user.Preferences;
-
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-import rx.functions.Action1;
-
-public class ClassSelectionActivity extends BaseActivity implements Action1<HabitRPGUser> {
-
-    String currentClass;
-    Boolean isInitialSelection;
-    Boolean classWasUnset = false;
-    Boolean shouldFinish = false;
-
-    @BindView(R.id.healerAvatarView)
-    AvatarView healerAvatarView;
-    @BindView(R.id.mageAvatarView)
-    AvatarView mageAvatarView;
-    @BindView(R.id.rogueAvatarView)
-    AvatarView rogueAvatarView;
-    @BindView(R.id.warriorAvatarView)
-    AvatarView warriorAvatarView;
-
-    @Inject
-    ApiClient apiClient;
-
-    ProgressDialog progressDialog;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_class_selection;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        Bundle bundle = intent.getExtras();
-        isInitialSelection = bundle.getBoolean("isInitialSelection");
-        currentClass = bundle.getString("currentClass");
-
-        Preferences preferences = new Preferences();
-        preferences.setHair(new Hair());
-        preferences.setCostume(false);
-        preferences.setSize(bundle.getString("size"));
-        preferences.setSkin(bundle.getString("skin"));
-        preferences.setShirt(bundle.getString("shirt"));
-        preferences.getHair().setBangs(bundle.getInt("hairBangs"));
-        preferences.getHair().setBase(bundle.getInt("hairBase"));
-        preferences.getHair().setColor(bundle.getString("hairColor"));
-        preferences.getHair().setMustache(bundle.getInt("hairMustache"));
-        preferences.getHair().setBeard(bundle.getInt("hairBeard"));
-
-
-        Outfit healerOutfit = new Outfit();
-        healerOutfit.setArmor("armor_healer_5");
-        healerOutfit.setHead("head_healer_5");
-        healerOutfit.setShield("shield_healer_5");
-        healerOutfit.setWeapon("weapon_healer_6");
-        HabitRPGUser healer = this.makeUser(preferences, healerOutfit);
-        healerAvatarView.setUser(healer);
-
-        Outfit mageOutfit = new Outfit();
-        mageOutfit.setArmor("armor_wizard_5");
-        mageOutfit.setHead("head_wizard_5");
-        mageOutfit.setWeapon("weapon_wizard_6");
-        HabitRPGUser mage = this.makeUser(preferences, mageOutfit);
-        mageAvatarView.setUser(mage);
-
-        Outfit rogueOutfit = new Outfit();
-        rogueOutfit.setArmor("armor_rogue_5");
-        rogueOutfit.setHead("head_rogue_5");
-        rogueOutfit.setShield("shield_rogue_6");
-        rogueOutfit.setWeapon("weapon_rogue_6");
-        HabitRPGUser rogue = this.makeUser(preferences, rogueOutfit);
-        rogueAvatarView.setUser(rogue);
-
-        Outfit warriorOutfit = new Outfit();
-        warriorOutfit.setArmor("armor_warrior_5");
-        warriorOutfit.setHead("head_warrior_5");
-        warriorOutfit.setShield("shield_warrior_5");
-        warriorOutfit.setWeapon("weapon_warrior_6");
-        HabitRPGUser warrior = this.makeUser(preferences, warriorOutfit);
-        warriorAvatarView.setUser(warrior);
-
-        if (!isInitialSelection) {
-            apiClient.changeClass()
-                    .subscribe(user -> {
-                        classWasUnset = true;
-                    }, throwable -> {
-                    });
-        }
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    public HabitRPGUser makeUser(Preferences preferences, Outfit outfit) {
-        HabitRPGUser user = new HabitRPGUser();
-        user.setPreferences(preferences);
-        user.setItems(new Items());
-        user.getItems().setGear(new Gear());
-        user.getItems().getGear().setEquipped(outfit);
-        return user;
-    }
-
-    @OnClick(R.id.healerWrapper)
-    public void healerSelected() {
-        displayConfirmationDialogForClass(getString(R.string.healer), "healer");
-    }
-
-    @OnClick(R.id.mageWrapper)
-    public void mageSelected() {
-        displayConfirmationDialogForClass(getString(R.string.mage), "wizard");
-    }
-
-    @OnClick(R.id.rogueWrapper)
-    public void rogueSelected() {
-        displayConfirmationDialogForClass(getString(R.string.rogue), "rogue");
-    }
-
-    @OnClick(R.id.warriorWrapper)
-    public void warriorSelected() {
-        displayConfirmationDialogForClass(getString(R.string.warrior), "warrior");
-    }
-
-    @OnClick(R.id.optOutWrapper)
-    public void optOutSelected() {
-        if (!this.isInitialSelection && !this.classWasUnset) {
-            return;
-        }
-        AlertDialog alert = new AlertDialog.Builder(this)
-                .setTitle(getString(R.string.opt_out_confirmation))
-                .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> {
-                    dialog.dismiss();
-                })
-                .setPositiveButton(getString(R.string.opt_out_class), (dialog, which) -> {
-                    optOutOfClasses();
-                }).create();
-        alert.show();
-    }
-
-    private void displayConfirmationDialogForClass(String className, String classIdentifier) {
-
-        if (!this.isInitialSelection && !this.classWasUnset) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(this)
-                    .setTitle(getString(R.string.change_class_confirmation))
-                    .setMessage(getString(R.string.change_class_equipment_warning, currentClass))
-                    .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> {
-                        dialog.dismiss();
-                    })
-                    .setPositiveButton(getString(R.string.choose_class), (dialog, which) -> {
-                        selectClass(classIdentifier);
-                        displayClassChanged(className);
-                    });
-            AlertDialog alert = builder.create();
-            alert.show();
-        } else {
-            AlertDialog.Builder builder = new AlertDialog.Builder(this)
-                    .setTitle(getString(R.string.class_confirmation, className))
-                    .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> {
-                        dialog.dismiss();
-                    })
-                    .setPositiveButton(getString(R.string.choose_class), (dialog, which) -> {
-                        selectClass(classIdentifier);
-                    });
-            AlertDialog alert = builder.create();
-            alert.show();
-        }
-    }
-
-    private void displayClassChanged(String newClassName) {
-        AlertDialog.Builder changeConfirmedBuilder = new AlertDialog.Builder(this)
-                .setTitle(getString(R.string.class_changed, newClassName))
-                .setMessage(getString(R.string.class_changed_description))
-                .setPositiveButton(getString(R.string.complete_tutorial), (dialog, which) -> {
-                    dialog.dismiss();
-                });
-        AlertDialog changeDoneAlert = changeConfirmedBuilder.create();
-        changeDoneAlert.show();
-    }
-
-    private void optOutOfClasses() {
-        shouldFinish = true;
-        this.displayProgressDialog();
-        apiClient.disableClasses()
-
-                .subscribe(this, throwable -> {
-                });
-    }
-
-    private void selectClass(String selectedClass) {
-        shouldFinish = true;
-        this.displayProgressDialog();
-        apiClient.changeClass(selectedClass)
-
-                .subscribe(this, throwable -> {
-                });
-    }
-
-    private void displayProgressDialog() {
-        progressDialog = ProgressDialog.show(this, getString(R.string.changing_class_progress), null, true);
-    }
-
-    @Override
-    public void call(HabitRPGUser user) {
-        if (shouldFinish) {
-            if (progressDialog != null) {
-                progressDialog.dismiss();
-            }
-            setResult(MainActivity.SELECT_CLASS_RESULT);
-            finish();
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.user.Gear;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Hair;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.user.Outfit;
+import com.habitrpg.android.habitica.models.user.Preferences;
+import com.habitrpg.android.habitica.ui.AvatarView;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+import rx.functions.Action1;
+
+public class ClassSelectionActivity extends BaseActivity implements Action1<HabitRPGUser> {
+
+    String currentClass;
+    Boolean isInitialSelection;
+    Boolean classWasUnset = false;
+    Boolean shouldFinish = false;
+
+    @BindView(R.id.healerAvatarView)
+    AvatarView healerAvatarView;
+    @BindView(R.id.mageAvatarView)
+    AvatarView mageAvatarView;
+    @BindView(R.id.rogueAvatarView)
+    AvatarView rogueAvatarView;
+    @BindView(R.id.warriorAvatarView)
+    AvatarView warriorAvatarView;
+
+    @Inject
+    ApiClient apiClient;
+
+    ProgressDialog progressDialog;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_class_selection;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        Bundle bundle = intent.getExtras();
+        isInitialSelection = bundle.getBoolean("isInitialSelection");
+        currentClass = bundle.getString("currentClass");
+
+        Preferences preferences = new Preferences();
+        preferences.setHair(new Hair());
+        preferences.setCostume(false);
+        preferences.setSize(bundle.getString("size"));
+        preferences.setSkin(bundle.getString("skin"));
+        preferences.setShirt(bundle.getString("shirt"));
+        preferences.getHair().setBangs(bundle.getInt("hairBangs"));
+        preferences.getHair().setBase(bundle.getInt("hairBase"));
+        preferences.getHair().setColor(bundle.getString("hairColor"));
+        preferences.getHair().setMustache(bundle.getInt("hairMustache"));
+        preferences.getHair().setBeard(bundle.getInt("hairBeard"));
+
+
+        Outfit healerOutfit = new Outfit();
+        healerOutfit.setArmor("armor_healer_5");
+        healerOutfit.setHead("head_healer_5");
+        healerOutfit.setShield("shield_healer_5");
+        healerOutfit.setWeapon("weapon_healer_6");
+        HabitRPGUser healer = this.makeUser(preferences, healerOutfit);
+        healerAvatarView.setUser(healer);
+
+        Outfit mageOutfit = new Outfit();
+        mageOutfit.setArmor("armor_wizard_5");
+        mageOutfit.setHead("head_wizard_5");
+        mageOutfit.setWeapon("weapon_wizard_6");
+        HabitRPGUser mage = this.makeUser(preferences, mageOutfit);
+        mageAvatarView.setUser(mage);
+
+        Outfit rogueOutfit = new Outfit();
+        rogueOutfit.setArmor("armor_rogue_5");
+        rogueOutfit.setHead("head_rogue_5");
+        rogueOutfit.setShield("shield_rogue_6");
+        rogueOutfit.setWeapon("weapon_rogue_6");
+        HabitRPGUser rogue = this.makeUser(preferences, rogueOutfit);
+        rogueAvatarView.setUser(rogue);
+
+        Outfit warriorOutfit = new Outfit();
+        warriorOutfit.setArmor("armor_warrior_5");
+        warriorOutfit.setHead("head_warrior_5");
+        warriorOutfit.setShield("shield_warrior_5");
+        warriorOutfit.setWeapon("weapon_warrior_6");
+        HabitRPGUser warrior = this.makeUser(preferences, warriorOutfit);
+        warriorAvatarView.setUser(warrior);
+
+        if (!isInitialSelection) {
+            apiClient.changeClass()
+                    .subscribe(user -> {
+                        classWasUnset = true;
+                    }, throwable -> {
+                    });
+        }
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    public HabitRPGUser makeUser(Preferences preferences, Outfit outfit) {
+        HabitRPGUser user = new HabitRPGUser();
+        user.setPreferences(preferences);
+        user.setItems(new Items());
+        user.getItems().setGear(new Gear());
+        user.getItems().getGear().setEquipped(outfit);
+        return user;
+    }
+
+    @OnClick(R.id.healerWrapper)
+    public void healerSelected() {
+        displayConfirmationDialogForClass(getString(R.string.healer), "healer");
+    }
+
+    @OnClick(R.id.mageWrapper)
+    public void mageSelected() {
+        displayConfirmationDialogForClass(getString(R.string.mage), "wizard");
+    }
+
+    @OnClick(R.id.rogueWrapper)
+    public void rogueSelected() {
+        displayConfirmationDialogForClass(getString(R.string.rogue), "rogue");
+    }
+
+    @OnClick(R.id.warriorWrapper)
+    public void warriorSelected() {
+        displayConfirmationDialogForClass(getString(R.string.warrior), "warrior");
+    }
+
+    @OnClick(R.id.optOutWrapper)
+    public void optOutSelected() {
+        if (!this.isInitialSelection && !this.classWasUnset) {
+            return;
+        }
+        AlertDialog alert = new AlertDialog.Builder(this)
+                .setTitle(getString(R.string.opt_out_confirmation))
+                .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> {
+                    dialog.dismiss();
+                })
+                .setPositiveButton(getString(R.string.opt_out_class), (dialog, which) -> {
+                    optOutOfClasses();
+                }).create();
+        alert.show();
+    }
+
+    private void displayConfirmationDialogForClass(String className, String classIdentifier) {
+
+        if (!this.isInitialSelection && !this.classWasUnset) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this)
+                    .setTitle(getString(R.string.change_class_confirmation))
+                    .setMessage(getString(R.string.change_class_equipment_warning, currentClass))
+                    .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> {
+                        dialog.dismiss();
+                    })
+                    .setPositiveButton(getString(R.string.choose_class), (dialog, which) -> {
+                        selectClass(classIdentifier);
+                        displayClassChanged(className);
+                    });
+            AlertDialog alert = builder.create();
+            alert.show();
+        } else {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this)
+                    .setTitle(getString(R.string.class_confirmation, className))
+                    .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> {
+                        dialog.dismiss();
+                    })
+                    .setPositiveButton(getString(R.string.choose_class), (dialog, which) -> {
+                        selectClass(classIdentifier);
+                    });
+            AlertDialog alert = builder.create();
+            alert.show();
+        }
+    }
+
+    private void displayClassChanged(String newClassName) {
+        AlertDialog.Builder changeConfirmedBuilder = new AlertDialog.Builder(this)
+                .setTitle(getString(R.string.class_changed, newClassName))
+                .setMessage(getString(R.string.class_changed_description))
+                .setPositiveButton(getString(R.string.complete_tutorial), (dialog, which) -> {
+                    dialog.dismiss();
+                });
+        AlertDialog changeDoneAlert = changeConfirmedBuilder.create();
+        changeDoneAlert.show();
+    }
+
+    private void optOutOfClasses() {
+        shouldFinish = true;
+        this.displayProgressDialog();
+        apiClient.disableClasses()
+
+                .subscribe(this, throwable -> {
+                });
+    }
+
+    private void selectClass(String selectedClass) {
+        shouldFinish = true;
+        this.displayProgressDialog();
+        apiClient.changeClass(selectedClass)
+
+                .subscribe(this, throwable -> {
+                });
+    }
+
+    private void displayProgressDialog() {
+        progressDialog = ProgressDialog.show(this, getString(R.string.changing_class_progress), null, true);
+    }
+
+    @Override
+    public void call(HabitRPGUser user) {
+        if (shouldFinish) {
+            if (progressDialog != null) {
+                progressDialog.dismiss();
+            }
+            setResult(MainActivity.SELECT_CLASS_RESULT);
+            finish();
+        }
+    }
+}
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 4d02e6a54..1a41dd753 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
@@ -1,510 +1,489 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-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.data.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;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.models.Achievement;
-import com.habitrpg.android.habitica.models.AchievementGroup;
-import com.habitrpg.android.habitica.models.AchievementResult;
-import com.habitrpg.android.habitica.models.user.Buffs;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Outfit;
-import com.habitrpg.android.habitica.models.user.Profile;
-import com.habitrpg.android.habitica.models.user.Stats;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-
-import net.pherth.android.emoji_library.EmojiEditText;
-
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.ScrollView;
-import android.widget.TableLayout;
-import android.widget.TableRow;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-
-public class FullProfileActivity extends BaseActivity {
-    @Inject
-    ContentCache contentCache;
-    @Inject
-    ApiClient apiClient;
-    @BindView(R.id.profile_image)
-    SimpleDraweeView profile_image;
-    @BindView(R.id.profile_blurb)
-    TextView blurbTextView;
-    @BindView(R.id.avatarView)
-    AvatarView avatarView;
-    @BindView(R.id.copy_userid)
-    Button copyUserIdButton;
-    @BindView(R.id.userid)
-    TextView userIdText;
-    @BindView(R.id.profile_attributes_card)
-    CardView attributesCardView;
-    @BindView(R.id.attributes_table)
-    TableLayout attributesTableLayout;
-    @BindView(R.id.attributes_collapse_icon)
-    ImageView attributesCollapseIcon;
-    @BindView(R.id.equipment_table)
-    TableLayout equipmentTableLayout;
-    @BindView(R.id.costume_table)
-    TableLayout costumeTableLayout;
-    @BindView(R.id.avatar_attributes_progress)
-    ProgressBar attributesProgress;
-    @BindView(R.id.avatar_equip_progress)
-    ProgressBar equipmentProgress;
-    @BindView(R.id.avatar_costume_progress)
-    ProgressBar costumeProgress;
-    @BindView(R.id.profile_costume_card)
-    CardView costumeCard;
-    @BindView(R.id.avatar_with_bars)
-    View avatar_with_bars;
-    @BindView(R.id.fullprofile_scrollview)
-    ScrollView fullprofile_scrollview;
-    @BindView(R.id.profile_pets_found_count)
-    TextView petsFoundCount;
-    @BindView(R.id.profile_mounts_tamed_count)
-    TextView mountsTamedCount;
-    @BindView(R.id.profile_achievements_card)
-    CardView achievementCard;
-    @BindView(R.id.avatar_achievements_progress)
-    ProgressBar achievementProgress;
-    @BindView(R.id.recyclerView)
-    RecyclerView achievementGroupList;
-    private String userId;
-    private String userName;
-    private AvatarWithBarsViewModel avatarWithBars;
-    private float attributeStrSum = 0;
-    private float attributeIntSum = 0;
-    private float attributeConSum = 0;
-    private float attributePerSum = 0;
-    private boolean attributeDetailsHidden = true;
-    private ArrayList<TableRow> attributeRows = new ArrayList<>();
-
-    // region Utils
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        Bundle bundle = intent.getExtras();
-        this.userId = bundle.getString("userId");
-
-        setTitle(R.string.profile_loading_data);
-
-        apiClient.getMember(this.userId)
-
-                .subscribe(this::updateView,
-                        throwable -> {
-                        });
-
-        avatarWithBars = new AvatarWithBarsViewModel(this, avatar_with_bars);
-        avatarWithBars.hideGems();
-        avatarWithBars.valueBarLabelsToBlack();
-
-        avatar_with_bars.setBackgroundColor(getResources().getColor(R.color.transparent));
-
-        attributeRows.clear();
-        attributesCardView.setOnClickListener(view -> toggleAttributeDetails());
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-
-        if (id == R.id.private_message) {
-            showSendMessageToUserDialog();
-
-            return true;
-        }
-
-        if (id == android.R.id.home) {
-            // app icon in action bar clicked; goto parent activity.
-            this.finish();
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void showSendMessageToUserDialog() {
-        LayoutInflater factory = LayoutInflater.from(this);
-        final View newMessageView = factory.inflate(
-                R.layout.profile_new_message_dialog, null);
-
-        EmojiEditText emojiEditText = (EmojiEditText) newMessageView.findViewById(R.id.edit_new_message_text);
-
-        TextView newMessageTitle = (TextView) newMessageView.findViewById(R.id.new_message_title);
-        newMessageTitle.setText(String.format(getString(R.string.profile_send_message_to), userName));
-
-        final AlertDialog addMessageDialog = new AlertDialog.Builder(this)
-                .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
-                    HashMap<String, String> messageObject = new HashMap<>();
-                    messageObject.put("message", emojiEditText.getText().toString());
-                    messageObject.put("toUserId", userId);
-
-                    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);
-                            }, throwable -> {
-                            });
-
-                    UiUtils.dismissKeyboard(HabiticaApplication.currentActivity);
-                })
-                .setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> {
-
-                    UiUtils.dismissKeyboard(HabiticaApplication.currentActivity);
-                })
-
-                .create();
-
-        addMessageDialog.setView(newMessageView);
-
-        addMessageDialog.show();
-    }
-
-    private void updateView(HabitRPGUser user) {
-        Profile profile = user.getProfile();
-        Stats stats = user.getStats();
-
-        userName = profile.getName();
-
-        setTitle(profile.getName());
-
-        String imageUrl = profile.getImageUrl();
-        if (imageUrl == null || imageUrl.isEmpty()) {
-            profile_image.setVisibility(View.GONE);
-        } else {
-            profile_image.setController(Fresco.newDraweeControllerBuilder()
-                    .setUri(imageUrl)
-                    .setControllerListener(new BaseControllerListener<ImageInfo>() {
-                        @Override
-                        public void onFailure(String id, Throwable throwable) {
-                            profile_image.setVisibility(View.GONE);
-                        }
-                    })
-                    .build());
-        }
-
-        String blurbText = profile.getBlurb();
-        if (blurbText != null && !blurbText.isEmpty()) {
-            blurbTextView.setText(MarkdownParser.parseMarkdown(blurbText));
-        }
-        userIdText.setText(userId);
-        copyUserIdButton.setVisibility(View.VISIBLE);
-        copyUserIdButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                android.content.ClipboardManager clipboard = (android.content.ClipboardManager) view.getContext()
-                        .getSystemService(view.getContext().CLIPBOARD_SERVICE);
-                android.content.ClipData clip = android.content.ClipData
-                        .newPlainText(
-                                userId, userId);
-                clipboard.setPrimaryClip(clip);
-            }
-        });
-
-
-        avatarView.setUser(user);
-        avatarWithBars.updateData(user);
-
-        addLevelAttributes(stats, user);
-
-        petsFoundCount.setText(String.valueOf(user.getPetsFoundCount()));
-        mountsTamedCount.setText(String.valueOf(user.getMountsTamedCount()));
-
-        // Load the members achievements now
-        apiClient.getMemberAchievements(this.userId)
-
-                .subscribe(this::fillAchievements,
-                        throwable -> {
-                        });
-    }
-
-    // endregion
-
-    // region Attributes
-
-    private void fillAchievements(AchievementResult achievements) {
-        List<Object> items = new ArrayList<>();
-
-        fillAchievements(achievements.basic, items);
-        fillAchievements(achievements.seasonal, items);
-        fillAchievements(achievements.special, items);
-
-        AchievementAdapter adapter = new AchievementAdapter();
-        adapter.setItemList(items);
-
-        GridLayoutManager layoutManager = new GridLayoutManager(this, 3);
-        layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
-            @Override
-            public int getSpanSize(int position) {
-                if (adapter.getItemViewType(position) == 0) {
-                    return layoutManager.getSpanCount();
-                } else {
-                    return 1;
-                }
-            }
-        });
-        achievementGroupList.setLayoutManager(layoutManager);
-        achievementGroupList.setAdapter(adapter);
-
-        stopAndHideProgress(achievementProgress);
-    }
-
-    private void fillAchievements(AchievementGroup achievementGroup, List<Object> targetList) {
-        // Order by ID first
-        ArrayList<Achievement> achievementList = new ArrayList<>(achievementGroup.achievements.values());
-        Collections.sort(achievementList, (achievement, t1) -> Double.compare(achievement.index, t1.index));
-
-        targetList.add(achievementGroup.label);
-        targetList.addAll(achievementList);
-    }
-
-    private void stopAndHideProgress(ProgressBar bar) {
-        bar.setIndeterminate(false);
-        bar.setVisibility(View.GONE);
-    }
-
-    private String getFloorValueString(float val, boolean roundDown) {
-        return roundDown
-                ? ((int) Math.floor(val)) + ""
-                : (val == 0.0 ? "0" : val + "");
-    }
-
-    private float getFloorValue(float val, boolean roundDown) {
-        return roundDown
-                ? ((int) Math.floor(val))
-                : val;
-    }
-
-    private TableRow addEquipmentRow(TableLayout table, String gearKey, String text, String stats) {
-        TableRow gearRow = (TableRow) getLayoutInflater().inflate(R.layout.profile_gear_tablerow, null);
-
-        SimpleDraweeView draweeView = (SimpleDraweeView) gearRow.findViewById(R.id.gear_drawee);
-
-        draweeView.setController(Fresco.newDraweeControllerBuilder()
-                .setUri(AvatarView.IMAGE_URI_ROOT + "shop_" + gearKey + ".png")
-                .setControllerListener(new BaseControllerListener<ImageInfo>() {
-                    @Override
-                    public void onFailure(String id, Throwable throwable) {
-                        draweeView.setVisibility(View.GONE);
-                    }
-                })
-                .build());
-
-        TextView keyTextView = (TextView) gearRow.findViewById(R.id.tableRowTextView1);
-        keyTextView.setText(text);
-
-        table.addView(gearRow);
-
-        TextView valueTextView = (TextView) gearRow.findViewById(R.id.tableRowTextView2);
-
-        if (!stats.isEmpty()) {
-            valueTextView.setText(stats);
-        } else {
-            valueTextView.setVisibility(View.GONE);
-        }
-
-        return gearRow;
-    }
-
-    private void addLevelAttributes(Stats stats, HabitRPGUser user) {
-        float byLevelStat = Math.min(stats.getLvl() / 2.0f, 50f);
-
-        addAttributeRow(getString(R.string.profile_level), byLevelStat, byLevelStat, byLevelStat, byLevelStat, true, false);
-
-        loadItemDataByOutfit(user.getItems().getGear().getEquipped(), obj -> {
-            gotGear(obj, user);
-            addNormalAddBuffAttributes(stats);
-
-            stopAndHideProgress(attributesProgress);
-        });
-
-        if (user.getPreferences().getCostume()) {
-            loadItemDataByOutfit(user.getItems().getGear().getCostume(), obj -> {
-                gotCostume(obj);
-            });
-        } else {
-            costumeCard.setVisibility(View.GONE);
-        }
-    }
-
-    private void loadItemDataByOutfit(Outfit outfit, ContentCache.GotContentEntryCallback<List<ItemData>> gotEntries) {
-        ArrayList<String> outfitList = new ArrayList<>();
-        outfitList.add(outfit.getArmor());
-        outfitList.add(outfit.getBack());
-        outfitList.add(outfit.getBody());
-        outfitList.add(outfit.getEyeWear());
-        outfitList.add(outfit.getHead());
-        outfitList.add(outfit.getHeadAccessory());
-        outfitList.add(outfit.getShield());
-        outfitList.add(outfit.getWeapon());
-
-        contentCache.getItemDataList(outfitList, gotEntries);
-    }
-
-    public void gotGear(List<ItemData> itemDataList, HabitRPGUser user) {
-        UserStatComputer userStatComputer = new UserStatComputer();
-        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
-
-        for (UserStatComputer.StatsRow row : statsRows) {
-            if (row.getClass().equals(UserStatComputer.EquipmentRow.class)) {
-                UserStatComputer.EquipmentRow equipmentRow = (UserStatComputer.EquipmentRow) row;
-                addEquipmentRow(equipmentTableLayout, equipmentRow.gearKey, equipmentRow.text, equipmentRow.stats);
-            } else if (row.getClass().equals(UserStatComputer.AttributeRow.class)) {
-                UserStatComputer.AttributeRow attributeRow2 = (UserStatComputer.AttributeRow) row;
-                addAttributeRow(getString(attributeRow2.labelId), attributeRow2.strVal, attributeRow2.intVal, attributeRow2.conVal, attributeRow2.perVal, attributeRow2.roundDown, attributeRow2.isSummary);
-            }
-        }
-
-        stopAndHideProgress(equipmentProgress);
-        equipmentTableLayout.setVisibility(View.VISIBLE);
-
-        stopAndHideProgress(attributesProgress);
-        attributesTableLayout.setVisibility(View.VISIBLE);
-    }
-
-    public void gotCostume(List<ItemData> obj) {
-        // fill costume table
-        for (ItemData i : obj) {
-            addEquipmentRow(costumeTableLayout, i.getKey(), i.getText(), "");
-        }
-
-        stopAndHideProgress(costumeProgress);
-    }
-
-    private void addNormalAddBuffAttributes(Stats stats) {
-        Buffs buffs = stats.getBuffs();
-
-        addAttributeRow(getString(R.string.profile_allocated), stats.getStr(), stats.get_int(), stats.getCon(), stats.getPer(), true, false);
-        addAttributeRow(getString(R.string.profile_boosts), buffs.getStr(), buffs.get_int(), buffs.getCon(), buffs.getPer(), true, false);
-
-        // Summary row
-        addAttributeRow("", attributeStrSum, attributeIntSum, attributeConSum, attributePerSum, false, true);
-    }
-
-    private TableRow addAttributeRow(String label, float strVal, float intVal, float conVal, float perVal, boolean roundDown, boolean isSummary) {
-        TableRow tableRow = (TableRow) getLayoutInflater().inflate(R.layout.profile_attributetablerow, null);
-        TextView keyTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_type);
-        keyTextView.setText(label);
-
-        TextView strTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_str);
-        strTextView.setText(getFloorValueString(strVal, roundDown));
-
-        TextView intTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_int);
-        intTextView.setText(getFloorValueString(intVal, roundDown));
-
-        TextView conTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_con);
-        conTextView.setText(getFloorValueString(conVal, roundDown));
-
-        TextView perTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_per);
-        perTextView.setText(getFloorValueString(perVal, roundDown));
-
-
-        if (isSummary) {
-            strTextView.setTypeface(null, Typeface.BOLD);
-            intTextView.setTypeface(null, Typeface.BOLD);
-            conTextView.setTypeface(null, Typeface.BOLD);
-            perTextView.setTypeface(null, Typeface.BOLD);
-        } else {
-            attributeStrSum += getFloorValue(strVal, roundDown);
-            attributeIntSum += getFloorValue(intVal, roundDown);
-            attributeConSum += getFloorValue(conVal, roundDown);
-            attributePerSum += getFloorValue(perVal, roundDown);
-
-            attributeRows.add(tableRow);
-            tableRow.setVisibility(attributeDetailsHidden ? View.GONE : View.VISIBLE);
-        }
-
-        attributesTableLayout.addView(tableRow);
-
-        return tableRow;
-    }
-
-    private void toggleAttributeDetails() {
-        attributeDetailsHidden = !attributeDetailsHidden;
-
-        attributesCollapseIcon.setImageDrawable(getResources().getDrawable(attributeDetailsHidden
-                ? R.drawable.ic_keyboard_arrow_right_black_24dp
-                : R.drawable.ic_keyboard_arrow_down_black_24dp));
-
-        for (TableRow row : attributeRows) {
-            row.setVisibility(attributeDetailsHidden ? View.GONE : View.VISIBLE);
-        }
-    }
-
-
-    // endregion
-
-    // region Navigation
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        finish();
-        return true;
-    }
-
-    @Override
-    public void onBackPressed() {
-        finish();
-    }
-
-    // endregion
-
-    // region BaseActivity-Overrides
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_full_profile;
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_full_profile, menu);
-        return true;
-    }
-
-    // endregion
-
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.GridLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.ScrollView;
+import android.widget.TableLayout;
+import android.widget.TableRow;
+import android.widget.TextView;
+
+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.HabiticaApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.helpers.UserStatComputer;
+import com.habitrpg.android.habitica.models.Achievement;
+import com.habitrpg.android.habitica.models.AchievementGroup;
+import com.habitrpg.android.habitica.models.AchievementResult;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.user.Buffs;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Outfit;
+import com.habitrpg.android.habitica.models.user.Profile;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
+import com.habitrpg.android.habitica.ui.adapter.social.AchievementAdapter;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+
+import net.pherth.android.emoji_library.EmojiEditText;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import rx.Observable;
+
+public class FullProfileActivity extends BaseActivity {
+    @Inject
+    InventoryRepository inventoryRepository;
+    @Inject
+    ApiClient apiClient;
+    @Inject
+    SocialRepository socialRepository;
+    @BindView(R.id.profile_image)
+    SimpleDraweeView profile_image;
+    @BindView(R.id.profile_blurb)
+    TextView blurbTextView;
+    @BindView(R.id.avatarView)
+    AvatarView avatarView;
+    @BindView(R.id.copy_userid)
+    Button copyUserIdButton;
+    @BindView(R.id.userid)
+    TextView userIdText;
+    @BindView(R.id.profile_attributes_card)
+    CardView attributesCardView;
+    @BindView(R.id.attributes_table)
+    TableLayout attributesTableLayout;
+    @BindView(R.id.attributes_collapse_icon)
+    ImageView attributesCollapseIcon;
+    @BindView(R.id.equipment_table)
+    TableLayout equipmentTableLayout;
+    @BindView(R.id.costume_table)
+    TableLayout costumeTableLayout;
+    @BindView(R.id.avatar_attributes_progress)
+    ProgressBar attributesProgress;
+    @BindView(R.id.avatar_equip_progress)
+    ProgressBar equipmentProgress;
+    @BindView(R.id.avatar_costume_progress)
+    ProgressBar costumeProgress;
+    @BindView(R.id.profile_costume_card)
+    CardView costumeCard;
+    @BindView(R.id.avatar_with_bars)
+    View avatar_with_bars;
+    @BindView(R.id.fullprofile_scrollview)
+    ScrollView fullprofile_scrollview;
+    @BindView(R.id.profile_pets_found_count)
+    TextView petsFoundCount;
+    @BindView(R.id.profile_mounts_tamed_count)
+    TextView mountsTamedCount;
+    @BindView(R.id.profile_achievements_card)
+    CardView achievementCard;
+    @BindView(R.id.avatar_achievements_progress)
+    ProgressBar achievementProgress;
+    @BindView(R.id.recyclerView)
+    RecyclerView achievementGroupList;
+    private String userId;
+    private String userName;
+    private AvatarWithBarsViewModel avatarWithBars;
+    private float attributeStrSum = 0;
+    private float attributeIntSum = 0;
+    private float attributeConSum = 0;
+    private float attributePerSum = 0;
+    private boolean attributeDetailsHidden = true;
+    private ArrayList<TableRow> attributeRows = new ArrayList<>();
+
+    // region Utils
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        Bundle bundle = intent.getExtras();
+        this.userId = bundle.getString("userId");
+
+        setTitle(R.string.profile_loading_data);
+
+        socialRepository.getMember(this.userId)
+                .subscribe(this::updateView,
+                        throwable -> {
+                        });
+
+        avatarWithBars = new AvatarWithBarsViewModel(this, avatar_with_bars);
+        avatarWithBars.hideGems();
+        avatarWithBars.valueBarLabelsToBlack();
+
+        avatar_with_bars.setBackgroundColor(ContextCompat.getColor(this, R.color.transparent));
+
+        attributeRows.clear();
+        attributesCardView.setOnClickListener(view -> toggleAttributeDetails());
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        if (id == R.id.private_message) {
+            showSendMessageToUserDialog();
+
+            return true;
+        }
+
+        if (id == android.R.id.home) {
+            // app icon in action bar clicked; goto parent activity.
+            this.finish();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void showSendMessageToUserDialog() {
+        LayoutInflater factory = LayoutInflater.from(this);
+        final View newMessageView = factory.inflate(
+                R.layout.profile_new_message_dialog, null);
+
+        EmojiEditText emojiEditText = (EmojiEditText) newMessageView.findViewById(R.id.edit_new_message_text);
+
+        TextView newMessageTitle = (TextView) newMessageView.findViewById(R.id.new_message_title);
+        newMessageTitle.setText(String.format(getString(R.string.profile_send_message_to), userName));
+
+        final AlertDialog addMessageDialog = new AlertDialog.Builder(this)
+                .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
+                    socialRepository.postPrivateMessage(emojiEditText.getText().toString(), userId)
+                            .subscribe(postChatMessageResult -> UiUtils.showSnackbar(FullProfileActivity.this, FullProfileActivity.this.fullprofile_scrollview,
+                                    String.format(getString(R.string.profile_message_sent_to), userName), UiUtils.SnackbarDisplayType.NORMAL), throwable -> {
+                            });
+
+                    UiUtils.dismissKeyboard(HabiticaApplication.currentActivity);
+                })
+                .setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> UiUtils.dismissKeyboard(HabiticaApplication.currentActivity))
+
+                .create();
+
+        addMessageDialog.setView(newMessageView);
+
+        addMessageDialog.show();
+    }
+
+    private void updateView(HabitRPGUser user) {
+        Profile profile = user.getProfile();
+        Stats stats = user.getStats();
+
+        userName = profile.getName();
+
+        setTitle(profile.getName());
+
+        String imageUrl = profile.getImageUrl();
+        if (imageUrl == null || imageUrl.isEmpty()) {
+            profile_image.setVisibility(View.GONE);
+        } else {
+            profile_image.setController(Fresco.newDraweeControllerBuilder()
+                    .setUri(imageUrl)
+                    .setControllerListener(new BaseControllerListener<ImageInfo>() {
+                        @Override
+                        public void onFailure(String id, Throwable throwable) {
+                            profile_image.setVisibility(View.GONE);
+                        }
+                    })
+                    .build());
+        }
+
+        String blurbText = profile.getBlurb();
+        if (blurbText != null && !blurbText.isEmpty()) {
+            blurbTextView.setText(MarkdownParser.parseMarkdown(blurbText));
+        }
+        userIdText.setText(userId);
+        copyUserIdButton.setVisibility(View.VISIBLE);
+        copyUserIdButton.setOnClickListener(view -> {
+            android.content.ClipboardManager clipboard = (android.content.ClipboardManager) view.getContext()
+                    .getSystemService(CLIPBOARD_SERVICE);
+            android.content.ClipData clip = android.content.ClipData
+                    .newPlainText(
+                            userId, userId);
+            clipboard.setPrimaryClip(clip);
+        });
+
+
+        avatarView.setUser(user);
+        avatarWithBars.updateData(user);
+
+        addLevelAttributes(stats, user);
+
+        petsFoundCount.setText(String.valueOf(user.getPetsFoundCount()));
+        mountsTamedCount.setText(String.valueOf(user.getMountsTamedCount()));
+
+        // Load the members achievements now
+        apiClient.getMemberAchievements(this.userId)
+
+                .subscribe(this::fillAchievements,
+                        throwable -> {
+                        });
+    }
+
+    // endregion
+
+    // region Attributes
+
+    private void fillAchievements(AchievementResult achievements) {
+        List<Object> items = new ArrayList<>();
+
+        fillAchievements(achievements.basic, items);
+        fillAchievements(achievements.seasonal, items);
+        fillAchievements(achievements.special, items);
+
+        AchievementAdapter adapter = new AchievementAdapter();
+        adapter.setItemList(items);
+
+        GridLayoutManager layoutManager = new GridLayoutManager(this, 3);
+        layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                if (adapter.getItemViewType(position) == 0) {
+                    return layoutManager.getSpanCount();
+                } else {
+                    return 1;
+                }
+            }
+        });
+        achievementGroupList.setLayoutManager(layoutManager);
+        achievementGroupList.setAdapter(adapter);
+
+        stopAndHideProgress(achievementProgress);
+    }
+
+    private void fillAchievements(AchievementGroup achievementGroup, List<Object> targetList) {
+        // Order by ID first
+        ArrayList<Achievement> achievementList = new ArrayList<>(achievementGroup.achievements.values());
+        Collections.sort(achievementList, (achievement, t1) -> Double.compare(achievement.index, t1.index));
+
+        targetList.add(achievementGroup.label);
+        targetList.addAll(achievementList);
+    }
+
+    private void stopAndHideProgress(ProgressBar bar) {
+        bar.setIndeterminate(false);
+        bar.setVisibility(View.GONE);
+    }
+
+    private String getFloorValueString(float val, boolean roundDown) {
+        return roundDown
+                ? ((int) Math.floor(val)) + ""
+                : (val == 0.0 ? "0" : val + "");
+    }
+
+    private float getFloorValue(float val, boolean roundDown) {
+        return roundDown
+                ? ((int) Math.floor(val))
+                : val;
+    }
+
+    private TableRow addEquipmentRow(TableLayout table, String gearKey, String text, String stats) {
+        TableRow gearRow = (TableRow) getLayoutInflater().inflate(R.layout.profile_gear_tablerow, table);
+
+        SimpleDraweeView draweeView = (SimpleDraweeView) gearRow.findViewById(R.id.gear_drawee);
+
+        draweeView.setController(Fresco.newDraweeControllerBuilder()
+                .setUri(AvatarView.IMAGE_URI_ROOT + "shop_" + gearKey + ".png")
+                .setControllerListener(new BaseControllerListener<ImageInfo>() {
+                    @Override
+                    public void onFailure(String id, Throwable throwable) {
+                        draweeView.setVisibility(View.GONE);
+                    }
+                })
+                .build());
+
+        TextView keyTextView = (TextView) gearRow.findViewById(R.id.tableRowTextView1);
+        keyTextView.setText(text);
+
+        TextView valueTextView = (TextView) gearRow.findViewById(R.id.tableRowTextView2);
+
+        if (!stats.isEmpty()) {
+            valueTextView.setText(stats);
+        } else {
+            valueTextView.setVisibility(View.GONE);
+        }
+
+        return gearRow;
+    }
+
+    private void addLevelAttributes(Stats stats, HabitRPGUser user) {
+        float byLevelStat = Math.min(stats.getLvl() / 2.0f, 50f);
+
+        addAttributeRow(getString(R.string.profile_level), byLevelStat, byLevelStat, byLevelStat, byLevelStat, true, false);
+
+        loadItemDataByOutfit(user.getItems().getGear().getEquipped()).subscribe(gear -> this.gotGear(gear, user), throwable -> {});
+
+        if (user.getPreferences().getCostume()) {
+            loadItemDataByOutfit(user.getItems().getGear().getCostume()).subscribe(this::gotCostume, throwable -> {});
+        } else {
+            costumeCard.setVisibility(View.GONE);
+        }
+    }
+
+    private Observable<List<ItemData>> loadItemDataByOutfit(Outfit outfit) {
+        ArrayList<String> outfitList = new ArrayList<>();
+        outfitList.add(outfit.getArmor());
+        outfitList.add(outfit.getBack());
+        outfitList.add(outfit.getBody());
+        outfitList.add(outfit.getEyeWear());
+        outfitList.add(outfit.getHead());
+        outfitList.add(outfit.getHeadAccessory());
+        outfitList.add(outfit.getShield());
+        outfitList.add(outfit.getWeapon());
+
+        return inventoryRepository.getItems(outfitList);
+    }
+
+    public void gotGear(List<ItemData> itemDataList, HabitRPGUser user) {
+        UserStatComputer userStatComputer = new UserStatComputer();
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
+
+        for (UserStatComputer.StatsRow row : statsRows) {
+            if (row.getClass().equals(UserStatComputer.EquipmentRow.class)) {
+                UserStatComputer.EquipmentRow equipmentRow = (UserStatComputer.EquipmentRow) row;
+                addEquipmentRow(equipmentTableLayout, equipmentRow.gearKey, equipmentRow.text, equipmentRow.stats);
+            } else if (row.getClass().equals(UserStatComputer.AttributeRow.class)) {
+                UserStatComputer.AttributeRow attributeRow2 = (UserStatComputer.AttributeRow) row;
+                addAttributeRow(getString(attributeRow2.labelId), attributeRow2.strVal, attributeRow2.intVal, attributeRow2.conVal, attributeRow2.perVal, attributeRow2.roundDown, attributeRow2.isSummary);
+            }
+        }
+
+        stopAndHideProgress(equipmentProgress);
+        equipmentTableLayout.setVisibility(View.VISIBLE);
+
+        stopAndHideProgress(attributesProgress);
+        attributesTableLayout.setVisibility(View.VISIBLE);
+    }
+
+    public void gotCostume(List<ItemData> obj) {
+        // fill costume table
+        for (ItemData i : obj) {
+            addEquipmentRow(costumeTableLayout, i.getKey(), i.getText(), "");
+        }
+
+        stopAndHideProgress(costumeProgress);
+    }
+
+    private void addNormalAddBuffAttributes(Stats stats) {
+        Buffs buffs = stats.getBuffs();
+
+        addAttributeRow(getString(R.string.profile_allocated), stats.getStr(), stats.get_int(), stats.getCon(), stats.getPer(), true, false);
+        addAttributeRow(getString(R.string.profile_boosts), buffs.getStr(), buffs.get_int(), buffs.getCon(), buffs.getPer(), true, false);
+
+        // Summary row
+        addAttributeRow("", attributeStrSum, attributeIntSum, attributeConSum, attributePerSum, false, true);
+    }
+
+    private TableRow addAttributeRow(String label, float strVal, float intVal, float conVal, float perVal, boolean roundDown, boolean isSummary) {
+        TableRow tableRow = (TableRow) getLayoutInflater().inflate(R.layout.profile_attributetablerow, attributesTableLayout);
+        TextView keyTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_type);
+        keyTextView.setText(label);
+
+        TextView strTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_str);
+        strTextView.setText(getFloorValueString(strVal, roundDown));
+
+        TextView intTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_int);
+        intTextView.setText(getFloorValueString(intVal, roundDown));
+
+        TextView conTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_con);
+        conTextView.setText(getFloorValueString(conVal, roundDown));
+
+        TextView perTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_per);
+        perTextView.setText(getFloorValueString(perVal, roundDown));
+
+
+        if (isSummary) {
+            strTextView.setTypeface(null, Typeface.BOLD);
+            intTextView.setTypeface(null, Typeface.BOLD);
+            conTextView.setTypeface(null, Typeface.BOLD);
+            perTextView.setTypeface(null, Typeface.BOLD);
+        } else {
+            attributeStrSum += getFloorValue(strVal, roundDown);
+            attributeIntSum += getFloorValue(intVal, roundDown);
+            attributeConSum += getFloorValue(conVal, roundDown);
+            attributePerSum += getFloorValue(perVal, roundDown);
+
+            attributeRows.add(tableRow);
+            tableRow.setVisibility(attributeDetailsHidden ? View.GONE : View.VISIBLE);
+        }
+
+        return tableRow;
+    }
+
+    private void toggleAttributeDetails() {
+        attributeDetailsHidden = !attributeDetailsHidden;
+
+        attributesCollapseIcon.setImageDrawable(ContextCompat.getDrawable(this, attributeDetailsHidden
+                ? R.drawable.ic_keyboard_arrow_right_black_24dp
+                : R.drawable.ic_keyboard_arrow_down_black_24dp));
+
+        for (TableRow row : attributeRows) {
+            row.setVisibility(attributeDetailsHidden ? View.GONE : View.VISIBLE);
+        }
+    }
+
+
+    // endregion
+
+    // region Navigation
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        finish();
+        return true;
+    }
+
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
+
+    // endregion
+
+    // region BaseActivity-Overrides
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_full_profile;
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_full_profile, menu);
+        return true;
+    }
+
+    // endregion
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.java
index ec0881d71..6372c2a1d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.java
@@ -1,6 +1,16 @@
 package com.habitrpg.android.habitica.ui.activities;
 
 
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
@@ -19,16 +29,6 @@ import org.solovyev.android.checkout.Purchase;
 import org.solovyev.android.checkout.Purchases;
 import org.solovyev.android.checkout.RequestListener;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.Toolbar;
-import android.view.MenuItem;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java
index ea2f5200a..8e61cfc8c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java
@@ -1,13 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-
-import net.pherth.android.emoji_library.EmojiEditText;
-import net.pherth.android.emoji_library.EmojiPopup;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -23,6 +15,14 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+
+import net.pherth.android.emoji_library.EmojiEditText;
+import net.pherth.android.emoji_library.EmojiPopup;
+
 import butterknife.BindView;
 
 public class GroupFormActivity extends BaseActivity {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
index a9e846985..ea1cfe389 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
@@ -1,96 +1,96 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import android.appwidget.AppWidgetManager;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import butterknife.BindView;
-
-public class HabitButtonWidgetActivity extends BaseActivity implements TaskClickActivity {
-
-    @Inject
-    TaskRepository taskRepository;
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    String userId;
-
-    @BindView(R.id.recyclerView)
-    RecyclerView recyclerView;
-    private int widgetId;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.widget_configure_habit_button;
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        Bundle extras = intent.getExtras();
-        if (extras != null) {
-            widgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
-        }
-
-        // If this activity was started with an intent without an app widget ID,
-        // finish with an error.
-        if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
-            finish();
-        }
-
-        LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
-
-        if (layoutManager == null) {
-            layoutManager = new LinearLayoutManager(this);
-
-            recyclerView.setLayoutManager(layoutManager);
-        }
-
-        recyclerView.setAdapter(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_HABIT, this, userId));
-    }
-
-    @Override
-    public void taskSelected(String taskId) {
-        finishWithSelection(taskId);
-    }
-
-    private void finishWithSelection(String selectedTaskId) {
-        storeSelectedTaskId(selectedTaskId);
-
-        Intent resultValue = new Intent();
-        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
-        setResult(RESULT_OK, resultValue);
-        finish();
-
-        Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, this, HabitButtonWidgetProvider.class);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{widgetId});
-        sendBroadcast(intent);
-    }
-
-    private void storeSelectedTaskId(String selectedTaskId) {
-        SharedPreferences.Editor preferences = PreferenceManager.getDefaultSharedPreferences(this).edit();
-        preferences.putString("habit_button_widget_" + widgetId, selectedTaskId);
-        preferences.apply();
-    }
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.appwidget.AppWidgetManager;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
+import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import butterknife.BindView;
+
+public class HabitButtonWidgetActivity extends BaseActivity implements TaskClickActivity {
+
+    @Inject
+    TaskRepository taskRepository;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
+
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+    private int widgetId;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.widget_configure_habit_button;
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        Bundle extras = intent.getExtras();
+        if (extras != null) {
+            widgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
+        }
+
+        // If this activity was started with an intent without an app widget ID,
+        // finish with an error.
+        if (widgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
+            finish();
+        }
+
+        LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+
+        if (layoutManager == null) {
+            layoutManager = new LinearLayoutManager(this);
+
+            recyclerView.setLayoutManager(layoutManager);
+        }
+
+        recyclerView.setAdapter(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_HABIT, this, userId));
+    }
+
+    @Override
+    public void taskSelected(String taskId) {
+        finishWithSelection(taskId);
+    }
+
+    private void finishWithSelection(String selectedTaskId) {
+        storeSelectedTaskId(selectedTaskId);
+
+        Intent resultValue = new Intent();
+        resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
+        setResult(RESULT_OK, resultValue);
+        finish();
+
+        Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, this, HabitButtonWidgetProvider.class);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{widgetId});
+        sendBroadcast(intent);
+    }
+
+    private void storeSelectedTaskId(String selectedTaskId) {
+        SharedPreferences.Editor preferences = PreferenceManager.getDefaultSharedPreferences(this).edit();
+        preferences.putString("habit_button_widget_" + widgetId, selectedTaskId);
+        preferences.apply();
+    }
+}
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 98ae28b33..f7c9b339d 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,166 +1,166 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
-import com.viewpagerindicator.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;
-import android.support.v4.app.FragmentPagerAdapter;
-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;
-
-import butterknife.BindView;
-
-public class IntroActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener {
-
-    @Inject
-    public ApiClient apiClient;
-    @BindView(R.id.view_pager)
-    ViewPager pager;
-    @BindView(R.id.view_pager_indicator)
-    IconPageIndicator indicator;
-    @BindView(R.id.skipButton)
-    Button skipButton;
-    @BindView(R.id.finishButton)
-    Button finishButton;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_intro;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        HabiticaBaseApplication.getComponent().inject(this);
-
-        setupIntro();
-        indicator.setViewPager(pager);
-
-        this.skipButton.setOnClickListener(this);
-        this.finishButton.setOnClickListener(this);
-
-        apiClient.getContent()
-                .subscribe(contentResult -> {}, throwable -> {});
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            Window window = getWindow();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha));
-            }
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-        }
-
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void setupIntro() {
-        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
-
-        pager.setAdapter(new PagerAdapter(fragmentManager));
-
-        pager.addOnPageChangeListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        finishIntro();
-    }
-
-    private void finishIntro() {
-        Intent intent = new Intent(this, LoginActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        this.startActivity(intent);
-        overridePendingTransition(0, R.anim.activity_fade_out);
-        finish();
-    }
-
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-    }
-
-    @Override
-    public void onPageSelected(int position) {
-        if (position == 2) {
-            this.finishButton.setVisibility(View.VISIBLE);
-        } else {
-            this.finishButton.setVisibility(View.GONE);
-        }
-    }
-
-    @Override
-    public void onPageScrollStateChanged(int state) {
-
-    }
-
-    private class PagerAdapter extends FragmentPagerAdapter implements IconPagerAdapter {
-        public PagerAdapter(FragmentManager fm) {
-            super(fm);
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            IntroFragment fragment = new IntroFragment();
-
-            switch (position) {
-                case 0: {
-                    fragment.setImage(ResourcesCompat.getDrawable(getResources(), R.drawable.intro_1, null));
-                    fragment.setSubtitle(getString(R.string.intro_1_subtitle));
-                    fragment.setTitleImage(ResourcesCompat.getDrawable(getResources(), R.drawable.intro_1_title, null));
-                    fragment.setDescription(getString(R.string.intro_1_description, getString(R.string.habitica_user_count)));
-                    fragment.setBackgroundColor(ContextCompat.getColor(IntroActivity.this, R.color.brand_300));
-                    break;
-                }
-                case 1: {
-                    fragment.setImage(ResourcesCompat.getDrawable(getResources(), R.drawable.intro_2, null));
-                    fragment.setSubtitle(getString(R.string.intro_2_subtitle));
-                    fragment.setTitle(getString(R.string.intro_2_title));
-                    fragment.setDescription(getString(R.string.intro_2_description));
-                    fragment.setBackgroundColor(ContextCompat.getColor(IntroActivity.this, R.color.best_10));
-                    break;
-                }
-                case 2: {
-                    fragment.setImage(ResourcesCompat.getDrawable(getResources(), R.drawable.intro_3, null));
-                    fragment.setSubtitle(getString(R.string.intro_3_subtitle));
-                    fragment.setTitle(getString(R.string.intro_3_title));
-                    fragment.setDescription(getString(R.string.intro_3_description));
-                    fragment.setBackgroundColor(ContextCompat.getColor(IntroActivity.this, R.color.worse_100));
-                    break;
-                }
-            }
-
-            return fragment;
-        }
-
-        @Override
-        public int getIconResId(int index) {
-            return R.drawable.indicator_diamond;
-        }
-
-        @Override
-        public int getCount() {
-            return 3;
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.content.Intent;
+import android.os.Build;
+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.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 com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
+import com.viewpagerindicator.IconPageIndicator;
+import com.viewpagerindicator.IconPagerAdapter;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+
+public class IntroActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener {
+
+    @Inject
+    public ApiClient apiClient;
+    @BindView(R.id.view_pager)
+    ViewPager pager;
+    @BindView(R.id.view_pager_indicator)
+    IconPageIndicator indicator;
+    @BindView(R.id.skipButton)
+    Button skipButton;
+    @BindView(R.id.finishButton)
+    Button finishButton;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_intro;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        HabiticaBaseApplication.getComponent().inject(this);
+
+        setupIntro();
+        indicator.setViewPager(pager);
+
+        this.skipButton.setOnClickListener(this);
+        this.finishButton.setOnClickListener(this);
+
+        apiClient.getContent()
+                .subscribe(contentResult -> {}, throwable -> {});
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            Window window = getWindow();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha));
+            }
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void setupIntro() {
+        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
+
+        pager.setAdapter(new PagerAdapter(fragmentManager));
+
+        pager.addOnPageChangeListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        finishIntro();
+    }
+
+    private void finishIntro() {
+        Intent intent = new Intent(this, LoginActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        this.startActivity(intent);
+        overridePendingTransition(0, R.anim.activity_fade_out);
+        finish();
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        if (position == 2) {
+            this.finishButton.setVisibility(View.VISIBLE);
+        } else {
+            this.finishButton.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+
+    private class PagerAdapter extends FragmentPagerAdapter implements IconPagerAdapter {
+        public PagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            IntroFragment fragment = new IntroFragment();
+
+            switch (position) {
+                case 0: {
+                    fragment.setImage(ResourcesCompat.getDrawable(getResources(), R.drawable.intro_1, null));
+                    fragment.setSubtitle(getString(R.string.intro_1_subtitle));
+                    fragment.setTitleImage(ResourcesCompat.getDrawable(getResources(), R.drawable.intro_1_title, null));
+                    fragment.setDescription(getString(R.string.intro_1_description, getString(R.string.habitica_user_count)));
+                    fragment.setBackgroundColor(ContextCompat.getColor(IntroActivity.this, R.color.brand_300));
+                    break;
+                }
+                case 1: {
+                    fragment.setImage(ResourcesCompat.getDrawable(getResources(), R.drawable.intro_2, null));
+                    fragment.setSubtitle(getString(R.string.intro_2_subtitle));
+                    fragment.setTitle(getString(R.string.intro_2_title));
+                    fragment.setDescription(getString(R.string.intro_2_description));
+                    fragment.setBackgroundColor(ContextCompat.getColor(IntroActivity.this, R.color.best_10));
+                    break;
+                }
+                case 2: {
+                    fragment.setImage(ResourcesCompat.getDrawable(getResources(), R.drawable.intro_3, null));
+                    fragment.setSubtitle(getString(R.string.intro_3_subtitle));
+                    fragment.setTitle(getString(R.string.intro_3_title));
+                    fragment.setDescription(getString(R.string.intro_3_description));
+                    fragment.setBackgroundColor(ContextCompat.getColor(IntroActivity.this, R.color.worse_100));
+                    break;
+                }
+            }
+
+            return fragment;
+        }
+
+        @Override
+        public int getIconResId(int index) {
+            return R.drawable.indicator_diamond;
+        }
+
+        @Override
+        public int getCount() {
+            return 3;
+        }
+    }
+}
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 853c321c1..3397b7c76 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,627 +1,626 @@
-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.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.helpers.UiUtils;
-import com.habitrpg.android.habitica.ui.views.login.LockableScrollView;
-import com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.accounts.AccountManager;
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
-import android.app.Dialog;
-import android.content.ActivityNotFoundException;
-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.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-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 java.io.IOException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import rx.Observable;
-import rx.exceptions.Exceptions;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
-
-/**
- * @author Mickael Goubin
- */
-public class LoginActivity extends BaseActivity
-        implements Action1<UserAuthResponse>, HabitRPGUserCallback.OnUserReceived {
-    static final int REQUEST_CODE_PICK_ACCOUNT = 1000;
-    private final static String TAG_ADDRESS = "address";
-    private final static String TAG_USERID = "user";
-    private final static String TAG_APIKEY = "key";
-    private static final int REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR = 1001;
-
-
-    @Inject
-    public ApiClient apiClient;
-    @Inject
-    public SharedPreferences sharedPrefs;
-    @Inject
-    public HostConfig hostConfig;
-    public String mTmpUserToken;
-    public String mTmpApiToken;
-    public Boolean isRegistering;
-    Boolean isShowingForm = false;
-
-    @BindView(R.id.background_container)
-    LockableScrollView backgroundContainer;
-    @BindView(R.id.background_view)
-    LoginBackgroundView backgroundView;
-    @BindView(R.id.new_game_button)
-    Button newGameButton;
-    @BindView(R.id.show_login_button)
-    Button showLoginButton;
-    @BindView(R.id.login_scrollview)
-    ScrollView scrollView;
-    @BindView(R.id.login_linear_layout)
-    LinearLayout formWrapper;
-    @BindView(R.id.back_button)
-    Button backButton;
-    @BindView(R.id.logo_view)
-    ImageView logoView;
-
-    @BindView(R.id.login_btn)
-    Button mLoginNormalBtn;
-    @BindView(R.id.PB_AsyncTask)
-    ProgressBar mProgressBar;
-    @BindView(R.id.username)
-    EditText mUsernameET;
-    @BindView(R.id.password)
-    EditText mPasswordET;
-    @BindView(R.id.email)
-    EditText mEmail;
-    @BindView(R.id.confirm_password)
-    EditText mConfirmPassword;
-    @BindView(R.id.forgot_pw_tv)
-    TextView mForgotPWTV;
-    private CallbackManager callbackManager;
-    private String googleEmail;
-    private LoginManager loginManager;
-
-    @Override
-    protected int getLayoutResId() {
-        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
-        return R.layout.activity_login;
-    }
-
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().hide();
-        }
-        //Set default values to avoid null-responses when requesting unedited settings
-        PreferenceManager.setDefaultValues(this, R.xml.preferences_fragment, false);
-
-        ButterKnife.bind(this);
-
-        setupFacebookLogin();
-
-        mLoginNormalBtn.setOnClickListener(mLoginNormalClick);
-
-        mForgotPWTV.setOnClickListener(mForgotPWClick);
-        SpannableString content = new SpannableString(mForgotPWTV.getText());
-        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        mForgotPWTV.setText(content);
-
-        callbackManager = CallbackManager.Factory.create();
-
-
-        this.isRegistering = true;
-
-        Map<String, Object> additionalData = new HashMap<>();
-        additionalData.put("page", this.getClass().getSimpleName());
-        AmplitudeManager.sendEvent("navigate", AmplitudeManager.EVENT_CATEGORY_NAVIGATION, AmplitudeManager.EVENT_HITTYPE_PAGEVIEW, additionalData);
-
-        backgroundContainer.post(() -> backgroundContainer.scrollTo(0, backgroundContainer.getBottom()));
-        backgroundContainer.setScrollingEnabled(false);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            Window window = getWindow();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha));
-            }
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-        }
-    }
-
-    private void setupFacebookLogin() {
-        callbackManager = CallbackManager.Factory.create();
-        loginManager = LoginManager.getInstance();
-        loginManager.registerCallback(callbackManager,
-                new FacebookCallback<LoginResult>() {
-                    @Override
-                    public void onSuccess(LoginResult loginResult) {
-                        Log.e("Login", "SUCCESS");
-                        AccessToken accessToken = AccessToken.getCurrentAccessToken();
-                        apiClient.connectSocial("facebook", accessToken.getUserId(), accessToken.getToken())
-                                .subscribe(LoginActivity.this, throwable -> hideProgress());
-                    }
-
-                    @Override
-                    public void onCancel() {
-                        Log.e("Login", "CANCEL");
-                    }
-
-                    @Override
-                    public void onError(FacebookException exception) {
-                        exception.printStackTrace();
-                    }
-                });
-
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (isShowingForm) {
-            hideForm();
-        } else {
-            super.onBackPressed();
-        }
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void resetLayout() {
-        if (this.isRegistering) {
-            if (this.mEmail.getVisibility() == View.GONE) {
-                show(this.mEmail);
-            }
-            if (this.mConfirmPassword.getVisibility() == View.GONE) {
-                show(this.mConfirmPassword);
-            }
-        } else {
-            if (this.mEmail.getVisibility() == View.VISIBLE) {
-                hide(this.mEmail);
-            }
-            if (this.mConfirmPassword.getVisibility() == View.VISIBLE) {
-                hide(this.mConfirmPassword);
-            }
-        }
-    }
-
-    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);
-        startActivity(intent);
-        finish();
-    }
-
-    private void startSetupActivity() {
-        Intent intent = new Intent(LoginActivity.this, SetupActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
-        finish();
-    }
-
-    private void toggleRegistering() {
-        this.isRegistering = !this.isRegistering;
-        this.setRegistering();
-    }
-
-    private void setRegistering() {
-        if (this.isRegistering) {
-            this.mLoginNormalBtn.setText(getString(R.string.register_btn));
-            mUsernameET.setHint(R.string.username);
-            mPasswordET.setImeOptions(EditorInfo.IME_ACTION_NEXT);
-        } else {
-            this.mLoginNormalBtn.setText(getString(R.string.login_btn));
-            mUsernameET.setHint(R.string.email_username);
-            mPasswordET.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        }
-        this.resetLayout();
-    }
-
-    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-        super.onActivityResult(requestCode, resultCode, intent);
-        callbackManager.onActivityResult(requestCode, resultCode, intent);
-        IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
-        if (scanResult != null) {
-            try {
-                Log.d("scanresult", scanResult.getContents());
-                this.parse(scanResult.getContents());
-            } catch (Exception e) {
-                Log.e("scanresult", "Could not parse scanResult", e);
-            }
-        }
-
-        if (requestCode == REQUEST_CODE_PICK_ACCOUNT) {
-            if (resultCode == RESULT_OK) {
-                googleEmail = intent.getStringExtra(AccountManager.KEY_ACCOUNT_NAME);
-                handleGoogleLoginResult();
-            }
-        }
-        if (requestCode == REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR) {
-            handleGoogleLoginResult();
-        }
-
-        if (requestCode == FacebookSdk.getCallbackRequestCodeOffset()) {
-            //This is necessary because the regular login callback is not called for some reason
-            AccessToken accessToken = AccessToken.getCurrentAccessToken();
-            if (accessToken != null && accessToken.getToken() != null) {
-                apiClient.connectSocial("facebook", accessToken.getUserId(), accessToken.getToken())
-                        .subscribe(LoginActivity.this, throwable -> hideProgress());
-            }
-        }
-    }
-
-    private void parse(String contents) {
-        String adr, user, key;
-        try {
-            JSONObject obj;
-
-            obj = new JSONObject(contents);
-            adr = obj.getString(TAG_ADDRESS);
-            user = obj.getString(TAG_USERID);
-            key = obj.getString(TAG_APIKEY);
-            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-            SharedPreferences.Editor editor = prefs.edit();
-            boolean ans = editor.putString(getString(R.string.SP_address), adr)
-                    .putString(getString(R.string.SP_APIToken), key)
-                    .putString(getString(R.string.SP_userID), user)
-                    .commit();
-            if (!ans) {
-                throw new Exception("PB_string_commit");
-            }
-            startMainActivity();
-        } catch (JSONException e) {
-            showSnackbar(getString(R.string.ERR_pb_barcode));
-            e.printStackTrace();
-        } catch (Exception e) {
-            if ("PB_string_commit".equals(e.getMessage())) {
-                showSnackbar(getString(R.string.ERR_pb_barcode));
-            }
-        }
-    }
-
-    private void showSnackbar(String content) {
-        Snackbar snackbar = Snackbar
-                .make(this.findViewById(R.id.login_linear_layout), content, Snackbar.LENGTH_LONG);
-
-        View snackbarView = snackbar.getView();
-        snackbarView.setBackgroundColor(Color.RED);//change Snackbar's background color;
-        snackbar.show(); // Don’t forget to show!
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_toggleRegistering:
-                toggleRegistering();
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void saveTokens(String api, String user) throws Exception {
-        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)
-                .commit();
-        if (!ans) {
-            throw new Exception("PB_string_commit");
-        }
-    }
-
-    @Override
-    public void onUserReceived(HabitRPGUser user) {
-        try {
-            saveTokens(mTmpApiToken, mTmpUserToken);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        this.startMainActivity();
-    }
-
-    private void hideProgress() {
-        mProgressBar.setVisibility(View.GONE);
-    }
-
-    private void showValidationError(int resourceMessageString) {
-        mProgressBar.setVisibility(View.GONE);
-        new android.support.v7.app.AlertDialog.Builder(this)
-                .setTitle(R.string.login_validation_error_title)
-                .setMessage(resourceMessageString)
-                .setNeutralButton(android.R.string.ok, (dialog, which) -> {
-                })
-                .setIcon(R.drawable.ic_warning_black)
-                .show();
-    }
-
-    @Override
-    public void call(UserAuthResponse userAuthResponse) {
-        try {
-            saveTokens(userAuthResponse.getToken(), userAuthResponse.getId());
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        if (userAuthResponse.getNewUser()) {
-            this.startSetupActivity();
-        } else {
-            AmplitudeManager.sendEvent("login", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT);
-            this.startMainActivity();
-        }
-    }
-
-    @OnClick(R.id.fb_login_button)
-    public void handleFacebookLogin() {
-        loginManager.logInWithReadPermissions(this, Collections.singletonList("user_friends"));
-    }
-
-    @OnClick(R.id.google_login_button)
-    public void handleGoogleLogin() {
-        String[] accountTypes = new String[]{"com.google"};
-        Intent intent = AccountPicker.newChooseAccountIntent(null, null,
-                accountTypes, false, null, null, null, null);
-        try {
-            startActivityForResult(intent, REQUEST_CODE_PICK_ACCOUNT);
-        } catch (ActivityNotFoundException e) {
-            Dialog dialog = new AlertDialog.Builder(this)
-                    .setTitle(R.string.authentication_error_title)
-                    .setMessage(R.string.google_services_missing)
-                    .setNegativeButton(R.string.close, (dialogInterface, i) -> dialogInterface.dismiss())
-                    .create();
-            dialog.show();
-        }
-    }
-
-    private void handleGoogleLoginResult() {
-        String scopesString = Scopes.PROFILE + " " + Scopes.EMAIL;
-        String scopes = "oauth2:" + scopesString;
-        Observable.defer(() -> {
-            try {
-                return Observable.just(GoogleAuthUtil.getToken(LoginActivity.this, googleEmail, scopes));
-            } catch (IOException | GoogleAuthException e) {
-                throw Exceptions.propagate(e);
-            }
-        })
-                .subscribeOn(Schedulers.io())
-                .flatMap(token -> apiClient.connectSocial("google", googleEmail, token))
-                .subscribe(LoginActivity.this, throwable -> {
-                    throwable.printStackTrace();
-                    hideProgress();
-                    if (throwable.getCause() != null && GoogleAuthException.class.isAssignableFrom(throwable.getCause().getClass())) {
-                        handleGoogleAuthException((GoogleAuthException) throwable.getCause());
-                    }
-                });
-    }
-
-    private void handleGoogleAuthException(final Exception e) {
-        if (e instanceof GooglePlayServicesAvailabilityException) {
-            // The Google Play services APK is old, disabled, or not present.
-            // Show a dialog created by Google Play services that allows
-            // the user to update the APK
-            int statusCode = ((GooglePlayServicesAvailabilityException) e)
-                    .getConnectionStatusCode();
-            Dialog dialog = GooglePlayServicesUtil.getErrorDialog(statusCode,
-                    LoginActivity.this,
-                    REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR);
-            dialog.show();
-        } else if (e instanceof UserRecoverableAuthException) {
-            // Unable to authenticate, such as when the user has not yet granted
-            // the app access to the account, but the user can fix this.
-            // Forward the user to an activity in Google Play services.
-            Intent intent = ((UserRecoverableAuthException) e).getIntent();
-            startActivityForResult(intent,
-                    REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR);
-        }
-    }
-
-    @OnClick(R.id.new_game_button)
-    void newGameButtonClicked() {
-        isRegistering = true;
-        showForm();
-        setRegistering();
-    }
-
-    @OnClick(R.id.show_login_button)
-    void showLoginButtonClicked() {
-        isRegistering = false;
-        showForm();
-        setRegistering();
-    }
-
-    @OnClick(R.id.back_button)
-    void backButtonClicked() {
-        if (isShowingForm) {
-            hideForm();
-        }
-    }
-
-
-    private void showForm() {
-        isShowingForm = true;
-        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);
-            showLoginAlphaAnimation.setDuration(400);
-            newGameAlphaAnimation.addListener(new AnimatorListenerAdapter() {
-                public void onAnimationEnd(Animator animation) {
-                    newGameButton.setVisibility(View.GONE);
-                    showLoginButton.setVisibility(View.GONE);
-                    scrollView.setVisibility(View.VISIBLE);
-                    scrollView.setAlpha(1);
-                }
-            });
-        } else {
-            showLoginAlphaAnimation.setStartDelay(600);
-            showLoginAlphaAnimation.setDuration(400);
-            newGameAlphaAnimation.setDuration(400);
-            showLoginAlphaAnimation.addListener(new AnimatorListenerAdapter() {
-                public void onAnimationEnd(Animator animation) {
-                    newGameButton.setVisibility(View.GONE);
-                    showLoginButton.setVisibility(View.GONE);
-                    scrollView.setVisibility(View.VISIBLE);
-                    scrollView.setAlpha(1);
-                }
-            });
-        }
-        ValueAnimator backAlphaAnimation = ObjectAnimator.ofFloat(backButton, View.ALPHA, 1).setDuration(800);
-        AnimatorSet showAnimation = new AnimatorSet();
-        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);
-            showAnimation.play(animator).after(panAnimation);
-        }
-
-        showAnimation.start();
-    }
-
-    private void hideForm() {
-        isShowingForm = false;
-        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() {
-            public void onAnimationEnd(Animator animation) {
-                newGameButton.setVisibility(View.VISIBLE);
-                showLoginButton.setVisibility(View.VISIBLE);
-                scrollView.setVisibility(View.INVISIBLE);
-            }
-        });
-        ValueAnimator backAlphaAnimation = ObjectAnimator.ofFloat(backButton, View.ALPHA, 0).setDuration(800);
-        AnimatorSet showAnimation = new AnimatorSet();
-        showAnimation.playTogether(panAnimation, scrollViewAlphaAnimation, backAlphaAnimation, scaleLogoAnimation);
-        showAnimation.play(newGameAlphaAnimation).after(scrollViewAlphaAnimation);
-        showAnimation.play(showLoginAlphaAnimation).after(scrollViewAlphaAnimation);
-        showAnimation.start();
-        UiUtils.dismissKeyboard(this);
-    }
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.accounts.AccountManager;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.app.Dialog;
+import android.content.ActivityNotFoundException;
+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.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+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.FacebookSdk;
+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.data.ApiClient;
+import com.habitrpg.android.habitica.helpers.AmplitudeManager;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+import com.habitrpg.android.habitica.ui.views.login.LockableScrollView;
+import com.habitrpg.android.habitica.ui.views.login.LoginBackgroundView;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import rx.Observable;
+import rx.exceptions.Exceptions;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+
+/**
+ * @author Mickael Goubin
+ */
+public class LoginActivity extends BaseActivity
+        implements Action1<UserAuthResponse>, HabitRPGUserCallback.OnUserReceived {
+    static final int REQUEST_CODE_PICK_ACCOUNT = 1000;
+    private final static String TAG_ADDRESS = "address";
+    private final static String TAG_USERID = "user";
+    private final static String TAG_APIKEY = "key";
+    private static final int REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR = 1001;
+
+
+    @Inject
+    public ApiClient apiClient;
+    @Inject
+    public SharedPreferences sharedPrefs;
+    @Inject
+    public HostConfig hostConfig;
+    public String mTmpUserToken;
+    public String mTmpApiToken;
+    public Boolean isRegistering;
+    Boolean isShowingForm = false;
+
+    @BindView(R.id.background_container)
+    LockableScrollView backgroundContainer;
+    @BindView(R.id.background_view)
+    LoginBackgroundView backgroundView;
+    @BindView(R.id.new_game_button)
+    Button newGameButton;
+    @BindView(R.id.show_login_button)
+    Button showLoginButton;
+    @BindView(R.id.login_scrollview)
+    ScrollView scrollView;
+    @BindView(R.id.login_linear_layout)
+    LinearLayout formWrapper;
+    @BindView(R.id.back_button)
+    Button backButton;
+    @BindView(R.id.logo_view)
+    ImageView logoView;
+
+    @BindView(R.id.login_btn)
+    Button mLoginNormalBtn;
+    @BindView(R.id.PB_AsyncTask)
+    ProgressBar mProgressBar;
+    @BindView(R.id.username)
+    EditText mUsernameET;
+    @BindView(R.id.password)
+    EditText mPasswordET;
+    @BindView(R.id.email)
+    EditText mEmail;
+    @BindView(R.id.confirm_password)
+    EditText mConfirmPassword;
+    @BindView(R.id.forgot_pw_tv)
+    TextView mForgotPWTV;
+    private CallbackManager callbackManager;
+    private String googleEmail;
+    private LoginManager loginManager;
+
+    @Override
+    protected int getLayoutResId() {
+        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
+        return R.layout.activity_login;
+    }
+
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().hide();
+        }
+        //Set default values to avoid null-responses when requesting unedited settings
+        PreferenceManager.setDefaultValues(this, R.xml.preferences_fragment, false);
+
+        ButterKnife.bind(this);
+
+        setupFacebookLogin();
+
+        mLoginNormalBtn.setOnClickListener(mLoginNormalClick);
+
+        mForgotPWTV.setOnClickListener(mForgotPWClick);
+        SpannableString content = new SpannableString(mForgotPWTV.getText());
+        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
+        mForgotPWTV.setText(content);
+
+        callbackManager = CallbackManager.Factory.create();
+
+
+        this.isRegistering = true;
+
+        Map<String, Object> additionalData = new HashMap<>();
+        additionalData.put("page", this.getClass().getSimpleName());
+        AmplitudeManager.sendEvent("navigate", AmplitudeManager.EVENT_CATEGORY_NAVIGATION, AmplitudeManager.EVENT_HITTYPE_PAGEVIEW, additionalData);
+
+        backgroundContainer.post(() -> backgroundContainer.scrollTo(0, backgroundContainer.getBottom()));
+        backgroundContainer.setScrollingEnabled(false);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            Window window = getWindow();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_20_alpha));
+            }
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+    }
+
+    private void setupFacebookLogin() {
+        callbackManager = CallbackManager.Factory.create();
+        loginManager = LoginManager.getInstance();
+        loginManager.registerCallback(callbackManager,
+                new FacebookCallback<LoginResult>() {
+                    @Override
+                    public void onSuccess(LoginResult loginResult) {
+                        Log.e("Login", "SUCCESS");
+                        AccessToken accessToken = AccessToken.getCurrentAccessToken();
+                        apiClient.connectSocial("facebook", accessToken.getUserId(), accessToken.getToken())
+                                .subscribe(LoginActivity.this, throwable -> hideProgress());
+                    }
+
+                    @Override
+                    public void onCancel() {
+                        Log.e("Login", "CANCEL");
+                    }
+
+                    @Override
+                    public void onError(FacebookException exception) {
+                        exception.printStackTrace();
+                    }
+                });
+
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (isShowingForm) {
+            hideForm();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void resetLayout() {
+        if (this.isRegistering) {
+            if (this.mEmail.getVisibility() == View.GONE) {
+                show(this.mEmail);
+            }
+            if (this.mConfirmPassword.getVisibility() == View.GONE) {
+                show(this.mConfirmPassword);
+            }
+        } else {
+            if (this.mEmail.getVisibility() == View.VISIBLE) {
+                hide(this.mEmail);
+            }
+            if (this.mConfirmPassword.getVisibility() == View.VISIBLE) {
+                hide(this.mConfirmPassword);
+            }
+        }
+    }
+
+    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);
+        startActivity(intent);
+        finish();
+    }
+
+    private void startSetupActivity() {
+        Intent intent = new Intent(LoginActivity.this, SetupActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+        finish();
+    }
+
+    private void toggleRegistering() {
+        this.isRegistering = !this.isRegistering;
+        this.setRegistering();
+    }
+
+    private void setRegistering() {
+        if (this.isRegistering) {
+            this.mLoginNormalBtn.setText(getString(R.string.register_btn));
+            mUsernameET.setHint(R.string.username);
+            mPasswordET.setImeOptions(EditorInfo.IME_ACTION_NEXT);
+        } else {
+            this.mLoginNormalBtn.setText(getString(R.string.login_btn));
+            mUsernameET.setHint(R.string.email_username);
+            mPasswordET.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        }
+        this.resetLayout();
+    }
+
+    public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        super.onActivityResult(requestCode, resultCode, intent);
+        callbackManager.onActivityResult(requestCode, resultCode, intent);
+        IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
+        if (scanResult != null) {
+            try {
+                Log.d("scanresult", scanResult.getContents());
+                this.parse(scanResult.getContents());
+            } catch (Exception e) {
+                Log.e("scanresult", "Could not parse scanResult", e);
+            }
+        }
+
+        if (requestCode == REQUEST_CODE_PICK_ACCOUNT) {
+            if (resultCode == RESULT_OK) {
+                googleEmail = intent.getStringExtra(AccountManager.KEY_ACCOUNT_NAME);
+                handleGoogleLoginResult();
+            }
+        }
+        if (requestCode == REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR) {
+            handleGoogleLoginResult();
+        }
+
+        if (requestCode == FacebookSdk.getCallbackRequestCodeOffset()) {
+            //This is necessary because the regular login callback is not called for some reason
+            AccessToken accessToken = AccessToken.getCurrentAccessToken();
+            if (accessToken != null && accessToken.getToken() != null) {
+                apiClient.connectSocial("facebook", accessToken.getUserId(), accessToken.getToken())
+                        .subscribe(LoginActivity.this, throwable -> hideProgress());
+            }
+        }
+    }
+
+    private void parse(String contents) {
+        String adr, user, key;
+        try {
+            JSONObject obj;
+
+            obj = new JSONObject(contents);
+            adr = obj.getString(TAG_ADDRESS);
+            user = obj.getString(TAG_USERID);
+            key = obj.getString(TAG_APIKEY);
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+            SharedPreferences.Editor editor = prefs.edit();
+            boolean ans = editor.putString(getString(R.string.SP_address), adr)
+                    .putString(getString(R.string.SP_APIToken), key)
+                    .putString(getString(R.string.SP_userID), user)
+                    .commit();
+            if (!ans) {
+                throw new Exception("PB_string_commit");
+            }
+            startMainActivity();
+        } catch (JSONException e) {
+            showSnackbar(getString(R.string.ERR_pb_barcode));
+            e.printStackTrace();
+        } catch (Exception e) {
+            if ("PB_string_commit".equals(e.getMessage())) {
+                showSnackbar(getString(R.string.ERR_pb_barcode));
+            }
+        }
+    }
+
+    private void showSnackbar(String content) {
+        Snackbar snackbar = Snackbar
+                .make(this.findViewById(R.id.login_linear_layout), content, Snackbar.LENGTH_LONG);
+
+        View snackbarView = snackbar.getView();
+        snackbarView.setBackgroundColor(Color.RED);//change Snackbar's background color;
+        snackbar.show(); // Don’t forget to show!
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_toggleRegistering:
+                toggleRegistering();
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void saveTokens(String api, String user) throws Exception {
+        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)
+                .commit();
+        if (!ans) {
+            throw new Exception("PB_string_commit");
+        }
+    }
+
+    @Override
+    public void onUserReceived(HabitRPGUser user) {
+        try {
+            saveTokens(mTmpApiToken, mTmpUserToken);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        this.startMainActivity();
+    }
+
+    private void hideProgress() {
+        mProgressBar.setVisibility(View.GONE);
+    }
+
+    private void showValidationError(int resourceMessageString) {
+        mProgressBar.setVisibility(View.GONE);
+        new android.support.v7.app.AlertDialog.Builder(this)
+                .setTitle(R.string.login_validation_error_title)
+                .setMessage(resourceMessageString)
+                .setNeutralButton(android.R.string.ok, (dialog, which) -> {
+                })
+                .setIcon(R.drawable.ic_warning_black)
+                .show();
+    }
+
+    @Override
+    public void call(UserAuthResponse userAuthResponse) {
+        try {
+            saveTokens(userAuthResponse.getToken(), userAuthResponse.getId());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (userAuthResponse.getNewUser()) {
+            this.startSetupActivity();
+        } else {
+            AmplitudeManager.sendEvent("login", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT);
+            this.startMainActivity();
+        }
+    }
+
+    @OnClick(R.id.fb_login_button)
+    public void handleFacebookLogin() {
+        loginManager.logInWithReadPermissions(this, Collections.singletonList("user_friends"));
+    }
+
+    @OnClick(R.id.google_login_button)
+    public void handleGoogleLogin() {
+        String[] accountTypes = new String[]{"com.google"};
+        Intent intent = AccountPicker.newChooseAccountIntent(null, null,
+                accountTypes, false, null, null, null, null);
+        try {
+            startActivityForResult(intent, REQUEST_CODE_PICK_ACCOUNT);
+        } catch (ActivityNotFoundException e) {
+            Dialog dialog = new AlertDialog.Builder(this)
+                    .setTitle(R.string.authentication_error_title)
+                    .setMessage(R.string.google_services_missing)
+                    .setNegativeButton(R.string.close, (dialogInterface, i) -> dialogInterface.dismiss())
+                    .create();
+            dialog.show();
+        }
+    }
+
+    private void handleGoogleLoginResult() {
+        String scopesString = Scopes.PROFILE + " " + Scopes.EMAIL;
+        String scopes = "oauth2:" + scopesString;
+        Observable.defer(() -> {
+            try {
+                return Observable.just(GoogleAuthUtil.getToken(LoginActivity.this, googleEmail, scopes));
+            } catch (IOException | GoogleAuthException e) {
+                throw Exceptions.propagate(e);
+            }
+        })
+                .subscribeOn(Schedulers.io())
+                .flatMap(token -> apiClient.connectSocial("google", googleEmail, token))
+                .subscribe(LoginActivity.this, throwable -> {
+                    throwable.printStackTrace();
+                    hideProgress();
+                    if (throwable.getCause() != null && GoogleAuthException.class.isAssignableFrom(throwable.getCause().getClass())) {
+                        handleGoogleAuthException((GoogleAuthException) throwable.getCause());
+                    }
+                });
+    }
+
+    private void handleGoogleAuthException(final Exception e) {
+        if (e instanceof GooglePlayServicesAvailabilityException) {
+            // The Google Play services APK is old, disabled, or not present.
+            // Show a dialog created by Google Play services that allows
+            // the user to update the APK
+            int statusCode = ((GooglePlayServicesAvailabilityException) e)
+                    .getConnectionStatusCode();
+            Dialog dialog = GooglePlayServicesUtil.getErrorDialog(statusCode,
+                    LoginActivity.this,
+                    REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR);
+            dialog.show();
+        } else if (e instanceof UserRecoverableAuthException) {
+            // Unable to authenticate, such as when the user has not yet granted
+            // the app access to the account, but the user can fix this.
+            // Forward the user to an activity in Google Play services.
+            Intent intent = ((UserRecoverableAuthException) e).getIntent();
+            startActivityForResult(intent,
+                    REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR);
+        }
+    }
+
+    @OnClick(R.id.new_game_button)
+    void newGameButtonClicked() {
+        isRegistering = true;
+        showForm();
+        setRegistering();
+    }
+
+    @OnClick(R.id.show_login_button)
+    void showLoginButtonClicked() {
+        isRegistering = false;
+        showForm();
+        setRegistering();
+    }
+
+    @OnClick(R.id.back_button)
+    void backButtonClicked() {
+        if (isShowingForm) {
+            hideForm();
+        }
+    }
+
+
+    private void showForm() {
+        isShowingForm = true;
+        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);
+            showLoginAlphaAnimation.setDuration(400);
+            newGameAlphaAnimation.addListener(new AnimatorListenerAdapter() {
+                public void onAnimationEnd(Animator animation) {
+                    newGameButton.setVisibility(View.GONE);
+                    showLoginButton.setVisibility(View.GONE);
+                    scrollView.setVisibility(View.VISIBLE);
+                    scrollView.setAlpha(1);
+                }
+            });
+        } else {
+            showLoginAlphaAnimation.setStartDelay(600);
+            showLoginAlphaAnimation.setDuration(400);
+            newGameAlphaAnimation.setDuration(400);
+            showLoginAlphaAnimation.addListener(new AnimatorListenerAdapter() {
+                public void onAnimationEnd(Animator animation) {
+                    newGameButton.setVisibility(View.GONE);
+                    showLoginButton.setVisibility(View.GONE);
+                    scrollView.setVisibility(View.VISIBLE);
+                    scrollView.setAlpha(1);
+                }
+            });
+        }
+        ValueAnimator backAlphaAnimation = ObjectAnimator.ofFloat(backButton, View.ALPHA, 1).setDuration(800);
+        AnimatorSet showAnimation = new AnimatorSet();
+        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);
+            showAnimation.play(animator).after(panAnimation);
+        }
+
+        showAnimation.start();
+    }
+
+    private void hideForm() {
+        isShowingForm = false;
+        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() {
+            public void onAnimationEnd(Animator animation) {
+                newGameButton.setVisibility(View.VISIBLE);
+                showLoginButton.setVisibility(View.VISIBLE);
+                scrollView.setVisibility(View.INVISIBLE);
+            }
+        });
+        ValueAnimator backAlphaAnimation = ObjectAnimator.ofFloat(backButton, View.ALPHA, 0).setDuration(800);
+        AnimatorSet showAnimation = new AnimatorSet();
+        showAnimation.playTogether(panAnimation, scrollViewAlphaAnimation, backAlphaAnimation, scaleLogoAnimation);
+        showAnimation.play(newGameAlphaAnimation).after(scrollViewAlphaAnimation);
+        showAnimation.play(showLoginAlphaAnimation).after(scrollViewAlphaAnimation);
+        showAnimation.start();
+        UiUtils.dismissKeyboard(this);
+    }
+}
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 a507cfd4e..b87d04239 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,1279 +1,1219 @@
-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.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.AppBarLayout;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.FileProvider;
-import android.support.v4.view.GravityCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.Toolbar;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.HabiticaApplication;
-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.TaskScoringCallback;
-import com.habitrpg.android.habitica.callbacks.TaskUpdateCallback;
-import com.habitrpg.android.habitica.callbacks.UnlockCallback;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.data.TagRepository;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.databinding.ValueBarBinding;
-import com.habitrpg.android.habitica.events.ContentReloadedEvent;
-import com.habitrpg.android.habitica.events.DisplayFragmentEvent;
-import com.habitrpg.android.habitica.events.DisplayTutorialEvent;
-import com.habitrpg.android.habitica.events.HabitScoreEvent;
-import com.habitrpg.android.habitica.events.OpenMysteryItemEvent;
-import com.habitrpg.android.habitica.events.OpenedMysteryItemEvent;
-import com.habitrpg.android.habitica.events.ReloadContentEvent;
-import com.habitrpg.android.habitica.events.SelectClassEvent;
-import com.habitrpg.android.habitica.events.ShareEvent;
-import com.habitrpg.android.habitica.events.TaskRemovedEvent;
-import com.habitrpg.android.habitica.events.TaskSaveEvent;
-import com.habitrpg.android.habitica.events.ToggledEditTagsEvent;
-import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
-import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
-import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
-import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
-import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
-import com.habitrpg.android.habitica.events.commands.EquipCommand;
-import com.habitrpg.android.habitica.events.commands.FeedCommand;
-import com.habitrpg.android.habitica.events.commands.HatchingCommand;
-import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
-import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
-import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
-import com.habitrpg.android.habitica.events.commands.SellItemCommand;
-import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
-import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
-import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
-import com.habitrpg.android.habitica.helpers.AmplitudeManager;
-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;
-import com.habitrpg.android.habitica.ui.TutorialView;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
-import com.habitrpg.android.habitica.userpicture.BitmapUtils;
-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.habitrpg.android.habitica.api.MaintenanceApiService;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Preferences;
-import com.habitrpg.android.habitica.models.shops.Shop;
-import com.habitrpg.android.habitica.models.user.SpecialItems;
-import com.habitrpg.android.habitica.models.user.Stats;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.models.TutorialStep;
-import com.habitrpg.android.habitica.models.inventory.Egg;
-import com.habitrpg.android.habitica.models.inventory.Food;
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.Item;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.mikepenz.materialdrawer.AccountHeader;
-import com.mikepenz.materialdrawer.Drawer;
-import com.mikepenz.materialdrawer.holder.BadgeStyle;
-import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
-import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
-import com.mikepenz.materialdrawer.model.interfaces.IProfile;
-import com.raizlabs.android.dbflow.runtime.TransactionManager;
-import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
-import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-import com.roughike.bottombar.BottomBar;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-import java.util.concurrent.TimeUnit;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import retrofit2.adapter.rxjava.HttpException;
-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;
-
-public class MainActivity extends BaseActivity implements Action1<Throwable>, HabitRPGUserCallback.OnUserReceived,
-        TaskScoringCallback.OnTaskScored, TutorialView.OnTutorialReaction {
-
-    public static final int SELECT_CLASS_RESULT = 11;
-    public static final int GEM_PURCHASE_REQUEST = 111;
-    @Inject
-    public ApiClient apiClient;
-
-    @Inject
-    public SoundManager soundManager;
-
-    @Inject
-    public MaintenanceApiService maintenanceService;
-    public HabitRPGUser user;
-    @BindView(R.id.floating_menu_wrapper)
-    public ViewGroup floatingMenuWrapper;
-    @BindView(R.id.bottom_navigation)
-    BottomBar bottomNavigation;
-    @Inject
-    protected HostConfig hostConfig;
-    @Inject
-    protected SharedPreferences sharedPreferences;
-    @Inject
-    CrashlyticsProxy crashlyticsProxy;
-    @BindView(R.id.appbar)
-    AppBarLayout appBar;
-    @BindView(R.id.toolbar)
-    Toolbar toolbar;
-    @BindView(R.id.detail_tabs)
-    TabLayout detail_tabs;
-    @BindView(R.id.avatar_with_bars)
-    View avatar_with_bars;
-    @BindView(R.id.overlayFrameLayout)
-    ViewGroup overlayLayout;
-
-    @Inject
-    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;
-    @Inject
-    UserRepository userRepository;
-    @Inject
-    TagRepository tagRepository;
-
-    @Inject
-    TaskAlarmManager taskAlarmManager;
-
-    // endregion
-
-    private Drawer drawer;
-    private AccountHeader accountHeader;
-    private BaseMainFragment activeFragment;
-    private AvatarWithBarsViewModel avatarInHeader;
-    private AlertDialog faintDialog;
-    private AvatarView sideAvatarView;
-    private Date lastSync;
-    private TutorialView activeTutorialView;
-    private boolean isloadingContent;
-
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_main;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString("language", "en"));
-        Locale.setDefault(languageHelper.getLocale());
-        Configuration configuration = new Configuration();
-        if (SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
-            configuration.locale = languageHelper.getLocale();
-        } else {
-            configuration.setLocale(languageHelper.getLocale());
-        }
-        getResources().updateConfiguration(configuration,
-                getResources().getDisplayMetrics());
-
-
-        if (!HabiticaApplication.checkUserAuthentication(this, hostConfig)) {
-            return;
-        }
-
-        userRepository.getUser(hostConfig.getUser())
-                .subscribe(newUser -> {
-                    MainActivity.this.user = newUser;
-                    MainActivity.this.setUserData(true);
-                }, throwable -> {});
-
-        setupToolbar(toolbar);
-
-        avatarInHeader = new AvatarWithBarsViewModel(this, avatar_with_bars);
-        accountHeader = MainDrawerBuilder.CreateDefaultAccountHeader(this).build();
-        drawer = MainDrawerBuilder.CreateDefaultBuilderSettings(this, sharedPreferences, toolbar, accountHeader)
-                .build();
-        drawer.setSelectionAtPosition(1, false);
-        sideAvatarView = new AvatarView(this, true, false, false);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            Window window = getWindow();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_10_alpha));
-            }
-            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            toolbar.setPadding(0, getStatusBarHeight(), 0, 0);
-            float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, getResources().getDisplayMetrics());
-            avatar_with_bars.setPadding((int)px, getStatusBarHeight(), (int)px, 0);
-        }
-
-        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;
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-        //resync, if last sync was more than 10 minutes ago
-        if (this.lastSync == null || (new Date().getTime() - this.lastSync.getTime()) > 180000) {
-            if (this.apiClient != null && this.apiClient.hasAuthenticationKeys()) {
-                retrieveUser();
-                this.checkMaintenance();
-            }
-        }
-
-        if (this.sharedPreferences.getLong("lastReminderSchedule", 0) < new Date().getTime() - 86400000) {
-            try {
-                taskAlarmManager.scheduleAllSavedAlarms();
-            } catch (Exception e) {
-                crashlyticsProxy.logException(e);
-            }
-        }
-
-        //after the activity has been stopped and is thereafter resumed,
-        //a state can arise in which the active fragment no longer has a
-        //reference to the tabLayout (and all its adapters are null).
-        //Recreate the fragment as a result.
-        if (activeFragment != null && activeFragment.tabLayout == null) {
-            activeFragment = null;
-            drawer.setSelectionAtPosition(this.sharedPreferences.getInt("lastActivePosition", 1));
-        }
-
-        if (isAlwaysFinishActivitiesOptionEnabled()) {
-            if (!sharedPreferences.getBoolean("showedFinishActivitiesWarning", false)) {
-                AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
-                        .setTitle(getString(R.string.warning))
-                        .setMessage(R.string.dont_keep_activities_warning)
-                        .setNeutralButton(R.string.close, (warningDialog, which) -> warningDialog.dismiss())
-                        .setPositiveButton(R.string.open_settings, (hatchingDialog, which) -> {
-                            showDeveloperOptionsScreen();
-                            hatchingDialog.dismiss();
-                        })
-                        .create();
-                dialog.show();
-                sharedPreferences.edit().putBoolean("showedFinishActivitiesWarning", true).apply();
-            }
-        }
-    }
-
-    @Override
-    protected void onPause() {
-        updateWidget(AvatarStatsWidgetProvider.class);
-        updateWidget(TodoListWidgetProvider.class);
-        updateWidget(DailiesWidgetProvider.class);
-        updateWidget(HabitButtonWidgetProvider.class);
-        super.onPause();
-    }
-
-    private void updateWidget(Class widgetClass) {
-        Intent intent = new Intent(this, widgetClass);
-        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
-        int ids[] = AppWidgetManager.getInstance(getApplication()).getAppWidgetIds(new ComponentName(getApplication(), widgetClass));
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids);
-        sendBroadcast(intent);
-    }
-
-
-    private void saveLoginInformation() {
-        HabiticaApplication.User = user;
-
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        SharedPreferences.Editor editor = prefs.edit();
-        boolean ans = editor.putString(getString(R.string.SP_username), user.getAuthentication().getLocalAuthentication().getUsername())
-                .putString(getString(R.string.SP_email), user.getAuthentication().getLocalAuthentication().getEmail())
-                .commit();
-
-        if (!ans) {
-            Log.e("SHARED PREFERENCES", "Shared Preferences Username and Email error");
-        }
-    }
-
-    public void displayFragment(BaseMainFragment fragment) {
-        if (this.activeFragment != null && fragment.getClass() == this.activeFragment.getClass()) {
-            return;
-        }
-        if (SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && this.isDestroyed()) {
-            return;
-        }
-        this.activeFragment = fragment;
-        fragment.setArguments(getIntent().getExtras());
-        fragment.setUser(user);
-        fragment.setActivity(this);
-        fragment.setTabLayout(detail_tabs);
-        fragment.setBottomNavigation(bottomNavigation);
-        fragment.setFloatingMenuWrapper(floatingMenuWrapper);
-
-
-        if (getSupportFragmentManager().getFragments() == null) {
-            getSupportFragmentManager().beginTransaction().add(R.id.fragment_container, fragment).commitAllowingStateLoss();
-        } else {
-            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-            transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out);
-            transaction.replace(R.id.fragment_container, fragment).addToBackStack(null).commitAllowingStateLoss();
-        }
-    }
-
-    protected void setUserData(boolean fromLocalDb) {
-        if (user != null) {
-
-            Preferences preferences = user.getPreferences();
-
-            if (preferences != null) {
-                apiClient.setLanguageCode(preferences.getLanguage());
-                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));
-                userRepository.updateUser(user, updateData)
-                        .subscribe(this::onUserReceived, throwable -> {
-                        });
-            }
-            runOnUiThread(() -> {
-                updateHeader();
-                updateSidebar();
-                saveLoginInformation();
-                if (activeFragment != null) {
-                    activeFragment.updateUserData(user);
-                } else {
-                    drawer.setSelectionAtPosition(1);
-                }
-            });
-
-            displayDeathDialogIfNeeded();
-
-            if (!fromLocalDb) {
-                displayNewInboxMessagesBadge();
-                pushNotificationManager.setUser(user);
-                pushNotificationManager.addPushDeviceUsingStoredToken();
-
-                // Update the oldEntries
-                new Thread(() -> {
-
-                    // multiple crashes because user is null
-                    if (user != null) {
-                        ArrayList<Task> allTasks = new ArrayList<>();
-                        allTasks.addAll(user.getDailys());
-                        allTasks.addAll(user.getTodos());
-                        allTasks.addAll(user.getHabits());
-                        allTasks.addAll(user.getRewards());
-
-                        taskRepository.removeOldTasks(user.getId(), allTasks);
-
-                        ArrayList<ChecklistItem> allChecklistItems = new ArrayList<>();
-                        for (Task t : allTasks) {
-                            if (t.checklist != null) {
-                                allChecklistItems.addAll(t.checklist);
-                            }
-                        }
-                        taskRepository.removeOldChecklists(allChecklistItems);
-
-                        ArrayList<TaskTag> allTaskTags = new ArrayList<>();
-                        for (Task t : allTasks) {
-                            if (t.getTags() != null) {
-                                allTaskTags.addAll(t.getTags());
-                            }
-                        }
-                        taskRepository.removeOldTaskTags(allTaskTags);
-
-                        ArrayList<RemindersItem> allReminders = new ArrayList<>();
-                        for (Task t : allTasks) {
-                            if (t.getReminders() != null) {
-                                allReminders.addAll(t.getReminders());
-                            }
-                        }
-                        taskRepository.removeOldReminders(allReminders);
-
-                        tagRepository.removeOldTags(user.getTags());
-
-                        updateOwnedDataForUser(user);
-                    }
-                }).start();
-            }
-        }
-    }
-
-    private void displayNewInboxMessagesBadge() {
-        Integer numberOfUnreadPms = this.user.getInbox().getNewMessages();
-        IDrawerItem newInboxItem;
-
-        if (numberOfUnreadPms <= 0) {
-            newInboxItem = new PrimaryDrawerItem()
-                    .withName(this.getString(R.string.sidebar_inbox))
-                    .withIdentifier(MainDrawerBuilder.SIDEBAR_INBOX);
-        } else {
-            String numberOfUnreadPmsLabel = String.valueOf(numberOfUnreadPms);
-            BadgeStyle badgeStyle = new BadgeStyle()
-                    .withTextColor(Color.WHITE)
-                    .withColorRes(R.color.md_red_700);
-
-            newInboxItem = new PrimaryDrawerItem()
-                    .withName(this.getString(R.string.sidebar_inbox))
-                    .withIdentifier(MainDrawerBuilder.SIDEBAR_INBOX)
-                    .withBadge(numberOfUnreadPmsLabel)
-                    .withBadgeStyle(badgeStyle);
-        }
-
-        this.drawer.updateItemAtPosition(newInboxItem, this.drawer.getPosition(MainDrawerBuilder.SIDEBAR_INBOX));
-    }
-
-    private void updateOwnedDataForUser(HabitRPGUser user) {
-        if (user == null || user.getItems() == null) {
-            return;
-        }
-        List<BaseModel> updates = new ArrayList<>();
-        updates.addAll(this.updateOwnedData(Egg.class, user.getItems().getEggs()));
-        updates.addAll(this.updateOwnedData(Food.class, user.getItems().getFood()));
-        updates.addAll(this.updateOwnedData(HatchingPotion.class, user.getItems().getHatchingPotions()));
-        updates.addAll(this.updateOwnedData(QuestContent.class, user.getItems().getQuests()));
-
-        updates.addAll(this.updateOwnedData(user.getItems().getGear().owned));
-        if (!updates.isEmpty()) {
-            TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(updates)));
-        }
-    }
-
-    private <T extends Item> List<T> updateOwnedData(Class<T> itemClass, HashMap<String, Integer> ownedMapping) {
-        List<T> updates = new ArrayList<>();
-        if (ownedMapping == null) {
-            return updates;
-        }
-        List<T> items = new Select().from(itemClass).queryList();
-        for (T item : items) {
-            if (ownedMapping.containsKey(item.getKey()) && !item.getOwned().equals(ownedMapping.get(item.getKey()))) {
-                item.setOwned(ownedMapping.get(item.getKey()));
-                updates.add(item);
-            } else if (!ownedMapping.containsKey(item.getKey()) && item.getOwned() > 0) {
-                item.setOwned(0);
-                updates.add(item);
-            }
-        }
-        return updates;
-    }
-
-    private List<ItemData> updateOwnedData(HashMap<String, Boolean> ownedMapping) {
-        List<ItemData> updates = new ArrayList<>();
-        if (ownedMapping == null) {
-            return updates;
-        }
-        List<ItemData> items = new Select().from(ItemData.class).queryList();
-        for (ItemData item : items) {
-            if (ownedMapping.containsKey(item.key) && item.owned != ownedMapping.get(item.key)) {
-                item.owned = ownedMapping.get(item.key);
-                updates.add(item);
-            } else if (!ownedMapping.containsKey(item.key) && item.owned != null) {
-                item.owned = null;
-                updates.add(item);
-            }
-        }
-        return updates;
-    }
-
-    private void updateUserAvatars() {
-        avatarInHeader.updateData(user);
-    }
-
-    private void updateHeader() {
-        updateUserAvatars();
-        setTranslatedFragmentTitle(activeFragment);
-
-        android.support.v7.app.ActionBarDrawerToggle actionBarDrawerToggle = drawer.getActionBarDrawerToggle();
-
-        if (actionBarDrawerToggle != null) {
-            actionBarDrawerToggle.setDrawerIndicatorEnabled(true);
-        }
-    }
-
-    public void updateSidebar() {
-        final IProfile profile = accountHeader.getProfiles().get(0);
-        if (user.getAuthentication() != null) {
-            if (user.getAuthentication().getLocalAuthentication() != null) {
-                profile.withEmail(user.getAuthentication().getLocalAuthentication().getEmail());
-            }
-        }
-        profile.withName(user.getProfile().getName());
-        sideAvatarView.setUser(user);
-        sideAvatarView.onAvatarImageReady(avatarImage -> {
-            profile.withIcon(avatarImage);
-            accountHeader.updateProfile(profile);
-        });
-        accountHeader.updateProfile(profile);
-
-        if (user.getPreferences() == null || user.getFlags() == null) {
-            return;
-        }
-
-        SpecialItems specialItems = user.getItems().getSpecial();
-        Boolean hasSpecialItems = false;
-        if (specialItems != null) {
-            hasSpecialItems = specialItems.hasSpecialItems();
-        }
-
-        IDrawerItem item = drawer.getDrawerItem(MainDrawerBuilder.SIDEBAR_SKILLS);
-        if (((user.getPreferences() != null && user.getPreferences().getDisableClasses())
-                || (user.getFlags() != null && !user.getFlags().getClassSelected()))
-                && !hasSpecialItems) {
-            if (item != null) {
-                drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS);
-            }
-        } else {
-            IDrawerItem newItem;
-            if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS && !hasSpecialItems) {
-                newItem = new PrimaryDrawerItem()
-                        .withName(this.getString(R.string.sidebar_skills))
-                        .withEnabled(false)
-                        .withBadge(this.getString(R.string.unlock_lvl_11))
-                        .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
-            } else {
-                newItem = new PrimaryDrawerItem()
-                        .withName(this.getString(R.string.sidebar_skills))
-                        .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
-            }
-            if (item == null) {
-                drawer.addItemAtPosition(newItem, 1);
-            } else {
-                drawer.updateItem(newItem);
-
-            }
-        }
-    }
-
-    @Override
-    public void onUserReceived(HabitRPGUser user) {
-        this.user = user;
-        this.lastSync = new Date();
-        MainActivity.this.setUserData(false);
-    }
-
-    public void setActiveFragment(BaseMainFragment fragment) {
-        this.activeFragment = fragment;
-        setTranslatedFragmentTitle(fragment);
-        this.drawer.setSelectionAtPosition(this.activeFragment.fragmentSidebarPosition, false);
-    }
-
-    private void setTranslatedFragmentTitle(BaseMainFragment fragment) {
-        if (getSupportActionBar() == null) {
-            return;
-        }
-        if (fragment != null && fragment.customTitle() != null) {
-            getSupportActionBar().setTitle(fragment.customTitle());
-        } else if (user != null && user.getProfile() != null) {
-            getSupportActionBar().setTitle(user.getProfile().getName());
-        }
-    }
-
-    public void onBackPressed() {
-        if (this.activeTutorialView != null) {
-            this.removeActiveTutorialView();
-        }
-        if (drawer.isDrawerOpen()) {
-            drawer.closeDrawer();
-        } else if (drawer.getDrawerLayout().isDrawerOpen(GravityCompat.END)) {
-            drawer.getDrawerLayout().closeDrawer(GravityCompat.END);
-            EventBus.getDefault().post(new ToggledEditTagsEvent(false));
-        } else {
-            super.onBackPressed();
-            if (this.activeFragment != null) {
-                this.activeFragment.updateUserData(user);
-            }
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode == SELECT_CLASS_RESULT) {
-            retrieveUser();
-        } else if (requestCode == GEM_PURCHASE_REQUEST) {
-            retrieveUser();
-        }
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-
-    // region Events
-
-    @Override
-    public void onDestroy() {
-        EventBus.getDefault().unregister(this);
-        super.onDestroy();
-    }
-
-    @Subscribe
-    public void onEvent(ToggledInnStateEvent evt) {
-        avatarInHeader.updateData(user);
-    }
-
-    @Subscribe
-    public void onEvent(UpdateUserCommand event) {
-        userRepository.updateUser(user, event.updateData)
-                .subscribe(this::onUserReceived, throwable -> {
-                });
-    }
-
-    @Subscribe
-    public void onEvent(EquipCommand event) {
-        this.apiClient.equipItem(event.type, event.key)
-                .subscribe(new ItemsCallback(this, this.user), throwable -> {
-                });
-    }
-
-    @Subscribe
-    public void onEvent(UnlockPathCommand event) {
-        this.user.setBalance(this.user.getBalance() - event.balanceDiff);
-        this.setUserData(false);
-        apiClient.unlockPath(event.path)
-                .subscribe(new UnlockCallback(this, this.user), throwable -> {
-                });
-    }
-
-    @Subscribe
-    public void onEvent(OpenMenuItemCommand event) {
-        drawer.setSelection(event.identifier);
-    }
-
-    @Subscribe
-    public void onEvent(final BuyGemItemCommand event) {
-        if (event.item.canBuy(user) || !event.item.getCurrency().equals("gems")) {
-            Observable<Void> observable;
-            if (event.shopIdentifier.equals(Shop.TIME_TRAVELERS_SHOP)) {
-                if (event.item.purchaseType.equals("gear")) {
-                    observable = apiClient.purchaseMysterySet(event.item.categoryIdentifier);
-                } else {
-                    observable = apiClient.purchaseHourglassItem(event.item.purchaseType, event.item.key);
-                }
-            } else if (event.item.purchaseType.equals("quests") && event.item.getCurrency().equals("gold")) {
-                observable = apiClient.purchaseQuest(event.item.key);
-            } else {
-                observable = apiClient.purchaseItem(event.item.purchaseType, event.item.key);
-            }
-            observable
-                    .doOnNext(aVoid -> showSnackbar(this, floatingMenuWrapper, getString(R.string.successful_purchase, event.item.text), SnackbarDisplayType.NORMAL))
-                    .subscribe(buyResponse -> userRepository.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);
-        }
-    }
-
-    @Subscribe
-    public void onEvent(final BuyRewardCommand event) {
-        final String rewardKey = event.Reward.getId();
-
-        if (user.getStats().getGp() < event.Reward.getValue()) {
-            showSnackbar(this, floatingMenuWrapper, getString(R.string.no_gold), SnackbarDisplayType.FAILURE);
-            return;
-        }
-
-        if (rewardKey.equals("potion")) {
-            int currentHp = user.getStats().getHp().intValue();
-            int maxHp = user.getStats().getMaxHealth();
-
-            if (currentHp == maxHp) {
-                UiUtils.showSnackbar(this, floatingMenuWrapper, getString(R.string.no_potion), SnackbarDisplayType.FAILURE_BLUE);
-                return;
-            }
-        }
-
-        if (event.Reward.specialTag != null && event.Reward.specialTag.equals("item")) {
-            apiClient.buyItem(event.Reward.getId())
-                    .subscribe(buyResponse -> {
-                                String snackbarMessage = getString(R.string.successful_purchase, event.Reward.getText());
-
-                                if (event.Reward.getId().equals("armoire")) {
-                                    if (buyResponse.armoire.get("type").equals("gear")) {
-                                        snackbarMessage = getApplicationContext().getString(R.string.armoireEquipment, buyResponse.armoire.get("dropText"));
-                                    } else if (buyResponse.armoire.get("type").equals("food")) {
-                                        snackbarMessage = getApplicationContext().getString(R.string.armoireFood, buyResponse.armoire.get("dropArticle"), buyResponse.armoire.get("dropText"));
-                                    } else {
-                                        snackbarMessage = getApplicationContext().getString(R.string.armoireExp);
-                                    }
-                                    soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop);
-                                } else if (!event.Reward.getId().equals("potion")) {
-                                    EventBus.getDefault().post(new TaskRemovedEvent(event.Reward.getId()));
-                                }
-                                if (buyResponse.items != null) {
-                                    user.setItems(buyResponse.items);
-                                }
-                                if (buyResponse.hp != null) {
-                                    user.getStats().setHp(buyResponse.hp);
-                                }
-                                if (buyResponse.exp != null) {
-                                    user.getStats().setExp(buyResponse.exp);
-                                }
-                                if (buyResponse.mp != null) {
-                                    user.getStats().setMp(buyResponse.mp);
-                                }
-                                if (buyResponse.gp != null) {
-                                    user.getStats().setGp(buyResponse.gp);
-                                }
-                                if (buyResponse.lvl != null) {
-                                    user.getStats().setLvl(buyResponse.lvl);
-                                }
-
-                                user.async().save();
-                                MainActivity.this.setUserData(true);
-
-                                showSnackbar(MainActivity.this, floatingMenuWrapper, snackbarMessage, SnackbarDisplayType.NORMAL);
-                            }, throwable -> {
-                            }
-                    );
-        } else {
-            buyRewardUseCase.observable(new BuyRewardUseCase.RequestValues(event.Reward))
-                    .subscribe(res -> onTaskDataReceived(res, event.Reward), error -> {
-                    });
-        }
-
-        //Update the users gold
-        Stats stats = user.getStats();
-        Double gp = stats.getGp() - event.Reward.getValue();
-        stats.setGp(gp);
-
-        avatarInHeader.updateData(user);
-        user.async().save();
-    }
-
-    @Subscribe
-    public void onEvent(final DeleteTaskCommand cmd) {
-        taskRepository.deleteTask(cmd.TaskIdToDelete)
-                .subscribe(aVoid -> EventBus.getDefault().post(new TaskRemovedEvent(cmd.TaskIdToDelete)), throwable -> {});
-    }
-
-    @Subscribe
-    public void openMysteryItem(OpenMysteryItemEvent event) {
-        apiClient.openMysteryItem()
-                .subscribe(mysteryItem -> userRepository.retrieveUser(false)
-                        .subscribe(new HabitRPGUserCallback(user1 -> {
-                            OpenedMysteryItemEvent openedEvent = new OpenedMysteryItemEvent();
-                            openedEvent.numberLeft = user1.getPurchased().getPlan().mysteryItems.size();
-                            openedEvent.mysteryItem = mysteryItem;
-                            EventBus.getDefault().post(openedEvent);
-                            MainActivity.this.onUserReceived(user1);
-                        }), throwable -> {
-                        }), throwable -> {
-                });
-    }
-
-    @Subscribe
-    public void openGemPurchaseFragment(@Nullable OpenGemPurchaseFragmentCommand cmd) {
-        drawer.setSelection(MainDrawerBuilder.SIDEBAR_PURCHASE);
-    }
-
-    @Subscribe
-    public void onEvent(DisplayTutorialEvent tutorialEvent) {
-        if (tutorialEvent.tutorialText != null) {
-            this.displayTutorialStep(tutorialEvent.step, tutorialEvent.tutorialText, tutorialEvent.canBeDeferred);
-        } else {
-            this.displayTutorialStep(tutorialEvent.step, tutorialEvent.tutorialTexts, tutorialEvent.canBeDeferred);
-        }
-    }
-
-    @Subscribe
-    public void onEvent(DisplayFragmentEvent event) {
-        this.displayFragment(event.fragment);
-    }
-
-    @Subscribe
-    public void onEvent(SellItemCommand event) {
-        this.apiClient.sellItem(event.item.getType(), event.item.getKey())
-                .subscribe(habitRPGUser -> {
-                    user.setItems(habitRPGUser.getItems());
-                    user.save();
-                    user.setStats(habitRPGUser.getStats());
-                    setUserData(false);
-                }, throwable -> {
-                });
-    }
-
-    @Subscribe
-    public void onEvent(final HatchingCommand event) {
-        if (event.usingEgg == null || event.usingHatchingPotion == null) {
-            return;
-        }
-        this.apiClient.hatchPet(event.usingEgg.getKey(), event.usingHatchingPotion.getKey())
-                .subscribe(new ItemsCallback(user1 -> {
-                    FrameLayout petWrapper = (FrameLayout) getLayoutInflater().inflate(R.layout.pet_imageview, null);
-                    SimpleDraweeView petImageView = (SimpleDraweeView) petWrapper.findViewById(R.id.pet_imageview);
-
-                    DataBindingUtils.loadImage(petImageView, "Pet-" + event.usingEgg.getKey() + "-" + event.usingHatchingPotion.getKey());
-                    String potionName = event.usingHatchingPotion.getText();
-                    String eggName = event.usingEgg.getText();
-                    AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
-                            .setTitle(getString(R.string.hatched_pet_title, potionName, eggName))
-                            .setView(petWrapper)
-                            .setPositiveButton(R.string.close, (hatchingDialog, which) -> hatchingDialog.dismiss())
-                            .setNeutralButton(R.string.share, (hatchingDialog, which) -> {
-                                ShareEvent event1 = new ShareEvent();
-                                event1.sharedMessage = getString(R.string.share_hatched, potionName, eggName) + " https://habitica.com/social/hatch-pet";
-                                Bitmap sharedImage = Bitmap.createBitmap(140, 140, Bitmap.Config.ARGB_8888);
-                                Canvas canvas = new Canvas(sharedImage);
-                                canvas.drawColor(ContextCompat.getColor(this, R.color.brand_300));
-                                petImageView.getDrawable().draw(canvas);
-                                event1.shareImage = sharedImage;
-                                EventBus.getDefault().post(event1);
-                                hatchingDialog.dismiss();
-                            })
-                            .create();
-                    dialog.show();
-                }, this.user), throwable -> {
-                });
-    }
-
-    @Subscribe
-    public void onEvent(FeedCommand event) {
-        if (event.usingFood == null || event.usingPet == null) {
-            return;
-        }
-        final Pet pet = event.usingPet;
-        this.apiClient.feedPet(event.usingPet.getKey(), event.usingFood.getKey())
-                .subscribe(feedResponse -> {
-                    MainActivity.this.user.getItems().getPets().put(pet.getKey(), feedResponse.value);
-                    MainActivity.this.user.getItems().getFood().put(event.usingFood.getKey(), event.usingFood.getOwned() - 1);
-                    MainActivity.this.setUserData(false);
-                    showSnackbar(MainActivity.this, floatingMenuWrapper, getString(R.string.notification_pet_fed, pet.getColorText(), pet.getAnimalText()), SnackbarDisplayType.NORMAL);
-                    if (feedResponse.value == -1) {
-                        FrameLayout mountWrapper = (FrameLayout) getLayoutInflater().inflate(R.layout.pet_imageview, null);
-                        SimpleDraweeView mountImageView = (SimpleDraweeView) mountWrapper.findViewById(R.id.pet_imageview);
-
-                        DataBindingUtils.loadImage(mountImageView, "Mount_Icon_" + event.usingPet.getKey());
-                        String colorName = event.usingPet.getColorText();
-                        String animalName = event.usingPet.getAnimalText();
-                        AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
-                                .setTitle(getString(R.string.hatched_pet_title, colorName, animalName))
-                                .setView(mountWrapper)
-                                .setPositiveButton(R.string.close, (hatchingDialog, which) -> {
-                                    hatchingDialog.dismiss();
-                                })
-                                .setNeutralButton(R.string.share, (hatchingDialog, which) -> {
-                                    ShareEvent event1 = new ShareEvent();
-                                    event1.sharedMessage = getString(R.string.share_raised, colorName, animalName) + " https://habitica.com/social/raise-pet";
-                                    Bitmap sharedImage = Bitmap.createBitmap(99, 99, Bitmap.Config.ARGB_8888);
-                                    Canvas canvas = new Canvas(sharedImage);
-                                    canvas.drawColor(ContextCompat.getColor(this, R.color.brand_300));
-                                    mountImageView.getDrawable().draw(canvas);
-                                    event1.shareImage = sharedImage;
-                                    EventBus.getDefault().post(event1);
-                                    hatchingDialog.dismiss();
-                                })
-                                .create();
-                        dialog.show();
-                    }
-                }, throwable -> {
-                });
-    }
-
-    // endregion
-
-    @Subscribe
-    public void reloadContent(ReloadContentEvent event) {
-        if (!this.isloadingContent) {
-            this.isloadingContent = true;
-            this.apiClient.getContent()
-                    .subscribe(contentResult -> {
-                        isloadingContent = false;
-                        ContentReloadedEvent event1 = new ContentReloadedEvent();
-                        EventBus.getDefault().post(event1);
-                    }, throwable -> {
-                    });
-        }
-    }
-
-    @Override
-    public void onTaskDataReceived(TaskDirectionData data, Task task) {
-
-        if (task.type.equals("reward")) {
-
-            showSnackbar(this, floatingMenuWrapper, getString(R.string.notification_purchase, task.getText()), SnackbarDisplayType.NORMAL);
-
-        } else {
-
-            if (user != null) {
-                notifyUserUseCase.observable(new NotifyUserUseCase.RequestValues(this, floatingMenuWrapper, this::retrieveUser,
-                        user, data.getExp(), data.getHp(), data.getGp(), data.getMp(), data.getLvl()))
-                        .subscribe(aVoid -> {
-                            user.getStats().hp = data.getHp();
-                            user.getStats().exp = data.getExp();
-                            user.getStats().mp = data.getMp();
-                            user.getStats().gp = data.getGp();
-                            user.getStats().lvl = data.getLvl();
-                            setUserData(true);
-                        }, throwable -> {});
-            }
-
-            displayItemDropUseCase.observable(new DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
-                    .subscribe(aVoid -> {}, throwable -> {});
-        }
-
-    }
-
-
-    private void displayDeathDialogIfNeeded() {
-
-        if (user.getStats().getHp() == null || user.getStats().getHp() > 0) {
-            return;
-        }
-
-        if (this.faintDialog == null) {
-
-            View customView = getLayoutInflater().inflate(R.layout.dialog_faint, null);
-            if (customView != null) {
-                View hpBarView = customView.findViewById(R.id.hpBar);
-
-                ValueBarBinding hpBar = DataBindingUtil.bind(hpBarView);
-                hpBar.setPartyMembers(true);
-                AvatarWithBarsViewModel.setHpBarData(hpBar, user.getStats(), this);
-
-                AvatarView dialogAvatarView = (AvatarView) customView.findViewById(R.id.avatarView);
-                dialogAvatarView.setUser(user);
-            }
-
-            this.faintDialog = new AlertDialog.Builder(this)
-                    .setTitle(R.string.faint_header)
-                    .setView(customView)
-                    .setPositiveButton(R.string.faint_button, (dialog, which) -> {
-                        faintDialog = null;
-                        userRepository.revive(user)
-                                .subscribe(this::onUserReceived, throwable -> {
-                                });
-                    })
-                    .create();
-
-            soundManager.loadAndPlayAudio(SoundManager.SoundDeath);
-            this.faintDialog.show();
-        }
-    }
-
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_MENU && drawer != null) {
-            drawer.openDrawer();
-            return true;
-        }
-
-        return super.onKeyUp(keyCode, event);
-    }
-
-    public ViewGroup getFloatingMenuWrapper() {
-        return floatingMenuWrapper;
-    }
-
-    protected void retrieveUser() {
-        if (this.userRepository != null) {
-            this.userRepository.retrieveUser(true)
-                    .subscribe(this::onUserReceived, throwable -> {
-                    });
-        }
-    }
-
-    @Subscribe
-    public void displayClassSelectionActivity(SelectClassEvent event) {
-        checkClassSelectionUseCase.observable(new CheckClassSelectionUseCase.RequestValues(user, event))
-                .subscribe(aVoid -> {
-                }, throwable -> {
-                });
-    }
-
-    private void displayTutorialStep(TutorialStep step, String text, boolean canBeDeferred) {
-        TutorialView view = new TutorialView(this, step, this);
-        view.setTutorialText(text);
-        view.onReaction = this;
-        view.setCanBeDeferred(canBeDeferred);
-        this.overlayLayout.addView(view);
-        this.activeTutorialView = view;
-
-        Map<String, Object> additionalData = new HashMap<>();
-        additionalData.put("eventLabel", step.getIdentifier() + "-android");
-        additionalData.put("eventValue", step.getIdentifier());
-        additionalData.put("complete", false);
-        AmplitudeManager.sendEvent("tutorial", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
-    }
-
-    private void displayTutorialStep(TutorialStep step, List<String> texts, boolean canBeDeferred) {
-        TutorialView view = new TutorialView(this, step, this);
-        view.setTutorialTexts(texts);
-        view.onReaction = this;
-        view.setCanBeDeferred(canBeDeferred);
-        this.overlayLayout.addView(view);
-        this.activeTutorialView = view;
-
-        Map<String, Object> additionalData = new HashMap<>();
-        additionalData.put("eventLabel", step.getIdentifier() + "-android");
-        additionalData.put("eventValue", step.getIdentifier());
-        additionalData.put("complete", false);
-        AmplitudeManager.sendEvent("tutorial", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
-    }
-
-    @Override
-    public void onTutorialCompleted(TutorialStep step) {
-        String path = "flags.tutorial." + step.getTutorialGroup() + "." + step.getIdentifier();
-        Map<String, Object> updateData = new HashMap<>();
-        updateData.put(path, true);
-        userRepository.updateUser(user,  updateData)
-                .subscribe(this::onUserReceived, throwable -> {
-                });
-        this.overlayLayout.removeView(this.activeTutorialView);
-        this.removeActiveTutorialView();
-
-        Map<String, Object> additionalData = new HashMap<>();
-        additionalData.put("eventLabel", step.getIdentifier() + "-android");
-        additionalData.put("eventValue", step.getIdentifier());
-        additionalData.put("complete", true);
-        AmplitudeManager.sendEvent("tutorial", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
-    }
-
-    @Override
-    public void onTutorialDeferred(TutorialStep step) {
-        step.setDisplayedOn(new Date());
-        step.save();
-
-        this.removeActiveTutorialView();
-    }
-
-    private void removeActiveTutorialView() {
-        if (this.activeTutorialView != null) {
-            this.overlayLayout.removeView(this.activeTutorialView);
-            this.activeTutorialView = null;
-        }
-    }
-
-    public String getUserID() {
-        if (this.user != null) {
-            return user.getId();
-        } else {
-            return "";
-        }
-    }
-
-    @Subscribe
-    public void shareEvent(ShareEvent event) {
-        Intent sharingIntent = new Intent(Intent.ACTION_SEND);
-        sharingIntent.setType("*/*");
-        sharingIntent.putExtra(Intent.EXTRA_TEXT, event.sharedMessage);
-        File f = BitmapUtils.saveToShareableFile(getFilesDir() + "/shared_images", "share.png", event.shareImage);
-        Uri fileUri = FileProvider.getUriForFile(this, getString(R.string.content_provider), f);
-        sharingIntent.putExtra(Intent.EXTRA_STREAM, fileUri);
-        List<ResolveInfo> resInfoList = this.getPackageManager().queryIntentActivities(sharingIntent, PackageManager.MATCH_DEFAULT_ONLY);
-        for (ResolveInfo resolveInfo : resInfoList) {
-            String packageName = resolveInfo.activityInfo.packageName;
-            this.grantUriPermission(packageName, fileUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        }
-        startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_using)));
-    }
-
-    @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(new TaskScoringCallback(this, event.Task.getId()), error -> {
-                        });
-            }
-            break;
-            case Task.TYPE_TODO: {
-                todoCheckUseCase.observable(new TodoCheckUseCase.RequestValues(event.Task, !event.Task.getCompleted()))
-                        .subscribe(new TaskScoringCallback(this, event.Task.getId()), error -> {
-                        });
-            }
-            break;
-        }
-    }
-
-    @Subscribe
-    public void onEvent(ChecklistCheckedCommand event) {
-        checklistCheckUseCase.observable(new ChecklistCheckUseCase.RequestValues(event.task.getId(), event.item.getId()))
-                .subscribe(new TaskUpdateCallback(), error -> {
-                });
-    }
-
-    @Subscribe
-    public void onEvent(HabitScoreEvent event) {
-        habitScoreUseCase.observable(new HabitScoreUseCase.RequestValues(event.habit, event.Up))
-                .subscribe(new TaskScoringCallback(this, event.habit.getId()), error -> {
-                });
-    }
-
-    @Subscribe
-    public void onEvent(final TaskSaveEvent event) {
-        Task task = event.task;
-        if (event.created) {
-            this.taskRepository.createTask(task).subscribe(task1 -> {}, throwable -> {});
-        } else {
-            this.taskRepository.updateTask(task).subscribe(task1 -> {}, throwable -> {});
-        }
-    }
-
-    private void checkMaintenance() {
-        this.maintenanceService.getMaintenanceStatus()
-                .compose(apiClient.configureApiCallObserver())
-                .subscribe(maintenanceResponse -> {
-                    if (maintenanceResponse.activeMaintenance) {
-                        Intent intent = createMaintenanceIntent(maintenanceResponse, false);
-                        startActivity(intent);
-                    } else {
-                        if (maintenanceResponse.minBuild != null) {
-                            PackageInfo packageInfo = null;
-                            try {
-                                packageInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
-                                if (packageInfo.versionCode < maintenanceResponse.minBuild) {
-                                    Intent intent = createMaintenanceIntent(maintenanceResponse, true);
-                                    startActivity(intent);
-                                }
-                            } catch (PackageManager.NameNotFoundException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
-                }, throwable -> {
-                });
-    }
-
-    private Intent createMaintenanceIntent(MaintenanceResponse maintenanceResponse, Boolean isDeprecationNotice) {
-        Intent intent = new Intent(this, MaintenanceActivity.class);
-        Bundle data = new Bundle();
-        data.putString("title", maintenanceResponse.title);
-        data.putString("imageUrl", maintenanceResponse.imageUrl);
-        data.putString("description", maintenanceResponse.description);
-        data.putBoolean("deprecationNotice", isDeprecationNotice);
-        intent.putExtras(data);
-        return intent;
-    }
-
-    @Override
-    public void call(Throwable throwable) {
-
-    }
-
-    @Subscribe
-    public void onEvent(OpenFullProfileCommand cmd) {
-        if (cmd.MemberId.equals("system"))
-            return;
-
-        Bundle bundle = new Bundle();
-        bundle.putString("userId", cmd.MemberId);
-
-        Intent intent = new Intent(this, FullProfileActivity.class);
-        intent.putExtras(bundle);
-        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        startActivity(intent);
-    }
-
-    public boolean isAppBarExpanded() {
-        return (appBar.getHeight() - appBar.getBottom()) == 0;
-    }
-}
+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.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.AppBarLayout;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.content.FileProvider;
+import android.support.v4.view.GravityCompat;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.api.MaintenanceApiService;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.callbacks.ItemsCallback;
+import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
+import com.habitrpg.android.habitica.callbacks.TaskUpdateCallback;
+import com.habitrpg.android.habitica.callbacks.UnlockCallback;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.data.TagRepository;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.databinding.ValueBarBinding;
+import com.habitrpg.android.habitica.events.ContentReloadedEvent;
+import com.habitrpg.android.habitica.events.DisplayFragmentEvent;
+import com.habitrpg.android.habitica.events.DisplayTutorialEvent;
+import com.habitrpg.android.habitica.events.HabitScoreEvent;
+import com.habitrpg.android.habitica.events.OpenMysteryItemEvent;
+import com.habitrpg.android.habitica.events.OpenedMysteryItemEvent;
+import com.habitrpg.android.habitica.events.ReloadContentEvent;
+import com.habitrpg.android.habitica.events.SelectClassEvent;
+import com.habitrpg.android.habitica.events.ShareEvent;
+import com.habitrpg.android.habitica.events.TaskRemovedEvent;
+import com.habitrpg.android.habitica.events.TaskSaveEvent;
+import com.habitrpg.android.habitica.events.ToggledEditTagsEvent;
+import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
+import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
+import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
+import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
+import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
+import com.habitrpg.android.habitica.events.commands.EquipCommand;
+import com.habitrpg.android.habitica.events.commands.FeedCommand;
+import com.habitrpg.android.habitica.events.commands.HatchingCommand;
+import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
+import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
+import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
+import com.habitrpg.android.habitica.events.commands.SellItemCommand;
+import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
+import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
+import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
+import com.habitrpg.android.habitica.helpers.AmplitudeManager;
+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.models.TutorialStep;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Preferences;
+import com.habitrpg.android.habitica.models.user.SpecialItems;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
+import com.habitrpg.android.habitica.ui.TutorialView;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
+import com.habitrpg.android.habitica.userpicture.BitmapUtils;
+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.mikepenz.materialdrawer.AccountHeader;
+import com.mikepenz.materialdrawer.Drawer;
+import com.mikepenz.materialdrawer.holder.BadgeStyle;
+import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
+import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
+import com.mikepenz.materialdrawer.model.interfaces.IProfile;
+import com.roughike.bottombar.BottomBar;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import retrofit2.adapter.rxjava.HttpException;
+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;
+
+public class MainActivity extends BaseActivity implements Action1<Throwable>, HabitRPGUserCallback.OnUserReceived,
+        TaskScoringCallback.OnTaskScored, TutorialView.OnTutorialReaction {
+
+    public static final int SELECT_CLASS_RESULT = 11;
+    public static final int GEM_PURCHASE_REQUEST = 111;
+    @Inject
+    public ApiClient apiClient;
+
+    @Inject
+    public SoundManager soundManager;
+
+    @Inject
+    public MaintenanceApiService maintenanceService;
+    public HabitRPGUser user;
+    @BindView(R.id.floating_menu_wrapper)
+    public ViewGroup floatingMenuWrapper;
+    @BindView(R.id.bottom_navigation)
+    BottomBar bottomNavigation;
+    @Inject
+    protected HostConfig hostConfig;
+    @Inject
+    protected SharedPreferences sharedPreferences;
+    @Inject
+    CrashlyticsProxy crashlyticsProxy;
+    @BindView(R.id.appbar)
+    AppBarLayout appBar;
+    @BindView(R.id.toolbar)
+    Toolbar toolbar;
+    @BindView(R.id.detail_tabs)
+    TabLayout detail_tabs;
+    @BindView(R.id.avatar_with_bars)
+    View avatar_with_bars;
+    @BindView(R.id.overlayFrameLayout)
+    ViewGroup overlayLayout;
+
+    @Inject
+    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;
+    @Inject
+    UserRepository userRepository;
+    @Inject
+    TagRepository tagRepository;
+    @Inject
+    InventoryRepository inventoryRepository;
+
+    @Inject
+    TaskAlarmManager taskAlarmManager;
+
+    // endregion
+
+    private Drawer drawer;
+    private AccountHeader accountHeader;
+    private BaseMainFragment activeFragment;
+    private AvatarWithBarsViewModel avatarInHeader;
+    private AlertDialog faintDialog;
+    private AvatarView sideAvatarView;
+    private Date lastSync;
+    private TutorialView activeTutorialView;
+    private boolean isloadingContent;
+
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_main;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString("language", "en"));
+        Locale.setDefault(languageHelper.getLocale());
+        Configuration configuration = new Configuration();
+        if (SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
+            configuration.locale = languageHelper.getLocale();
+        } else {
+            configuration.setLocale(languageHelper.getLocale());
+        }
+        getResources().updateConfiguration(configuration,
+                getResources().getDisplayMetrics());
+
+
+        if (!HabiticaApplication.checkUserAuthentication(this, hostConfig)) {
+            return;
+        }
+
+        userRepository.getUser(hostConfig.getUser())
+                .subscribe(newUser -> {
+                    MainActivity.this.user = newUser;
+                    MainActivity.this.setUserData(true);
+                }, throwable -> {});
+
+        setupToolbar(toolbar);
+
+        avatarInHeader = new AvatarWithBarsViewModel(this, avatar_with_bars);
+        accountHeader = MainDrawerBuilder.CreateDefaultAccountHeader(this).build();
+        drawer = MainDrawerBuilder.CreateDefaultBuilderSettings(this, sharedPreferences, toolbar, accountHeader)
+                .build();
+        drawer.setSelectionAtPosition(1, false);
+        sideAvatarView = new AvatarView(this, true, false, false);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            Window window = getWindow();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                window.setStatusBarColor(ContextCompat.getColor(this, R.color.black_10_alpha));
+            }
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            toolbar.setPadding(0, getStatusBarHeight(), 0, 0);
+            float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, getResources().getDisplayMetrics());
+            avatar_with_bars.setPadding((int)px, getStatusBarHeight(), (int)px, 0);
+        }
+
+        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;
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        //resync, if last sync was more than 10 minutes ago
+        if (this.lastSync == null || (new Date().getTime() - this.lastSync.getTime()) > 180000) {
+            if (this.apiClient != null && this.apiClient.hasAuthenticationKeys()) {
+                retrieveUser();
+                this.checkMaintenance();
+            }
+        }
+
+        if (this.sharedPreferences.getLong("lastReminderSchedule", 0) < new Date().getTime() - 86400000) {
+            try {
+                taskAlarmManager.scheduleAllSavedAlarms();
+            } catch (Exception e) {
+                crashlyticsProxy.logException(e);
+            }
+        }
+
+        //after the activity has been stopped and is thereafter resumed,
+        //a state can arise in which the active fragment no longer has a
+        //reference to the tabLayout (and all its adapters are null).
+        //Recreate the fragment as a result.
+        if (activeFragment != null && activeFragment.tabLayout == null) {
+            activeFragment = null;
+            drawer.setSelectionAtPosition(this.sharedPreferences.getInt("lastActivePosition", 1));
+        }
+
+        if (isAlwaysFinishActivitiesOptionEnabled()) {
+            if (!sharedPreferences.getBoolean("showedFinishActivitiesWarning", false)) {
+                AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
+                        .setTitle(getString(R.string.warning))
+                        .setMessage(R.string.dont_keep_activities_warning)
+                        .setNeutralButton(R.string.close, (warningDialog, which) -> warningDialog.dismiss())
+                        .setPositiveButton(R.string.open_settings, (hatchingDialog, which) -> {
+                            showDeveloperOptionsScreen();
+                            hatchingDialog.dismiss();
+                        })
+                        .create();
+                dialog.show();
+                sharedPreferences.edit().putBoolean("showedFinishActivitiesWarning", true).apply();
+            }
+        }
+    }
+
+    @Override
+    protected void onPause() {
+        updateWidget(AvatarStatsWidgetProvider.class);
+        updateWidget(TodoListWidgetProvider.class);
+        updateWidget(DailiesWidgetProvider.class);
+        updateWidget(HabitButtonWidgetProvider.class);
+        super.onPause();
+    }
+
+    private void updateWidget(Class widgetClass) {
+        Intent intent = new Intent(this, widgetClass);
+        intent.setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+        int ids[] = AppWidgetManager.getInstance(getApplication()).getAppWidgetIds(new ComponentName(getApplication(), widgetClass));
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids);
+        sendBroadcast(intent);
+    }
+
+
+    private void saveLoginInformation() {
+        HabiticaApplication.User = user;
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        SharedPreferences.Editor editor = prefs.edit();
+        boolean ans = editor.putString(getString(R.string.SP_username), user.getAuthentication().getLocalAuthentication().getUsername())
+                .putString(getString(R.string.SP_email), user.getAuthentication().getLocalAuthentication().getEmail())
+                .commit();
+
+        if (!ans) {
+            Log.e("SHARED PREFERENCES", "Shared Preferences Username and Email error");
+        }
+    }
+
+    public void displayFragment(BaseMainFragment fragment) {
+        if (this.activeFragment != null && fragment.getClass() == this.activeFragment.getClass()) {
+            return;
+        }
+        if (SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && this.isDestroyed()) {
+            return;
+        }
+        this.activeFragment = fragment;
+        fragment.setArguments(getIntent().getExtras());
+        fragment.setUser(user);
+        fragment.setActivity(this);
+        fragment.setTabLayout(detail_tabs);
+        fragment.setBottomNavigation(bottomNavigation);
+        fragment.setFloatingMenuWrapper(floatingMenuWrapper);
+
+
+        if (getSupportFragmentManager().getFragments() == null) {
+            getSupportFragmentManager().beginTransaction().add(R.id.fragment_container, fragment).commitAllowingStateLoss();
+        } else {
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            transaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out, android.R.anim.fade_in, android.R.anim.fade_out);
+            transaction.replace(R.id.fragment_container, fragment).addToBackStack(null).commitAllowingStateLoss();
+        }
+    }
+
+    protected void setUserData(boolean fromLocalDb) {
+        if (user != null) {
+
+            Preferences preferences = user.getPreferences();
+
+            if (preferences != null) {
+                apiClient.setLanguageCode(preferences.getLanguage());
+                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));
+                userRepository.updateUser(user, updateData)
+                        .subscribe(this::onUserReceived, throwable -> {
+                        });
+            }
+            runOnUiThread(() -> {
+                updateHeader();
+                updateSidebar();
+                saveLoginInformation();
+                if (activeFragment != null) {
+                    activeFragment.updateUserData(user);
+                } else {
+                    drawer.setSelectionAtPosition(1);
+                }
+            });
+
+            displayDeathDialogIfNeeded();
+
+            if (!fromLocalDb) {
+                displayNewInboxMessagesBadge();
+                pushNotificationManager.setUser(user);
+                pushNotificationManager.addPushDeviceUsingStoredToken();
+
+                // Update the oldEntries
+                new Thread(() -> {
+
+                    // multiple crashes because user is null
+                    if (user != null) {
+                        ArrayList<Task> allTasks = new ArrayList<>();
+                        allTasks.addAll(user.getDailys());
+                        allTasks.addAll(user.getTodos());
+                        allTasks.addAll(user.getHabits());
+                        allTasks.addAll(user.getRewards());
+
+                        taskRepository.removeOldTasks(user.getId(), allTasks);
+
+                        ArrayList<ChecklistItem> allChecklistItems = new ArrayList<>();
+                        for (Task t : allTasks) {
+                            if (t.checklist != null) {
+                                allChecklistItems.addAll(t.checklist);
+                            }
+                        }
+                        taskRepository.removeOldChecklists(allChecklistItems);
+
+                        ArrayList<TaskTag> allTaskTags = new ArrayList<>();
+                        for (Task t : allTasks) {
+                            if (t.getTags() != null) {
+                                allTaskTags.addAll(t.getTags());
+                            }
+                        }
+                        taskRepository.removeOldTaskTags(allTaskTags);
+
+                        ArrayList<RemindersItem> allReminders = new ArrayList<>();
+                        for (Task t : allTasks) {
+                            if (t.getReminders() != null) {
+                                allReminders.addAll(t.getReminders());
+                            }
+                        }
+                        taskRepository.removeOldReminders(allReminders);
+
+                        tagRepository.removeOldTags(user.getTags());
+
+                        inventoryRepository.updateOwnedEquipment(user);
+                    }
+                }).start();
+            }
+        }
+    }
+
+    private void displayNewInboxMessagesBadge() {
+        Integer numberOfUnreadPms = this.user.getInbox().getNewMessages();
+        IDrawerItem newInboxItem;
+
+        if (numberOfUnreadPms <= 0) {
+            newInboxItem = new PrimaryDrawerItem()
+                    .withName(this.getString(R.string.sidebar_inbox))
+                    .withIdentifier(MainDrawerBuilder.SIDEBAR_INBOX);
+        } else {
+            String numberOfUnreadPmsLabel = String.valueOf(numberOfUnreadPms);
+            BadgeStyle badgeStyle = new BadgeStyle()
+                    .withTextColor(Color.WHITE)
+                    .withColorRes(R.color.md_red_700);
+
+            newInboxItem = new PrimaryDrawerItem()
+                    .withName(this.getString(R.string.sidebar_inbox))
+                    .withIdentifier(MainDrawerBuilder.SIDEBAR_INBOX)
+                    .withBadge(numberOfUnreadPmsLabel)
+                    .withBadgeStyle(badgeStyle);
+        }
+
+        this.drawer.updateItemAtPosition(newInboxItem, this.drawer.getPosition(MainDrawerBuilder.SIDEBAR_INBOX));
+    }
+
+    private void updateUserAvatars() {
+        avatarInHeader.updateData(user);
+    }
+
+    private void updateHeader() {
+        updateUserAvatars();
+        setTranslatedFragmentTitle(activeFragment);
+
+        android.support.v7.app.ActionBarDrawerToggle actionBarDrawerToggle = drawer.getActionBarDrawerToggle();
+
+        if (actionBarDrawerToggle != null) {
+            actionBarDrawerToggle.setDrawerIndicatorEnabled(true);
+        }
+    }
+
+    public void updateSidebar() {
+        final IProfile profile = accountHeader.getProfiles().get(0);
+        if (user.getAuthentication() != null) {
+            if (user.getAuthentication().getLocalAuthentication() != null) {
+                profile.withEmail(user.getAuthentication().getLocalAuthentication().getEmail());
+            }
+        }
+        profile.withName(user.getProfile().getName());
+        sideAvatarView.setUser(user);
+        sideAvatarView.onAvatarImageReady(avatarImage -> {
+            profile.withIcon(avatarImage);
+            accountHeader.updateProfile(profile);
+        });
+        accountHeader.updateProfile(profile);
+
+        if (user.getPreferences() == null || user.getFlags() == null) {
+            return;
+        }
+
+        SpecialItems specialItems = user.getItems().getSpecial();
+        Boolean hasSpecialItems = false;
+        if (specialItems != null) {
+            hasSpecialItems = specialItems.hasSpecialItems();
+        }
+
+        IDrawerItem item = drawer.getDrawerItem(MainDrawerBuilder.SIDEBAR_SKILLS);
+        if (((user.getPreferences() != null && user.getPreferences().getDisableClasses())
+                || (user.getFlags() != null && !user.getFlags().getClassSelected()))
+                && !hasSpecialItems) {
+            if (item != null) {
+                drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS);
+            }
+        } else {
+            IDrawerItem newItem;
+            if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS && !hasSpecialItems) {
+                newItem = new PrimaryDrawerItem()
+                        .withName(this.getString(R.string.sidebar_skills))
+                        .withEnabled(false)
+                        .withBadge(this.getString(R.string.unlock_lvl_11))
+                        .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
+            } else {
+                newItem = new PrimaryDrawerItem()
+                        .withName(this.getString(R.string.sidebar_skills))
+                        .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
+            }
+            if (item == null) {
+                drawer.addItemAtPosition(newItem, 1);
+            } else {
+                drawer.updateItem(newItem);
+
+            }
+        }
+    }
+
+    @Override
+    public void onUserReceived(HabitRPGUser user) {
+        this.user = user;
+        this.lastSync = new Date();
+        MainActivity.this.setUserData(false);
+    }
+
+    public void setActiveFragment(BaseMainFragment fragment) {
+        this.activeFragment = fragment;
+        setTranslatedFragmentTitle(fragment);
+        this.drawer.setSelectionAtPosition(this.activeFragment.fragmentSidebarPosition, false);
+    }
+
+    private void setTranslatedFragmentTitle(BaseMainFragment fragment) {
+        if (getSupportActionBar() == null) {
+            return;
+        }
+        if (fragment != null && fragment.customTitle() != null) {
+            getSupportActionBar().setTitle(fragment.customTitle());
+        } else if (user != null && user.getProfile() != null) {
+            getSupportActionBar().setTitle(user.getProfile().getName());
+        }
+    }
+
+    public void onBackPressed() {
+        if (this.activeTutorialView != null) {
+            this.removeActiveTutorialView();
+        }
+        if (drawer.isDrawerOpen()) {
+            drawer.closeDrawer();
+        } else if (drawer.getDrawerLayout().isDrawerOpen(GravityCompat.END)) {
+            drawer.getDrawerLayout().closeDrawer(GravityCompat.END);
+            EventBus.getDefault().post(new ToggledEditTagsEvent(false));
+        } else {
+            super.onBackPressed();
+            if (this.activeFragment != null) {
+                this.activeFragment.updateUserData(user);
+            }
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == SELECT_CLASS_RESULT) {
+            retrieveUser();
+        } else if (requestCode == GEM_PURCHASE_REQUEST) {
+            retrieveUser();
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    // region Events
+
+    @Override
+    public void onDestroy() {
+        EventBus.getDefault().unregister(this);
+        super.onDestroy();
+    }
+
+    @Subscribe
+    public void onEvent(ToggledInnStateEvent evt) {
+        avatarInHeader.updateData(user);
+    }
+
+    @Subscribe
+    public void onEvent(UpdateUserCommand event) {
+        userRepository.updateUser(user, event.updateData)
+                .subscribe(this::onUserReceived, throwable -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(EquipCommand event) {
+        this.apiClient.equipItem(event.type, event.key)
+                .subscribe(new ItemsCallback(this, this.user), throwable -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(UnlockPathCommand event) {
+        this.user.setBalance(this.user.getBalance() - event.balanceDiff);
+        this.setUserData(false);
+        apiClient.unlockPath(event.path)
+                .subscribe(new UnlockCallback(this, this.user), throwable -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(OpenMenuItemCommand event) {
+        drawer.setSelection(event.identifier);
+    }
+
+    @Subscribe
+    public void onEvent(final BuyGemItemCommand event) {
+        if (event.item.canBuy(user) || !event.item.getCurrency().equals("gems")) {
+            Observable<Void> observable;
+            if (event.shopIdentifier.equals(Shop.TIME_TRAVELERS_SHOP)) {
+                if (event.item.purchaseType.equals("gear")) {
+                    observable = apiClient.purchaseMysterySet(event.item.categoryIdentifier);
+                } else {
+                    observable = apiClient.purchaseHourglassItem(event.item.purchaseType, event.item.key);
+                }
+            } else if (event.item.purchaseType.equals("quests") && event.item.getCurrency().equals("gold")) {
+                observable = apiClient.purchaseQuest(event.item.key);
+            } else {
+                observable = apiClient.purchaseItem(event.item.purchaseType, event.item.key);
+            }
+            observable
+                    .doOnNext(aVoid -> showSnackbar(this, floatingMenuWrapper, getString(R.string.successful_purchase, event.item.text), SnackbarDisplayType.NORMAL))
+                    .subscribe(buyResponse -> userRepository.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);
+        }
+    }
+
+    @Subscribe
+    public void onEvent(final BuyRewardCommand event) {
+        final String rewardKey = event.Reward.getId();
+
+        if (user.getStats().getGp() < event.Reward.getValue()) {
+            showSnackbar(this, floatingMenuWrapper, getString(R.string.no_gold), SnackbarDisplayType.FAILURE);
+            return;
+        }
+
+        if (rewardKey.equals("potion")) {
+            int currentHp = user.getStats().getHp().intValue();
+            int maxHp = user.getStats().getMaxHealth();
+
+            if (currentHp == maxHp) {
+                UiUtils.showSnackbar(this, floatingMenuWrapper, getString(R.string.no_potion), SnackbarDisplayType.FAILURE_BLUE);
+                return;
+            }
+        }
+
+        if (event.Reward.specialTag != null && event.Reward.specialTag.equals("item")) {
+            apiClient.buyItem(event.Reward.getId())
+                    .subscribe(buyResponse -> {
+                                String snackbarMessage = getString(R.string.successful_purchase, event.Reward.getText());
+
+                                if (event.Reward.getId().equals("armoire")) {
+                                    if (buyResponse.armoire.get("type").equals("gear")) {
+                                        snackbarMessage = getApplicationContext().getString(R.string.armoireEquipment, buyResponse.armoire.get("dropText"));
+                                    } else if (buyResponse.armoire.get("type").equals("food")) {
+                                        snackbarMessage = getApplicationContext().getString(R.string.armoireFood, buyResponse.armoire.get("dropArticle"), buyResponse.armoire.get("dropText"));
+                                    } else {
+                                        snackbarMessage = getApplicationContext().getString(R.string.armoireExp);
+                                    }
+                                    soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop);
+                                } else if (!event.Reward.getId().equals("potion")) {
+                                    EventBus.getDefault().post(new TaskRemovedEvent(event.Reward.getId()));
+                                }
+                                if (buyResponse.items != null) {
+                                    user.setItems(buyResponse.items);
+                                }
+                                if (buyResponse.hp != null) {
+                                    user.getStats().setHp(buyResponse.hp);
+                                }
+                                if (buyResponse.exp != null) {
+                                    user.getStats().setExp(buyResponse.exp);
+                                }
+                                if (buyResponse.mp != null) {
+                                    user.getStats().setMp(buyResponse.mp);
+                                }
+                                if (buyResponse.gp != null) {
+                                    user.getStats().setGp(buyResponse.gp);
+                                }
+                                if (buyResponse.lvl != null) {
+                                    user.getStats().setLvl(buyResponse.lvl);
+                                }
+
+                                user.async().save();
+                                MainActivity.this.setUserData(true);
+
+                                showSnackbar(MainActivity.this, floatingMenuWrapper, snackbarMessage, SnackbarDisplayType.NORMAL);
+                            }, throwable -> {
+                            }
+                    );
+        } else {
+            buyRewardUseCase.observable(new BuyRewardUseCase.RequestValues(event.Reward))
+                    .subscribe(res -> onTaskDataReceived(res, event.Reward), error -> {
+                    });
+        }
+
+        //Update the users gold
+        Stats stats = user.getStats();
+        Double gp = stats.getGp() - event.Reward.getValue();
+        stats.setGp(gp);
+
+        avatarInHeader.updateData(user);
+        user.async().save();
+    }
+
+    @Subscribe
+    public void onEvent(final DeleteTaskCommand cmd) {
+        taskRepository.deleteTask(cmd.TaskIdToDelete)
+                .subscribe(aVoid -> EventBus.getDefault().post(new TaskRemovedEvent(cmd.TaskIdToDelete)), throwable -> {});
+    }
+
+    @Subscribe
+    public void openMysteryItem(OpenMysteryItemEvent event) {
+        apiClient.openMysteryItem()
+                .subscribe(mysteryItem -> userRepository.retrieveUser(false)
+                        .subscribe(new HabitRPGUserCallback(user1 -> {
+                            OpenedMysteryItemEvent openedEvent = new OpenedMysteryItemEvent();
+                            openedEvent.numberLeft = user1.getPurchased().getPlan().mysteryItems.size();
+                            openedEvent.mysteryItem = mysteryItem;
+                            EventBus.getDefault().post(openedEvent);
+                            MainActivity.this.onUserReceived(user1);
+                        }), throwable -> {
+                        }), throwable -> {
+                });
+    }
+
+    @Subscribe
+    public void openGemPurchaseFragment(@Nullable OpenGemPurchaseFragmentCommand cmd) {
+        drawer.setSelection(MainDrawerBuilder.SIDEBAR_PURCHASE);
+    }
+
+    @Subscribe
+    public void onEvent(DisplayTutorialEvent tutorialEvent) {
+        if (tutorialEvent.tutorialText != null) {
+            this.displayTutorialStep(tutorialEvent.step, tutorialEvent.tutorialText, tutorialEvent.canBeDeferred);
+        } else {
+            this.displayTutorialStep(tutorialEvent.step, tutorialEvent.tutorialTexts, tutorialEvent.canBeDeferred);
+        }
+    }
+
+    @Subscribe
+    public void onEvent(DisplayFragmentEvent event) {
+        this.displayFragment(event.fragment);
+    }
+
+    @Subscribe
+    public void onEvent(SellItemCommand event) {
+        this.apiClient.sellItem(event.item.getType(), event.item.getKey())
+                .subscribe(habitRPGUser -> {
+                    user.setItems(habitRPGUser.getItems());
+                    user.save();
+                    user.setStats(habitRPGUser.getStats());
+                    setUserData(false);
+                }, throwable -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(final HatchingCommand event) {
+        if (event.usingEgg == null || event.usingHatchingPotion == null) {
+            return;
+        }
+        this.apiClient.hatchPet(event.usingEgg.getKey(), event.usingHatchingPotion.getKey())
+                .subscribe(new ItemsCallback(user1 -> {
+                    FrameLayout petWrapper = (FrameLayout) getLayoutInflater().inflate(R.layout.pet_imageview, null);
+                    SimpleDraweeView petImageView = (SimpleDraweeView) petWrapper.findViewById(R.id.pet_imageview);
+
+                    DataBindingUtils.loadImage(petImageView, "Pet-" + event.usingEgg.getKey() + "-" + event.usingHatchingPotion.getKey());
+                    String potionName = event.usingHatchingPotion.getText();
+                    String eggName = event.usingEgg.getText();
+                    AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
+                            .setTitle(getString(R.string.hatched_pet_title, potionName, eggName))
+                            .setView(petWrapper)
+                            .setPositiveButton(R.string.close, (hatchingDialog, which) -> hatchingDialog.dismiss())
+                            .setNeutralButton(R.string.share, (hatchingDialog, which) -> {
+                                ShareEvent event1 = new ShareEvent();
+                                event1.sharedMessage = getString(R.string.share_hatched, potionName, eggName) + " https://habitica.com/social/hatch-pet";
+                                Bitmap sharedImage = Bitmap.createBitmap(140, 140, Bitmap.Config.ARGB_8888);
+                                Canvas canvas = new Canvas(sharedImage);
+                                canvas.drawColor(ContextCompat.getColor(this, R.color.brand_300));
+                                petImageView.getDrawable().draw(canvas);
+                                event1.shareImage = sharedImage;
+                                EventBus.getDefault().post(event1);
+                                hatchingDialog.dismiss();
+                            })
+                            .create();
+                    dialog.show();
+                }, this.user), throwable -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(FeedCommand event) {
+        if (event.usingFood == null || event.usingPet == null) {
+            return;
+        }
+        final Pet pet = event.usingPet;
+        this.apiClient.feedPet(event.usingPet.getKey(), event.usingFood.getKey())
+                .subscribe(feedResponse -> {
+                    MainActivity.this.user.getItems().getPets().put(pet.getKey(), feedResponse.value);
+                    MainActivity.this.user.getItems().getFood().put(event.usingFood.getKey(), event.usingFood.getOwned() - 1);
+                    MainActivity.this.setUserData(false);
+                    showSnackbar(MainActivity.this, floatingMenuWrapper, getString(R.string.notification_pet_fed, pet.getColorText(), pet.getAnimalText()), SnackbarDisplayType.NORMAL);
+                    if (feedResponse.value == -1) {
+                        FrameLayout mountWrapper = (FrameLayout) getLayoutInflater().inflate(R.layout.pet_imageview, null);
+                        SimpleDraweeView mountImageView = (SimpleDraweeView) mountWrapper.findViewById(R.id.pet_imageview);
+
+                        DataBindingUtils.loadImage(mountImageView, "Mount_Icon_" + event.usingPet.getKey());
+                        String colorName = event.usingPet.getColorText();
+                        String animalName = event.usingPet.getAnimalText();
+                        AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
+                                .setTitle(getString(R.string.hatched_pet_title, colorName, animalName))
+                                .setView(mountWrapper)
+                                .setPositiveButton(R.string.close, (hatchingDialog, which) -> {
+                                    hatchingDialog.dismiss();
+                                })
+                                .setNeutralButton(R.string.share, (hatchingDialog, which) -> {
+                                    ShareEvent event1 = new ShareEvent();
+                                    event1.sharedMessage = getString(R.string.share_raised, colorName, animalName) + " https://habitica.com/social/raise-pet";
+                                    Bitmap sharedImage = Bitmap.createBitmap(99, 99, Bitmap.Config.ARGB_8888);
+                                    Canvas canvas = new Canvas(sharedImage);
+                                    canvas.drawColor(ContextCompat.getColor(this, R.color.brand_300));
+                                    mountImageView.getDrawable().draw(canvas);
+                                    event1.shareImage = sharedImage;
+                                    EventBus.getDefault().post(event1);
+                                    hatchingDialog.dismiss();
+                                })
+                                .create();
+                        dialog.show();
+                    }
+                }, throwable -> {
+                });
+    }
+
+    // endregion
+
+    @Subscribe
+    public void reloadContent(ReloadContentEvent event) {
+        if (!this.isloadingContent) {
+            this.isloadingContent = true;
+            this.apiClient.getContent()
+                    .subscribe(contentResult -> {
+                        isloadingContent = false;
+                        ContentReloadedEvent event1 = new ContentReloadedEvent();
+                        EventBus.getDefault().post(event1);
+                    }, throwable -> {
+                    });
+        }
+    }
+
+    @Override
+    public void onTaskDataReceived(TaskDirectionData data, Task task) {
+
+        if (task.type.equals("reward")) {
+
+            showSnackbar(this, floatingMenuWrapper, getString(R.string.notification_purchase, task.getText()), SnackbarDisplayType.NORMAL);
+
+        } else {
+
+            if (user != null) {
+                notifyUserUseCase.observable(new NotifyUserUseCase.RequestValues(this, floatingMenuWrapper, this::retrieveUser,
+                        user, data.getExp(), data.getHp(), data.getGp(), data.getMp(), data.getLvl()))
+                        .subscribe(aVoid -> {
+                            user.getStats().hp = data.getHp();
+                            user.getStats().exp = data.getExp();
+                            user.getStats().mp = data.getMp();
+                            user.getStats().gp = data.getGp();
+                            user.getStats().lvl = data.getLvl();
+                            setUserData(true);
+                        }, throwable -> {});
+            }
+
+            displayItemDropUseCase.observable(new DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
+                    .subscribe(aVoid -> {}, throwable -> {});
+        }
+
+    }
+
+
+    private void displayDeathDialogIfNeeded() {
+
+        if (user.getStats().getHp() == null || user.getStats().getHp() > 0) {
+            return;
+        }
+
+        if (this.faintDialog == null) {
+
+            View customView = getLayoutInflater().inflate(R.layout.dialog_faint, null);
+            if (customView != null) {
+                View hpBarView = customView.findViewById(R.id.hpBar);
+
+                ValueBarBinding hpBar = DataBindingUtil.bind(hpBarView);
+                hpBar.setPartyMembers(true);
+                AvatarWithBarsViewModel.setHpBarData(hpBar, user.getStats(), this);
+
+                AvatarView dialogAvatarView = (AvatarView) customView.findViewById(R.id.avatarView);
+                dialogAvatarView.setUser(user);
+            }
+
+            this.faintDialog = new AlertDialog.Builder(this)
+                    .setTitle(R.string.faint_header)
+                    .setView(customView)
+                    .setPositiveButton(R.string.faint_button, (dialog, which) -> {
+                        faintDialog = null;
+                        userRepository.revive(user)
+                                .subscribe(this::onUserReceived, throwable -> {
+                                });
+                    })
+                    .create();
+
+            soundManager.loadAndPlayAudio(SoundManager.SoundDeath);
+            this.faintDialog.show();
+        }
+    }
+
+
+    @Override
+    public boolean onKeyUp(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_MENU && drawer != null) {
+            drawer.openDrawer();
+            return true;
+        }
+
+        return super.onKeyUp(keyCode, event);
+    }
+
+    public ViewGroup getFloatingMenuWrapper() {
+        return floatingMenuWrapper;
+    }
+
+    protected void retrieveUser() {
+        if (this.userRepository != null) {
+            this.userRepository.retrieveUser(true)
+                    .subscribe(this::onUserReceived, throwable -> {
+                    });
+        }
+    }
+
+    @Subscribe
+    public void displayClassSelectionActivity(SelectClassEvent event) {
+        checkClassSelectionUseCase.observable(new CheckClassSelectionUseCase.RequestValues(user, event))
+                .subscribe(aVoid -> {
+                }, throwable -> {
+                });
+    }
+
+    private void displayTutorialStep(TutorialStep step, String text, boolean canBeDeferred) {
+        TutorialView view = new TutorialView(this, step, this);
+        view.setTutorialText(text);
+        view.onReaction = this;
+        view.setCanBeDeferred(canBeDeferred);
+        this.overlayLayout.addView(view);
+        this.activeTutorialView = view;
+
+        Map<String, Object> additionalData = new HashMap<>();
+        additionalData.put("eventLabel", step.getIdentifier() + "-android");
+        additionalData.put("eventValue", step.getIdentifier());
+        additionalData.put("complete", false);
+        AmplitudeManager.sendEvent("tutorial", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
+    }
+
+    private void displayTutorialStep(TutorialStep step, List<String> texts, boolean canBeDeferred) {
+        TutorialView view = new TutorialView(this, step, this);
+        view.setTutorialTexts(texts);
+        view.onReaction = this;
+        view.setCanBeDeferred(canBeDeferred);
+        this.overlayLayout.addView(view);
+        this.activeTutorialView = view;
+
+        Map<String, Object> additionalData = new HashMap<>();
+        additionalData.put("eventLabel", step.getIdentifier() + "-android");
+        additionalData.put("eventValue", step.getIdentifier());
+        additionalData.put("complete", false);
+        AmplitudeManager.sendEvent("tutorial", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
+    }
+
+    @Override
+    public void onTutorialCompleted(TutorialStep step) {
+        String path = "flags.tutorial." + step.getTutorialGroup() + "." + step.getIdentifier();
+        Map<String, Object> updateData = new HashMap<>();
+        updateData.put(path, true);
+        userRepository.updateUser(user,  updateData)
+                .subscribe(this::onUserReceived, throwable -> {
+                });
+        this.overlayLayout.removeView(this.activeTutorialView);
+        this.removeActiveTutorialView();
+
+        Map<String, Object> additionalData = new HashMap<>();
+        additionalData.put("eventLabel", step.getIdentifier() + "-android");
+        additionalData.put("eventValue", step.getIdentifier());
+        additionalData.put("complete", true);
+        AmplitudeManager.sendEvent("tutorial", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
+    }
+
+    @Override
+    public void onTutorialDeferred(TutorialStep step) {
+        step.setDisplayedOn(new Date());
+        step.save();
+
+        this.removeActiveTutorialView();
+    }
+
+    private void removeActiveTutorialView() {
+        if (this.activeTutorialView != null) {
+            this.overlayLayout.removeView(this.activeTutorialView);
+            this.activeTutorialView = null;
+        }
+    }
+
+    public String getUserID() {
+        if (this.user != null) {
+            return user.getId();
+        } else {
+            return "";
+        }
+    }
+
+    @Subscribe
+    public void shareEvent(ShareEvent event) {
+        Intent sharingIntent = new Intent(Intent.ACTION_SEND);
+        sharingIntent.setType("*/*");
+        sharingIntent.putExtra(Intent.EXTRA_TEXT, event.sharedMessage);
+        File f = BitmapUtils.saveToShareableFile(getFilesDir() + "/shared_images", "share.png", event.shareImage);
+        Uri fileUri = FileProvider.getUriForFile(this, getString(R.string.content_provider), f);
+        sharingIntent.putExtra(Intent.EXTRA_STREAM, fileUri);
+        List<ResolveInfo> resInfoList = this.getPackageManager().queryIntentActivities(sharingIntent, PackageManager.MATCH_DEFAULT_ONLY);
+        for (ResolveInfo resolveInfo : resInfoList) {
+            String packageName = resolveInfo.activityInfo.packageName;
+            this.grantUriPermission(packageName, fileUri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        }
+        startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_using)));
+    }
+
+    @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(new TaskScoringCallback(taskRepository, inventoryRepository, this, event.Task.getId()), error -> {
+                        });
+            }
+            break;
+            case Task.TYPE_TODO: {
+                todoCheckUseCase.observable(new TodoCheckUseCase.RequestValues(event.Task, !event.Task.getCompleted()))
+                        .subscribe(new TaskScoringCallback(taskRepository, inventoryRepository, this, event.Task.getId()), error -> {
+                        });
+            }
+            break;
+        }
+    }
+
+    @Subscribe
+    public void onEvent(ChecklistCheckedCommand event) {
+        checklistCheckUseCase.observable(new ChecklistCheckUseCase.RequestValues(event.task.getId(), event.item.getId()))
+                .subscribe(new TaskUpdateCallback(), error -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(HabitScoreEvent event) {
+        habitScoreUseCase.observable(new HabitScoreUseCase.RequestValues(event.habit, event.Up))
+                .subscribe(new TaskScoringCallback(taskRepository, inventoryRepository, this, event.habit.getId()), error -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(final TaskSaveEvent event) {
+        Task task = event.task;
+        if (event.created) {
+            this.taskRepository.createTask(task).subscribe(task1 -> {}, throwable -> {});
+        } else {
+            this.taskRepository.updateTask(task).subscribe(task1 -> {}, throwable -> {});
+        }
+    }
+
+    private void checkMaintenance() {
+        this.maintenanceService.getMaintenanceStatus()
+                .compose(apiClient.configureApiCallObserver())
+                .subscribe(maintenanceResponse -> {
+                    if (maintenanceResponse.activeMaintenance) {
+                        Intent intent = createMaintenanceIntent(maintenanceResponse, false);
+                        startActivity(intent);
+                    } else {
+                        if (maintenanceResponse.minBuild != null) {
+                            PackageInfo packageInfo = null;
+                            try {
+                                packageInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
+                                if (packageInfo.versionCode < maintenanceResponse.minBuild) {
+                                    Intent intent = createMaintenanceIntent(maintenanceResponse, true);
+                                    startActivity(intent);
+                                }
+                            } catch (PackageManager.NameNotFoundException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                }, throwable -> {
+                });
+    }
+
+    private Intent createMaintenanceIntent(MaintenanceResponse maintenanceResponse, Boolean isDeprecationNotice) {
+        Intent intent = new Intent(this, MaintenanceActivity.class);
+        Bundle data = new Bundle();
+        data.putString("title", maintenanceResponse.title);
+        data.putString("imageUrl", maintenanceResponse.imageUrl);
+        data.putString("description", maintenanceResponse.description);
+        data.putBoolean("deprecationNotice", isDeprecationNotice);
+        intent.putExtras(data);
+        return intent;
+    }
+
+    @Override
+    public void call(Throwable throwable) {
+
+    }
+
+    @Subscribe
+    public void onEvent(OpenFullProfileCommand cmd) {
+        if (cmd.MemberId.equals("system"))
+            return;
+
+        Bundle bundle = new Bundle();
+        bundle.putString("userId", cmd.MemberId);
+
+        Intent intent = new Intent(this, FullProfileActivity.class);
+        intent.putExtras(bundle);
+        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        startActivity(intent);
+    }
+
+    public boolean isAppBarExpanded() {
+        return (appBar.getHeight() - appBar.getBottom()) == 0;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java
index af299b1bf..48606ce7c 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,97 +1,97 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.habitrpg.android.habitica.api.MaintenanceApiService;
-
-import net.pherth.android.emoji_library.EmojiTextView;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.method.LinkMovementMethod;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-public class MaintenanceActivity extends BaseActivity {
-
-    @Inject
-    public MaintenanceApiService maintenanceService;
-
-    @Inject
-    public ApiClient apiClient;
-
-    @BindView(R.id.titleTextView)
-    TextView titleTextView;
-    @BindView(R.id.imageView)
-    SimpleDraweeView imageView;
-    @BindView(R.id.descriptionTextView)
-    EmojiTextView descriptionTextView;
-    @BindView(R.id.playStoreButton)
-    Button playStoreButton;
-    private Boolean isDeprecationNotice;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_maintenance;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Bundle data = getIntent().getExtras();
-
-        this.titleTextView.setText(data.getString("title"));
-
-        imageView.setImageURI(Uri.parse(data.getString("imageUrl")));
-        this.descriptionTextView.setText(MarkdownParser.parseMarkdown(data.getString("description")));
-        this.descriptionTextView.setMovementMethod(LinkMovementMethod.getInstance());
-
-        isDeprecationNotice = data.getBoolean("deprecationNotice");
-        if (isDeprecationNotice) {
-            this.playStoreButton.setVisibility(View.VISIBLE);
-        } else {
-            this.playStoreButton.setVisibility(View.GONE);
-        }
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (!isDeprecationNotice) {
-            this.maintenanceService.getMaintenanceStatus()
-                    .compose(apiClient.configureApiCallObserver())
-                    .subscribe(maintenanceResponse -> {
-                        if (!maintenanceResponse.activeMaintenance) {
-                            finish();
-                        }
-                    }, throwable -> {
-                    });
-        }
-    }
-
-    @OnClick(R.id.playStoreButton)
-    public void openInPlayStore() {
-        final String appPackageName = getPackageName();
-        try {
-            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appPackageName)));
-        } catch (android.content.ActivityNotFoundException anfe) {
-            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + appPackageName)));
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.method.LinkMovementMethod;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.api.MaintenanceApiService;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+
+import net.pherth.android.emoji_library.EmojiTextView;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+public class MaintenanceActivity extends BaseActivity {
+
+    @Inject
+    public MaintenanceApiService maintenanceService;
+
+    @Inject
+    public ApiClient apiClient;
+
+    @BindView(R.id.titleTextView)
+    TextView titleTextView;
+    @BindView(R.id.imageView)
+    SimpleDraweeView imageView;
+    @BindView(R.id.descriptionTextView)
+    EmojiTextView descriptionTextView;
+    @BindView(R.id.playStoreButton)
+    Button playStoreButton;
+    private Boolean isDeprecationNotice;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_maintenance;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bundle data = getIntent().getExtras();
+
+        this.titleTextView.setText(data.getString("title"));
+
+        imageView.setImageURI(Uri.parse(data.getString("imageUrl")));
+        this.descriptionTextView.setText(MarkdownParser.parseMarkdown(data.getString("description")));
+        this.descriptionTextView.setMovementMethod(LinkMovementMethod.getInstance());
+
+        isDeprecationNotice = data.getBoolean("deprecationNotice");
+        if (isDeprecationNotice) {
+            this.playStoreButton.setVisibility(View.VISIBLE);
+        } else {
+            this.playStoreButton.setVisibility(View.GONE);
+        }
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (!isDeprecationNotice) {
+            this.maintenanceService.getMaintenanceStatus()
+                    .compose(apiClient.configureApiCallObserver())
+                    .subscribe(maintenanceResponse -> {
+                        if (!maintenanceResponse.activeMaintenance) {
+                            finish();
+                        }
+                    }, throwable -> {
+                    });
+        }
+    }
+
+    @OnClick(R.id.playStoreButton)
+    public void openInPlayStore() {
+        final String appPackageName = getPackageName();
+        try {
+            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appPackageName)));
+        } catch (android.content.ActivityNotFoundException anfe) {
+            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://play.google.com/store/apps/details?id=" + appPackageName)));
+        }
+    }
+}
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 0410e630a..55aa974c2 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,188 +1,188 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.Toast;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
-import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
-import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import butterknife.BindView;
-
-public class PartyInviteActivity extends BaseActivity {
-
-    public static final int RESULT_SEND_INVITES = 100;
-    public static final String USER_IDS_KEY = "userIDs";
-    public static final String IS_EMAIL_KEY = "isEmail";
-    public static final String EMAILS_KEY = "emails";
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    protected String userId;
-    @Inject
-    SocialRepository socialRepository;
-    @Inject
-    UserRepository userRepository;
-    @BindView(R.id.tab_layout)
-    TabLayout tabLayout;
-    @BindView(R.id.view_pager)
-    ViewPager viewPager;
-    List<PartyInviteFragment> fragments = new ArrayList<>();
-    private String userIdToInvite;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_party_invite;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        viewPager.setCurrentItem(0);
-
-        setViewPagerAdapter();
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_party_invite, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_send_invites) {
-            setResult(Activity.RESULT_OK, createResultIntent());
-            finish();
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private Intent createResultIntent() {
-        Intent intent = new Intent();
-        PartyInviteFragment fragment = fragments.get(viewPager.getCurrentItem());
-        if (viewPager.getCurrentItem() == 0) {
-            intent.putExtra(PartyInviteActivity.IS_EMAIL_KEY, true);
-            intent.putExtra(PartyInviteActivity.EMAILS_KEY, fragment.getValues());
-        } else {
-            intent.putExtra(PartyInviteActivity.IS_EMAIL_KEY, false);
-            intent.putExtra(PartyInviteActivity.USER_IDS_KEY, fragment.getValues());
-        }
-        return intent;
-    }
-
-    public void setViewPagerAdapter() {
-        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
-
-        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
-
-            @Override
-            public Fragment getItem(int position) {
-
-                PartyInviteFragment fragment = new PartyInviteFragment();
-                fragment.isEmailInvite = position == 0;
-                if (fragments.size() > position) {
-                    fragments.set(position, fragment);
-                } else {
-                    fragments.add(fragment);
-                }
-
-                return fragment;
-            }
-
-            @Override
-            public int getCount() {
-                return 2;
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                switch (position) {
-                    case 0:
-                        return getString(R.string.by_email);
-                    case 1:
-                        return getString(R.string.invite_existing_users);
-                }
-                return "";
-            }
-        });
-
-        if (tabLayout != null && viewPager != null) {
-            tabLayout.setupWithViewPager(viewPager);
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        IntentResult scanningResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
-
-        if (scanningResult != null && scanningResult.getContents() != null) {
-            String qrCodeUrl = scanningResult.getContents();
-            Uri uri = Uri.parse(qrCodeUrl);
-            if (uri == null || uri.getPathSegments().size() < 3) {
-                return;
-            }
-            userIdToInvite = uri.getPathSegments().get(2);
-
-            userRepository.getUser(userId).subscribe(this::handleUserRecieved, throwable -> {});
-        }
-    }
-
-    public void handleUserRecieved(HabitRPGUser user) {
-
-        if (this.userIdToInvite == null) {
-            return;
-        }
-
-        Toast toast = Toast.makeText(getApplicationContext(),
-                "Invited: " + userIdToInvite, Toast.LENGTH_LONG);
-        toast.show();
-
-        Map<String, Object> inviteData = new HashMap<>();
-        List<String> invites = new ArrayList<>();
-        invites.add(userIdToInvite);
-        inviteData.put("uuids", invites);
-
-        this.socialRepository.inviteToGroup(user.getParty().getId(), inviteData)
-                .subscribe(aVoid -> {}, throwable -> {});
-    }
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
+import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import butterknife.BindView;
+
+public class PartyInviteActivity extends BaseActivity {
+
+    public static final int RESULT_SEND_INVITES = 100;
+    public static final String USER_IDS_KEY = "userIDs";
+    public static final String IS_EMAIL_KEY = "isEmail";
+    public static final String EMAILS_KEY = "emails";
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    protected String userId;
+    @Inject
+    SocialRepository socialRepository;
+    @Inject
+    UserRepository userRepository;
+    @BindView(R.id.tab_layout)
+    TabLayout tabLayout;
+    @BindView(R.id.view_pager)
+    ViewPager viewPager;
+    List<PartyInviteFragment> fragments = new ArrayList<>();
+    private String userIdToInvite;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_party_invite;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        viewPager.setCurrentItem(0);
+
+        setViewPagerAdapter();
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_party_invite, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_send_invites) {
+            setResult(Activity.RESULT_OK, createResultIntent());
+            finish();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private Intent createResultIntent() {
+        Intent intent = new Intent();
+        PartyInviteFragment fragment = fragments.get(viewPager.getCurrentItem());
+        if (viewPager.getCurrentItem() == 0) {
+            intent.putExtra(PartyInviteActivity.IS_EMAIL_KEY, true);
+            intent.putExtra(PartyInviteActivity.EMAILS_KEY, fragment.getValues());
+        } else {
+            intent.putExtra(PartyInviteActivity.IS_EMAIL_KEY, false);
+            intent.putExtra(PartyInviteActivity.USER_IDS_KEY, fragment.getValues());
+        }
+        return intent;
+    }
+
+    public void setViewPagerAdapter() {
+        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
+
+        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
+
+            @Override
+            public Fragment getItem(int position) {
+
+                PartyInviteFragment fragment = new PartyInviteFragment();
+                fragment.isEmailInvite = position == 0;
+                if (fragments.size() > position) {
+                    fragments.set(position, fragment);
+                } else {
+                    fragments.add(fragment);
+                }
+
+                return fragment;
+            }
+
+            @Override
+            public int getCount() {
+                return 2;
+            }
+
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return getString(R.string.by_email);
+                    case 1:
+                        return getString(R.string.invite_existing_users);
+                }
+                return "";
+            }
+        });
+
+        if (tabLayout != null && viewPager != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        IntentResult scanningResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+
+        if (scanningResult != null && scanningResult.getContents() != null) {
+            String qrCodeUrl = scanningResult.getContents();
+            Uri uri = Uri.parse(qrCodeUrl);
+            if (uri == null || uri.getPathSegments().size() < 3) {
+                return;
+            }
+            userIdToInvite = uri.getPathSegments().get(2);
+
+            userRepository.getUser(userId).subscribe(this::handleUserRecieved, throwable -> {});
+        }
+    }
+
+    public void handleUserRecieved(HabitRPGUser user) {
+
+        if (this.userIdToInvite == null) {
+            return;
+        }
+
+        Toast toast = Toast.makeText(getApplicationContext(),
+                "Invited: " + userIdToInvite, Toast.LENGTH_LONG);
+        toast.show();
+
+        Map<String, Object> inviteData = new HashMap<>();
+        List<String> invites = new ArrayList<>();
+        invites.add(userIdToInvite);
+        inviteData.put("uuids", invites);
+
+        this.socialRepository.inviteToGroup(user.getParty().getId(), inviteData)
+                .subscribe(aVoid -> {}, throwable -> {});
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
index 37e2f01d2..acfa2e026 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
@@ -1,13 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.fragments.preferences.AccountDetailsFragment;
-import com.habitrpg.android.habitica.ui.fragments.preferences.PreferencesFragment;
-import com.habitrpg.android.habitica.ui.fragments.preferences.PushNotificationsPreferencesFragment;
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -16,6 +8,14 @@ import android.support.v7.preference.PreferenceFragmentCompat;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.widget.Toolbar;
 
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.ui.fragments.preferences.AccountDetailsFragment;
+import com.habitrpg.android.habitica.ui.fragments.preferences.PreferencesFragment;
+import com.habitrpg.android.habitica.ui.fragments.preferences.PushNotificationsPreferencesFragment;
+
 import butterknife.BindView;
 
 public class PrefsActivity extends BaseActivity implements
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 9056b8c2e..c64ede3b3 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,303 +1,303 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-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;
-import android.view.View;
-import android.view.Window;
-import android.widget.Button;
-
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.habitrpg.android.habitica.callbacks.ItemsCallback;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.commands.EquipCommand;
-import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
-import com.habitrpg.android.habitica.helpers.AmplitudeManager;
-import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
-import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
-import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment;
-import com.habitrpg.android.habitica.ui.views.FadingViewPager;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.viewpagerindicator.IconPageIndicator;
-import com.viewpagerindicator.IconPagerAdapter;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-import rx.Observable;
-
-public class SetupActivity extends BaseActivity implements ViewPager.OnPageChangeListener, HabitRPGUserCallback.OnUserReceived {
-
-    @Inject
-    public ApiClient apiClient;
-    @Inject
-    protected HostConfig hostConfig;
-    @Inject
-    protected UserRepository userRepository;
-    @Inject
-    protected TaskRepository taskRepository;
-    @BindView(R.id.view_pager)
-    FadingViewPager pager;
-    @BindView(R.id.nextButton)
-    Button nextButton;
-    @BindView(R.id.previousButton)
-    Button previousButton;
-    @BindView(R.id.view_pager_indicator)
-    IconPageIndicator indicator;
-    AvatarSetupFragment avatarSetupFragment;
-    TaskSetupFragment taskSetupFragment;
-    @Nullable
-    HabitRPGUser user;
-    boolean completedSetup = false;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_setup;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        userRepository.getUser(hostConfig.getUser())
-                .flatMap(user -> {
-                    if (user == null) {
-                        return userRepository.retrieveUser(true);
-                    } else {
-                        return Observable.just(user);
-                    }
-                })
-                .subscribe(this::onUserReceived, throwable -> {
-
-        });
-
-        Map<String, Object> additionalData = new HashMap<>();
-        additionalData.put("status", "displayed");
-        AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
-
-        String currentDeviceLanguage = Locale.getDefault().getLanguage();
-        for (String language : getResources().getStringArray(R.array.LanguageValues)) {
-            if (language.equals(currentDeviceLanguage)) {
-                apiClient.registrationLanguage(currentDeviceLanguage)
-                        .subscribe(habitRPGUser -> {}, throwable -> {
-                        });
-            }
-        }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            Window window = getWindow();
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                View decor = getWindow().getDecorView();
-                    decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
-                window.setStatusBarColor(ContextCompat.getColor(this, R.color.light_gray_bg));
-            } else {
-                window.setStatusBarColor(ContextCompat.getColor(this, R.color.days_gray));
-            }
-        }
-
-        pager.disableFading = true;
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-        EventBus.getDefault().unregister(this);
-    }
-
-    private void setupViewpager() {
-        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
-
-        pager.setAdapter(new ViewPageAdapter(fragmentManager));
-
-        pager.addOnPageChangeListener(this);
-        indicator.setViewPager(pager);
-    }
-
-    @Subscribe
-    public void onEvent(UpdateUserCommand event) {
-        this.userRepository.updateUser(user, event.updateData)
-                .subscribe(this::onUserReceived, 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);
-        SharedPreferences.Editor editor = sharedPreferences.edit();
-        editor.putString("FirstDayOfTheWeek",
-                Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
-        editor.apply();
-        if (isLastPage()) {
-            List<Task> newTasks = this.taskSetupFragment.createSampleTasks();
-            this.completedSetup = true;
-            this.taskRepository.createTasks(newTasks)
-                    .subscribe(tasks -> onUserReceived(user), throwable -> {
-                    });
-            //this.apiHelper.apiService.batchOperation(operations, new HabitRPGUserCallback(this));
-        }
-        this.pager.setCurrentItem(this.pager.getCurrentItem() + 1);
-    }
-
-    @OnClick(R.id.previousButton)
-    public void previousClicked() {
-        this.pager.setCurrentItem(this.pager.getCurrentItem() - 1);
-    }
-
-    private void setPreviousButtonEnabled(boolean enabled) {
-        Drawable leftDrawable;
-        if (enabled) {
-            previousButton.setText(R.string.action_back);
-            leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_enabled);
-        } else {
-            previousButton.setText(null);
-            leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_disabled);
-        }
-        previousButton.setCompoundDrawablesWithIntrinsicBounds(leftDrawable, null, null, null);
-    }
-
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-    }
-
-    @Override
-    public void onPageSelected(int position) {
-        if (position == 0) {
-            this.setPreviousButtonEnabled(false);
-            this.nextButton.setText(this.getString(R.string.next_button));
-        } else if (isLastPage()) {
-            this.setPreviousButtonEnabled(true);
-            this.nextButton.setText(this.getString(R.string.intro_finish_button));
-        } else {
-            this.setPreviousButtonEnabled(true);
-            this.nextButton.setText(this.getString(R.string.next_button));
-        }
-    }
-
-    @Override
-    public void onPageScrollStateChanged(int state) {
-
-    }
-
-    @Override
-    public void onUserReceived(HabitRPGUser user) {
-        if (completedSetup) {
-            this.startMainActivity();
-            return;
-        }
-        this.user = user;
-        if (this.pager.getAdapter() == null) {
-            this.setupViewpager();
-        } else {
-            if (this.avatarSetupFragment != null) {
-                this.avatarSetupFragment.setUser(user);
-            }
-            if (this.taskSetupFragment != null) {
-                this.taskSetupFragment.setUser(user);
-            }
-        }
-
-        Map<String, Object> additionalData = new HashMap<>();
-        additionalData.put("status", "completed");
-        AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
-    }
-
-    private void startMainActivity() {
-        Intent intent = new Intent(SetupActivity.this, MainActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent);
-        finish();
-    }
-
-    private class ViewPageAdapter extends FragmentPagerAdapter implements IconPagerAdapter {
-
-        public ViewPageAdapter(FragmentManager fm) {
-            super(fm);
-        }
-
-        @Override
-        public Fragment getItem(int position) {
-            Fragment fragment;
-
-            switch (position) {
-                case 1: {
-                    avatarSetupFragment = new AvatarSetupFragment();
-                    avatarSetupFragment.activity = SetupActivity.this;
-                    avatarSetupFragment.setUser(user);
-                    avatarSetupFragment.width = pager.getWidth();
-                    fragment = avatarSetupFragment;
-                    break;
-                }
-                case 2: {
-                    taskSetupFragment = new TaskSetupFragment();
-                    taskSetupFragment.setUser(user);
-                    fragment = taskSetupFragment;
-                    break;
-                }
-                default: {
-                    fragment = new WelcomeFragment();
-                    break;
-                }
-            }
-
-            return fragment;
-        }
-
-        @Override
-        public int getCount() {
-            return 3;
-        }
-
-        @Override
-        public int getIconResId(int index) {
-            return R.drawable.indicator_diamond;
-        }
-    }
-
-    private boolean isLastPage() {
-        return this.pager == null || this.pager.getCurrentItem() == this.pager.getAdapter().getCount() - 1;
-    }
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+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;
+import android.view.View;
+import android.view.Window;
+import android.widget.Button;
+
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.callbacks.ItemsCallback;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.commands.EquipCommand;
+import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
+import com.habitrpg.android.habitica.helpers.AmplitudeManager;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
+import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
+import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment;
+import com.habitrpg.android.habitica.ui.views.FadingViewPager;
+import com.viewpagerindicator.IconPageIndicator;
+import com.viewpagerindicator.IconPagerAdapter;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+import rx.Observable;
+
+public class SetupActivity extends BaseActivity implements ViewPager.OnPageChangeListener, HabitRPGUserCallback.OnUserReceived {
+
+    @Inject
+    public ApiClient apiClient;
+    @Inject
+    protected HostConfig hostConfig;
+    @Inject
+    protected UserRepository userRepository;
+    @Inject
+    protected TaskRepository taskRepository;
+    @BindView(R.id.view_pager)
+    FadingViewPager pager;
+    @BindView(R.id.nextButton)
+    Button nextButton;
+    @BindView(R.id.previousButton)
+    Button previousButton;
+    @BindView(R.id.view_pager_indicator)
+    IconPageIndicator indicator;
+    AvatarSetupFragment avatarSetupFragment;
+    TaskSetupFragment taskSetupFragment;
+    @Nullable
+    HabitRPGUser user;
+    boolean completedSetup = false;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_setup;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        userRepository.getUser(hostConfig.getUser())
+                .flatMap(user -> {
+                    if (user == null) {
+                        return userRepository.retrieveUser(true);
+                    } else {
+                        return Observable.just(user);
+                    }
+                })
+                .subscribe(this::onUserReceived, throwable -> {
+
+        });
+
+        Map<String, Object> additionalData = new HashMap<>();
+        additionalData.put("status", "displayed");
+        AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
+
+        String currentDeviceLanguage = Locale.getDefault().getLanguage();
+        for (String language : getResources().getStringArray(R.array.LanguageValues)) {
+            if (language.equals(currentDeviceLanguage)) {
+                apiClient.registrationLanguage(currentDeviceLanguage)
+                        .subscribe(habitRPGUser -> {}, throwable -> {
+                        });
+            }
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                View decor = getWindow().getDecorView();
+                    decor.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+                window.setStatusBarColor(ContextCompat.getColor(this, R.color.light_gray_bg));
+            } else {
+                window.setStatusBarColor(ContextCompat.getColor(this, R.color.days_gray));
+            }
+        }
+
+        pager.disableFading = true;
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        EventBus.getDefault().register(this);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        EventBus.getDefault().unregister(this);
+    }
+
+    private void setupViewpager() {
+        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
+
+        pager.setAdapter(new ViewPageAdapter(fragmentManager));
+
+        pager.addOnPageChangeListener(this);
+        indicator.setViewPager(pager);
+    }
+
+    @Subscribe
+    public void onEvent(UpdateUserCommand event) {
+        this.userRepository.updateUser(user, event.updateData)
+                .subscribe(this::onUserReceived, 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);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putString("FirstDayOfTheWeek",
+                Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
+        editor.apply();
+        if (isLastPage()) {
+            List<Task> newTasks = this.taskSetupFragment.createSampleTasks();
+            this.completedSetup = true;
+            this.taskRepository.createTasks(newTasks)
+                    .subscribe(tasks -> onUserReceived(user), throwable -> {
+                    });
+            //this.apiHelper.apiService.batchOperation(operations, new HabitRPGUserCallback(this));
+        }
+        this.pager.setCurrentItem(this.pager.getCurrentItem() + 1);
+    }
+
+    @OnClick(R.id.previousButton)
+    public void previousClicked() {
+        this.pager.setCurrentItem(this.pager.getCurrentItem() - 1);
+    }
+
+    private void setPreviousButtonEnabled(boolean enabled) {
+        Drawable leftDrawable;
+        if (enabled) {
+            previousButton.setText(R.string.action_back);
+            leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_enabled);
+        } else {
+            previousButton.setText(null);
+            leftDrawable = AppCompatResources.getDrawable(this, R.drawable.back_arrow_disabled);
+        }
+        previousButton.setCompoundDrawablesWithIntrinsicBounds(leftDrawable, null, null, null);
+    }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        if (position == 0) {
+            this.setPreviousButtonEnabled(false);
+            this.nextButton.setText(this.getString(R.string.next_button));
+        } else if (isLastPage()) {
+            this.setPreviousButtonEnabled(true);
+            this.nextButton.setText(this.getString(R.string.intro_finish_button));
+        } else {
+            this.setPreviousButtonEnabled(true);
+            this.nextButton.setText(this.getString(R.string.next_button));
+        }
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int state) {
+
+    }
+
+    @Override
+    public void onUserReceived(HabitRPGUser user) {
+        if (completedSetup) {
+            this.startMainActivity();
+            return;
+        }
+        this.user = user;
+        if (this.pager.getAdapter() == null) {
+            this.setupViewpager();
+        } else {
+            if (this.avatarSetupFragment != null) {
+                this.avatarSetupFragment.setUser(user);
+            }
+            if (this.taskSetupFragment != null) {
+                this.taskSetupFragment.setUser(user);
+            }
+        }
+
+        Map<String, Object> additionalData = new HashMap<>();
+        additionalData.put("status", "completed");
+        AmplitudeManager.sendEvent("setup", AmplitudeManager.EVENT_CATEGORY_BEHAVIOUR, AmplitudeManager.EVENT_HITTYPE_EVENT, additionalData);
+    }
+
+    private void startMainActivity() {
+        Intent intent = new Intent(SetupActivity.this, MainActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+        finish();
+    }
+
+    private class ViewPageAdapter extends FragmentPagerAdapter implements IconPagerAdapter {
+
+        public ViewPageAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            Fragment fragment;
+
+            switch (position) {
+                case 1: {
+                    avatarSetupFragment = new AvatarSetupFragment();
+                    avatarSetupFragment.activity = SetupActivity.this;
+                    avatarSetupFragment.setUser(user);
+                    avatarSetupFragment.width = pager.getWidth();
+                    fragment = avatarSetupFragment;
+                    break;
+                }
+                case 2: {
+                    taskSetupFragment = new TaskSetupFragment();
+                    taskSetupFragment.setUser(user);
+                    fragment = taskSetupFragment;
+                    break;
+                }
+                default: {
+                    fragment = new WelcomeFragment();
+                    break;
+                }
+            }
+
+            return fragment;
+        }
+
+        @Override
+        public int getCount() {
+            return 3;
+        }
+
+        @Override
+        public int getIconResId(int index) {
+            return R.drawable.indicator_diamond;
+        }
+    }
+
+    private boolean isLastPage() {
+        return this.pager == null || this.pager.getCurrentItem() == this.pager.getAdapter().getCount() - 1;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java
index 49e0c6469..df9130ce7 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,20 +1,20 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
-import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
+import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
index c35612d47..5ad14e310 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
@@ -1,110 +1,110 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.util.SparseArray;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import butterknife.BindView;
-
-public class SkillTasksActivity extends BaseActivity implements TaskClickActivity {
-
-    @Inject
-    TaskRepository taskRepository;
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    String userId;
-
-    @BindView(R.id.viewpager)
-    public ViewPager viewPager;
-
-    @BindView(R.id.tab_layout)
-    public TabLayout tabLayout;
-    SparseArray<SkillTasksRecyclerViewFragment> viewFragmentsDictionary = new SparseArray<>();
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_skill_tasks;
-    }
-
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        loadTaskLists();
-    }
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    public void loadTaskLists() {
-        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
-
-        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
-
-            @Override
-            public Fragment getItem(int position) {
-                SkillTasksRecyclerViewFragment fragment;
-
-                switch (position) {
-                    case 0:
-                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_HABIT, SkillTasksActivity.this, userId), Task.TYPE_HABIT);
-                        break;
-                    case 1:
-                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_DAILY, SkillTasksActivity.this, userId), Task.TYPE_DAILY);
-                        break;
-                    default:
-                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_TODO, SkillTasksActivity.this, userId), Task.TYPE_TODO);
-                }
-
-                viewFragmentsDictionary.put(position, fragment);
-
-                return fragment;
-            }
-
-            @Override
-            public int getCount() {
-                return 3;
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                switch (position) {
-                    case 0:
-                        return getString(R.string.habits);
-                    case 1:
-                        return getString(R.string.dailies);
-                    case 2:
-                        return getString(R.string.todos);
-                }
-                return "";
-            }
-        });
-
-
-        tabLayout.setupWithViewPager(viewPager);
-    }
-
-    public void taskSelected(String taskId) {
-        Intent resultIntent = new Intent();
-        resultIntent.putExtra("task_id", taskId);
-        setResult(Activity.RESULT_OK, resultIntent);
-        finish();
-    }
-}
-
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.util.SparseArray;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import butterknife.BindView;
+
+public class SkillTasksActivity extends BaseActivity implements TaskClickActivity {
+
+    @Inject
+    TaskRepository taskRepository;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
+
+    @BindView(R.id.viewpager)
+    public ViewPager viewPager;
+
+    @BindView(R.id.tab_layout)
+    public TabLayout tabLayout;
+    SparseArray<SkillTasksRecyclerViewFragment> viewFragmentsDictionary = new SparseArray<>();
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_skill_tasks;
+    }
+
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        loadTaskLists();
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    public void loadTaskLists() {
+        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
+
+        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
+
+            @Override
+            public Fragment getItem(int position) {
+                SkillTasksRecyclerViewFragment fragment;
+
+                switch (position) {
+                    case 0:
+                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_HABIT, SkillTasksActivity.this, userId), Task.TYPE_HABIT);
+                        break;
+                    case 1:
+                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_DAILY, SkillTasksActivity.this, userId), Task.TYPE_DAILY);
+                        break;
+                    default:
+                        fragment = SkillTasksRecyclerViewFragment.newInstance(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_TODO, SkillTasksActivity.this, userId), Task.TYPE_TODO);
+                }
+
+                viewFragmentsDictionary.put(position, fragment);
+
+                return fragment;
+            }
+
+            @Override
+            public int getCount() {
+                return 3;
+            }
+
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return getString(R.string.habits);
+                    case 1:
+                        return getString(R.string.dailies);
+                    case 2:
+                        return getString(R.string.todos);
+                }
+                return "";
+            }
+        });
+
+
+        tabLayout.setupWithViewPager(viewPager);
+    }
+
+    public void taskSelected(String taskId) {
+        Intent resultIntent = new Intent();
+        resultIntent.putExtra("task_id", taskId);
+        setResult(Activity.RESULT_OK, resultIntent);
+        finish();
+    }
+}
+
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 b6922e5d7..20bfbd0b8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -1,1012 +1,1007 @@
-package com.habitrpg.android.habitica.ui.activities;
-
-import android.app.DatePickerDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TextInputLayout;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.PreferenceManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.DatePicker;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.NumberPicker;
-import android.widget.Spinner;
-import android.widget.TableRow;
-import android.widget.TextView;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.TagRepository;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.events.TaskSaveEvent;
-import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
-import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
-import com.habitrpg.android.habitica.helpers.RemindersManager;
-import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
-import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.Days;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.habitrpg.android.habitica.ui.WrapContentRecyclerViewLayoutManager;
-import com.habitrpg.android.habitica.ui.adapter.tasks.CheckListAdapter;
-import com.habitrpg.android.habitica.ui.adapter.tasks.RemindersAdapter;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.habitrpg.android.habitica.ui.helpers.SimpleItemTouchHelperCallback;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import net.pherth.android.emoji_library.EmojiEditText;
-import net.pherth.android.emoji_library.EmojiPopup;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-public class TaskFormActivity extends BaseActivity implements AdapterView.OnItemSelectedListener {
-    public static final String TASK_ID_KEY = "taskId";
-    public static final String USER_ID_KEY = "userId";
-    public static final String TASK_TYPE_KEY = "type";
-    public static final String ALLOCATION_MODE_KEY = "allocationModeKey";
-
-    @BindView(R.id.task_value_edittext)
-    EditText taskValue;
-    @BindView(R.id.task_value_layout)
-    TextInputLayout taskValueLayout;
-
-    @BindView(R.id.task_checklist_wrapper)
-    LinearLayout checklistWrapper;
-
-    @BindView(R.id.task_difficulty_wrapper)
-    LinearLayout difficultyWrapper;
-
-    @BindView(R.id.task_attribute_wrapper)
-    LinearLayout attributeWrapper;
-
-    @BindView(R.id.task_main_wrapper)
-    LinearLayout mainWrapper;
-
-    @BindView(R.id.task_text_edittext)
-    EmojiEditText taskText;
-
-    @BindView(R.id.task_notes_edittext)
-    EmojiEditText taskNotes;
-
-    @BindView(R.id.task_difficulty_spinner)
-    Spinner taskDifficultySpinner;
-
-    @BindView(R.id.task_attribute_spinner)
-    Spinner taskAttributeSpinner;
-
-    @BindView(R.id.btn_delete_task)
-    Button btnDelete;
-
-    @BindView(R.id.task_startdate_layout)
-    LinearLayout startDateLayout;
-
-    @BindView(R.id.task_task_wrapper)
-    LinearLayout taskWrapper;
-
-    @BindView(R.id.task_positive_checkbox)
-    CheckBox positiveCheckBox;
-
-    @BindView(R.id.task_negative_checkbox)
-    CheckBox negativeCheckBox;
-
-    @BindView(R.id.task_actions_wrapper)
-    LinearLayout actionsLayout;
-
-    @BindView(R.id.task_weekdays_wrapper)
-    LinearLayout weekdayWrapper;
-
-    @BindView(R.id.task_frequency_spinner)
-    Spinner dailyFrequencySpinner;
-
-    @BindView(R.id.task_frequency_container)
-    LinearLayout frequencyContainer;
-
-    @BindView(R.id.checklist_recycler_view)
-    RecyclerView recyclerView;
-
-    @BindView(R.id.new_checklist)
-    EmojiEditText newCheckListEditText;
-
-    @BindView(R.id.add_checklist_button)
-    Button addChecklistItemButton;
-
-    @BindView(R.id.task_reminders_wrapper)
-    LinearLayout remindersWrapper;
-
-    @BindView(R.id.new_reminder_edittext)
-    EditText newRemindersEditText;
-
-    @BindView(R.id.reminders_recycler_view)
-    RecyclerView remindersRecyclerView;
-
-    @BindView(R.id.emoji_toggle_btn0)
-    ImageButton emojiToggle0;
-
-    @BindView(R.id.emoji_toggle_btn1)
-    ImageButton emojiToggle1;
-    ImageButton emojiToggle2;
-
-    @BindView(R.id.task_duedate_layout)
-    LinearLayout dueDateLayout;
-
-    @BindView(R.id.task_duedate_picker_layout)
-    LinearLayout dueDatePickerLayout;
-
-    @BindView(R.id.duedate_checkbox)
-    CheckBox dueDateCheckBox;
-
-    @BindView(R.id.startdate_text_edittext)
-    EditText startDatePickerText;
-    DateEditTextListener startDateListener;
-
-    @BindView(R.id.duedate_text_edittext)
-    EditText dueDatePickerText;
-    DateEditTextListener dueDateListener;
-
-    @BindView(R.id.task_tags_wrapper)
-    LinearLayout tagsWrapper;
-
-    @BindView(R.id.task_tags_checklist)
-    LinearLayout tagsContainerLinearLayout;
-
-    @Inject
-    TaskFilterHelper taskFilterHelper;
-    @Inject
-    TaskRepository taskRepository;
-    @Inject
-    TagRepository tagRepository;
-
-    EmojiPopup popup;
-
-    private String taskType;
-    private String taskId;
-    private String userId;
-    private Task task;
-    private String allocationMode;
-    private List<CheckBox> weekdayCheckboxes = new ArrayList<>();
-    private NumberPicker frequencyPicker;
-    private List<Tag> tags;
-    private CheckListAdapter checklistAdapter;
-    private RemindersAdapter remindersAdapter;
-    private List<CheckBox> tagCheckBoxList;
-    private List<Tag> selectedTags;
-
-    private RemindersManager remindersManager;
-    private FirstDayOfTheWeekHelper firstDayOfTheWeekHelper;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_task_form;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Intent intent = getIntent();
-        Bundle bundle = intent.getExtras();
-        taskType = bundle.getString(TASK_TYPE_KEY);
-        taskId = bundle.getString(TASK_ID_KEY);
-        userId = bundle.getString(USER_ID_KEY);
-        allocationMode = bundle.getString(ALLOCATION_MODE_KEY);
-        tagCheckBoxList = new ArrayList<>();
-        selectedTags = new ArrayList<>();
-        if (taskType == null) {
-            return;
-        }
-
-        remindersManager = new RemindersManager(taskType);
-
-        dueDateListener = new DateEditTextListener(dueDatePickerText);
-        startDateListener = new DateEditTextListener(startDatePickerText);
-
-        btnDelete.setEnabled(false);
-        ViewHelper.SetBackgroundTint(btnDelete, ContextCompat.getColor(this, R.color.worse_10));
-        btnDelete.setOnClickListener(view -> new AlertDialog.Builder(view.getContext())
-                .setTitle(getString(R.string.taskform_delete_title))
-                .setMessage(getString(R.string.taskform_delete_message)).setPositiveButton(getString(R.string.yes), (dialog, which) -> {
-                    if (task != null) {
-                        task.delete();
-                    }
-
-                    finish();
-                    dismissKeyboard();
-
-                    EventBus.getDefault().post(new DeleteTaskCommand(taskId));
-                }).setNegativeButton(getString(R.string.no), (dialog, which) -> {
-                    dialog.dismiss();
-                }).show());
-
-        ArrayAdapter<CharSequence> difficultyAdapter = ArrayAdapter.createFromResource(this,
-                R.array.task_difficulties, android.R.layout.simple_spinner_item);
-        difficultyAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        taskDifficultySpinner.setAdapter(difficultyAdapter);
-        taskDifficultySpinner.setSelection(1);
-
-        ArrayAdapter<CharSequence> attributeAdapter = ArrayAdapter.createFromResource(this,
-                R.array.task_attributes, android.R.layout.simple_spinner_item);
-        attributeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        taskAttributeSpinner.setAdapter(attributeAdapter);
-        taskAttributeSpinner.setSelection(0);
-
-        if (TextUtils.isEmpty(allocationMode) || !allocationMode.equals("taskbased")) {
-            attributeWrapper.setVisibility(View.GONE);
-        }
-
-        if (taskType.equals("habit")) {
-            taskWrapper.removeView(startDateLayout);
-
-            mainWrapper.removeView(checklistWrapper);
-            mainWrapper.removeView(remindersWrapper);
-
-            positiveCheckBox.setChecked(true);
-            negativeCheckBox.setChecked(true);
-        } else {
-            mainWrapper.removeView(actionsLayout);
-        }
-
-        if (taskType.equals("daily")) {
-            ArrayAdapter<CharSequence> frequencyAdapter = ArrayAdapter.createFromResource(this,
-                    R.array.daily_frequencies, android.R.layout.simple_spinner_item);
-            frequencyAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-            this.dailyFrequencySpinner.setAdapter(frequencyAdapter);
-            this.dailyFrequencySpinner.setOnItemSelectedListener(this);
-        } else {
-            mainWrapper.removeView(weekdayWrapper);
-            mainWrapper.removeView(startDateLayout);
-        }
-
-        if (taskType.equals("todo")) {
-            dueDatePickerLayout.removeView(dueDatePickerText);
-            //Allows user to decide if they want to add a due date or not
-            dueDateCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                if (buttonView.isChecked()) {
-                    dueDatePickerLayout.addView(dueDatePickerText);
-                } else {
-                    dueDatePickerLayout.removeView(dueDatePickerText);
-                }
-            });
-        } else {
-            mainWrapper.removeView(dueDateLayout);
-        }
-
-        if (!taskType.equals("reward")) {
-            taskValueLayout.setVisibility(View.GONE);
-        } else {
-
-            mainWrapper.removeView(checklistWrapper);
-            mainWrapper.removeView(remindersWrapper);
-
-            difficultyWrapper.setVisibility(View.GONE);
-            attributeWrapper.setVisibility(View.GONE);
-        }
-
-        if (taskId != null) {
-            taskRepository.getTask(taskId).subscribe(task -> {
-                this.task = task;
-                if (task != null) {
-                    populate(task);
-                }
-
-                setTitle(task);
-            }, throwable -> {});
-
-            btnDelete.setEnabled(true);
-        } else {
-            setTitle((Task) null);
-            taskText.requestFocus();
-        }
-
-        if (taskType.equals("todo") || taskType.equals("daily")) {
-            createCheckListRecyclerView();
-            createRemindersRecyclerView();
-        }
-
-        // Emoji keyboard stuff
-        boolean isTodo = false;
-        if (taskType.equals("todo")) {
-            isTodo = true;
-        }
-
-        // If it's a to-do, change the emojiToggle2 to the actual emojiToggle2 (prevents NPEs when not a to-do task)
-        if (isTodo) {
-            emojiToggle2 = (ImageButton) findViewById(R.id.emoji_toggle_btn2);
-        } else {
-            emojiToggle2 = emojiToggle0;
-        }
-
-        popup = new EmojiPopup(emojiToggle0.getRootView(), this, ContextCompat.getColor(this, R.color.brand));
-
-        popup.setSizeForSoftKeyboard();
-        popup.setOnDismissListener(() -> changeEmojiKeyboardIcon(false));
-        popup.setOnSoftKeyboardOpenCloseListener(new EmojiPopup.OnSoftKeyboardOpenCloseListener() {
-
-            @Override
-            public void onKeyboardOpen(int keyBoardHeight) {
-
-            }
-
-            @Override
-            public void onKeyboardClose() {
-                if (popup.isShowing()) {
-                    popup.dismiss();
-                }
-            }
-        });
-
-        popup.setOnEmojiconClickedListener(emojicon -> {
-            EmojiEditText emojiEditText = null;
-            if (getCurrentFocus() == null || !isEmojiEditText(getCurrentFocus()) || emojicon == null) {
-                return;
-            } else {
-                emojiEditText = (EmojiEditText) getCurrentFocus();
-            }
-            int start = emojiEditText.getSelectionStart();
-            int end = emojiEditText.getSelectionEnd();
-            if (start < 0) {
-                emojiEditText.append(emojicon.getEmoji());
-            } else {
-                emojiEditText.getText().replace(Math.min(start, end),
-                        Math.max(start, end), emojicon.getEmoji(), 0,
-                        emojicon.getEmoji().length());
-            }
-        });
-
-        popup.setOnEmojiconBackspaceClickedListener(v -> {
-            if (isEmojiEditText(getCurrentFocus())) {
-                KeyEvent event = new KeyEvent(
-                        0, 0, 0, KeyEvent.KEYCODE_DEL, 0, 0, 0, 0, KeyEvent.KEYCODE_ENDCALL);
-                getCurrentFocus().dispatchKeyEvent(event);
-            }
-        });
-
-        emojiToggle0.setOnClickListener(new emojiClickListener(taskText));
-        emojiToggle1.setOnClickListener(new emojiClickListener(taskNotes));
-        if (isTodo) {
-            emojiToggle2.setOnClickListener(new emojiClickListener(newCheckListEditText));
-        }
-
-        tagRepository.getTags(userId)
-                .subscribe(
-                        loadedTags -> {
-                            tags = loadedTags;
-                            createTagsCheckBoxes();
-                        },
-                        throwable -> {
-                        }
-                );
-    }
-
-
-
-    @Override
-    protected void injectActivity(AppComponent component) {
-        component.inject(this);
-    }
-
-    private boolean isEmojiEditText(@Nullable View view) {
-        return view instanceof EmojiEditText;
-    }
-
-    private void changeEmojiKeyboardIcon(Boolean keyboardOpened) {
-
-        if (keyboardOpened) {
-            emojiToggle0.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_keyboard_grey600_24dp));
-            emojiToggle1.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_keyboard_grey600_24dp));
-            emojiToggle2.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_keyboard_grey600_24dp));
-        } else {
-            emojiToggle0.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_emoticon_grey600_24dp));
-            emojiToggle1.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_emoticon_grey600_24dp));
-            emojiToggle2.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_emoticon_grey600_24dp));
-        }
-    }
-
-    private void createCheckListRecyclerView() {
-        List<ChecklistItem> checklistItems = new ArrayList<>();
-        if (task != null && task.getChecklist() != null) {
-            checklistItems = task.getChecklist();
-        }
-        checklistAdapter = new CheckListAdapter(checklistItems);
-
-        LinearLayoutManager llm = new LinearLayoutManager(this);
-        llm.setOrientation(LinearLayoutManager.VERTICAL);
-
-        recyclerView.setLayoutManager(llm);
-        recyclerView.setAdapter(checklistAdapter);
-
-        recyclerView.setLayoutManager(new WrapContentRecyclerViewLayoutManager(this));
-
-        ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(checklistAdapter);
-        ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(callback);
-        mItemTouchHelper.attachToRecyclerView(recyclerView);
-    }
-
-    @OnClick(R.id.add_checklist_button)
-    public void addChecklistItem() {
-        String checklist = newCheckListEditText.getText().toString();
-        ChecklistItem item = new ChecklistItem(checklist);
-        checklistAdapter.addItem(item);
-        newCheckListEditText.setText("");
-    }
-
-    private void createRemindersRecyclerView() {
-        List<RemindersItem> reminders = new ArrayList<>();
-        if (task != null && task.getReminders() != null) {
-            reminders = task.getReminders();
-        }
-
-        remindersAdapter = new RemindersAdapter(reminders, taskType);
-
-        LinearLayoutManager llm = new LinearLayoutManager(this);
-        llm.setOrientation(LinearLayoutManager.VERTICAL);
-
-        remindersRecyclerView.setLayoutManager(llm);
-        remindersRecyclerView.setAdapter(remindersAdapter);
-
-        remindersRecyclerView.setLayoutManager(new WrapContentRecyclerViewLayoutManager(this));
-
-        ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(remindersAdapter);
-        ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(callback);
-        mItemTouchHelper.attachToRecyclerView(remindersRecyclerView);
-    }
-
-    private void addNewReminder(RemindersItem remindersItem) {
-        remindersAdapter.addItem(remindersItem);
-    }
-
-    @OnClick(R.id.new_reminder_edittext)
-    public void selectNewReminderTime() {
-        remindersManager.createReminderTimeDialog(this::addNewReminder, taskType, this, null);
-    }
-
-    private void createTagsCheckBoxes() {
-        int position = 0;
-        for (Tag tag : tags) {
-            TableRow row = (TableRow) getLayoutInflater().inflate(R.layout.row_checklist, this.tagsContainerLinearLayout, false);
-            CheckBox checkbox = (CheckBox) row.findViewById(R.id.checkbox);
-            row.setId(position);
-            checkbox.setText(tag.getName()); // set text Name
-            checkbox.setId(position);
-            //This is to check if the tag was selected by the user. Similar to onClickListener
-            checkbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                if (buttonView.isChecked()) {
-                    if (!selectedTags.contains(tag)) {
-                        selectedTags.add(tag);
-                    }
-                } else {
-                    if (selectedTags.contains(tag)) {
-                        selectedTags.remove(tag);
-
-                    }
-                }
-            });
-            checkbox.setChecked(taskFilterHelper.isTagChecked(tag.getId()));
-            tagsContainerLinearLayout.addView(row);
-            tagCheckBoxList.add(checkbox);
-            position++;
-        }
-
-        if (task != null) {
-            fillTagCheckboxes();
-        }
-    }
-
-    private void setTitle(@Nullable Task task) {
-        ActionBar actionBar = getSupportActionBar();
-
-        if (actionBar != null) {
-
-            String title = "";
-
-            if (task != null) {
-                title = getResources().getString(R.string.action_edit) + " " + task.getText();
-            } else {
-                switch (taskType) {
-                    case "todo":
-                        title = getResources().getString(R.string.new_todo);
-                        break;
-                    case "daily":
-                        title = getResources().getString(R.string.new_daily);
-                        break;
-                    case "habit":
-                        title = getResources().getString(R.string.new_habit);
-                        break;
-                    case "reward":
-                        title = getResources().getString(R.string.new_reward);
-                        break;
-                }
-            }
-
-            actionBar.setTitle(title);
-        }
-    }
-
-    private void setDailyFrequencyViews() {
-        this.frequencyContainer.removeAllViews();
-        if (this.dailyFrequencySpinner.getSelectedItemPosition() == 0) {
-            String[] weekdays = getResources().getStringArray(R.array.weekdays);
-            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-            String dayOfTheWeek = sharedPreferences.getString("FirstDayOfTheWeek",
-                    Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
-            firstDayOfTheWeekHelper =
-                    FirstDayOfTheWeekHelper.newInstance(Integer.parseInt(dayOfTheWeek));
-            ArrayList<String> weekdaysTemp = new ArrayList<>(Arrays.asList(weekdays));
-            Collections.rotate(weekdaysTemp, firstDayOfTheWeekHelper.getDailyTaskFormOffset());
-            weekdays = weekdaysTemp.toArray(new String[1]);
-
-            for (int i = 0; i < 7; i++) {
-                View weekdayRow = getLayoutInflater().inflate(R.layout.row_checklist, this.frequencyContainer, false);
-                CheckBox checkbox = (CheckBox) weekdayRow.findViewById(R.id.checkbox);
-                checkbox.setText(weekdays[i]);
-                checkbox.setChecked(true);
-                this.weekdayCheckboxes.add(checkbox);
-                this.frequencyContainer.addView(weekdayRow);
-            }
-        } else {
-            View dayRow = getLayoutInflater().inflate(R.layout.row_number_picker, this.frequencyContainer, false);
-            this.frequencyPicker = (NumberPicker) dayRow.findViewById(R.id.numberPicker);
-            this.frequencyPicker.setMinValue(1);
-            this.frequencyPicker.setMaxValue(366);
-            TextView tv = (TextView) dayRow.findViewById(R.id.label);
-            tv.setText(getResources().getString(R.string.frequency_daily));
-            this.frequencyContainer.addView(dayRow);
-        }
-
-        if (this.task != null) {
-
-            if (this.dailyFrequencySpinner.getSelectedItemPosition() == 0) {
-                int offset = firstDayOfTheWeekHelper.getDailyTaskFormOffset();
-                this.weekdayCheckboxes.get(offset).setChecked(this.task.getRepeat().getM());
-                this.weekdayCheckboxes.get((offset + 1) % 7).setChecked(this.task.getRepeat().getT());
-                this.weekdayCheckboxes.get((offset + 2) % 7).setChecked(this.task.getRepeat().getW());
-                this.weekdayCheckboxes.get((offset + 3) % 7).setChecked(this.task.getRepeat().getTh());
-                this.weekdayCheckboxes.get((offset + 4) % 7).setChecked(this.task.getRepeat().getF());
-                this.weekdayCheckboxes.get((offset + 5) % 7).setChecked(this.task.getRepeat().getS());
-                this.weekdayCheckboxes.get((offset + 6) % 7).setChecked(this.task.getRepeat().getSu());
-            } else {
-                this.frequencyPicker.setValue(this.task.getEveryX());
-            }
-        }
-
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.menu_task_form, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        //noinspection SimplifiableIfStatement
-        if (id == R.id.action_save_changes) {
-            finishActivitySuccessfully();
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void populate(Task task) {
-        taskText.setText(task.text);
-        taskNotes.setText(task.notes);
-        taskValue.setText(String.format(Locale.getDefault(), "%.2f", task.value));
-
-        if (tags != null) {
-            fillTagCheckboxes();
-        }
-
-        for (TaskTag tt : task.getTags()) {
-            selectedTags.add(tt.getTag());
-        }
-
-        float priority = task.getPriority();
-        if (Math.abs(priority - 0.1) < 0.000001) {
-            this.taskDifficultySpinner.setSelection(0);
-        } else if (Math.abs(priority - 1.0) < 0.000001) {
-            this.taskDifficultySpinner.setSelection(1);
-        } else if (Math.abs(priority - 1.5) < 0.000001) {
-            this.taskDifficultySpinner.setSelection(2);
-        } else if (Math.abs(priority - 2.0) < 0.000001) {
-            this.taskDifficultySpinner.setSelection(3);
-        }
-
-        String attribute = task.getAttribute();
-        if (attribute != null) {
-            switch (attribute) {
-                case Task.ATTRIBUTE_STRENGTH:
-                    taskAttributeSpinner.setSelection(0);
-                    break;
-                case Task.ATTRIBUTE_INTELLIGENCE:
-                    taskAttributeSpinner.setSelection(1);
-                    break;
-                case Task.ATTRIBUTE_CONSTITUTION:
-                    taskAttributeSpinner.setSelection(2);
-                    break;
-                case Task.ATTRIBUTE_PERCEPTION:
-                    taskAttributeSpinner.setSelection(3);
-                    break;
-            }
-        }
-
-        if (task.type.equals("habit")) {
-            positiveCheckBox.setChecked(task.getUp());
-            negativeCheckBox.setChecked(task.getDown());
-        }
-
-        if (task.type.equals("daily")) {
-
-            if (task.getStartDate() != null) {
-                startDateListener.setCalendar(task.getStartDate());
-            }
-
-            if (task.getFrequency().equals("weekly")) {
-                this.dailyFrequencySpinner.setSelection(0);
-                if (weekdayCheckboxes.size() == 7) {
-                    int offset = firstDayOfTheWeekHelper.getDailyTaskFormOffset();
-                    this.weekdayCheckboxes.get(offset).setChecked(this.task.getRepeat().getM());
-                    this.weekdayCheckboxes.get((offset + 1) % 7).setChecked(this.task.getRepeat().getT());
-                    this.weekdayCheckboxes.get((offset + 2) % 7).setChecked(this.task.getRepeat().getW());
-                    this.weekdayCheckboxes.get((offset + 3) % 7).setChecked(this.task.getRepeat().getTh());
-                    this.weekdayCheckboxes.get((offset + 4) % 7).setChecked(this.task.getRepeat().getF());
-                    this.weekdayCheckboxes.get((offset + 5) % 7).setChecked(this.task.getRepeat().getS());
-                    this.weekdayCheckboxes.get((offset + 6) % 7).setChecked(this.task.getRepeat().getSu());
-                }
-            } else {
-                this.dailyFrequencySpinner.setSelection(1);
-                if (this.frequencyPicker != null) {
-                    this.frequencyPicker.setValue(task.getEveryX());
-                }
-            }
-        }
-
-        if (task.type.equals("todo")) {
-            if (task.getDueDate() != null) {
-                dueDateCheckBox.setChecked(true);
-                dueDateListener.setCalendar(task.getDueDate());
-            }
-        }
-
-        if (task.isGroupTask()) {
-            new AlertDialog.Builder(this)
-                    .setTitle(R.string.group_tasks_edit_title)
-                    .setMessage(R.string.group_tasks_edit_description)
-                    .setPositiveButton(android.R.string.ok, (dialog, which) -> finish())
-                    .show();
-        }
-    }
-
-    private void fillTagCheckboxes() {
-        for (TaskTag tt : task.getTags()) {
-            int position = tags.indexOf(tt.getTag());
-            if (tagCheckBoxList.size() > position && position >= 0) {
-                tagCheckBoxList.get(position).setChecked(true);
-            }
-        }
-    }
-
-    private boolean saveTask(Task task) {
-        task.text = MarkdownParser.parseCompiled(taskText.getText());
-
-        if (checklistAdapter != null) {
-            if (checklistAdapter.getCheckListItems() != null) {
-                task.setChecklist(checklistAdapter.getCheckListItems());
-            }
-        }
-
-        if (remindersAdapter != null) {
-            if (remindersAdapter.getRemindersItems() != null) {
-                task.setReminders(remindersAdapter.getRemindersItems());
-            }
-        }
-
-        if (task.text.isEmpty()) {
-            return false;
-        }
-
-        task.notes = MarkdownParser.parseCompiled(taskNotes.getText());
-
-        if (this.taskDifficultySpinner.getSelectedItemPosition() == 0) {
-            task.setPriority((float) 0.1);
-        } else if (this.taskDifficultySpinner.getSelectedItemPosition() == 1) {
-            task.setPriority((float) 1.0);
-        } else if (this.taskDifficultySpinner.getSelectedItemPosition() == 2) {
-            task.setPriority((float) 1.5);
-        } else if (this.taskDifficultySpinner.getSelectedItemPosition() == 3) {
-            task.setPriority((float) 2.0);
-        }
-
-        if (TextUtils.isEmpty(allocationMode) || !allocationMode.equals("taskbased")) {
-            task.setAttribute(Task.ATTRIBUTE_STRENGTH);
-        } else {
-            switch (this.taskAttributeSpinner.getSelectedItemPosition()) {
-                case 0:
-                    task.setAttribute(Task.ATTRIBUTE_STRENGTH);
-                    break;
-                case 1:
-                    task.setAttribute(Task.ATTRIBUTE_INTELLIGENCE);
-                    break;
-                case 2:
-                    task.setAttribute(Task.ATTRIBUTE_CONSTITUTION);
-                    break;
-                case 3:
-                    task.setAttribute(Task.ATTRIBUTE_PERCEPTION);
-                    break;
-            }
-        }
-
-        switch (task.type) {
-            case "habit": {
-                task.setUp(positiveCheckBox.isChecked());
-                task.setDown(negativeCheckBox.isChecked());
-            }
-            break;
-
-            case "daily": {
-                task.setStartDate(new Date(startDateListener.getCalendar().getTimeInMillis()));
-
-                if (this.dailyFrequencySpinner.getSelectedItemPosition() == 0) {
-                    task.setFrequency("weekly");
-                    Days repeat = task.getRepeat();
-                    if (repeat == null) {
-                        repeat = new Days();
-                        task.setRepeat(repeat);
-                    }
-
-                    int offset = firstDayOfTheWeekHelper.getDailyTaskFormOffset();
-                    repeat.setM(this.weekdayCheckboxes.get(offset).isChecked());
-                    repeat.setT(this.weekdayCheckboxes.get((offset + 1) % 7).isChecked());
-                    repeat.setW(this.weekdayCheckboxes.get((offset + 2) % 7).isChecked());
-                    repeat.setTh(this.weekdayCheckboxes.get((offset + 3) % 7).isChecked());
-                    repeat.setF(this.weekdayCheckboxes.get((offset + 4) % 7).isChecked());
-                    repeat.setS(this.weekdayCheckboxes.get((offset + 5) % 7).isChecked());
-                    repeat.setSu(this.weekdayCheckboxes.get((offset + 6) % 7).isChecked());
-                } else {
-                    task.setFrequency("daily");
-                    task.setEveryX(this.frequencyPicker.getValue());
-                }
-            }
-            break;
-
-            case "todo": {
-                if (dueDateCheckBox.isChecked()) {
-                    task.setDueDate(new Date(dueDateListener.getCalendar().getTimeInMillis()));
-                } else {
-                    task.setDueDate(null);
-                }
-            }
-            break;
-
-            case "reward": {
-                String value = taskValue.getText().toString();
-                if (!value.isEmpty()) {
-                    NumberFormat localFormat = DecimalFormat.getInstance(Locale.getDefault());
-                    try {
-                        task.setValue(localFormat.parse(value).doubleValue());
-                    } catch (ParseException e) {
-                    }
-                } else {
-                    task.setValue(0.0d);
-                }
-
-            }
-            break;
-        }
-
-        return true;
-    }
-
-    public void onItemSelected(AdapterView<?> parent, View view,
-                               int pos, long id) {
-        this.setDailyFrequencyViews();
-    }
-
-    public void onNothingSelected(AdapterView<?> parent) {
-        this.setDailyFrequencyViews();
-    }
-
-    private void prepareSave() {
-        if (this.task == null) {
-            this.task = new Task();
-            this.task.setType(taskType);
-        }
-
-        if (this.saveTask(this.task)) {
-            List<TaskTag> taskTags = new ArrayList<>();
-            for (Tag tag : selectedTags) {
-                TaskTag tt = new TaskTag();
-                tt.setTag(tag);
-                tt.setTask(task);
-                taskTags.add(tt);
-            }
-            //save
-            this.task.setTags(taskTags);
-            this.task.save();
-            //send back to other elements.
-            TaskSaveEvent event = new TaskSaveEvent();
-            if (TaskFormActivity.this.task.getId() == null) {
-                event.created = true;
-            }
-
-            event.task = TaskFormActivity.this.task;
-            EventBus.getDefault().post(event);
-        }
-    }
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        finish();
-        dismissKeyboard();
-        return true;
-    }
-
-    @Override
-    public void onBackPressed() {
-        finish();
-        dismissKeyboard();
-    }
-
-    private void finishActivitySuccessfully() {
-        this.prepareSave();
-        finishWithSuccess();
-        dismissKeyboard();
-    }
-
-    private void finishWithSuccess() {
-        Intent resultIntent = new Intent();
-        resultIntent.putExtra(TaskFormActivity.TASK_TYPE_KEY, taskType);
-        setResult(RESULT_OK, resultIntent);
-        finish();
-    }
-
-    private void dismissKeyboard() {
-        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        View currentFocus = getCurrentFocus();
-        if (currentFocus != null) {
-            imm.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0);
-        }
-    }
-
-    private class DateEditTextListener implements View.OnClickListener, DatePickerDialog.OnDateSetListener {
-        Calendar calendar;
-        DatePickerDialog datePickerDialog;
-        EditText datePickerText;
-        DateFormat dateFormatter;
-
-        public DateEditTextListener(EditText dateText) {
-            calendar = Calendar.getInstance();
-
-            this.datePickerText = dateText;
-            this.datePickerText.setOnClickListener(this);
-            this.dateFormatter = DateFormat.getDateInstance();
-            this.datePickerDialog = new DatePickerDialog(datePickerText.getContext(), this,
-                    calendar.get(Calendar.YEAR),
-                    calendar.get(Calendar.MONTH),
-                    calendar.get(Calendar.DAY_OF_MONTH));
-
-            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-            String dayOfTheWeek = sharedPreferences.getString("FirstDayOfTheWeek",
-                    Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
-            FirstDayOfTheWeekHelper firstDayOfTheWeekHelper =
-                    FirstDayOfTheWeekHelper.newInstance(Integer.parseInt(dayOfTheWeek));
-            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH) {
-                datePickerDialog.getDatePicker().getCalendarView().setFirstDayOfWeek(
-                        firstDayOfTheWeekHelper.getFirstDayOfTheWeek());
-            } else {
-                datePickerDialog.getDatePicker().setFirstDayOfWeek(firstDayOfTheWeekHelper
-                        .getFirstDayOfTheWeek());
-            }
-
-            this.datePickerDialog.setButton(DialogInterface.BUTTON_NEUTRAL, getResources().getString(R.string.today), (dialog, which) -> {
-                setCalendar(Calendar.getInstance().getTime());
-            });
-            updateDateText();
-        }
-
-        public void onClick(View view) {
-            datePickerDialog.show();
-        }
-
-        public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
-            calendar.set(year, monthOfYear, dayOfMonth);
-            updateDateText();
-        }
-
-        public Calendar getCalendar() {
-            return (Calendar) calendar.clone();
-        }
-
-        public void setCalendar(Date date) {
-            calendar.setTime(date);
-            datePickerDialog.updateDate(calendar.get(Calendar.YEAR),
-                    calendar.get(Calendar.MONTH),
-                    calendar.get(Calendar.DAY_OF_MONTH));
-            updateDateText();
-        }
-
-        private void updateDateText() {
-            datePickerText.setText(dateFormatter.format(calendar.getTime()));
-        }
-    }
-
-    private class emojiClickListener implements View.OnClickListener {
-
-        EmojiEditText view;
-
-        public emojiClickListener(EmojiEditText view) {
-            this.view = view;
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (!popup.isShowing()) {
-
-                if (popup.isKeyBoardOpen()) {
-                    popup.showAtBottom();
-                    changeEmojiKeyboardIcon(true);
-                } else {
-                    view.setFocusableInTouchMode(true);
-                    view.requestFocus();
-                    popup.showAtBottomPending();
-                    final InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                    inputMethodManager.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
-                    changeEmojiKeyboardIcon(true);
-                }
-            } else {
-                popup.dismiss();
-                changeEmojiKeyboardIcon(false);
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.app.DatePickerDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.TextInputLayout;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.DatePicker;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.NumberPicker;
+import android.widget.Spinner;
+import android.widget.TableRow;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.TagRepository;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.events.TaskSaveEvent;
+import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
+import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
+import com.habitrpg.android.habitica.helpers.RemindersManager;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.Days;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.ui.WrapContentRecyclerViewLayoutManager;
+import com.habitrpg.android.habitica.ui.adapter.tasks.CheckListAdapter;
+import com.habitrpg.android.habitica.ui.adapter.tasks.RemindersAdapter;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+import com.habitrpg.android.habitica.ui.helpers.SimpleItemTouchHelperCallback;
+import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
+
+import net.pherth.android.emoji_library.EmojiEditText;
+import net.pherth.android.emoji_library.EmojiPopup;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+public class TaskFormActivity extends BaseActivity implements AdapterView.OnItemSelectedListener {
+    public static final String TASK_ID_KEY = "taskId";
+    public static final String USER_ID_KEY = "userId";
+    public static final String TASK_TYPE_KEY = "type";
+    public static final String ALLOCATION_MODE_KEY = "allocationModeKey";
+
+    @BindView(R.id.task_value_edittext)
+    EditText taskValue;
+    @BindView(R.id.task_value_layout)
+    TextInputLayout taskValueLayout;
+
+    @BindView(R.id.task_checklist_wrapper)
+    LinearLayout checklistWrapper;
+
+    @BindView(R.id.task_difficulty_wrapper)
+    LinearLayout difficultyWrapper;
+
+    @BindView(R.id.task_attribute_wrapper)
+    LinearLayout attributeWrapper;
+
+    @BindView(R.id.task_main_wrapper)
+    LinearLayout mainWrapper;
+
+    @BindView(R.id.task_text_edittext)
+    EmojiEditText taskText;
+
+    @BindView(R.id.task_notes_edittext)
+    EmojiEditText taskNotes;
+
+    @BindView(R.id.task_difficulty_spinner)
+    Spinner taskDifficultySpinner;
+
+    @BindView(R.id.task_attribute_spinner)
+    Spinner taskAttributeSpinner;
+
+    @BindView(R.id.btn_delete_task)
+    Button btnDelete;
+
+    @BindView(R.id.task_startdate_layout)
+    LinearLayout startDateLayout;
+
+    @BindView(R.id.task_task_wrapper)
+    LinearLayout taskWrapper;
+
+    @BindView(R.id.task_positive_checkbox)
+    CheckBox positiveCheckBox;
+
+    @BindView(R.id.task_negative_checkbox)
+    CheckBox negativeCheckBox;
+
+    @BindView(R.id.task_actions_wrapper)
+    LinearLayout actionsLayout;
+
+    @BindView(R.id.task_weekdays_wrapper)
+    LinearLayout weekdayWrapper;
+
+    @BindView(R.id.task_frequency_spinner)
+    Spinner dailyFrequencySpinner;
+
+    @BindView(R.id.task_frequency_container)
+    LinearLayout frequencyContainer;
+
+    @BindView(R.id.checklist_recycler_view)
+    RecyclerView recyclerView;
+
+    @BindView(R.id.new_checklist)
+    EmojiEditText newCheckListEditText;
+
+    @BindView(R.id.add_checklist_button)
+    Button addChecklistItemButton;
+
+    @BindView(R.id.task_reminders_wrapper)
+    LinearLayout remindersWrapper;
+
+    @BindView(R.id.new_reminder_edittext)
+    EditText newRemindersEditText;
+
+    @BindView(R.id.reminders_recycler_view)
+    RecyclerView remindersRecyclerView;
+
+    @BindView(R.id.emoji_toggle_btn0)
+    ImageButton emojiToggle0;
+
+    @BindView(R.id.emoji_toggle_btn1)
+    ImageButton emojiToggle1;
+    ImageButton emojiToggle2;
+
+    @BindView(R.id.task_duedate_layout)
+    LinearLayout dueDateLayout;
+
+    @BindView(R.id.task_duedate_picker_layout)
+    LinearLayout dueDatePickerLayout;
+
+    @BindView(R.id.duedate_checkbox)
+    CheckBox dueDateCheckBox;
+
+    @BindView(R.id.startdate_text_edittext)
+    EditText startDatePickerText;
+    DateEditTextListener startDateListener;
+
+    @BindView(R.id.duedate_text_edittext)
+    EditText dueDatePickerText;
+    DateEditTextListener dueDateListener;
+
+    @BindView(R.id.task_tags_wrapper)
+    LinearLayout tagsWrapper;
+
+    @BindView(R.id.task_tags_checklist)
+    LinearLayout tagsContainerLinearLayout;
+
+    @Inject
+    TaskFilterHelper taskFilterHelper;
+    @Inject
+    TaskRepository taskRepository;
+    @Inject
+    TagRepository tagRepository;
+
+    EmojiPopup popup;
+
+    private String taskType;
+    private String taskId;
+    private String userId;
+    private Task task;
+    private String allocationMode;
+    private List<CheckBox> weekdayCheckboxes = new ArrayList<>();
+    private NumberPicker frequencyPicker;
+    private List<Tag> tags;
+    private CheckListAdapter checklistAdapter;
+    private RemindersAdapter remindersAdapter;
+    private List<CheckBox> tagCheckBoxList;
+    private List<Tag> selectedTags;
+
+    private RemindersManager remindersManager;
+    private FirstDayOfTheWeekHelper firstDayOfTheWeekHelper;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_task_form;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        Bundle bundle = intent.getExtras();
+        taskType = bundle.getString(TASK_TYPE_KEY);
+        taskId = bundle.getString(TASK_ID_KEY);
+        userId = bundle.getString(USER_ID_KEY);
+        allocationMode = bundle.getString(ALLOCATION_MODE_KEY);
+        tagCheckBoxList = new ArrayList<>();
+        selectedTags = new ArrayList<>();
+        if (taskType == null) {
+            return;
+        }
+
+        remindersManager = new RemindersManager(taskType);
+
+        dueDateListener = new DateEditTextListener(dueDatePickerText);
+        startDateListener = new DateEditTextListener(startDatePickerText);
+
+        btnDelete.setEnabled(false);
+        ViewHelper.SetBackgroundTint(btnDelete, ContextCompat.getColor(this, R.color.worse_10));
+        btnDelete.setOnClickListener(view -> new AlertDialog.Builder(view.getContext())
+                .setTitle(getString(R.string.taskform_delete_title))
+                .setMessage(getString(R.string.taskform_delete_message)).setPositiveButton(getString(R.string.yes), (dialog, which) -> {
+                    if (task != null) {
+                        task.delete();
+                    }
+
+                    finish();
+                    dismissKeyboard();
+
+                    EventBus.getDefault().post(new DeleteTaskCommand(taskId));
+                }).setNegativeButton(getString(R.string.no), (dialog, which) -> {
+                    dialog.dismiss();
+                }).show());
+
+        ArrayAdapter<CharSequence> difficultyAdapter = ArrayAdapter.createFromResource(this,
+                R.array.task_difficulties, android.R.layout.simple_spinner_item);
+        difficultyAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        taskDifficultySpinner.setAdapter(difficultyAdapter);
+        taskDifficultySpinner.setSelection(1);
+
+        ArrayAdapter<CharSequence> attributeAdapter = ArrayAdapter.createFromResource(this,
+                R.array.task_attributes, android.R.layout.simple_spinner_item);
+        attributeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        taskAttributeSpinner.setAdapter(attributeAdapter);
+        taskAttributeSpinner.setSelection(0);
+
+        if (TextUtils.isEmpty(allocationMode) || !allocationMode.equals("taskbased")) {
+            attributeWrapper.setVisibility(View.GONE);
+        }
+
+        if (taskType.equals("habit")) {
+            taskWrapper.removeView(startDateLayout);
+
+            mainWrapper.removeView(checklistWrapper);
+            mainWrapper.removeView(remindersWrapper);
+
+            positiveCheckBox.setChecked(true);
+            negativeCheckBox.setChecked(true);
+        } else {
+            mainWrapper.removeView(actionsLayout);
+        }
+
+        if (taskType.equals("daily")) {
+            ArrayAdapter<CharSequence> frequencyAdapter = ArrayAdapter.createFromResource(this,
+                    R.array.daily_frequencies, android.R.layout.simple_spinner_item);
+            frequencyAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            this.dailyFrequencySpinner.setAdapter(frequencyAdapter);
+            this.dailyFrequencySpinner.setOnItemSelectedListener(this);
+        } else {
+            mainWrapper.removeView(weekdayWrapper);
+            mainWrapper.removeView(startDateLayout);
+        }
+
+        if (taskType.equals("todo")) {
+            dueDatePickerLayout.removeView(dueDatePickerText);
+            //Allows user to decide if they want to add a due date or not
+            dueDateCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                if (buttonView.isChecked()) {
+                    dueDatePickerLayout.addView(dueDatePickerText);
+                } else {
+                    dueDatePickerLayout.removeView(dueDatePickerText);
+                }
+            });
+        } else {
+            mainWrapper.removeView(dueDateLayout);
+        }
+
+        if (!taskType.equals("reward")) {
+            taskValueLayout.setVisibility(View.GONE);
+        } else {
+
+            mainWrapper.removeView(checklistWrapper);
+            mainWrapper.removeView(remindersWrapper);
+
+            difficultyWrapper.setVisibility(View.GONE);
+            attributeWrapper.setVisibility(View.GONE);
+        }
+
+        if (taskId != null) {
+            taskRepository.getTask(taskId).subscribe(task -> {
+                this.task = task;
+                if (task != null) {
+                    populate(task);
+                }
+
+                setTitle(task);
+            }, throwable -> {});
+
+            btnDelete.setEnabled(true);
+        } else {
+            setTitle((Task) null);
+            taskText.requestFocus();
+        }
+
+        if (taskType.equals("todo") || taskType.equals("daily")) {
+            createCheckListRecyclerView();
+            createRemindersRecyclerView();
+        }
+
+        // Emoji keyboard stuff
+        boolean isTodo = false;
+        if (taskType.equals("todo")) {
+            isTodo = true;
+        }
+
+        // If it's a to-do, change the emojiToggle2 to the actual emojiToggle2 (prevents NPEs when not a to-do task)
+        if (isTodo) {
+            emojiToggle2 = (ImageButton) findViewById(R.id.emoji_toggle_btn2);
+        } else {
+            emojiToggle2 = emojiToggle0;
+        }
+
+        popup = new EmojiPopup(emojiToggle0.getRootView(), this, ContextCompat.getColor(this, R.color.brand));
+
+        popup.setSizeForSoftKeyboard();
+        popup.setOnDismissListener(() -> changeEmojiKeyboardIcon(false));
+        popup.setOnSoftKeyboardOpenCloseListener(new EmojiPopup.OnSoftKeyboardOpenCloseListener() {
+
+            @Override
+            public void onKeyboardOpen(int keyBoardHeight) {
+
+            }
+
+            @Override
+            public void onKeyboardClose() {
+                if (popup.isShowing()) {
+                    popup.dismiss();
+                }
+            }
+        });
+
+        popup.setOnEmojiconClickedListener(emojicon -> {
+            EmojiEditText emojiEditText = null;
+            if (getCurrentFocus() == null || !isEmojiEditText(getCurrentFocus()) || emojicon == null) {
+                return;
+            } else {
+                emojiEditText = (EmojiEditText) getCurrentFocus();
+            }
+            int start = emojiEditText.getSelectionStart();
+            int end = emojiEditText.getSelectionEnd();
+            if (start < 0) {
+                emojiEditText.append(emojicon.getEmoji());
+            } else {
+                emojiEditText.getText().replace(Math.min(start, end),
+                        Math.max(start, end), emojicon.getEmoji(), 0,
+                        emojicon.getEmoji().length());
+            }
+        });
+
+        popup.setOnEmojiconBackspaceClickedListener(v -> {
+            if (isEmojiEditText(getCurrentFocus())) {
+                KeyEvent event = new KeyEvent(
+                        0, 0, 0, KeyEvent.KEYCODE_DEL, 0, 0, 0, 0, KeyEvent.KEYCODE_ENDCALL);
+                getCurrentFocus().dispatchKeyEvent(event);
+            }
+        });
+
+        emojiToggle0.setOnClickListener(new emojiClickListener(taskText));
+        emojiToggle1.setOnClickListener(new emojiClickListener(taskNotes));
+        if (isTodo) {
+            emojiToggle2.setOnClickListener(new emojiClickListener(newCheckListEditText));
+        }
+
+        tagRepository.getTags(userId)
+                .subscribe(
+                        loadedTags -> {
+                            tags = loadedTags;
+                            createTagsCheckBoxes();
+                        },
+                        throwable -> {
+                        }
+                );
+    }
+
+
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    private boolean isEmojiEditText(@Nullable View view) {
+        return view instanceof EmojiEditText;
+    }
+
+    private void changeEmojiKeyboardIcon(Boolean keyboardOpened) {
+
+        if (keyboardOpened) {
+            emojiToggle0.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_keyboard_grey600_24dp));
+            emojiToggle1.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_keyboard_grey600_24dp));
+            emojiToggle2.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_keyboard_grey600_24dp));
+        } else {
+            emojiToggle0.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_emoticon_grey600_24dp));
+            emojiToggle1.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_emoticon_grey600_24dp));
+            emojiToggle2.setImageDrawable(ContextCompat.getDrawable(this, R.drawable.ic_emoticon_grey600_24dp));
+        }
+    }
+
+    private void createCheckListRecyclerView() {
+        List<ChecklistItem> checklistItems = new ArrayList<>();
+        if (task != null && task.getChecklist() != null) {
+            checklistItems = task.getChecklist();
+        }
+        checklistAdapter = new CheckListAdapter(checklistItems);
+
+        LinearLayoutManager llm = new LinearLayoutManager(this);
+        llm.setOrientation(LinearLayoutManager.VERTICAL);
+
+        recyclerView.setLayoutManager(llm);
+        recyclerView.setAdapter(checklistAdapter);
+
+        recyclerView.setLayoutManager(new WrapContentRecyclerViewLayoutManager(this));
+
+        ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(checklistAdapter);
+        ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(callback);
+        mItemTouchHelper.attachToRecyclerView(recyclerView);
+    }
+
+    @OnClick(R.id.add_checklist_button)
+    public void addChecklistItem() {
+        String checklist = newCheckListEditText.getText().toString();
+        ChecklistItem item = new ChecklistItem(checklist);
+        checklistAdapter.addItem(item);
+        newCheckListEditText.setText("");
+    }
+
+    private void createRemindersRecyclerView() {
+        List<RemindersItem> reminders = new ArrayList<>();
+        if (task != null && task.getReminders() != null) {
+            reminders = task.getReminders();
+        }
+
+        remindersAdapter = new RemindersAdapter(reminders, taskType);
+
+        LinearLayoutManager llm = new LinearLayoutManager(this);
+        llm.setOrientation(LinearLayoutManager.VERTICAL);
+
+        remindersRecyclerView.setLayoutManager(llm);
+        remindersRecyclerView.setAdapter(remindersAdapter);
+
+        remindersRecyclerView.setLayoutManager(new WrapContentRecyclerViewLayoutManager(this));
+
+        ItemTouchHelper.Callback callback = new SimpleItemTouchHelperCallback(remindersAdapter);
+        ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(callback);
+        mItemTouchHelper.attachToRecyclerView(remindersRecyclerView);
+    }
+
+    private void addNewReminder(RemindersItem remindersItem) {
+        remindersAdapter.addItem(remindersItem);
+    }
+
+    @OnClick(R.id.new_reminder_edittext)
+    public void selectNewReminderTime() {
+        remindersManager.createReminderTimeDialog(this::addNewReminder, taskType, this, null);
+    }
+
+    private void createTagsCheckBoxes() {
+        int position = 0;
+        for (Tag tag : tags) {
+            TableRow row = (TableRow) getLayoutInflater().inflate(R.layout.row_checklist, this.tagsContainerLinearLayout, false);
+            CheckBox checkbox = (CheckBox) row.findViewById(R.id.checkbox);
+            row.setId(position);
+            checkbox.setText(tag.getName()); // set text Name
+            checkbox.setId(position);
+            //This is to check if the tag was selected by the user. Similar to onClickListener
+            checkbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                if (buttonView.isChecked()) {
+                    if (!selectedTags.contains(tag)) {
+                        selectedTags.add(tag);
+                    }
+                } else {
+                    if (selectedTags.contains(tag)) {
+                        selectedTags.remove(tag);
+
+                    }
+                }
+            });
+            checkbox.setChecked(taskFilterHelper.isTagChecked(tag.getId()));
+            tagsContainerLinearLayout.addView(row);
+            tagCheckBoxList.add(checkbox);
+            position++;
+        }
+
+        if (task != null) {
+            fillTagCheckboxes();
+        }
+    }
+
+    private void setTitle(@Nullable Task task) {
+        ActionBar actionBar = getSupportActionBar();
+
+        if (actionBar != null) {
+
+            String title = "";
+
+            if (task != null) {
+                title = getResources().getString(R.string.action_edit) + " " + task.getText();
+            } else {
+                switch (taskType) {
+                    case "todo":
+                        title = getResources().getString(R.string.new_todo);
+                        break;
+                    case "daily":
+                        title = getResources().getString(R.string.new_daily);
+                        break;
+                    case "habit":
+                        title = getResources().getString(R.string.new_habit);
+                        break;
+                    case "reward":
+                        title = getResources().getString(R.string.new_reward);
+                        break;
+                }
+            }
+
+            actionBar.setTitle(title);
+        }
+    }
+
+    private void setDailyFrequencyViews() {
+        this.frequencyContainer.removeAllViews();
+        if (this.dailyFrequencySpinner.getSelectedItemPosition() == 0) {
+            String[] weekdays = getResources().getStringArray(R.array.weekdays);
+            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+            String dayOfTheWeek = sharedPreferences.getString("FirstDayOfTheWeek",
+                    Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
+            firstDayOfTheWeekHelper =
+                    FirstDayOfTheWeekHelper.newInstance(Integer.parseInt(dayOfTheWeek));
+            ArrayList<String> weekdaysTemp = new ArrayList<>(Arrays.asList(weekdays));
+            Collections.rotate(weekdaysTemp, firstDayOfTheWeekHelper.getDailyTaskFormOffset());
+            weekdays = weekdaysTemp.toArray(new String[1]);
+
+            for (int i = 0; i < 7; i++) {
+                View weekdayRow = getLayoutInflater().inflate(R.layout.row_checklist, this.frequencyContainer, false);
+                CheckBox checkbox = (CheckBox) weekdayRow.findViewById(R.id.checkbox);
+                checkbox.setText(weekdays[i]);
+                checkbox.setChecked(true);
+                this.weekdayCheckboxes.add(checkbox);
+                this.frequencyContainer.addView(weekdayRow);
+            }
+        } else {
+            View dayRow = getLayoutInflater().inflate(R.layout.row_number_picker, this.frequencyContainer, false);
+            this.frequencyPicker = (NumberPicker) dayRow.findViewById(R.id.numberPicker);
+            this.frequencyPicker.setMinValue(1);
+            this.frequencyPicker.setMaxValue(366);
+            TextView tv = (TextView) dayRow.findViewById(R.id.label);
+            tv.setText(getResources().getString(R.string.frequency_daily));
+            this.frequencyContainer.addView(dayRow);
+        }
+
+        if (this.task != null) {
+
+            if (this.dailyFrequencySpinner.getSelectedItemPosition() == 0) {
+                int offset = firstDayOfTheWeekHelper.getDailyTaskFormOffset();
+                this.weekdayCheckboxes.get(offset).setChecked(this.task.getRepeat().getM());
+                this.weekdayCheckboxes.get((offset + 1) % 7).setChecked(this.task.getRepeat().getT());
+                this.weekdayCheckboxes.get((offset + 2) % 7).setChecked(this.task.getRepeat().getW());
+                this.weekdayCheckboxes.get((offset + 3) % 7).setChecked(this.task.getRepeat().getTh());
+                this.weekdayCheckboxes.get((offset + 4) % 7).setChecked(this.task.getRepeat().getF());
+                this.weekdayCheckboxes.get((offset + 5) % 7).setChecked(this.task.getRepeat().getS());
+                this.weekdayCheckboxes.get((offset + 6) % 7).setChecked(this.task.getRepeat().getSu());
+            } else {
+                this.frequencyPicker.setValue(this.task.getEveryX());
+            }
+        }
+
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.menu_task_form, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        //noinspection SimplifiableIfStatement
+        if (id == R.id.action_save_changes) {
+            finishActivitySuccessfully();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void populate(Task task) {
+        taskText.setText(task.text);
+        taskNotes.setText(task.notes);
+        taskValue.setText(String.format(Locale.getDefault(), "%.2f", task.value));
+
+        if (tags != null) {
+            fillTagCheckboxes();
+        }
+
+        for (TaskTag tt : task.getTags()) {
+            selectedTags.add(tt.getTag());
+        }
+
+        float priority = task.getPriority();
+        if (Math.abs(priority - 0.1) < 0.000001) {
+            this.taskDifficultySpinner.setSelection(0);
+        } else if (Math.abs(priority - 1.0) < 0.000001) {
+            this.taskDifficultySpinner.setSelection(1);
+        } else if (Math.abs(priority - 1.5) < 0.000001) {
+            this.taskDifficultySpinner.setSelection(2);
+        } else if (Math.abs(priority - 2.0) < 0.000001) {
+            this.taskDifficultySpinner.setSelection(3);
+        }
+
+        String attribute = task.getAttribute();
+        if (attribute != null) {
+            switch (attribute) {
+                case Task.ATTRIBUTE_STRENGTH:
+                    taskAttributeSpinner.setSelection(0);
+                    break;
+                case Task.ATTRIBUTE_INTELLIGENCE:
+                    taskAttributeSpinner.setSelection(1);
+                    break;
+                case Task.ATTRIBUTE_CONSTITUTION:
+                    taskAttributeSpinner.setSelection(2);
+                    break;
+                case Task.ATTRIBUTE_PERCEPTION:
+                    taskAttributeSpinner.setSelection(3);
+                    break;
+            }
+        }
+
+        if (task.type.equals("habit")) {
+            positiveCheckBox.setChecked(task.getUp());
+            negativeCheckBox.setChecked(task.getDown());
+        }
+
+        if (task.type.equals("daily")) {
+
+            if (task.getStartDate() != null) {
+                startDateListener.setCalendar(task.getStartDate());
+            }
+
+            if (task.getFrequency().equals("weekly")) {
+                this.dailyFrequencySpinner.setSelection(0);
+                if (weekdayCheckboxes.size() == 7) {
+                    int offset = firstDayOfTheWeekHelper.getDailyTaskFormOffset();
+                    this.weekdayCheckboxes.get(offset).setChecked(this.task.getRepeat().getM());
+                    this.weekdayCheckboxes.get((offset + 1) % 7).setChecked(this.task.getRepeat().getT());
+                    this.weekdayCheckboxes.get((offset + 2) % 7).setChecked(this.task.getRepeat().getW());
+                    this.weekdayCheckboxes.get((offset + 3) % 7).setChecked(this.task.getRepeat().getTh());
+                    this.weekdayCheckboxes.get((offset + 4) % 7).setChecked(this.task.getRepeat().getF());
+                    this.weekdayCheckboxes.get((offset + 5) % 7).setChecked(this.task.getRepeat().getS());
+                    this.weekdayCheckboxes.get((offset + 6) % 7).setChecked(this.task.getRepeat().getSu());
+                }
+            } else {
+                this.dailyFrequencySpinner.setSelection(1);
+                if (this.frequencyPicker != null) {
+                    this.frequencyPicker.setValue(task.getEveryX());
+                }
+            }
+        }
+
+        if (task.type.equals("todo")) {
+            if (task.getDueDate() != null) {
+                dueDateCheckBox.setChecked(true);
+                dueDateListener.setCalendar(task.getDueDate());
+            }
+        }
+
+        if (task.isGroupTask()) {
+            new AlertDialog.Builder(this)
+                    .setTitle(R.string.group_tasks_edit_title)
+                    .setMessage(R.string.group_tasks_edit_description)
+                    .setPositiveButton(android.R.string.ok, (dialog, which) -> finish())
+                    .show();
+        }
+    }
+
+    private void fillTagCheckboxes() {
+        for (TaskTag tt : task.getTags()) {
+            int position = tags.indexOf(tt.getTag());
+            if (tagCheckBoxList.size() > position && position >= 0) {
+                tagCheckBoxList.get(position).setChecked(true);
+            }
+        }
+    }
+
+    private boolean saveTask(Task task) {
+        task.text = MarkdownParser.parseCompiled(taskText.getText());
+
+        if (checklistAdapter != null) {
+            if (checklistAdapter.getCheckListItems() != null) {
+                task.setChecklist(checklistAdapter.getCheckListItems());
+            }
+        }
+
+        if (remindersAdapter != null) {
+            if (remindersAdapter.getRemindersItems() != null) {
+                task.setReminders(remindersAdapter.getRemindersItems());
+            }
+        }
+
+        if (task.text.isEmpty()) {
+            return false;
+        }
+
+        task.notes = MarkdownParser.parseCompiled(taskNotes.getText());
+
+        if (this.taskDifficultySpinner.getSelectedItemPosition() == 0) {
+            task.setPriority((float) 0.1);
+        } else if (this.taskDifficultySpinner.getSelectedItemPosition() == 1) {
+            task.setPriority((float) 1.0);
+        } else if (this.taskDifficultySpinner.getSelectedItemPosition() == 2) {
+            task.setPriority((float) 1.5);
+        } else if (this.taskDifficultySpinner.getSelectedItemPosition() == 3) {
+            task.setPriority((float) 2.0);
+        }
+
+        if (TextUtils.isEmpty(allocationMode) || !allocationMode.equals("taskbased")) {
+            task.setAttribute(Task.ATTRIBUTE_STRENGTH);
+        } else {
+            switch (this.taskAttributeSpinner.getSelectedItemPosition()) {
+                case 0:
+                    task.setAttribute(Task.ATTRIBUTE_STRENGTH);
+                    break;
+                case 1:
+                    task.setAttribute(Task.ATTRIBUTE_INTELLIGENCE);
+                    break;
+                case 2:
+                    task.setAttribute(Task.ATTRIBUTE_CONSTITUTION);
+                    break;
+                case 3:
+                    task.setAttribute(Task.ATTRIBUTE_PERCEPTION);
+                    break;
+            }
+        }
+
+        switch (task.type) {
+            case "habit": {
+                task.setUp(positiveCheckBox.isChecked());
+                task.setDown(negativeCheckBox.isChecked());
+            }
+            break;
+
+            case "daily": {
+                task.setStartDate(new Date(startDateListener.getCalendar().getTimeInMillis()));
+
+                if (this.dailyFrequencySpinner.getSelectedItemPosition() == 0) {
+                    task.setFrequency("weekly");
+                    Days repeat = task.getRepeat();
+                    if (repeat == null) {
+                        repeat = new Days();
+                        task.setRepeat(repeat);
+                    }
+
+                    int offset = firstDayOfTheWeekHelper.getDailyTaskFormOffset();
+                    repeat.setM(this.weekdayCheckboxes.get(offset).isChecked());
+                    repeat.setT(this.weekdayCheckboxes.get((offset + 1) % 7).isChecked());
+                    repeat.setW(this.weekdayCheckboxes.get((offset + 2) % 7).isChecked());
+                    repeat.setTh(this.weekdayCheckboxes.get((offset + 3) % 7).isChecked());
+                    repeat.setF(this.weekdayCheckboxes.get((offset + 4) % 7).isChecked());
+                    repeat.setS(this.weekdayCheckboxes.get((offset + 5) % 7).isChecked());
+                    repeat.setSu(this.weekdayCheckboxes.get((offset + 6) % 7).isChecked());
+                } else {
+                    task.setFrequency("daily");
+                    task.setEveryX(this.frequencyPicker.getValue());
+                }
+            }
+            break;
+
+            case "todo": {
+                if (dueDateCheckBox.isChecked()) {
+                    task.setDueDate(new Date(dueDateListener.getCalendar().getTimeInMillis()));
+                } else {
+                    task.setDueDate(null);
+                }
+            }
+            break;
+
+            case "reward": {
+                String value = taskValue.getText().toString();
+                if (!value.isEmpty()) {
+                    NumberFormat localFormat = DecimalFormat.getInstance(Locale.getDefault());
+                    try {
+                        task.setValue(localFormat.parse(value).doubleValue());
+                    } catch (ParseException e) {
+                    }
+                } else {
+                    task.setValue(0.0d);
+                }
+
+            }
+            break;
+        }
+
+        return true;
+    }
+
+    public void onItemSelected(AdapterView<?> parent, View view,
+                               int pos, long id) {
+        this.setDailyFrequencyViews();
+    }
+
+    public void onNothingSelected(AdapterView<?> parent) {
+        this.setDailyFrequencyViews();
+    }
+
+    private void prepareSave() {
+        if (this.task == null) {
+            this.task = new Task();
+            this.task.setType(taskType);
+        }
+
+        if (this.saveTask(this.task)) {
+            List<TaskTag> taskTags = new ArrayList<>();
+            for (Tag tag : selectedTags) {
+                TaskTag tt = new TaskTag();
+                tt.setTag(tag);
+                tt.setTask(task);
+                taskTags.add(tt);
+            }
+            //save
+            this.task.setTags(taskTags);
+            this.task.save();
+            //send back to other elements.
+            TaskSaveEvent event = new TaskSaveEvent();
+            if (TaskFormActivity.this.task.getId() == null) {
+                event.created = true;
+            }
+
+            event.task = TaskFormActivity.this.task;
+            EventBus.getDefault().post(event);
+        }
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        finish();
+        dismissKeyboard();
+        return true;
+    }
+
+    @Override
+    public void onBackPressed() {
+        finish();
+        dismissKeyboard();
+    }
+
+    private void finishActivitySuccessfully() {
+        this.prepareSave();
+        finishWithSuccess();
+        dismissKeyboard();
+    }
+
+    private void finishWithSuccess() {
+        Intent resultIntent = new Intent();
+        resultIntent.putExtra(TaskFormActivity.TASK_TYPE_KEY, taskType);
+        setResult(RESULT_OK, resultIntent);
+        finish();
+    }
+
+    private void dismissKeyboard() {
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        View currentFocus = getCurrentFocus();
+        if (currentFocus != null) {
+            imm.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0);
+        }
+    }
+
+    private class DateEditTextListener implements View.OnClickListener, DatePickerDialog.OnDateSetListener {
+        Calendar calendar;
+        DatePickerDialog datePickerDialog;
+        EditText datePickerText;
+        DateFormat dateFormatter;
+
+        public DateEditTextListener(EditText dateText) {
+            calendar = Calendar.getInstance();
+
+            this.datePickerText = dateText;
+            this.datePickerText.setOnClickListener(this);
+            this.dateFormatter = DateFormat.getDateInstance();
+            this.datePickerDialog = new DatePickerDialog(datePickerText.getContext(), this,
+                    calendar.get(Calendar.YEAR),
+                    calendar.get(Calendar.MONTH),
+                    calendar.get(Calendar.DAY_OF_MONTH));
+
+            SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+            String dayOfTheWeek = sharedPreferences.getString("FirstDayOfTheWeek",
+                    Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
+            FirstDayOfTheWeekHelper firstDayOfTheWeekHelper =
+                    FirstDayOfTheWeekHelper.newInstance(Integer.parseInt(dayOfTheWeek));
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.KITKAT_WATCH) {
+                datePickerDialog.getDatePicker().getCalendarView().setFirstDayOfWeek(
+                        firstDayOfTheWeekHelper.getFirstDayOfTheWeek());
+            } else {
+                datePickerDialog.getDatePicker().setFirstDayOfWeek(firstDayOfTheWeekHelper
+                        .getFirstDayOfTheWeek());
+            }
+
+            this.datePickerDialog.setButton(DialogInterface.BUTTON_NEUTRAL, getResources().getString(R.string.today), (dialog, which) -> {
+                setCalendar(Calendar.getInstance().getTime());
+            });
+            updateDateText();
+        }
+
+        public void onClick(View view) {
+            datePickerDialog.show();
+        }
+
+        public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
+            calendar.set(year, monthOfYear, dayOfMonth);
+            updateDateText();
+        }
+
+        public Calendar getCalendar() {
+            return (Calendar) calendar.clone();
+        }
+
+        public void setCalendar(Date date) {
+            calendar.setTime(date);
+            datePickerDialog.updateDate(calendar.get(Calendar.YEAR),
+                    calendar.get(Calendar.MONTH),
+                    calendar.get(Calendar.DAY_OF_MONTH));
+            updateDateText();
+        }
+
+        private void updateDateText() {
+            datePickerText.setText(dateFormatter.format(calendar.getTime()));
+        }
+    }
+
+    private class emojiClickListener implements View.OnClickListener {
+
+        EmojiEditText view;
+
+        public emojiClickListener(EmojiEditText view) {
+            this.view = view;
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (!popup.isShowing()) {
+
+                if (popup.isKeyBoardOpen()) {
+                    popup.showAtBottom();
+                    changeEmojiKeyboardIcon(true);
+                } else {
+                    view.setFocusableInTouchMode(true);
+                    view.requestFocus();
+                    popup.showAtBottomPending();
+                    final InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                    inputMethodManager.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
+                    changeEmojiKeyboardIcon(true);
+                }
+            } else {
+                popup.dismiss();
+                changeEmojiKeyboardIcon(false);
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
index 2a2755afd..2db9cf54d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
@@ -1,302 +1,302 @@
-package com.habitrpg.android.habitica.ui.adapter;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
-import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
-import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
-import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.habitrpg.android.habitica.models.inventory.CustomizationSet;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.support.v7.app.AlertDialog;
-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.Button;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    public String userSize;
-    public String hairColor;
-    public double gemBalance;
-    private List<Object> customizationList;
-    private String activeCustomization;
-
-    public void updateOwnership(List<String> ownedCustomizations) {
-        int position = 0;
-        for (Object obj : customizationList) {
-            if (obj.getClass().equals(Customization.class)) {
-                Customization customization = (Customization) obj;
-                if (customization.getPurchased() != ownedCustomizations.contains(customization.getId())) {
-                    customization.setPurchased(ownedCustomizations.contains(customization.getId()));
-                    notifyItemChanged(position);
-                }
-            }
-            position++;
-        }
-    }
-
-    public void setActiveCustomization(String activeCustomization) {
-        this.activeCustomization = activeCustomization;
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-        if (viewType == 0) {
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.customization_section_header, parent, false);
-
-            return new SectionViewHolder(view);
-        } else {
-            int viewID;
-            if (viewType == 1) {
-                viewID = R.layout.customization_grid_item;
-            } else {
-                viewID = R.layout.customization_grid_background_item;
-            }
-
-
-            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(CustomizationSet.class)) {
-            ((SectionViewHolder) holder).bind((CustomizationSet) obj);
-        } else {
-            ((CustomizationViewHolder) holder).bind((Customization) customizationList.get(position));
-
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return customizationList == null ? 0 : customizationList.size();
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (this.customizationList.get(position).getClass().equals(CustomizationSet.class)) {
-            return 0;
-        } else {
-            Customization customization = (Customization) customizationList.get(position);
-            if (customization.getType().equals("background")) {
-                return 2;
-            }
-            return 1;
-        }
-    }
-
-    public List<Object> getCustomizationList() {
-        return this.customizationList;
-    }
-
-    public void setCustomizationList(List<Customization> newCustomizationList) {
-        this.customizationList = new ArrayList<>();
-        CustomizationSet lastSet = new CustomizationSet();
-        for (Customization customization : newCustomizationList) {
-            if (customization.getCustomizationSet() != null && !customization.getCustomizationSet().equals(lastSet.identifier)) {
-                CustomizationSet set = new CustomizationSet();
-                set.identifier = customization.getCustomizationSet();
-                set.text = customization.getCustomizationSetName();
-                set.price = customization.getSetPrice();
-                set.hasPurchasable = !customization.isUsable();
-                lastSet = set;
-                customizationList.add(set);
-            }
-            customizationList.add(customization);
-            if (!customization.isUsable() && !lastSet.hasPurchasable) {
-                lastSet.hasPurchasable = true;
-            }
-        }
-        this.notifyDataSetChanged();
-    }
-
-    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;
-
-        @BindView(R.id.purchaseOverlay)
-        View purchaseOverlay;
-
-        Customization customization;
-
-        Context context;
-
-        public CustomizationViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-
-            linearLayout.setOnClickListener(this);
-
-            context = itemView.getContext();
-        }
-
-        public void bind(Customization customization) {
-            this.customization = customization;
-
-
-            DataBindingUtils.loadImage(this.imageView, customization.getImageName(userSize, hairColor));
-            cardView.setCardBackgroundColor(context.getResources().getColor(android.R.color.white));
-            if (customization.isUsable()) {
-                imageView.setAlpha(1.0f);
-                purchaseOverlay.setAlpha(0.0f);
-                if (customization.getIdentifier().equals(activeCustomization)) {
-                    cardView.setCardBackgroundColor(context.getResources().getColor(R.color.brand_500));
-                }
-            } else {
-                imageView.setAlpha(0.3f);
-                purchaseOverlay.setAlpha(0.8f);
-            }
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (!customization.isUsable()) {
-
-                LinearLayout dialogContent = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.dialog_purchase_customization, null);
-
-                SimpleDraweeView imageView = (SimpleDraweeView) dialogContent.findViewById(R.id.imageView);
-                DataBindingUtils.loadImage(imageView, customization.getImageName(userSize, hairColor));
-
-                TextView priceLabel = (TextView) dialogContent.findViewById(R.id.priceLabel);
-                priceLabel.setText(String.valueOf(customization.getPrice()));
-
-                AlertDialog dialog = new AlertDialog.Builder(context)
-                        .setPositiveButton(R.string.purchase_button, (dialog1, which) -> {
-                            if (customization.getPrice() > gemBalance) {
-                                OpenMenuItemCommand event = new OpenMenuItemCommand();
-                                event.identifier = MainDrawerBuilder.SIDEBAR_PURCHASE;
-                                EventBus.getDefault().post(event);
-                                return;
-                            }
-                            UnlockPathCommand event = new UnlockPathCommand();
-                            event.path = customization.getPath();
-                            event.balanceDiff = customization.getPrice() / 4;
-                            EventBus.getDefault().post(event);
-                        })
-                        .setTitle(context.getString(R.string.purchase_customization))
-                        .setView(dialogContent)
-                        .setNegativeButton(R.string.reward_dialog_dismiss, (dialog1, which) -> {
-                            dialog1.dismiss();
-                        }).create();
-                dialog.show();
-                return;
-            }
-
-            if (customization.getIdentifier().equals(activeCustomization)) {
-                return;
-            }
-
-            UpdateUserCommand command = new UpdateUserCommand();
-            Map<String, Object> updateData = new HashMap<>();
-            String updatePath = "preferences." + customization.getType();
-            if (customization.getCategory() != null) {
-                updatePath = updatePath + "." + customization.getCategory();
-            }
-            updateData.put(updatePath, customization.getIdentifier());
-            command.updateData = updateData;
-
-            EventBus.getDefault().post(command);
-        }
-    }
-
-    class SectionViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-
-        @BindView(R.id.label)
-        TextView label;
-        @BindView(R.id.purchaseSetButton)
-        Button purchaseSetButton;
-        Context context;
-        private CustomizationSet set;
-
-        public SectionViewHolder(View itemView) {
-            super(itemView);
-            context = itemView.getContext();
-            ButterKnife.bind(this, itemView);
-            purchaseSetButton.setOnClickListener(this);
-        }
-
-        public void bind(CustomizationSet set) {
-            this.set = set;
-            this.label.setText(set.text);
-            if (set.hasPurchasable) {
-                this.purchaseSetButton.setVisibility(View.VISIBLE);
-                this.purchaseSetButton.setText(context.getString(R.string.purchase_set_button, set.price));
-            } else {
-                this.purchaseSetButton.setVisibility(View.GONE);
-            }
-        }
-
-        @Override
-        public void onClick(View v) {
-            LinearLayout dialogContent = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.dialog_purchase_customization, null);
-
-            TextView priceLabel = (TextView) dialogContent.findViewById(R.id.priceLabel);
-            priceLabel.setText(String.valueOf(set.price));
-
-            AlertDialog dialog = new AlertDialog.Builder(context)
-                    .setPositiveButton(R.string.purchase_button, (dialog1, which) -> {
-                        if (set.price > gemBalance) {
-                            OpenMenuItemCommand event = new OpenMenuItemCommand();
-                            event.identifier = MainDrawerBuilder.SIDEBAR_PURCHASE;
-                            EventBus.getDefault().post(event);
-                            return;
-                        }
-                        UnlockPathCommand event = new UnlockPathCommand();
-                        String path = "";
-                        for (Object obj : customizationList) {
-                            if (obj.getClass().equals(Customization.class)) {
-                                Customization customization = (Customization) obj;
-                                if (!customization.isUsable() && customization.getCustomizationSet() != null && customization.getCustomizationSet().equals(set.identifier)) {
-                                    path = path + "," + customization.getPath();
-                                }
-                            }
-                        }
-                        path = path.substring(1);
-                        event.path = path;
-                        event.balanceDiff = set.price / 4;
-                        EventBus.getDefault().post(event);
-                    })
-                    .setTitle(context.getString(R.string.purchase_set_title, set.text))
-                    .setView(dialogContent)
-                    .setNegativeButton(R.string.reward_dialog_dismiss, (dialog1, which) -> {
-                        dialog1.dismiss();
-                    }).create();
-            dialog.show();
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter;
+
+import android.content.Context;
+import android.support.v7.app.AlertDialog;
+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.Button;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
+import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
+import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.inventory.CustomizationSet;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    public String userSize;
+    public String hairColor;
+    public double gemBalance;
+    private List<Object> customizationList;
+    private String activeCustomization;
+
+    public void updateOwnership(List<String> ownedCustomizations) {
+        int position = 0;
+        for (Object obj : customizationList) {
+            if (obj.getClass().equals(Customization.class)) {
+                Customization customization = (Customization) obj;
+                if (customization.getPurchased() != ownedCustomizations.contains(customization.getId())) {
+                    customization.setPurchased(ownedCustomizations.contains(customization.getId()));
+                    notifyItemChanged(position);
+                }
+            }
+            position++;
+        }
+    }
+
+    public void setActiveCustomization(String activeCustomization) {
+        this.activeCustomization = activeCustomization;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        if (viewType == 0) {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.customization_section_header, parent, false);
+
+            return new SectionViewHolder(view);
+        } else {
+            int viewID;
+            if (viewType == 1) {
+                viewID = R.layout.customization_grid_item;
+            } else {
+                viewID = R.layout.customization_grid_background_item;
+            }
+
+
+            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(CustomizationSet.class)) {
+            ((SectionViewHolder) holder).bind((CustomizationSet) obj);
+        } else {
+            ((CustomizationViewHolder) holder).bind((Customization) customizationList.get(position));
+
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return customizationList == null ? 0 : customizationList.size();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (this.customizationList.get(position).getClass().equals(CustomizationSet.class)) {
+            return 0;
+        } else {
+            Customization customization = (Customization) customizationList.get(position);
+            if (customization.getType().equals("background")) {
+                return 2;
+            }
+            return 1;
+        }
+    }
+
+    public List<Object> getCustomizationList() {
+        return this.customizationList;
+    }
+
+    public void setCustomizationList(List<Customization> newCustomizationList) {
+        this.customizationList = new ArrayList<>();
+        CustomizationSet lastSet = new CustomizationSet();
+        for (Customization customization : newCustomizationList) {
+            if (customization.getCustomizationSet() != null && !customization.getCustomizationSet().equals(lastSet.identifier)) {
+                CustomizationSet set = new CustomizationSet();
+                set.identifier = customization.getCustomizationSet();
+                set.text = customization.getCustomizationSetName();
+                set.price = customization.getSetPrice();
+                set.hasPurchasable = !customization.isUsable();
+                lastSet = set;
+                customizationList.add(set);
+            }
+            customizationList.add(customization);
+            if (!customization.isUsable() && !lastSet.hasPurchasable) {
+                lastSet.hasPurchasable = true;
+            }
+        }
+        this.notifyDataSetChanged();
+    }
+
+    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;
+
+        @BindView(R.id.purchaseOverlay)
+        View purchaseOverlay;
+
+        Customization customization;
+
+        Context context;
+
+        public CustomizationViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+
+            linearLayout.setOnClickListener(this);
+
+            context = itemView.getContext();
+        }
+
+        public void bind(Customization customization) {
+            this.customization = customization;
+
+
+            DataBindingUtils.loadImage(this.imageView, customization.getImageName(userSize, hairColor));
+            cardView.setCardBackgroundColor(context.getResources().getColor(android.R.color.white));
+            if (customization.isUsable()) {
+                imageView.setAlpha(1.0f);
+                purchaseOverlay.setAlpha(0.0f);
+                if (customization.getIdentifier().equals(activeCustomization)) {
+                    cardView.setCardBackgroundColor(context.getResources().getColor(R.color.brand_500));
+                }
+            } else {
+                imageView.setAlpha(0.3f);
+                purchaseOverlay.setAlpha(0.8f);
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (!customization.isUsable()) {
+
+                LinearLayout dialogContent = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.dialog_purchase_customization, null);
+
+                SimpleDraweeView imageView = (SimpleDraweeView) dialogContent.findViewById(R.id.imageView);
+                DataBindingUtils.loadImage(imageView, customization.getImageName(userSize, hairColor));
+
+                TextView priceLabel = (TextView) dialogContent.findViewById(R.id.priceLabel);
+                priceLabel.setText(String.valueOf(customization.getPrice()));
+
+                AlertDialog dialog = new AlertDialog.Builder(context)
+                        .setPositiveButton(R.string.purchase_button, (dialog1, which) -> {
+                            if (customization.getPrice() > gemBalance) {
+                                OpenMenuItemCommand event = new OpenMenuItemCommand();
+                                event.identifier = MainDrawerBuilder.SIDEBAR_PURCHASE;
+                                EventBus.getDefault().post(event);
+                                return;
+                            }
+                            UnlockPathCommand event = new UnlockPathCommand();
+                            event.path = customization.getPath();
+                            event.balanceDiff = customization.getPrice() / 4;
+                            EventBus.getDefault().post(event);
+                        })
+                        .setTitle(context.getString(R.string.purchase_customization))
+                        .setView(dialogContent)
+                        .setNegativeButton(R.string.reward_dialog_dismiss, (dialog1, which) -> {
+                            dialog1.dismiss();
+                        }).create();
+                dialog.show();
+                return;
+            }
+
+            if (customization.getIdentifier().equals(activeCustomization)) {
+                return;
+            }
+
+            UpdateUserCommand command = new UpdateUserCommand();
+            Map<String, Object> updateData = new HashMap<>();
+            String updatePath = "preferences." + customization.getType();
+            if (customization.getCategory() != null) {
+                updatePath = updatePath + "." + customization.getCategory();
+            }
+            updateData.put(updatePath, customization.getIdentifier());
+            command.updateData = updateData;
+
+            EventBus.getDefault().post(command);
+        }
+    }
+
+    class SectionViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+        @BindView(R.id.label)
+        TextView label;
+        @BindView(R.id.purchaseSetButton)
+        Button purchaseSetButton;
+        Context context;
+        private CustomizationSet set;
+
+        public SectionViewHolder(View itemView) {
+            super(itemView);
+            context = itemView.getContext();
+            ButterKnife.bind(this, itemView);
+            purchaseSetButton.setOnClickListener(this);
+        }
+
+        public void bind(CustomizationSet set) {
+            this.set = set;
+            this.label.setText(set.text);
+            if (set.hasPurchasable) {
+                this.purchaseSetButton.setVisibility(View.VISIBLE);
+                this.purchaseSetButton.setText(context.getString(R.string.purchase_set_button, set.price));
+            } else {
+                this.purchaseSetButton.setVisibility(View.GONE);
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            LinearLayout dialogContent = (LinearLayout) LayoutInflater.from(context).inflate(R.layout.dialog_purchase_customization, null);
+
+            TextView priceLabel = (TextView) dialogContent.findViewById(R.id.priceLabel);
+            priceLabel.setText(String.valueOf(set.price));
+
+            AlertDialog dialog = new AlertDialog.Builder(context)
+                    .setPositiveButton(R.string.purchase_button, (dialog1, which) -> {
+                        if (set.price > gemBalance) {
+                            OpenMenuItemCommand event = new OpenMenuItemCommand();
+                            event.identifier = MainDrawerBuilder.SIDEBAR_PURCHASE;
+                            EventBus.getDefault().post(event);
+                            return;
+                        }
+                        UnlockPathCommand event = new UnlockPathCommand();
+                        String path = "";
+                        for (Object obj : customizationList) {
+                            if (obj.getClass().equals(Customization.class)) {
+                                Customization customization = (Customization) obj;
+                                if (!customization.isUsable() && customization.getCustomizationSet() != null && customization.getCustomizationSet().equals(set.identifier)) {
+                                    path = path + "," + customization.getPath();
+                                }
+                            }
+                        }
+                        path = path.substring(1);
+                        event.path = path;
+                        event.balanceDiff = set.price / 4;
+                        EventBus.getDefault().post(event);
+                    })
+                    .setTitle(context.getString(R.string.purchase_set_title, set.text))
+                    .setView(dialogContent)
+                    .setNegativeButton(R.string.reward_dialog_dismiss, (dialog1, which) -> {
+                        dialog1.dismiss();
+                    }).create();
+            dialog.show();
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.java
index 04c5106e3..c1320af6d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/FAQOverviewRecyclerAdapter.java
@@ -1,115 +1,115 @@
-package com.habitrpg.android.habitica.ui.adapter;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.ui.fragments.faq.FAQDetailFragment;
-import com.habitrpg.android.habitica.models.FAQArticle;
-
-import android.content.Context;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import rx.Observable;
-import rx.subjects.PublishSubject;
-
-public class FAQOverviewRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    private static final int VIEW_TYPE_JUSTIN = 0;
-    private static final int VIEW_TYPE_FAQ = 1;
-
-    public MainActivity activity;
-    private List<FAQArticle> articles;
-
-    private PublishSubject<Void> resetWalkthroughEvents = PublishSubject.create();
-
-    public void setArticles(List<FAQArticle> articles) {
-        this.articles = articles;
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        if (viewType == VIEW_TYPE_JUSTIN) {
-            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.button_list_item, parent, false);
-            return new ResetWalkthroughViewHolder(view);
-        } else {
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.plain_list_item, parent, false);
-            return new FAQArticleViewHolder(view);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        if (getItemViewType(position) == VIEW_TYPE_FAQ) {
-            ((FAQArticleViewHolder) holder).bind(this.articles.get(position-1));
-        }
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (position == 0) {
-            return VIEW_TYPE_JUSTIN;
-        } else {
-            return VIEW_TYPE_FAQ;
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return this.articles == null ? 1 : this.articles.size()+1;
-    }
-
-    public Observable<Void> getResetWalkthroughEvents() {
-        return resetWalkthroughEvents.asObservable();
-    }
-
-    class FAQArticleViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-
-        @BindView(R.id.textView)
-        TextView textView;
-
-        FAQArticle article;
-
-        Context context;
-
-        FAQArticleViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-
-            textView.setOnClickListener(this);
-
-            context = itemView.getContext();
-        }
-
-        public void bind(FAQArticle article) {
-            this.article = article;
-            this.textView.setText(this.article.getQuestion());
-        }
-
-        @Override
-        public void onClick(View v) {
-            FAQDetailFragment fragment = new FAQDetailFragment();
-            fragment.setArticle(this.article);
-            activity.displayFragment(fragment);
-        }
-    }
-
-    private class ResetWalkthroughViewHolder extends RecyclerView.ViewHolder {
-
-        ResetWalkthroughViewHolder(View itemView) {
-            super(itemView);
-            Button button = (Button)itemView;
-            button.setText(itemView.getContext().getString(R.string.reset_walkthrough));
-            button.setOnClickListener(v -> resetWalkthroughEvents.onNext(null));
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.FAQArticle;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.habitrpg.android.habitica.ui.fragments.faq.FAQDetailFragment;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import rx.Observable;
+import rx.subjects.PublishSubject;
+
+public class FAQOverviewRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private static final int VIEW_TYPE_JUSTIN = 0;
+    private static final int VIEW_TYPE_FAQ = 1;
+
+    public MainActivity activity;
+    private List<FAQArticle> articles;
+
+    private PublishSubject<Void> resetWalkthroughEvents = PublishSubject.create();
+
+    public void setArticles(List<FAQArticle> articles) {
+        this.articles = articles;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        if (viewType == VIEW_TYPE_JUSTIN) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.button_list_item, parent, false);
+            return new ResetWalkthroughViewHolder(view);
+        } else {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.plain_list_item, parent, false);
+            return new FAQArticleViewHolder(view);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        if (getItemViewType(position) == VIEW_TYPE_FAQ) {
+            ((FAQArticleViewHolder) holder).bind(this.articles.get(position-1));
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (position == 0) {
+            return VIEW_TYPE_JUSTIN;
+        } else {
+            return VIEW_TYPE_FAQ;
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return this.articles == null ? 1 : this.articles.size()+1;
+    }
+
+    public Observable<Void> getResetWalkthroughEvents() {
+        return resetWalkthroughEvents.asObservable();
+    }
+
+    class FAQArticleViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+        @BindView(R.id.textView)
+        TextView textView;
+
+        FAQArticle article;
+
+        Context context;
+
+        FAQArticleViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+
+            textView.setOnClickListener(this);
+
+            context = itemView.getContext();
+        }
+
+        public void bind(FAQArticle article) {
+            this.article = article;
+            this.textView.setText(this.article.getQuestion());
+        }
+
+        @Override
+        public void onClick(View v) {
+            FAQDetailFragment fragment = new FAQDetailFragment();
+            fragment.setArticle(this.article);
+            activity.displayFragment(fragment);
+        }
+    }
+
+    private class ResetWalkthroughViewHolder extends RecyclerView.ViewHolder {
+
+        ResetWalkthroughViewHolder(View itemView) {
+            super(itemView);
+            Button button = (Button)itemView;
+            button.setText(itemView.getContext().getString(R.string.reset_walkthrough));
+            button.setOnClickListener(v -> resetWalkthroughEvents.onNext(null));
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/IReceiveNewEntries.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/IReceiveNewEntries.java
index f60e32455..8e0c1ee53 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/IReceiveNewEntries.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/IReceiveNewEntries.java
@@ -1,9 +1,9 @@
-package com.habitrpg.android.habitica.ui.adapter;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import java.util.List;
-
-public interface IReceiveNewEntries {
-    void GotAdditionalItems(List<Task> items);
-}
+package com.habitrpg.android.habitica.ui.adapter;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+import java.util.List;
+
+public interface IReceiveNewEntries {
+    void GotAdditionalItems(List<Task> items);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
index 12dc2f185..3d23b093d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
@@ -1,154 +1,151 @@
-package com.habitrpg.android.habitica.ui.adapter;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding;
-import com.habitrpg.android.habitica.ui.activities.TaskClickActivity;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.OrderBy;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import android.databinding.DataBindingUtil;
-import android.databinding.ObservableArrayList;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import java.util.UUID;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-
-public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter<SkillTasksRecyclerViewAdapter.ViewHolder> {
-
-
-    private static final int TYPE_CELL = 1;
-    private final TaskRepository taskRepository;
-    String taskType;
-    TaskClickActivity activity;
-    private ObservableArrayList<Task> observableContent;
-    private RecyclerView.Adapter<ViewHolder> parentAdapter;
-    private String userId;
-
-    public SkillTasksRecyclerViewAdapter(TaskRepository taskRepository, String taskType, TaskClickActivity activity, String userId) {
-        this.setHasStableIds(true);
-        this.taskType = taskType;
-        this.activity = activity;
-        this.taskRepository = taskRepository;
-        this.userId = userId;
-
-        this.loadContent();
-
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        switch (position) {
-            default:
-                return TYPE_CELL;
-        }
-    }
-
-    @Override
-    public long getItemId(int position) {
-        Task task = observableContent.get(position);
-        if (task.getId() != null && task.getId().length() == 36) {
-            return UUID.fromString(task.getId()).getMostSignificantBits();
-        }
-        return UUID.randomUUID().getMostSignificantBits();
-    }
-
-    @Override
-    public int getItemCount() {
-        return observableContent.size();
-    }
-
-    @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.skill_task_item_card, parent, false);
-        return new SkillTasksRecyclerViewAdapter.ViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(ViewHolder holder, int position) {
-        Task item = observableContent.get(position);
-
-        holder.bindHolder(item, position);
-    }
-
-    // region ViewHolders
-
-    public void loadContent() {
-        this.loadContent(false);
-    }
-
-    // endregion
-
-    public void loadContent(boolean forced) {
-
-        if (this.observableContent == null || forced) {
-
-            this.observableContent = new ObservableArrayList<>();
-            taskRepository.getTasks(taskType, userId).subscribe(tasks -> {
-                this.observableContent.addAll(tasks);
-                if (parentAdapter != null) {
-                    parentAdapter.notifyDataSetChanged();
-                } else {
-                    notifyDataSetChanged();
-                }
-            }, throwable -> {});
-        } else {
-            if (parentAdapter != null) {
-                parentAdapter.notifyDataSetChanged();
-            } else {
-                notifyDataSetChanged();
-            }
-        }
-    }
-
-    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-
-        public Task task;
-        protected android.content.res.Resources resources;
-        SkillTaskItemCardBinding binding;
-
-        @BindView(R.id.notesTextView)
-        TextView notesTextView;
-
-        public ViewHolder(View itemView) {
-            super(itemView);
-
-            itemView.setOnClickListener(this);
-            itemView.setClickable(true);
-
-            ButterKnife.bind(this, itemView);
-            binding = DataBindingUtil.bind(itemView);
-
-            resources = itemView.getResources();
-        }
-
-        void bindHolder(Task habitItem, int position) {
-            task = habitItem;
-            if (habitItem.notes == null || habitItem.notes.length() == 0) {
-                notesTextView.setHeight(0);
-            } else {
-                notesTextView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
-            }
-            binding.setTask(task);
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (v != itemView)
-                return;
-            activity.taskSelected(task.getId());
-        }
-
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter;
+
+import android.databinding.DataBindingUtil;
+import android.databinding.ObservableArrayList;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.ui.activities.TaskClickActivity;
+
+import java.util.UUID;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+
+public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter<SkillTasksRecyclerViewAdapter.ViewHolder> {
+
+
+    private static final int TYPE_CELL = 1;
+    private final TaskRepository taskRepository;
+    String taskType;
+    TaskClickActivity activity;
+    private ObservableArrayList<Task> observableContent;
+    private RecyclerView.Adapter<ViewHolder> parentAdapter;
+    private String userId;
+
+    public SkillTasksRecyclerViewAdapter(TaskRepository taskRepository, String taskType, TaskClickActivity activity, String userId) {
+        this.setHasStableIds(true);
+        this.taskType = taskType;
+        this.activity = activity;
+        this.taskRepository = taskRepository;
+        this.userId = userId;
+
+        this.loadContent();
+
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        switch (position) {
+            default:
+                return TYPE_CELL;
+        }
+    }
+
+    @Override
+    public long getItemId(int position) {
+        Task task = observableContent.get(position);
+        if (task.getId() != null && task.getId().length() == 36) {
+            return UUID.fromString(task.getId()).getMostSignificantBits();
+        }
+        return UUID.randomUUID().getMostSignificantBits();
+    }
+
+    @Override
+    public int getItemCount() {
+        return observableContent.size();
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.skill_task_item_card, parent, false);
+        return new SkillTasksRecyclerViewAdapter.ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        Task item = observableContent.get(position);
+
+        holder.bindHolder(item, position);
+    }
+
+    // region ViewHolders
+
+    public void loadContent() {
+        this.loadContent(false);
+    }
+
+    // endregion
+
+    public void loadContent(boolean forced) {
+
+        if (this.observableContent == null || forced) {
+
+            this.observableContent = new ObservableArrayList<>();
+            taskRepository.getTasks(taskType, userId).subscribe(tasks -> {
+                this.observableContent.addAll(tasks);
+                if (parentAdapter != null) {
+                    parentAdapter.notifyDataSetChanged();
+                } else {
+                    notifyDataSetChanged();
+                }
+            }, throwable -> {});
+        } else {
+            if (parentAdapter != null) {
+                parentAdapter.notifyDataSetChanged();
+            } else {
+                notifyDataSetChanged();
+            }
+        }
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+        public Task task;
+        protected android.content.res.Resources resources;
+        SkillTaskItemCardBinding binding;
+
+        @BindView(R.id.notesTextView)
+        TextView notesTextView;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+
+            itemView.setOnClickListener(this);
+            itemView.setClickable(true);
+
+            ButterKnife.bind(this, itemView);
+            binding = DataBindingUtil.bind(itemView);
+
+            resources = itemView.getResources();
+        }
+
+        void bindHolder(Task habitItem, int position) {
+            task = habitItem;
+            if (habitItem.notes == null || habitItem.notes.length() == 0) {
+                notesTextView.setHeight(0);
+            } else {
+                notesTextView.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+            }
+            binding.setTask(task);
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (v != itemView)
+                return;
+            activity.taskSelected(task.getId());
+        }
+
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
index 170ee6b9d..df039508f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
@@ -1,123 +1,123 @@
-package com.habitrpg.android.habitica.ui.adapter;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.UseSkillCommand;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.habitrpg.android.habitica.models.Skill;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class SkillsRecyclerViewAdapter extends RecyclerView.Adapter<SkillsRecyclerViewAdapter.SkillViewHolder> {
-
-    public Double mana;
-    private List<Skill> skillList;
-
-    public void setSkillList(List<Skill> skillList) {
-        this.skillList = skillList;
-        this.notifyDataSetChanged();
-    }
-
-    public void setMana(Double mana) {
-        this.mana = mana;
-        this.notifyDataSetChanged();
-    }
-
-
-    @Override
-    public SkillViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.skill_list_item, parent, false);
-
-        return new SkillViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(SkillViewHolder holder, int position) {
-        holder.bind(skillList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return skillList == null ? 0 : skillList.size();
-    }
-
-    class SkillViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-
-        @BindView(R.id.skill_image)
-        SimpleDraweeView skillImageView;
-
-        @BindView(R.id.skill_text)
-        TextView skillNameTextView;
-
-        @BindView(R.id.skill_notes)
-        TextView skillNotesTextView;
-
-        @BindView(R.id.price_button)
-        Button priceButton;
-
-        Skill skill;
-
-        Context context;
-
-        public SkillViewHolder(View itemView) {
-            super(itemView);
-
-            ButterKnife.bind(this, itemView);
-
-            context = itemView.getContext();
-
-            priceButton.setOnClickListener(this);
-        }
-
-        public void bind(Skill skill) {
-            this.skill = skill;
-            skillNameTextView.setText(skill.text);
-            skillNotesTextView.setText(skill.notes);
-
-            if (skill.isSpecialItem) {
-                priceButton.setText(R.string.skill_transformation_use);
-
-                priceButton.setCompoundDrawables(null, null, null, null);
-            } else {
-                priceButton.setText(skill.mana + "");
-                priceButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_magic, 0, 0, 0);
-            }
-            DataBindingUtils.loadImage(skillImageView, "shop_" + skill.key);
-
-            if (skill.mana > mana) {
-                priceButton.setEnabled(false);
-                priceButton.setBackgroundResource(R.color.task_gray);
-                skillNameTextView.setTextColor(ContextCompat.getColor(context, R.color.task_gray));
-                skillNotesTextView.setTextColor(ContextCompat.getColor(context, R.color.task_gray));
-            } else {
-                skillNameTextView.setTextColor(ContextCompat.getColor(context, android.R.color.black));
-                skillNotesTextView.setTextColor(ContextCompat.getColor(context, android.R.color.black));
-                priceButton.setEnabled(true);
-            }
-        }
-
-        @Override
-        public void onClick(View v) {
-            UseSkillCommand event = new UseSkillCommand();
-            event.skill = this.skill;
-
-            EventBus.getDefault().post(event);
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter;
+
+import android.content.Context;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.UseSkillCommand;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class SkillsRecyclerViewAdapter extends RecyclerView.Adapter<SkillsRecyclerViewAdapter.SkillViewHolder> {
+
+    public Double mana;
+    private List<Skill> skillList;
+
+    public void setSkillList(List<Skill> skillList) {
+        this.skillList = skillList;
+        this.notifyDataSetChanged();
+    }
+
+    public void setMana(Double mana) {
+        this.mana = mana;
+        this.notifyDataSetChanged();
+    }
+
+
+    @Override
+    public SkillViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.skill_list_item, parent, false);
+
+        return new SkillViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(SkillViewHolder holder, int position) {
+        holder.bind(skillList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return skillList == null ? 0 : skillList.size();
+    }
+
+    class SkillViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+        @BindView(R.id.skill_image)
+        SimpleDraweeView skillImageView;
+
+        @BindView(R.id.skill_text)
+        TextView skillNameTextView;
+
+        @BindView(R.id.skill_notes)
+        TextView skillNotesTextView;
+
+        @BindView(R.id.price_button)
+        Button priceButton;
+
+        Skill skill;
+
+        Context context;
+
+        public SkillViewHolder(View itemView) {
+            super(itemView);
+
+            ButterKnife.bind(this, itemView);
+
+            context = itemView.getContext();
+
+            priceButton.setOnClickListener(this);
+        }
+
+        public void bind(Skill skill) {
+            this.skill = skill;
+            skillNameTextView.setText(skill.text);
+            skillNotesTextView.setText(skill.notes);
+
+            if (skill.isSpecialItem) {
+                priceButton.setText(R.string.skill_transformation_use);
+
+                priceButton.setCompoundDrawables(null, null, null, null);
+            } else {
+                priceButton.setText(skill.mana + "");
+                priceButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_magic, 0, 0, 0);
+            }
+            DataBindingUtils.loadImage(skillImageView, "shop_" + skill.key);
+
+            if (skill.mana > mana) {
+                priceButton.setEnabled(false);
+                priceButton.setBackgroundResource(R.color.task_gray);
+                skillNameTextView.setTextColor(ContextCompat.getColor(context, R.color.task_gray));
+                skillNotesTextView.setTextColor(ContextCompat.getColor(context, R.color.task_gray));
+            } else {
+                skillNameTextView.setTextColor(ContextCompat.getColor(context, android.R.color.black));
+                skillNotesTextView.setTextColor(ContextCompat.getColor(context, android.R.color.black));
+                priceButton.setEnabled(true);
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            UseSkillCommand event = new UseSkillCommand();
+            event.skill = this.skill;
+
+            EventBus.getDefault().post(event);
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
index fa98c225d..0122b7b95 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
@@ -1,120 +1,120 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.EquipCommand;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.net.Uri;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class EquipmentRecyclerViewAdapter extends RecyclerView.Adapter<EquipmentRecyclerViewAdapter.GearViewHolder> {
-
-    public String equippedGear;
-    public Boolean isCostume;
-    public String type;
-    private List<ItemData> gearList;
-
-    public void setGearList(List<ItemData> gearList) {
-        this.gearList = gearList;
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public GearViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.gear_list_item, parent, false);
-
-        return new GearViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(GearViewHolder holder, int position) {
-        holder.bind(gearList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return gearList == null ? 0 : gearList.size();
-    }
-
-    class GearViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-
-        @BindView(R.id.gear_container)
-        View gearContainer;
-
-        @BindView(R.id.gear_text)
-        TextView gearNameTextView;
-
-        @BindView(R.id.gear_notes)
-        TextView gearNotesTextView;
-
-        @BindView(R.id.gear_image)
-        SimpleDraweeView imageView;
-
-        @BindView(R.id.equippedIndicator)
-        View equippedIndicator;
-
-        ItemData gear;
-
-        Context context;
-
-        public GearViewHolder(View itemView) {
-            super(itemView);
-
-            ButterKnife.bind(this, itemView);
-
-            context = itemView.getContext();
-            itemView.setOnClickListener(this);
-        }
-
-        public void bind(ItemData gear) {
-            this.gear = gear;
-            this.gearNameTextView.setText(this.gear.text);
-            this.gearNotesTextView.setText(this.gear.notes);
-
-            if (gear.key.equals(equippedGear)) {
-                this.equippedIndicator.setVisibility(View.VISIBLE);
-                this.gearContainer.setBackgroundColor(ContextCompat.getColor(context, R.color.brand_700));
-            } else {
-                this.equippedIndicator.setVisibility(View.GONE);
-                this.gearContainer.setBackgroundResource(R.drawable.selection_highlight);
-            }
-
-            String imageUrl = "https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_" + gear.key + ".png";
-            imageView.setImageURI(Uri.parse(imageUrl));
-        }
-
-        @Override
-        public void onClick(View v) {
-            EquipCommand command = new EquipCommand();
-            command.key = this.gear.key;
-            if (isCostume) {
-                command.type = "costume";
-            } else {
-                command.type = "equipped";
-            }
-            EventBus.getDefault().post(command);
-            if (this.gear.key.equals(equippedGear)) {
-                equippedGear = type + "_base_0";
-            } else {
-                equippedGear = this.gear.key;
-            }
-            notifyDataSetChanged();
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.EquipCommand;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class EquipmentRecyclerViewAdapter extends RecyclerView.Adapter<EquipmentRecyclerViewAdapter.GearViewHolder> {
+
+    public String equippedGear;
+    public Boolean isCostume;
+    public String type;
+    private List<ItemData> gearList;
+
+    public void setGearList(List<ItemData> gearList) {
+        this.gearList = gearList;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public GearViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.gear_list_item, parent, false);
+
+        return new GearViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(GearViewHolder holder, int position) {
+        holder.bind(gearList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return gearList == null ? 0 : gearList.size();
+    }
+
+    class GearViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+        @BindView(R.id.gear_container)
+        View gearContainer;
+
+        @BindView(R.id.gear_text)
+        TextView gearNameTextView;
+
+        @BindView(R.id.gear_notes)
+        TextView gearNotesTextView;
+
+        @BindView(R.id.gear_image)
+        SimpleDraweeView imageView;
+
+        @BindView(R.id.equippedIndicator)
+        View equippedIndicator;
+
+        ItemData gear;
+
+        Context context;
+
+        public GearViewHolder(View itemView) {
+            super(itemView);
+
+            ButterKnife.bind(this, itemView);
+
+            context = itemView.getContext();
+            itemView.setOnClickListener(this);
+        }
+
+        public void bind(ItemData gear) {
+            this.gear = gear;
+            this.gearNameTextView.setText(this.gear.text);
+            this.gearNotesTextView.setText(this.gear.notes);
+
+            if (gear.key.equals(equippedGear)) {
+                this.equippedIndicator.setVisibility(View.VISIBLE);
+                this.gearContainer.setBackgroundColor(ContextCompat.getColor(context, R.color.brand_700));
+            } else {
+                this.equippedIndicator.setVisibility(View.GONE);
+                this.gearContainer.setBackgroundResource(R.drawable.selection_highlight);
+            }
+
+            String imageUrl = "https://habitica-assets.s3.amazonaws.com/mobileApp/images/shop_" + gear.key + ".png";
+            imageView.setImageURI(Uri.parse(imageUrl));
+        }
+
+        @Override
+        public void onClick(View v) {
+            EquipCommand command = new EquipCommand();
+            command.key = this.gear.key;
+            if (isCostume) {
+                command.type = "costume";
+            } else {
+                command.type = "equipped";
+            }
+            EventBus.getDefault().post(command);
+            if (this.gear.key.equals(equippedGear)) {
+                equippedGear = type + "_base_0";
+            } else {
+                equippedGear = this.gear.key;
+            }
+            notifyDataSetChanged();
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
index 96a07fa07..433e2d8ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
@@ -1,228 +1,228 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.databinding.ItemItemBinding;
-import com.habitrpg.android.habitica.events.OpenMysteryItemEvent;
-import com.habitrpg.android.habitica.events.ReloadContentEvent;
-import com.habitrpg.android.habitica.events.commands.FeedCommand;
-import com.habitrpg.android.habitica.events.commands.HatchingCommand;
-import com.habitrpg.android.habitica.events.commands.InvitePartyToQuestCommand;
-import com.habitrpg.android.habitica.events.commands.SellItemCommand;
-import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
-import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
-import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
-import com.habitrpg.android.habitica.models.inventory.Egg;
-import com.habitrpg.android.habitica.models.inventory.Food;
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.Item;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.inventory.SpecialItem;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.databinding.DataBindingUtil;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.HashMap;
-import java.util.List;
-
-public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapter.ItemViewHolder> {
-
-    public Boolean isHatching;
-    public Boolean isFeeding;
-    public Boolean showShopAd;
-    public String shopIdentifier;
-    public Item hatchingItem;
-    public Pet feedingPet;
-    public ItemRecyclerFragment fragment;
-    public HashMap<String, Integer> ownedPets;
-    public Context context;
-    private List<Item> itemList;
-
-    public void setItemList(List<Item> itemList) {
-        this.itemList = itemList;
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.item_item, parent, false);
-
-        return new ItemViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(ItemViewHolder holder, int position) {
-        holder.bind(this.itemList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return itemList == null ? 0 : itemList.size();
-    }
-
-    public void openedMysteryItem(int numberLeft) {
-        int itemPos = 0;
-        for (Object obj : itemList) {
-            if (obj.getClass().equals(SpecialItem.class)) {
-                SpecialItem item = (SpecialItem) obj;
-                if (item.isMysteryItem) {
-                    item.setOwned(numberLeft);
-                    break;
-                }
-            }
-            itemPos++;
-        }
-        notifyItemChanged(itemPos);
-    }
-
-    class ItemViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        Item item;
-
-        Resources resources;
-        ItemItemBinding binding;
-
-        public ItemViewHolder(View itemView) {
-            super(itemView);
-
-            resources = itemView.getResources();
-
-            binding = DataBindingUtil.bind(itemView);
-
-            itemView.setOnClickListener(this);
-        }
-
-        public Boolean isPetOwned() {
-            String petKey;
-            if (item instanceof Egg) {
-                petKey = item.getKey() + "-" + hatchingItem.getKey();
-            } else {
-                petKey = hatchingItem.getKey() + "-" + item.getKey();
-            }
-            return ownedPets != null && ownedPets.containsKey(petKey) && ownedPets.get(petKey) > 0;
-        }
-
-        public void bind(Item item) {
-            this.item = item;
-            binding.setTitle(item.getText());
-
-            if (item.getText() == null) {
-                ReloadContentEvent event = new ReloadContentEvent();
-                EventBus.getDefault().post(event);
-            }
-
-            binding.setDisabled(false);
-            if (item instanceof QuestContent) {
-                binding.setImageNamed("inventory_quest_scroll_" + item.getKey());
-            } else if (item instanceof SpecialItem) {
-                binding.setImageNamed(item.getKey());
-            } else {
-                String type = "";
-                if (item instanceof Egg) {
-                    type = "Egg";
-                } else if (item instanceof Food) {
-                    type = "Food";
-                } else if (item instanceof HatchingPotion) {
-                    type = "HatchingPotion";
-                }
-                binding.setImageNamed("Pet_" + type + "_" + item.getKey());
-
-                if (isHatching != null && isHatching) {
-                    this.binding.setDisabled(this.isPetOwned());
-                }
-            }
-            binding.setValue(item.getOwned().toString());
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (!isHatching && !isFeeding) {
-                BottomSheetMenu menu = new BottomSheetMenu(context);
-                if (!(item instanceof QuestContent) && !(item instanceof SpecialItem)) {
-                    menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.sell, item.getValue()), true));
-                }
-                if (item instanceof Egg) {
-                    menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.hatch_with_potion)));
-                } else if (item instanceof HatchingPotion) {
-                    menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.hatch_egg)));
-                } else if (item instanceof QuestContent) {
-                    menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.invite_party)));
-                } else if (item instanceof SpecialItem) {
-                    SpecialItem specialItem = (SpecialItem) item;
-                    if (specialItem.isMysteryItem && specialItem.getOwned() > 0) {
-                        menu.addMenuItem(new BottomSheetMenuItem(context.getString(R.string.open)));
-                    }
-                }
-                menu.setSelectionRunnable(index -> {
-                    if (!((item instanceof QuestContent) || (item instanceof SpecialItem)) && index == 0) {
-                        SellItemCommand event = new SellItemCommand();
-                        event.item = item;
-                        EventBus.getDefault().post(event);
-                        if (item.getOwned() > 1) {
-                            item.setOwned(item.getOwned() - 1);
-                            notifyItemChanged(getAdapterPosition());
-                        } else {
-                            if (getAdapterPosition() >= 0) {
-                                itemList.remove(getAdapterPosition());
-                            }
-                            notifyItemRemoved(getAdapterPosition());
-                        }
-
-                        return;
-                    }
-                    if (item instanceof Egg) {
-                        HatchingCommand event = new HatchingCommand();
-                        event.usingEgg = (Egg) item;
-                        EventBus.getDefault().post(event);
-                    } else if (item instanceof Food) {
-                        FeedCommand event = new FeedCommand();
-                        event.usingFood = (Food) item;
-                        EventBus.getDefault().post(event);
-                    } else if (item instanceof HatchingPotion) {
-                        HatchingCommand event = new HatchingCommand();
-                        event.usingHatchingPotion = (HatchingPotion) item;
-                        EventBus.getDefault().post(event);
-                    } else if (item instanceof QuestContent) {
-                        InvitePartyToQuestCommand event = new InvitePartyToQuestCommand();
-                        event.questKey = item.getKey();
-                        EventBus.getDefault().post(event);
-                    } else if (item instanceof SpecialItem) {
-                        EventBus.getDefault().post(new OpenMysteryItemEvent());
-                    }
-                });
-                menu.show();
-            } else if (isHatching) {
-                if (this.isPetOwned()) {
-                    return;
-                }
-                if (item instanceof Egg) {
-                    HatchingCommand event = new HatchingCommand();
-                    event.usingEgg = (Egg) item;
-                    event.usingHatchingPotion = (HatchingPotion) hatchingItem;
-                    EventBus.getDefault().post(event);
-                } else if (item instanceof HatchingPotion) {
-                    HatchingCommand event = new HatchingCommand();
-                    event.usingHatchingPotion = (HatchingPotion) item;
-                    event.usingEgg = (Egg) hatchingItem;
-                    EventBus.getDefault().post(event);
-                }
-                fragment.dismiss();
-            } else if (isFeeding) {
-                FeedCommand event = new FeedCommand();
-                event.usingPet = feedingPet;
-                event.usingFood = (Food) item;
-                EventBus.getDefault().post(event);
-                fragment.dismiss();
-            }
-
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+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.databinding.ItemItemBinding;
+import com.habitrpg.android.habitica.events.OpenMysteryItemEvent;
+import com.habitrpg.android.habitica.events.ReloadContentEvent;
+import com.habitrpg.android.habitica.events.commands.FeedCommand;
+import com.habitrpg.android.habitica.events.commands.HatchingCommand;
+import com.habitrpg.android.habitica.events.commands.InvitePartyToQuestCommand;
+import com.habitrpg.android.habitica.events.commands.SellItemCommand;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.inventory.SpecialItem;
+import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
+import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
+import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.HashMap;
+import java.util.List;
+
+public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapter.ItemViewHolder> {
+
+    public Boolean isHatching;
+    public Boolean isFeeding;
+    public Boolean showShopAd;
+    public String shopIdentifier;
+    public Item hatchingItem;
+    public Pet feedingPet;
+    public ItemRecyclerFragment fragment;
+    public HashMap<String, Integer> ownedPets;
+    public Context context;
+    private List<Item> itemList;
+
+    public void setItemList(List<Item> itemList) {
+        this.itemList = itemList;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.item_item, parent, false);
+
+        return new ItemViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(ItemViewHolder holder, int position) {
+        holder.bind(this.itemList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return itemList == null ? 0 : itemList.size();
+    }
+
+    public void openedMysteryItem(int numberLeft) {
+        int itemPos = 0;
+        for (Object obj : itemList) {
+            if (obj.getClass().equals(SpecialItem.class)) {
+                SpecialItem item = (SpecialItem) obj;
+                if (item.isMysteryItem) {
+                    item.setOwned(numberLeft);
+                    break;
+                }
+            }
+            itemPos++;
+        }
+        notifyItemChanged(itemPos);
+    }
+
+    class ItemViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        Item item;
+
+        Resources resources;
+        ItemItemBinding binding;
+
+        public ItemViewHolder(View itemView) {
+            super(itemView);
+
+            resources = itemView.getResources();
+
+            binding = DataBindingUtil.bind(itemView);
+
+            itemView.setOnClickListener(this);
+        }
+
+        public Boolean isPetOwned() {
+            String petKey;
+            if (item instanceof Egg) {
+                petKey = item.getKey() + "-" + hatchingItem.getKey();
+            } else {
+                petKey = hatchingItem.getKey() + "-" + item.getKey();
+            }
+            return ownedPets != null && ownedPets.containsKey(petKey) && ownedPets.get(petKey) > 0;
+        }
+
+        public void bind(Item item) {
+            this.item = item;
+            binding.setTitle(item.getText());
+
+            if (item.getText() == null) {
+                ReloadContentEvent event = new ReloadContentEvent();
+                EventBus.getDefault().post(event);
+            }
+
+            binding.setDisabled(false);
+            if (item instanceof QuestContent) {
+                binding.setImageNamed("inventory_quest_scroll_" + item.getKey());
+            } else if (item instanceof SpecialItem) {
+                binding.setImageNamed(item.getKey());
+            } else {
+                String type = "";
+                if (item instanceof Egg) {
+                    type = "Egg";
+                } else if (item instanceof Food) {
+                    type = "Food";
+                } else if (item instanceof HatchingPotion) {
+                    type = "HatchingPotion";
+                }
+                binding.setImageNamed("Pet_" + type + "_" + item.getKey());
+
+                if (isHatching != null && isHatching) {
+                    this.binding.setDisabled(this.isPetOwned());
+                }
+            }
+            binding.setValue(item.getOwned().toString());
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (!isHatching && !isFeeding) {
+                BottomSheetMenu menu = new BottomSheetMenu(context);
+                if (!(item instanceof QuestContent) && !(item instanceof SpecialItem)) {
+                    menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.sell, item.getValue()), true));
+                }
+                if (item instanceof Egg) {
+                    menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.hatch_with_potion)));
+                } else if (item instanceof HatchingPotion) {
+                    menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.hatch_egg)));
+                } else if (item instanceof QuestContent) {
+                    menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.invite_party)));
+                } else if (item instanceof SpecialItem) {
+                    SpecialItem specialItem = (SpecialItem) item;
+                    if (specialItem.isMysteryItem && specialItem.getOwned() > 0) {
+                        menu.addMenuItem(new BottomSheetMenuItem(context.getString(R.string.open)));
+                    }
+                }
+                menu.setSelectionRunnable(index -> {
+                    if (!((item instanceof QuestContent) || (item instanceof SpecialItem)) && index == 0) {
+                        SellItemCommand event = new SellItemCommand();
+                        event.item = item;
+                        EventBus.getDefault().post(event);
+                        if (item.getOwned() > 1) {
+                            item.setOwned(item.getOwned() - 1);
+                            notifyItemChanged(getAdapterPosition());
+                        } else {
+                            if (getAdapterPosition() >= 0) {
+                                itemList.remove(getAdapterPosition());
+                            }
+                            notifyItemRemoved(getAdapterPosition());
+                        }
+
+                        return;
+                    }
+                    if (item instanceof Egg) {
+                        HatchingCommand event = new HatchingCommand();
+                        event.usingEgg = (Egg) item;
+                        EventBus.getDefault().post(event);
+                    } else if (item instanceof Food) {
+                        FeedCommand event = new FeedCommand();
+                        event.usingFood = (Food) item;
+                        EventBus.getDefault().post(event);
+                    } else if (item instanceof HatchingPotion) {
+                        HatchingCommand event = new HatchingCommand();
+                        event.usingHatchingPotion = (HatchingPotion) item;
+                        EventBus.getDefault().post(event);
+                    } else if (item instanceof QuestContent) {
+                        InvitePartyToQuestCommand event = new InvitePartyToQuestCommand();
+                        event.questKey = item.getKey();
+                        EventBus.getDefault().post(event);
+                    } else if (item instanceof SpecialItem) {
+                        EventBus.getDefault().post(new OpenMysteryItemEvent());
+                    }
+                });
+                menu.show();
+            } else if (isHatching) {
+                if (this.isPetOwned()) {
+                    return;
+                }
+                if (item instanceof Egg) {
+                    HatchingCommand event = new HatchingCommand();
+                    event.usingEgg = (Egg) item;
+                    event.usingHatchingPotion = (HatchingPotion) hatchingItem;
+                    EventBus.getDefault().post(event);
+                } else if (item instanceof HatchingPotion) {
+                    HatchingCommand event = new HatchingCommand();
+                    event.usingHatchingPotion = (HatchingPotion) item;
+                    event.usingEgg = (Egg) hatchingItem;
+                    EventBus.getDefault().post(event);
+                }
+                fragment.dismiss();
+            } else if (isFeeding) {
+                FeedCommand event = new FeedCommand();
+                event.usingPet = feedingPet;
+                event.usingFood = (Food) item;
+                EventBus.getDefault().post(event);
+                fragment.dismiss();
+            }
+
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
index 29f563c24..2b8b1e7e2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
@@ -1,130 +1,130 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.EquipCommand;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
-import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
-import com.habitrpg.android.habitica.models.inventory.Mount;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.content.res.Resources;
-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.TextView;
-
-import java.util.HashMap;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetailRecyclerAdapter.MountViewHolder> {
-
-    public String itemType;
-    public Context context;
-    private List<Mount> itemList;
-    private HashMap<String, Boolean> ownedMapping;
-
-    public void setItemList(List<Mount> itemList) {
-        this.itemList = itemList;
-        this.notifyDataSetChanged();
-    }
-
-    public void setOwnedMapping(HashMap<String, Boolean> map) {
-        this.ownedMapping = map;
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public MountViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.animal_overview_item, parent, false);
-
-        return new MountViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(MountViewHolder holder, int position) {
-        holder.bind(this.itemList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return itemList == null ? 0 : itemList.size();
-    }
-
-    class MountViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        Mount animal;
-
-        @BindView(R.id.card_view)
-        CardView cardView;
-
-        @BindView(R.id.imageView)
-        SimpleDraweeView imageView;
-
-        @BindView(R.id.titleTextView)
-        TextView titleView;
-
-        @BindView(R.id.ownedTextView)
-        TextView ownedTextView;
-
-        Resources resources;
-
-        public MountViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-
-            resources = itemView.getResources();
-
-            itemView.setOnClickListener(this);
-        }
-
-        Boolean isOwned() {
-            if (ownedMapping != null && animal != null) {
-                if (ownedMapping.containsKey(animal.getKey()) && ownedMapping.get(animal.getKey())) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public void bind(Mount item) {
-            animal = item;
-            titleView.setText(item.getColorText());
-            ownedTextView.setVisibility(View.GONE);
-            this.imageView.setAlpha(1.0f);
-            if (this.isOwned()) {
-                DataBindingUtils.loadImage(this.imageView, "Mount_Icon_" + itemType + "-" + item.getColor());
-            } else {
-                DataBindingUtils.loadImage(this.imageView, "PixelPaw");
-                this.imageView.setAlpha(0.3f);
-            }
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (!this.isOwned()) {
-                return;
-            }
-            BottomSheetMenu menu = new BottomSheetMenu(context);
-            menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.use_animal)));
-            menu.setSelectionRunnable(index -> {
-                if (index == 0) {
-                    EquipCommand event = new EquipCommand();
-                    event.type = "mount";
-                    event.key = animal.getKey();
-                    EventBus.getDefault().post(event);
-                }
-            });
-            menu.show();
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory;
+
+import android.content.Context;
+import android.content.res.Resources;
+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.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.EquipCommand;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
+import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.HashMap;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetailRecyclerAdapter.MountViewHolder> {
+
+    public String itemType;
+    public Context context;
+    private List<Mount> itemList;
+    private HashMap<String, Boolean> ownedMapping;
+
+    public void setItemList(List<Mount> itemList) {
+        this.itemList = itemList;
+        this.notifyDataSetChanged();
+    }
+
+    public void setOwnedMapping(HashMap<String, Boolean> map) {
+        this.ownedMapping = map;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public MountViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.animal_overview_item, parent, false);
+
+        return new MountViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(MountViewHolder holder, int position) {
+        holder.bind(this.itemList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return itemList == null ? 0 : itemList.size();
+    }
+
+    class MountViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        Mount animal;
+
+        @BindView(R.id.card_view)
+        CardView cardView;
+
+        @BindView(R.id.imageView)
+        SimpleDraweeView imageView;
+
+        @BindView(R.id.titleTextView)
+        TextView titleView;
+
+        @BindView(R.id.ownedTextView)
+        TextView ownedTextView;
+
+        Resources resources;
+
+        public MountViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+
+            resources = itemView.getResources();
+
+            itemView.setOnClickListener(this);
+        }
+
+        Boolean isOwned() {
+            if (ownedMapping != null && animal != null) {
+                if (ownedMapping.containsKey(animal.getKey()) && ownedMapping.get(animal.getKey())) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public void bind(Mount item) {
+            animal = item;
+            titleView.setText(item.getColorText());
+            ownedTextView.setVisibility(View.GONE);
+            this.imageView.setAlpha(1.0f);
+            if (this.isOwned()) {
+                DataBindingUtils.loadImage(this.imageView, "Mount_Icon_" + itemType + "-" + item.getColor());
+            } else {
+                DataBindingUtils.loadImage(this.imageView, "PixelPaw");
+                this.imageView.setAlpha(0.3f);
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (!this.isOwned()) {
+                return;
+            }
+            BottomSheetMenu menu = new BottomSheetMenu(context);
+            menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.use_animal)));
+            menu.setSelectionRunnable(index -> {
+                if (index == 0) {
+                    EquipCommand event = new EquipCommand();
+                    event.type = "mount";
+                    event.key = animal.getKey();
+                    EventBus.getDefault().post(event);
+                }
+            });
+            menu.show();
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
index 50e14b3fc..ebc7eec24 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
@@ -1,171 +1,171 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.EquipCommand;
-import com.habitrpg.android.habitica.events.commands.FeedCommand;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
-import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.content.res.Resources;
-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.ProgressBar;
-import android.widget.TextView;
-
-import java.util.HashMap;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class PetDetailRecyclerAdapter extends RecyclerView.Adapter<PetDetailRecyclerAdapter.PetViewHolder> {
-
-    public String itemType;
-    public Context context;
-    private List<Pet> itemList;
-    private HashMap<String, Integer> ownedMapping;
-    private HashMap<String, Boolean> ownedMountMapping;
-
-    public void setItemList(List<Pet> itemList) {
-        this.itemList = itemList;
-        this.notifyDataSetChanged();
-    }
-
-    public void setOwnedMapping(HashMap<String, Integer> map) {
-        this.ownedMapping = map;
-        this.notifyDataSetChanged();
-    }
-
-    public void setOwnedMountsMapping(HashMap<String, Boolean> map) {
-        this.ownedMountMapping = map;
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public PetViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.pet_detail_item, parent, false);
-
-        return new PetViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(PetViewHolder holder, int position) {
-        holder.bind(this.itemList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return itemList == null ? 0 : itemList.size();
-    }
-
-    class PetViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        Pet animal;
-
-        @BindView(R.id.card_view)
-        CardView cardView;
-
-        @BindView(R.id.imageView)
-        SimpleDraweeView imageView;
-
-        @BindView(R.id.titleTextView)
-        TextView titleView;
-
-        @BindView(R.id.trainedProgressBar)
-        ProgressBar trainedProgressbar;
-
-        Resources resources;
-
-        public PetViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-
-            resources = itemView.getResources();
-
-            itemView.setOnClickListener(this);
-        }
-
-        public int getOwnedStatus() {
-            if (ownedMapping != null && animal != null) {
-                if (ownedMapping.containsKey(animal.getKey())) {
-                    return ownedMapping.get(animal.getKey());
-                }
-            }
-            return 0;
-        }
-
-        public boolean isOwned() {
-            return this.getOwnedStatus() > 0;
-        }
-
-        public Boolean isMountOwned() {
-            if (animal.getAnimalGroup().equals("specialPets")) {
-                return false;
-            }
-            if (ownedMountMapping != null && animal != null) {
-                if (ownedMountMapping.get(animal.getKey()) != null) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public void bind(Pet item) {
-            this.animal = item;
-            this.titleView.setText(item.getColorText());
-            this.trainedProgressbar.setVisibility(animal.getAnimalGroup().equals("specialPets") ? View.GONE : View.VISIBLE);
-            this.imageView.setAlpha(1.0f);
-            if (this.getOwnedStatus() > 0) {
-                if (this.isMountOwned()) {
-                    this.trainedProgressbar.setVisibility(View.GONE);
-                } else {
-                    this.trainedProgressbar.setProgress(ownedMapping.get(item.getKey()));
-                }
-                DataBindingUtils.loadImage(this.imageView, "Pet-" + itemType + "-" + item.getColor());
-            } else {
-                this.trainedProgressbar.setVisibility(View.GONE);
-                if (this.getOwnedStatus() == 0) {
-                    DataBindingUtils.loadImage(this.imageView, "PixelPaw");
-                } else {
-                    DataBindingUtils.loadImage(this.imageView, "Pet-" + itemType + "-" + item.getColor());
-                }
-                this.imageView.setAlpha(0.3f);
-            }
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (!this.isOwned()) {
-                return;
-            }
-            BottomSheetMenu menu = new BottomSheetMenu(context);
-            menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.use_animal)));
-            if (!animal.getAnimalGroup().equals("specialPets") && !this.isMountOwned()) {
-                menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.feed)));
-            }
-            menu.setSelectionRunnable(index -> {
-                if (index == 0) {
-                    EquipCommand event = new EquipCommand();
-                    event.type = "pet";
-                    event.key = animal.getKey();
-                    EventBus.getDefault().post(event);
-                } else if (index == 1) {
-                    FeedCommand event = new FeedCommand();
-                    event.usingPet = animal;
-                    EventBus.getDefault().post(event);
-                }
-            });
-            menu.show();
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory;
+
+import android.content.Context;
+import android.content.res.Resources;
+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.ProgressBar;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.EquipCommand;
+import com.habitrpg.android.habitica.events.commands.FeedCommand;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
+import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.HashMap;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class PetDetailRecyclerAdapter extends RecyclerView.Adapter<PetDetailRecyclerAdapter.PetViewHolder> {
+
+    public String itemType;
+    public Context context;
+    private List<Pet> itemList;
+    private HashMap<String, Integer> ownedMapping;
+    private HashMap<String, Boolean> ownedMountMapping;
+
+    public void setItemList(List<Pet> itemList) {
+        this.itemList = itemList;
+        this.notifyDataSetChanged();
+    }
+
+    public void setOwnedMapping(HashMap<String, Integer> map) {
+        this.ownedMapping = map;
+        this.notifyDataSetChanged();
+    }
+
+    public void setOwnedMountsMapping(HashMap<String, Boolean> map) {
+        this.ownedMountMapping = map;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public PetViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.pet_detail_item, parent, false);
+
+        return new PetViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(PetViewHolder holder, int position) {
+        holder.bind(this.itemList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return itemList == null ? 0 : itemList.size();
+    }
+
+    class PetViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        Pet animal;
+
+        @BindView(R.id.card_view)
+        CardView cardView;
+
+        @BindView(R.id.imageView)
+        SimpleDraweeView imageView;
+
+        @BindView(R.id.titleTextView)
+        TextView titleView;
+
+        @BindView(R.id.trainedProgressBar)
+        ProgressBar trainedProgressbar;
+
+        Resources resources;
+
+        public PetViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+
+            resources = itemView.getResources();
+
+            itemView.setOnClickListener(this);
+        }
+
+        public int getOwnedStatus() {
+            if (ownedMapping != null && animal != null) {
+                if (ownedMapping.containsKey(animal.getKey())) {
+                    return ownedMapping.get(animal.getKey());
+                }
+            }
+            return 0;
+        }
+
+        public boolean isOwned() {
+            return this.getOwnedStatus() > 0;
+        }
+
+        public Boolean isMountOwned() {
+            if (animal.getAnimalGroup().equals("specialPets")) {
+                return false;
+            }
+            if (ownedMountMapping != null && animal != null) {
+                if (ownedMountMapping.get(animal.getKey()) != null) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public void bind(Pet item) {
+            this.animal = item;
+            this.titleView.setText(item.getColorText());
+            this.trainedProgressbar.setVisibility(animal.getAnimalGroup().equals("specialPets") ? View.GONE : View.VISIBLE);
+            this.imageView.setAlpha(1.0f);
+            if (this.getOwnedStatus() > 0) {
+                if (this.isMountOwned()) {
+                    this.trainedProgressbar.setVisibility(View.GONE);
+                } else {
+                    this.trainedProgressbar.setProgress(ownedMapping.get(item.getKey()));
+                }
+                DataBindingUtils.loadImage(this.imageView, "Pet-" + itemType + "-" + item.getColor());
+            } else {
+                this.trainedProgressbar.setVisibility(View.GONE);
+                if (this.getOwnedStatus() == 0) {
+                    DataBindingUtils.loadImage(this.imageView, "PixelPaw");
+                } else {
+                    DataBindingUtils.loadImage(this.imageView, "Pet-" + itemType + "-" + item.getColor());
+                }
+                this.imageView.setAlpha(0.3f);
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (!this.isOwned()) {
+                return;
+            }
+            BottomSheetMenu menu = new BottomSheetMenu(context);
+            menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.use_animal)));
+            if (!animal.getAnimalGroup().equals("specialPets") && !this.isMountOwned()) {
+                menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.feed)));
+            }
+            menu.setSelectionRunnable(index -> {
+                if (index == 0) {
+                    EquipCommand event = new EquipCommand();
+                    event.type = "pet";
+                    event.key = animal.getKey();
+                    EventBus.getDefault().post(event);
+                } else if (index == 1) {
+                    FeedCommand event = new FeedCommand();
+                    event.usingPet = animal;
+                    EventBus.getDefault().post(event);
+                }
+            });
+            menu.show();
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
index b047b024c..7b093edf5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.java
@@ -1,254 +1,254 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
-import com.habitrpg.android.habitica.ui.ItemDetailDialog;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
-import com.habitrpg.android.habitica.models.shops.Shop;
-import com.habitrpg.android.habitica.models.shops.ShopCategory;
-import com.habitrpg.android.habitica.models.shops.ShopItem;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.RecyclerView;
-import android.text.Html;
-import android.text.method.LinkMovementMethod;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    private List<Object> items;
-    private String shopIdentifier;
-
-    public void setShop(Shop shop) {
-        shopIdentifier = shop.identifier;
-        items = new ArrayList<>();
-        items.add(shop);
-        for (ShopCategory category : shop.categories) {
-            if (category.items != null && category.items.size() > 0) {
-                items.add(category);
-                for (ShopItem item : category.items) {
-                    item.categoryIdentifier = category.getIdentifier();
-                    items.add(item);
-                }
-            }
-        }
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        if (viewType == 0) {
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.shop_header, parent, false);
-
-            return new ShopHeaderViewHolder(view);
-        } else if (viewType == 1) {
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.customization_section_header, parent, false);
-
-            return new SectionViewHolder(view);
-        } else {
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.row_shopitem, parent, false);
-            ItemViewHolder viewHolder = new ItemViewHolder(view);
-            viewHolder.shopIdentifier = shopIdentifier;
-            return viewHolder;
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        Object obj = this.items.get(position);
-        if (obj.getClass().equals(Shop.class)) {
-            ShopHeaderViewHolder viewHolder = (ShopHeaderViewHolder) holder;
-            Shop shop = (Shop) obj;
-            DataBindingUtils.loadImage(viewHolder.imageView, shop.imageName);
-            viewHolder.descriptionView.setText(Html.fromHtml(shop.getNotes()));
-        } else if (obj.getClass().equals(ShopCategory.class)) {
-            ((SectionViewHolder) holder).bind(((ShopCategory) obj).getText());
-        } else {
-            ((ItemViewHolder) holder).bind((ShopItem) items.get(position));
-
-        }
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (this.items.get(position).getClass().equals(Shop.class)) {
-            return 0;
-        } else if (this.items.get(position).getClass().equals(ShopCategory.class)) {
-            return 1;
-        } else {
-            return 2;
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return items != null ? items.size() : 0;
-    }
-
-    public void updateGoldGemCount(int numberLeft) {
-        int itemPos = 0;
-        for (Object obj : items) {
-            if (obj.getClass().equals(ShopItem.class)) {
-                ShopItem item = (ShopItem) obj;
-                if (item.key.equals(ShopItem.GEM_FOR_GOLD)) {
-                    item.limitedNumberLeft = numberLeft;
-                    break;
-                }
-            }
-            itemPos++;
-        }
-        notifyItemChanged(itemPos);
-    }
-
-    static class ItemViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-
-        @BindView(R.id.imageView)
-        SimpleDraweeView imageView;
-        @BindView(R.id.titleView)
-        TextView titleView;
-        @BindView(R.id.descriptionView)
-        TextView descriptionView;
-        @BindView(R.id.buyButton)
-        Button buyButton;
-        @BindView(R.id.unlockView)
-        TextView unlockView;
-        @BindView(R.id.limitedCountText)
-        TextView limitedCountText;
-
-        String shopIdentifier;
-        ShopItem item;
-
-        Context context;
-
-        public ItemViewHolder(View itemView) {
-            super(itemView);
-
-            context = itemView.getContext();
-
-            ButterKnife.bind(this, itemView);
-
-            itemView.setOnClickListener(this);
-            itemView.setClickable(true);
-
-            buyButton.setOnClickListener(view -> {
-                String currencyString = "";
-                if (item.getCurrency().equals("gems")) {
-                    if (item.getValue() == 1) {
-                        currencyString = context.getString(R.string.gem);
-                    } else {
-                        currencyString = context.getString(R.string.gems);
-                    }
-                } else if (item.getCurrency().equals("gold")) {
-                    if (item.getValue() == 1) {
-                        currencyString = context.getString(R.string.gold_singular);
-                    } else {
-                        currencyString = context.getString(R.string.gold_plural);
-                    }
-                } else if (item.getCurrency().equals("hourglasses")) {
-                    if (item.getValue() == 1) {
-                        currencyString = context.getString(R.string.hourglass);
-                    } else {
-                        currencyString = context.getString(R.string.hourglasses);
-                    }
-                }
-                new AlertDialog.Builder(context)
-                        .setTitle(R.string.purchase_confirmation_title)
-                        .setMessage(context.getString(R.string.confirm_purchase_text, item.getText(), item.getValue().toString(), currencyString))
-                        .setPositiveButton(android.R.string.yes, (dialog, which) -> this.buyItem())
-                        .setNegativeButton(android.R.string.no, (dialog, which) -> dialog.dismiss())
-                        .show();
-            });
-        }
-
-        private void buyItem() {
-            BuyGemItemCommand command = new BuyGemItemCommand();
-            command.shopIdentifier = shopIdentifier;
-            command.item = item;
-            EventBus.getDefault().post(command);
-        }
-
-        public void bind(ShopItem item) {
-            this.item = item;
-            buyButton.setVisibility(View.VISIBLE);
-            titleView.setText(item.getText());
-            descriptionView.setText(Html.fromHtml(item.getNotes()));
-
-            DataBindingUtils.loadImage(this.imageView, item.getImageName());
-
-            if (item.getUnlockCondition() == null) {
-                buyButton.setText(item.getValue().toString());
-                if (item.getCurrency().equals("gold")) {
-                    buyButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_gold, 0, 0, 0);
-                } else if (item.getCurrency().equals("gems")) {
-                    buyButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_gem, 0, 0, 0);
-                } else {
-                    buyButton.setVisibility(View.GONE);
-                }
-                unlockView.setVisibility(View.GONE);
-            } else {
-                buyButton.setVisibility(View.GONE);
-                unlockView.setVisibility(View.VISIBLE);
-                unlockView.setText(item.unlockCondition.readableUnlockConditionId());
-            }
-
-            if (item.getLocked()) {
-                buyButton.setVisibility(View.GONE);
-            }
-
-            if (item.limitedNumberLeft != null) {
-                limitedCountText.setText(context.getString(R.string.limited_count, item.limitedNumberLeft));
-                limitedCountText.setVisibility(View.VISIBLE);
-            } else {
-                limitedCountText.setVisibility(View.GONE);
-            }
-        }
-
-        @Override
-        public void onClick(View view) {
-            ItemDetailDialog dialog = new ItemDetailDialog(context);
-            dialog.setTitle(item.getText());
-            dialog.setDescription(Html.fromHtml(item.getNotes()));
-            dialog.setImage(item.getImageName());
-            if (item.getUnlockCondition() == null) {
-                dialog.setCurrency(item.getCurrency());
-                dialog.setValue(item.getValue());
-                dialog.setBuyListener((clickedDialog, which) -> this.buyItem());
-            }
-            dialog.show();
-        }
-    }
-
-    public static class ShopHeaderViewHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.imageView)
-        public SimpleDraweeView imageView;
-
-        @BindView(R.id.descriptionView)
-        public TextView descriptionView;
-
-        public ShopHeaderViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
-        }
-
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory;
+
+import android.content.Context;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.RecyclerView;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.shops.ShopCategory;
+import com.habitrpg.android.habitica.models.shops.ShopItem;
+import com.habitrpg.android.habitica.ui.ItemDetailDialog;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private List<Object> items;
+    private String shopIdentifier;
+
+    public void setShop(Shop shop) {
+        shopIdentifier = shop.identifier;
+        items = new ArrayList<>();
+        items.add(shop);
+        for (ShopCategory category : shop.categories) {
+            if (category.items != null && category.items.size() > 0) {
+                items.add(category);
+                for (ShopItem item : category.items) {
+                    item.categoryIdentifier = category.getIdentifier();
+                    items.add(item);
+                }
+            }
+        }
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        if (viewType == 0) {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.shop_header, parent, false);
+
+            return new ShopHeaderViewHolder(view);
+        } else if (viewType == 1) {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.customization_section_header, parent, false);
+
+            return new SectionViewHolder(view);
+        } else {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.row_shopitem, parent, false);
+            ItemViewHolder viewHolder = new ItemViewHolder(view);
+            viewHolder.shopIdentifier = shopIdentifier;
+            return viewHolder;
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        Object obj = this.items.get(position);
+        if (obj.getClass().equals(Shop.class)) {
+            ShopHeaderViewHolder viewHolder = (ShopHeaderViewHolder) holder;
+            Shop shop = (Shop) obj;
+            DataBindingUtils.loadImage(viewHolder.imageView, shop.imageName);
+            viewHolder.descriptionView.setText(Html.fromHtml(shop.getNotes()));
+        } else if (obj.getClass().equals(ShopCategory.class)) {
+            ((SectionViewHolder) holder).bind(((ShopCategory) obj).getText());
+        } else {
+            ((ItemViewHolder) holder).bind((ShopItem) items.get(position));
+
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (this.items.get(position).getClass().equals(Shop.class)) {
+            return 0;
+        } else if (this.items.get(position).getClass().equals(ShopCategory.class)) {
+            return 1;
+        } else {
+            return 2;
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return items != null ? items.size() : 0;
+    }
+
+    public void updateGoldGemCount(int numberLeft) {
+        int itemPos = 0;
+        for (Object obj : items) {
+            if (obj.getClass().equals(ShopItem.class)) {
+                ShopItem item = (ShopItem) obj;
+                if (item.key.equals(ShopItem.GEM_FOR_GOLD)) {
+                    item.limitedNumberLeft = numberLeft;
+                    break;
+                }
+            }
+            itemPos++;
+        }
+        notifyItemChanged(itemPos);
+    }
+
+    static class ItemViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+        @BindView(R.id.imageView)
+        SimpleDraweeView imageView;
+        @BindView(R.id.titleView)
+        TextView titleView;
+        @BindView(R.id.descriptionView)
+        TextView descriptionView;
+        @BindView(R.id.buyButton)
+        Button buyButton;
+        @BindView(R.id.unlockView)
+        TextView unlockView;
+        @BindView(R.id.limitedCountText)
+        TextView limitedCountText;
+
+        String shopIdentifier;
+        ShopItem item;
+
+        Context context;
+
+        public ItemViewHolder(View itemView) {
+            super(itemView);
+
+            context = itemView.getContext();
+
+            ButterKnife.bind(this, itemView);
+
+            itemView.setOnClickListener(this);
+            itemView.setClickable(true);
+
+            buyButton.setOnClickListener(view -> {
+                String currencyString = "";
+                if (item.getCurrency().equals("gems")) {
+                    if (item.getValue() == 1) {
+                        currencyString = context.getString(R.string.gem);
+                    } else {
+                        currencyString = context.getString(R.string.gems);
+                    }
+                } else if (item.getCurrency().equals("gold")) {
+                    if (item.getValue() == 1) {
+                        currencyString = context.getString(R.string.gold_singular);
+                    } else {
+                        currencyString = context.getString(R.string.gold_plural);
+                    }
+                } else if (item.getCurrency().equals("hourglasses")) {
+                    if (item.getValue() == 1) {
+                        currencyString = context.getString(R.string.hourglass);
+                    } else {
+                        currencyString = context.getString(R.string.hourglasses);
+                    }
+                }
+                new AlertDialog.Builder(context)
+                        .setTitle(R.string.purchase_confirmation_title)
+                        .setMessage(context.getString(R.string.confirm_purchase_text, item.getText(), item.getValue().toString(), currencyString))
+                        .setPositiveButton(android.R.string.yes, (dialog, which) -> this.buyItem())
+                        .setNegativeButton(android.R.string.no, (dialog, which) -> dialog.dismiss())
+                        .show();
+            });
+        }
+
+        private void buyItem() {
+            BuyGemItemCommand command = new BuyGemItemCommand();
+            command.shopIdentifier = shopIdentifier;
+            command.item = item;
+            EventBus.getDefault().post(command);
+        }
+
+        public void bind(ShopItem item) {
+            this.item = item;
+            buyButton.setVisibility(View.VISIBLE);
+            titleView.setText(item.getText());
+            descriptionView.setText(Html.fromHtml(item.getNotes()));
+
+            DataBindingUtils.loadImage(this.imageView, item.getImageName());
+
+            if (item.getUnlockCondition() == null) {
+                buyButton.setText(item.getValue().toString());
+                if (item.getCurrency().equals("gold")) {
+                    buyButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_gold, 0, 0, 0);
+                } else if (item.getCurrency().equals("gems")) {
+                    buyButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_gem, 0, 0, 0);
+                } else {
+                    buyButton.setVisibility(View.GONE);
+                }
+                unlockView.setVisibility(View.GONE);
+            } else {
+                buyButton.setVisibility(View.GONE);
+                unlockView.setVisibility(View.VISIBLE);
+                unlockView.setText(item.unlockCondition.readableUnlockConditionId());
+            }
+
+            if (item.getLocked()) {
+                buyButton.setVisibility(View.GONE);
+            }
+
+            if (item.limitedNumberLeft != null) {
+                limitedCountText.setText(context.getString(R.string.limited_count, item.limitedNumberLeft));
+                limitedCountText.setVisibility(View.VISIBLE);
+            } else {
+                limitedCountText.setVisibility(View.GONE);
+            }
+        }
+
+        @Override
+        public void onClick(View view) {
+            ItemDetailDialog dialog = new ItemDetailDialog(context);
+            dialog.setTitle(item.getText());
+            dialog.setDescription(Html.fromHtml(item.getNotes()));
+            dialog.setImage(item.getImageName());
+            if (item.getUnlockCondition() == null) {
+                dialog.setCurrency(item.getCurrency());
+                dialog.setValue(item.getValue());
+                dialog.setBuyListener((clickedDialog, which) -> this.buyItem());
+            }
+            dialog.show();
+        }
+    }
+
+    public static class ShopHeaderViewHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.imageView)
+        public SimpleDraweeView imageView;
+
+        @BindView(R.id.descriptionView)
+        public TextView descriptionView;
+
+        public ShopHeaderViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+            descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
+        }
+
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java
index 35920de17..02a782fa3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java
@@ -1,140 +1,140 @@
-package com.habitrpg.android.habitica.ui.adapter.inventory;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.ui.fragments.inventory.stable.MountDetailRecyclerFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.stable.PetDetailRecyclerFragment;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
-import com.habitrpg.android.habitica.models.inventory.Animal;
-
-import android.content.res.Resources;
-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.TextView;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class StableRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    public String itemType;
-    public MainActivity activity;
-    private List<Object> itemList;
-
-    public <T extends Animal> void setItemList(List<Object> itemList) {
-        this.itemList = itemList;
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        if (viewType == 0) {
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.customization_section_header, parent, false);
-
-            return new SectionViewHolder(view);
-        } else {
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.animal_overview_item, parent, false);
-
-            return new StableViewHolder(view);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        Object obj = this.itemList.get(position);
-        if (obj.getClass().equals(String.class)) {
-            ((SectionViewHolder) holder).bind((String) obj);
-        } else {
-            ((StableViewHolder) holder).bind((Animal) itemList.get(position));
-
-        }
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (this.itemList.get(position).getClass().equals(String.class)) {
-            return 0;
-        } else {
-            return 1;
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return itemList == null ? 0 : itemList.size();
-    }
-
-    class StableViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        Animal animal;
-
-        @BindView(R.id.card_view)
-        CardView cardView;
-
-        @BindView(R.id.imageView)
-        SimpleDraweeView imageView;
-
-        @BindView(R.id.titleTextView)
-        TextView titleView;
-
-        @BindView(R.id.ownedTextView)
-        TextView ownedTextView;
-
-        Resources resources;
-
-        public StableViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-
-            resources = itemView.getResources();
-
-            itemView.setOnClickListener(this);
-        }
-
-        public void bind(Animal item) {
-            this.animal = item;
-            titleView.setText(item.getAnimalText());
-            ownedTextView.setVisibility(View.VISIBLE);
-            this.imageView.setAlpha(1.0f);
-            if (animal.getNumberOwned() > 0) {
-                this.ownedTextView.setText(animal.getNumberOwned().toString());
-                if (itemType.equals("pets")) {
-                    DataBindingUtils.loadImage(this.imageView, "Pet-" + item.getKey());
-                } else {
-                    DataBindingUtils.loadImage(this.imageView, "Mount_Icon_" + item.getKey());
-                }
-            } else {
-                ownedTextView.setVisibility(View.GONE);
-                DataBindingUtils.loadImage(this.imageView, "PixelPaw");
-                this.imageView.setAlpha(0.4f);
-            }
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (animal != null) {
-                if (animal.getNumberOwned() > 0) {
-                    if (itemType.equals("pets")) {
-                        PetDetailRecyclerFragment fragment = new PetDetailRecyclerFragment();
-                        fragment.animalType = animal.getAnimal();
-                        fragment.animalGroup = animal.getAnimalGroup();
-                        activity.displayFragment(fragment);
-                    } else {
-                        MountDetailRecyclerFragment fragment = new MountDetailRecyclerFragment();
-                        fragment.animalType = animal.getAnimal();
-                        fragment.animalGroup = animal.getAnimalGroup();
-                        activity.displayFragment(fragment);
-                    }
-                }
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.inventory;
+
+import android.content.res.Resources;
+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.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.inventory.Animal;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.habitrpg.android.habitica.ui.fragments.inventory.stable.MountDetailRecyclerFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.stable.PetDetailRecyclerFragment;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class StableRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    public String itemType;
+    public MainActivity activity;
+    private List<Object> itemList;
+
+    public <T extends Animal> void setItemList(List<Object> itemList) {
+        this.itemList = itemList;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        if (viewType == 0) {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.customization_section_header, parent, false);
+
+            return new SectionViewHolder(view);
+        } else {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.animal_overview_item, parent, false);
+
+            return new StableViewHolder(view);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        Object obj = this.itemList.get(position);
+        if (obj.getClass().equals(String.class)) {
+            ((SectionViewHolder) holder).bind((String) obj);
+        } else {
+            ((StableViewHolder) holder).bind((Animal) itemList.get(position));
+
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (this.itemList.get(position).getClass().equals(String.class)) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return itemList == null ? 0 : itemList.size();
+    }
+
+    class StableViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        Animal animal;
+
+        @BindView(R.id.card_view)
+        CardView cardView;
+
+        @BindView(R.id.imageView)
+        SimpleDraweeView imageView;
+
+        @BindView(R.id.titleTextView)
+        TextView titleView;
+
+        @BindView(R.id.ownedTextView)
+        TextView ownedTextView;
+
+        Resources resources;
+
+        public StableViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+
+            resources = itemView.getResources();
+
+            itemView.setOnClickListener(this);
+        }
+
+        public void bind(Animal item) {
+            this.animal = item;
+            titleView.setText(item.getAnimalText());
+            ownedTextView.setVisibility(View.VISIBLE);
+            this.imageView.setAlpha(1.0f);
+            if (animal.getNumberOwned() > 0) {
+                this.ownedTextView.setText(animal.getNumberOwned().toString());
+                if (itemType.equals("pets")) {
+                    DataBindingUtils.loadImage(this.imageView, "Pet-" + item.getKey());
+                } else {
+                    DataBindingUtils.loadImage(this.imageView, "Mount_Icon_" + item.getKey());
+                }
+            } else {
+                ownedTextView.setVisibility(View.GONE);
+                DataBindingUtils.loadImage(this.imageView, "PixelPaw");
+                this.imageView.setAlpha(0.4f);
+            }
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (animal != null) {
+                if (animal.getNumberOwned() > 0) {
+                    if (itemType.equals("pets")) {
+                        PetDetailRecyclerFragment fragment = new PetDetailRecyclerFragment();
+                        fragment.animalType = animal.getAnimal();
+                        fragment.animalGroup = animal.getAnimalGroup();
+                        activity.displayFragment(fragment);
+                    } else {
+                        MountDetailRecyclerFragment fragment = new MountDetailRecyclerFragment();
+                        fragment.animalType = animal.getAnimal();
+                        fragment.animalGroup = animal.getAnimalGroup();
+                        activity.displayFragment(fragment);
+                    }
+                }
+            }
+        }
+    }
+}
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 96e70050d..f92557e7e 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,184 +1,184 @@
-package com.habitrpg.android.habitica.ui.adapter.setup;
-
-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.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Preferences;
-import com.habitrpg.android.habitica.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.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    public String userSize;
-    public HabitRPGUser user;
-    private List<SetupCustomization> customizationList;
-
-    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;
-
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(viewID, parent, false);
-
-        return new CustomizationViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        ((CustomizationViewHolder) holder).bind(customizationList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return customizationList == null ? 0 : customizationList.size();
-    }
-
-    private boolean isCustomizationActive(SetupCustomization customization) {
-        if (this.user == null) {
-            return false;
-        }
-        Preferences prefs = this.user.getPreferences();
-        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()) || ("eyewear_base_0".equals(this.user.getItems().getGear().getEquipped().getEyeWear()) && customization.key.length() == 0);
-                    case "flower":
-                        return Integer.parseInt(customization.key) == prefs.getHair().getFlower();
-                    case "wheelchair":
-                        return ("chair_"+customization.key).equals(prefs.getChair()) || customization.key.equals(prefs.getChair()) || (customization.key.equals("none") && prefs.getChair() == null);
-                }
-            }
-        }
-        return false;
-    }
-
-    class CustomizationViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-
-        @BindView(R.id.imageView)
-        ImageView imageView;
-
-        @BindView(R.id.textView)
-        TextView textView;
-
-        SetupCustomization customization;
-
-        Context context;
-
-        CustomizationViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-
-            itemView.setOnClickListener(this);
-
-            context = itemView.getContext();
-        }
-
-        public void bind(SetupCustomization customization) {
-            this.customization = customization;
-
-            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 (!"0".equals(customization.key) && "flower".equals(customization.subcategory)) {
-                if (isCustomizationActive(customization)) {
-                    imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg_selected);
-                } else {
-                    imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg);
-                }
-            } else {
-                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) {
-            if (customization.path.equals("glasses")) {
-                EquipCommand command = new EquipCommand();
-                if (customization.key.length() == 0) {
-                    command.key = user.getItems().getGear().getEquipped().getEyeWear();
-                } else {
-                    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);
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.setup;
+
+import android.content.Context;
+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;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+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.models.SetupCustomization;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Preferences;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    public String userSize;
+    public HabitRPGUser user;
+    private List<SetupCustomization> customizationList;
+
+    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;
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(viewID, parent, false);
+
+        return new CustomizationViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        ((CustomizationViewHolder) holder).bind(customizationList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return customizationList == null ? 0 : customizationList.size();
+    }
+
+    private boolean isCustomizationActive(SetupCustomization customization) {
+        if (this.user == null) {
+            return false;
+        }
+        Preferences prefs = this.user.getPreferences();
+        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()) || ("eyewear_base_0".equals(this.user.getItems().getGear().getEquipped().getEyeWear()) && customization.key.length() == 0);
+                    case "flower":
+                        return Integer.parseInt(customization.key) == prefs.getHair().getFlower();
+                    case "wheelchair":
+                        return ("chair_"+customization.key).equals(prefs.getChair()) || customization.key.equals(prefs.getChair()) || (customization.key.equals("none") && prefs.getChair() == null);
+                }
+            }
+        }
+        return false;
+    }
+
+    class CustomizationViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+        @BindView(R.id.imageView)
+        ImageView imageView;
+
+        @BindView(R.id.textView)
+        TextView textView;
+
+        SetupCustomization customization;
+
+        Context context;
+
+        CustomizationViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+
+            itemView.setOnClickListener(this);
+
+            context = itemView.getContext();
+        }
+
+        public void bind(SetupCustomization customization) {
+            this.customization = customization;
+
+            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 (!"0".equals(customization.key) && "flower".equals(customization.subcategory)) {
+                if (isCustomizationActive(customization)) {
+                    imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg_selected);
+                } else {
+                    imageView.setBackgroundResource(R.drawable.setup_customization_flower_bg);
+                }
+            } else {
+                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) {
+            if (customization.path.equals("glasses")) {
+                EquipCommand command = new EquipCommand();
+                if (customization.key.length() == 0) {
+                    command.key = user.getItems().getGear().getEquipped().getEyeWear();
+                } else {
+                    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);
+            }
+        }
+    }
+}
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 f97980460..2a07a366b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.java
@@ -1,104 +1,104 @@
-package com.habitrpg.android.habitica.ui.adapter.setup;
-
-import android.content.Context;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.support.graphics.drawable.VectorDrawableCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.habitrpg.android.habitica.R;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class TaskSetupAdapter extends RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder> {
-
-    public List<Boolean> checkedList;
-    private String[][] taskList;
-
-    public void setTaskList(String[][] taskList) {
-        this.taskList = taskList;
-        this.checkedList = new ArrayList<>();
-        for (String[] ignored : this.taskList) {
-            this.checkedList.add(false);
-        }
-    }
-
-    @Override
-    public TaskViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.task_setup_item, parent, false);
-
-        return new TaskViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(TaskViewHolder holder, int position) {
-        holder.bind(this.taskList[position], this.checkedList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return this.taskList == null ? 0 : this.taskList.length;
-    }
-
-    class TaskViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-
-        private final Drawable icon;
-        @BindView(R.id.textView)
-        TextView textView;
-
-        String[] taskGroup;
-        Boolean isChecked;
-
-        Context context;
-
-        TaskViewHolder(View itemView) {
-            super(itemView);
-
-            ButterKnife.bind(this, itemView);
-
-            context = itemView.getContext();
-
-            itemView.setOnClickListener(this);
-
-            icon = VectorDrawableCompat.create(context.getResources(), R.drawable.ic_check_white_18dp, null);
-            if (icon != null) {
-                icon.setColorFilter(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY);
-            }
-        }
-
-        public void bind(String[] taskGroup, Boolean isChecked) {
-            this.taskGroup = taskGroup;
-            this.isChecked = isChecked;
-
-            this.textView.setText(this.taskGroup[0]);
-            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
-        public void onClick(View v) {
-            int position = this.getAdapterPosition();
-            checkedList.set(position, !checkedList.get(position));
-            notifyItemChanged(position);
-        }
-    }
-
-}
+package com.habitrpg.android.habitica.ui.adapter.setup;
+
+import android.content.Context;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.support.graphics.drawable.VectorDrawableCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class TaskSetupAdapter extends RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder> {
+
+    public List<Boolean> checkedList;
+    private String[][] taskList;
+
+    public void setTaskList(String[][] taskList) {
+        this.taskList = taskList;
+        this.checkedList = new ArrayList<>();
+        for (String[] ignored : this.taskList) {
+            this.checkedList.add(false);
+        }
+    }
+
+    @Override
+    public TaskViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.task_setup_item, parent, false);
+
+        return new TaskViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(TaskViewHolder holder, int position) {
+        holder.bind(this.taskList[position], this.checkedList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return this.taskList == null ? 0 : this.taskList.length;
+    }
+
+    class TaskViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+        private final Drawable icon;
+        @BindView(R.id.textView)
+        TextView textView;
+
+        String[] taskGroup;
+        Boolean isChecked;
+
+        Context context;
+
+        TaskViewHolder(View itemView) {
+            super(itemView);
+
+            ButterKnife.bind(this, itemView);
+
+            context = itemView.getContext();
+
+            itemView.setOnClickListener(this);
+
+            icon = VectorDrawableCompat.create(context.getResources(), R.drawable.ic_check_white_18dp, null);
+            if (icon != null) {
+                icon.setColorFilter(ContextCompat.getColor(context, R.color.brand_100), PorterDuff.Mode.MULTIPLY);
+            }
+        }
+
+        public void bind(String[] taskGroup, Boolean isChecked) {
+            this.taskGroup = taskGroup;
+            this.isChecked = isChecked;
+
+            this.textView.setText(this.taskGroup[0]);
+            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
+        public void onClick(View v) {
+            int position = this.getAdapterPosition();
+            checkedList.set(position, !checkedList.get(position));
+            notifyItemChanged(position);
+        }
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java
index 22f886220..84268317c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/AchievementAdapter.java
@@ -1,154 +1,154 @@
-package com.habitrpg.android.habitica.ui.adapter.social;
-
-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.HabiticaApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.AvatarView;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
-import com.habitrpg.android.habitica.models.Achievement;
-
-import android.content.res.Resources;
-import android.support.v7.app.AlertDialog;
-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.LinearLayout;
-import android.widget.TextView;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class AchievementAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    public String itemType;
-    public MainActivity activity;
-    private List<Object> itemList;
-
-    public void setItemList(List<Object> itemList) {
-        this.itemList = itemList;
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        if (viewType == 0) {
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.profile_achievement_category, parent, false);
-
-            return new SectionViewHolder(view);
-        } else {
-            View view = LayoutInflater.from(parent.getContext())
-                    .inflate(R.layout.profile_achievement_item, parent, false);
-
-            return new AchievementViewHolder(view);
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        Object obj = this.itemList.get(position);
-        if (obj.getClass().equals(String.class)) {
-            ((SectionViewHolder) holder).bind((String) obj);
-        } else {
-            ((AchievementViewHolder) holder).bind((Achievement) itemList.get(position));
-        }
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (this.itemList.get(position).getClass().equals(String.class)) {
-            return 0;
-        } else {
-            return 1;
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return itemList == null ? 0 : itemList.size();
-    }
-
-    class AchievementViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        Achievement achievement;
-
-        @BindView(R.id.achievement_drawee)
-        SimpleDraweeView draweeView;
-
-        @BindView(R.id.achievement_text)
-        TextView titleView;
-
-        @BindView(R.id.achievement_count_label)
-        TextView countText;
-
-        @BindView(R.id.achievement_item_layout)
-        LinearLayout item_layout;
-
-        Resources resources;
-
-        AchievementViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-
-            item_layout = (LinearLayout) itemView;
-            resources = itemView.getResources();
-
-            item_layout.setClickable(true);
-            item_layout.setOnClickListener(this);
-        }
-
-        public void bind(Achievement item) {
-            String iconUrl = AvatarView.IMAGE_URI_ROOT + (!item.earned ? "achievement-unearned" : item.icon) + "2x.png";
-
-            draweeView.setController(Fresco.newDraweeControllerBuilder()
-                    .setUri(iconUrl)
-                    .setControllerListener(new BaseControllerListener<ImageInfo>() {
-                        @Override
-                        public void onFailure(String id, Throwable throwable) {
-                        }
-                    })
-                    .build());
-
-
-            this.achievement = item;
-            titleView.setText(item.title);
-
-            if (item.optionalCount == null) {
-                countText.setVisibility(View.GONE);
-            } else {
-                countText.setVisibility(View.VISIBLE);
-                countText.setText(item.optionalCount.toString());
-            }
-        }
-
-        @Override
-        public void onClick(View view) {
-            AlertDialog.Builder b = new AlertDialog.Builder(HabiticaApplication.currentActivity);
-
-            View customView = LayoutInflater.from(itemView.getContext())
-                    .inflate(R.layout.dialog_achievement_details, null);
-            ImageView achievementImage = (ImageView) customView.findViewById(R.id.achievement_image);
-            achievementImage.setImageDrawable(draweeView.getDrawable());
-
-            TextView titleView = (TextView) customView.findViewById(R.id.achievement_title);
-            titleView.setText(achievement.title);
-
-
-            TextView textView = (TextView) customView.findViewById(R.id.achievement_text);
-            textView.setText(achievement.text);
-
-            b.setView(customView);
-            b.setPositiveButton(R.string.profile_achievement_ok, (dialogInterface, i) -> {
-            });
-
-            b.show();
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.social;
+
+import android.content.res.Resources;
+import android.support.v7.app.AlertDialog;
+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.LinearLayout;
+import android.widget.TextView;
+
+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.HabiticaApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.Achievement;
+import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class AchievementAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    public String itemType;
+    public MainActivity activity;
+    private List<Object> itemList;
+
+    public void setItemList(List<Object> itemList) {
+        this.itemList = itemList;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        if (viewType == 0) {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.profile_achievement_category, parent, false);
+
+            return new SectionViewHolder(view);
+        } else {
+            View view = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.profile_achievement_item, parent, false);
+
+            return new AchievementViewHolder(view);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+        Object obj = this.itemList.get(position);
+        if (obj.getClass().equals(String.class)) {
+            ((SectionViewHolder) holder).bind((String) obj);
+        } else {
+            ((AchievementViewHolder) holder).bind((Achievement) itemList.get(position));
+        }
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (this.itemList.get(position).getClass().equals(String.class)) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return itemList == null ? 0 : itemList.size();
+    }
+
+    class AchievementViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        Achievement achievement;
+
+        @BindView(R.id.achievement_drawee)
+        SimpleDraweeView draweeView;
+
+        @BindView(R.id.achievement_text)
+        TextView titleView;
+
+        @BindView(R.id.achievement_count_label)
+        TextView countText;
+
+        @BindView(R.id.achievement_item_layout)
+        LinearLayout item_layout;
+
+        Resources resources;
+
+        AchievementViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+
+            item_layout = (LinearLayout) itemView;
+            resources = itemView.getResources();
+
+            item_layout.setClickable(true);
+            item_layout.setOnClickListener(this);
+        }
+
+        public void bind(Achievement item) {
+            String iconUrl = AvatarView.IMAGE_URI_ROOT + (!item.earned ? "achievement-unearned" : item.icon) + "2x.png";
+
+            draweeView.setController(Fresco.newDraweeControllerBuilder()
+                    .setUri(iconUrl)
+                    .setControllerListener(new BaseControllerListener<ImageInfo>() {
+                        @Override
+                        public void onFailure(String id, Throwable throwable) {
+                        }
+                    })
+                    .build());
+
+
+            this.achievement = item;
+            titleView.setText(item.title);
+
+            if (item.optionalCount == null) {
+                countText.setVisibility(View.GONE);
+            } else {
+                countText.setVisibility(View.VISIBLE);
+                countText.setText(item.optionalCount.toString());
+            }
+        }
+
+        @Override
+        public void onClick(View view) {
+            AlertDialog.Builder b = new AlertDialog.Builder(HabiticaApplication.currentActivity);
+
+            View customView = LayoutInflater.from(itemView.getContext())
+                    .inflate(R.layout.dialog_achievement_details, null);
+            ImageView achievementImage = (ImageView) customView.findViewById(R.id.achievement_image);
+            achievementImage.setImageDrawable(draweeView.getDrawable());
+
+            TextView titleView = (TextView) customView.findViewById(R.id.achievement_title);
+            titleView.setText(achievement.title);
+
+
+            TextView textView = (TextView) customView.findViewById(R.id.achievement_text);
+            textView.setText(achievement.text);
+
+            b.setView(customView);
+            b.setPositiveButton(R.string.profile_achievement_ok, (dialogInterface, i) -> {
+            });
+
+            b.show();
+        }
+    }
+}
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 e517f61bf..96ff8f30f 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
@@ -1,213 +1,209 @@
-package com.habitrpg.android.habitica.ui.adapter.social;
-
-import com.github.underscore.$;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
-import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
-import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import net.pherth.android.emoji_library.EmojiParser;
-import net.pherth.android.emoji_library.EmojiTextView;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-import static com.raizlabs.android.dbflow.config.FlowManager.getContext;
-
-
-public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesListViewAdapter.ChallengeViewHolder> {
-
-
-    private List<Challenge> challenges = new ArrayList<>();
-    private List<Challenge> challengesSource = new ArrayList<>();
-
-    private boolean viewUserChallengesOnly;
-    @Nullable
-    private HabitRPGUser user;
-
-    public ChallengesListViewAdapter(boolean viewUserChallengesOnly, @Nullable HabitRPGUser user) {
-        this.viewUserChallengesOnly = viewUserChallengesOnly;
-        this.user = user;
-    }
-
-    public void setChallenges(List<Challenge> challenges) {
-        this.challengesSource = challenges;
-        this.challenges = new ArrayList<>(challengesSource);
-        this.notifyDataSetChanged();
-    }
-
-    public void setFilterByGroups(ChallengeFilterOptions filterOptions){
-        this.challenges = $.filter(challengesSource, arg -> {
-            boolean showChallenge = $.find(filterOptions.showByGroups, g -> g.id.contains(arg.groupId)).isPresent();
-
-            boolean showByOwnership = true;
-            if(filterOptions.showOwned == filterOptions.notOwned && this.user != null){
-                if (filterOptions.showOwned) {
-                    showByOwnership = arg.leaderId.equals(this.user.getId());
-                } else {
-                    showByOwnership = !arg.leaderId.equals(this.user.getId());
-                }
-            }
-
-            return showChallenge && showByOwnership;
-        });
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public ChallengeViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.challenge_item, parent, false);
-
-        return new ChallengeViewHolder(view, viewUserChallengesOnly);
-    }
-
-    @Override
-    public void onBindViewHolder(ChallengeViewHolder holder, int position) {
-        holder.bind(challenges.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return challenges.size();
-    }
-
-    public void addChallenge(Challenge challenge) {
-        challenges.add(challenge);
-        notifyDataSetChanged();
-    }
-
-    public void replaceChallenge(Challenge challenge) {
-        int index = challenges.indexOf(challenge);
-
-        if (index == -1) {
-            for (int i = 0; i < challenges.size(); i++) {
-                if (challenges.get(i).id.equals(challenge.id)) {
-                    index = i;
-
-                    break;
-                }
-            }
-        }
-
-        if (index != -1) {
-            challenges.set(index, challenge);
-            notifyItemChanged(index);
-        }
-    }
-
-    public static class ChallengeViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-        @BindView(R.id.challenge_name)
-        EmojiTextView challengeName;
-
-        @BindView(R.id.challenge_group_name)
-        TextView challengeDescription;
-
-        @BindView(R.id.leaderParticipantLayout)
-        LinearLayout leaderParticipantLayout;
-
-        @BindView(R.id.leaderName)
-        TextView leaderName;
-
-        @BindView(R.id.participantCount)
-        TextView participantCount;
-
-        @BindView(R.id.officialHabiticaChallengeLayout)
-        LinearLayout officialChallengeLayout;
-
-        @BindView(R.id.challenge_is_participating)
-        View challengeParticipatingTextView;
-
-        @Nullable
-        @BindView(R.id.memberCountTextView)
-        TextView memberCountTextView;
-
-        @BindView(R.id.arrowImage)
-        LinearLayout arrowImage;
-
-        @BindView(R.id.gemPrizeTextView)
-        TextView gemPrizeTextView;
-
-        private Challenge challenge;
-        private boolean viewUserChallengesOnly;
-
-        ChallengeViewHolder(View itemView, boolean viewUserChallengesOnly) {
-            super(itemView);
-            this.viewUserChallengesOnly = viewUserChallengesOnly;
-
-            ButterKnife.bind(this, itemView);
-
-            itemView.setOnClickListener(this);
-
-            if (!viewUserChallengesOnly) {
-                challengeName.setTextColor(ContextCompat.getColor(getContext(), R.color.brand_200));
-            }
-        }
-
-        public static String getLabelByTypeAndCount(Context context, String type, int count) {
-            if (Challenge.TASK_ORDER_DAILYS.equals(type)) {
-                return context.getString(count == 1 ? R.string.daily : R.string.dailies);
-            } else if (Challenge.TASK_ORDER_HABITS.equals(type)) {
-                return context.getString(count == 1 ? R.string.habit : R.string.habits);
-            } else if (Challenge.TASK_ORDER_REWARDS.equals(type)) {
-                return context.getString(count == 1 ? R.string.reward : R.string.rewards);
-            } else {
-                return context.getString(count == 1 ? R.string.todo : R.string.todos);
-            }
-        }
-
-        public void bind(Challenge challenge) {
-            this.challenge = challenge;
-
-            challengeName.setText(EmojiParser.parseEmojis(challenge.name.trim()));
-            challengeDescription.setText(challenge.groupName);
-
-            officialChallengeLayout.setVisibility(challenge.official ? View.VISIBLE : View.GONE);
-            boolean userIdExists = challenge.user_id != null && !challenge.user_id.isEmpty();
-
-            if (viewUserChallengesOnly) {
-                leaderParticipantLayout.setVisibility(View.GONE);
-                challengeParticipatingTextView.setVisibility(View.GONE);
-                arrowImage.setVisibility(View.VISIBLE);
-            } else {
-                challengeParticipatingTextView.setVisibility(userIdExists ? View.VISIBLE : View.GONE);
-
-                leaderName.setText(getContext().getString(R.string.byLeader, challenge.leaderName));
-                participantCount.setText(String.valueOf(challenge.memberCount));
-                leaderParticipantLayout.setVisibility(View.VISIBLE);
-                arrowImage.setVisibility(View.GONE);
-            }
-
-            gemPrizeTextView.setText(String.valueOf(challenge.prize));
-        }
-
-        @Override
-        public void onClick(View view) {
-            if (challenge != null) {
-                if (viewUserChallengesOnly) {
-                    EventBus.getDefault().post(new ShowChallengeDetailActivityCommand(challenge.id));
-                } else {
-                    EventBus.getDefault().post(new ShowChallengeDetailDialogCommand(challenge.id));
-                }
-            }
-        }
-    }
+package com.habitrpg.android.habitica.ui.adapter.social;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.github.underscore.$;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
+import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions;
+
+import net.pherth.android.emoji_library.EmojiParser;
+import net.pherth.android.emoji_library.EmojiTextView;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesListViewAdapter.ChallengeViewHolder> {
+
+
+    private List<Challenge> challenges = new ArrayList<>();
+    private List<Challenge> challengesSource = new ArrayList<>();
+
+    private boolean viewUserChallengesOnly;
+    @Nullable
+    private HabitRPGUser user;
+
+    public ChallengesListViewAdapter(boolean viewUserChallengesOnly, @Nullable HabitRPGUser user) {
+        this.viewUserChallengesOnly = viewUserChallengesOnly;
+        this.user = user;
+    }
+
+    public void setChallenges(List<Challenge> challenges) {
+        this.challengesSource = challenges;
+        this.challenges = new ArrayList<>(challengesSource);
+        this.notifyDataSetChanged();
+    }
+
+    public void setFilterByGroups(ChallengeFilterOptions filterOptions){
+        this.challenges = $.filter(challengesSource, arg -> {
+            boolean showChallenge = $.find(filterOptions.showByGroups, g -> g.id.contains(arg.groupId)).isPresent();
+
+            boolean showByOwnership = true;
+            if(filterOptions.showOwned == filterOptions.notOwned && this.user != null){
+                if (filterOptions.showOwned) {
+                    showByOwnership = arg.leaderId.equals(this.user.getId());
+                } else {
+                    showByOwnership = !arg.leaderId.equals(this.user.getId());
+                }
+            }
+
+            return showChallenge && showByOwnership;
+        });
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public ChallengeViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.challenge_item, parent, false);
+
+        return new ChallengeViewHolder(view, viewUserChallengesOnly);
+    }
+
+    @Override
+    public void onBindViewHolder(ChallengeViewHolder holder, int position) {
+        holder.bind(challenges.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return challenges.size();
+    }
+
+    public void addChallenge(Challenge challenge) {
+        challenges.add(challenge);
+        notifyDataSetChanged();
+    }
+
+    public void replaceChallenge(Challenge challenge) {
+        int index = challenges.indexOf(challenge);
+
+        if (index == -1) {
+            for (int i = 0; i < challenges.size(); i++) {
+                if (challenges.get(i).id.equals(challenge.id)) {
+                    index = i;
+
+                    break;
+                }
+            }
+        }
+
+        if (index != -1) {
+            challenges.set(index, challenge);
+            notifyItemChanged(index);
+        }
+    }
+
+    public static class ChallengeViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+        @BindView(R.id.challenge_name)
+        EmojiTextView challengeName;
+
+        @BindView(R.id.challenge_group_name)
+        TextView challengeDescription;
+
+        @BindView(R.id.leaderParticipantLayout)
+        LinearLayout leaderParticipantLayout;
+
+        @BindView(R.id.leaderName)
+        TextView leaderName;
+
+        @BindView(R.id.participantCount)
+        TextView participantCount;
+
+        @BindView(R.id.officialHabiticaChallengeLayout)
+        LinearLayout officialChallengeLayout;
+
+        @BindView(R.id.challenge_is_participating)
+        View challengeParticipatingTextView;
+
+        @Nullable
+        @BindView(R.id.memberCountTextView)
+        TextView memberCountTextView;
+
+        @BindView(R.id.arrowImage)
+        LinearLayout arrowImage;
+
+        @BindView(R.id.gemPrizeTextView)
+        TextView gemPrizeTextView;
+
+        private Challenge challenge;
+        private boolean viewUserChallengesOnly;
+
+        ChallengeViewHolder(View itemView, boolean viewUserChallengesOnly) {
+            super(itemView);
+            this.viewUserChallengesOnly = viewUserChallengesOnly;
+
+            ButterKnife.bind(this, itemView);
+
+            itemView.setOnClickListener(this);
+
+            if (!viewUserChallengesOnly) {
+                challengeName.setTextColor(ContextCompat.getColor(itemView.getContext(), R.color.brand_200));
+            }
+        }
+
+        public static String getLabelByTypeAndCount(Context context, String type, int count) {
+            if (Challenge.TASK_ORDER_DAILYS.equals(type)) {
+                return context.getString(count == 1 ? R.string.daily : R.string.dailies);
+            } else if (Challenge.TASK_ORDER_HABITS.equals(type)) {
+                return context.getString(count == 1 ? R.string.habit : R.string.habits);
+            } else if (Challenge.TASK_ORDER_REWARDS.equals(type)) {
+                return context.getString(count == 1 ? R.string.reward : R.string.rewards);
+            } else {
+                return context.getString(count == 1 ? R.string.todo : R.string.todos);
+            }
+        }
+
+        public void bind(Challenge challenge) {
+            this.challenge = challenge;
+
+            challengeName.setText(EmojiParser.parseEmojis(challenge.name.trim()));
+            challengeDescription.setText(challenge.groupName);
+
+            officialChallengeLayout.setVisibility(challenge.official ? View.VISIBLE : View.GONE);
+            boolean userIdExists = challenge.user_id != null && !challenge.user_id.isEmpty();
+
+            if (viewUserChallengesOnly) {
+                leaderParticipantLayout.setVisibility(View.GONE);
+                challengeParticipatingTextView.setVisibility(View.GONE);
+                arrowImage.setVisibility(View.VISIBLE);
+            } else {
+                challengeParticipatingTextView.setVisibility(userIdExists ? View.VISIBLE : View.GONE);
+
+                leaderName.setText(itemView.getContext().getString(R.string.byLeader, challenge.leaderName));
+                participantCount.setText(String.valueOf(challenge.memberCount));
+                leaderParticipantLayout.setVisibility(View.VISIBLE);
+                arrowImage.setVisibility(View.GONE);
+            }
+
+            gemPrizeTextView.setText(String.valueOf(challenge.prize));
+        }
+
+        @Override
+        public void onClick(View view) {
+            if (challenge != null) {
+                if (viewUserChallengesOnly) {
+                    EventBus.getDefault().post(new ShowChallengeDetailActivityCommand(challenge.id));
+                } else {
+                    EventBus.getDefault().post(new ShowChallengeDetailDialogCommand(challenge.id));
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
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 495f0a76d..b80df0f00 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
@@ -1,349 +1,346 @@
-package com.habitrpg.android.habitica.ui.adapter.social;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.graphics.Paint;
-import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.PopupMenu;
-import android.support.v7.widget.RecyclerView;
-import android.text.method.LinkMovementMethod;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.CopyChatAsTodoCommand;
-import com.habitrpg.android.habitica.events.commands.CopyChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
-import com.habitrpg.android.habitica.events.commands.OpenNewPMActivityCommand;
-import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-
-import net.pherth.android.emoji_library.EmojiTextView;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerViewAdapter.ChatRecyclerViewHolder> {
-
-    private List<ChatMessage> messages;
-    private HabitRPGUser user;
-    private String uuid;
-    private String groupId;
-    private boolean isInboxChat = false;
-    private String replyToUserUUID;
-    private HabitRPGUser sendingUser;
-
-    public ChatRecyclerViewAdapter(List<ChatMessage> messages, HabitRPGUser user, String groupId) {
-        this.messages = messages;
-        this.user = user;
-        if (user != null) this.uuid = user.getId();
-        this.groupId = groupId;
-    }
-
-    public void setToInboxChat(String replyToUserUUID) {
-        this.replyToUserUUID = replyToUserUUID;
-        this.isInboxChat = true;
-    }
-
-    public void setSendingUser(@Nullable HabitRPGUser user) {
-        this.sendingUser = user;
-    }
-
-    public void setMessages(List<ChatMessage> messages) {
-        this.messages = messages;
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public ChatRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.tavern_chat_item, parent, false);
-        return new ChatRecyclerViewHolder(view, viewType, uuid, groupId);
-    }
-
-    @Override
-    public void onBindViewHolder(ChatRecyclerViewHolder holder, int position) {
-        holder.bind(messages.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return messages != null ? messages.size() : 0;
-    }
-
-    public class ChatRecyclerViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, PopupMenu.OnMenuItemClickListener {
-
-        @BindView(R.id.btn_options)
-        ImageView btnOptions;
-        @BindView(R.id.user_background_layout)
-        LinearLayout userBackground;
-        @BindView(R.id.like_background_layout)
-        LinearLayout likeBackground;
-        @BindView(R.id.user_label)
-        TextView userLabel;
-        @BindView(R.id.message_text)
-        EmojiTextView messageText;
-        @BindView(R.id.ago_label)
-        TextView agoLabel;
-        @BindView(R.id.tvLikes)
-        TextView tvLikes;
-
-        Context context;
-        Resources res;
-        int likeCount = 0;
-        boolean currentUserLikedPost = false;
-        private int layoutType;
-        private String uuid;
-        private String groupId;
-        private ChatMessage currentMsg;
-
-        public ChatRecyclerViewHolder(View itemView, int layoutType, String currentUserId, String groupId) {
-            super(itemView);
-            this.layoutType = layoutType;
-            this.uuid = currentUserId;
-            this.groupId = groupId;
-
-            ButterKnife.bind(this, itemView);
-
-            context = itemView.getContext();
-
-            res = context.getResources();
-
-            if (btnOptions != null) {
-                btnOptions.setOnClickListener(this);
-            }
-            if (tvLikes != null) {
-                tvLikes.setOnClickListener(this);
-            }
-        }
-
-        public void bind(final ChatMessage msg) {
-            currentMsg = msg;
-
-            setLikeProperties(msg);
-
-            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("")) {
-                msg.user = "system";
-            }
-
-            if (userLabel != null) {
-                if (msg.sent != null && msg.sent.equals("true")) {
-                    userLabel.setText(sendingUser.getProfile().getName());
-                } else {
-                    userLabel.setText(msg.user);
-                }
-
-                userLabel.setClickable(true);
-                userLabel.setOnClickListener(view -> {
-                    OpenFullProfileCommand cmd = new OpenFullProfileCommand(msg.uuid);
-
-                    EventBus.getDefault().post(cmd);
-                });
-            }
-
-            DataBindingUtils.setForegroundTintColor(userLabel, msg.getContributorForegroundColor());
-
-            if (messageText != null) {
-                messageText.setText(msg.parsedText);
-                if (msg.parsedText == null) {
-                    messageText.setText(msg.text);
-                }
-                this.messageText.setMovementMethod(LinkMovementMethod.getInstance());
-            }
-
-            if (agoLabel != null) {
-                agoLabel.setText(msg.getAgoString(res));
-            }
-        }
-
-        private void setLikeProperties(ChatMessage msg) {
-            likeCount = 0;
-            currentUserLikedPost = false;
-
-            if (msg != null && msg.likes != null) {
-                for (Map.Entry<String, Boolean> e : msg.likes.entrySet()) {
-                    if (e.getValue()) {
-                        likeCount++;
-                    }
-
-                    if (e.getKey().equals(uuid)) {
-                        currentUserLikedPost = true;
-                    }
-                }
-            }
-
-            setLikeProperties(likeCount);
-        }
-
-        private void setLikeProperties(int likeCount) {
-            if (tvLikes != null) {
-                tvLikes.setText("+" + likeCount);
-            }
-
-            int backgroundColorRes;
-            int foregroundColorRes;
-
-            if (likeCount != 0) {
-                if (currentUserLikedPost) {
-                    backgroundColorRes = R.color.tavern_userliked_background;
-                    foregroundColorRes = R.color.tavern_userliked_foreground;
-                } else {
-                    backgroundColorRes = R.color.tavern_somelikes_background;
-                    foregroundColorRes = R.color.tavern_somelikes_foreground;
-                }
-            } else {
-                backgroundColorRes = R.color.tavern_nolikes_background;
-                foregroundColorRes = R.color.tavern_nolikes_foreground;
-            }
-
-            DataBindingUtils.setRoundedBackground(likeBackground, ContextCompat.getColor(context, backgroundColorRes));
-            tvLikes.setTextColor(ContextCompat.getColor(context, foregroundColorRes));
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (currentMsg != null) {
-                if (btnOptions == v) {
-                    PopupMenu popupMenu = new PopupMenu(context, v);
-
-                    //set my own listener giving the View that activates the event onClick (i.e. YOUR ImageView)
-                    popupMenu.setOnMenuItemClickListener(this);
-                    //inflate your PopUpMenu
-                    popupMenu.getMenuInflater().inflate(R.menu.chat_message, popupMenu.getMenu());
-
-                    // Force icons to show
-                    Object menuHelper = null;
-                    Class[] argTypes;
-                    try {
-                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
-                        fMenuHelper.setAccessible(true);
-                        menuHelper = fMenuHelper.get(popupMenu);
-                        argTypes = new Class[]{boolean.class};
-                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon", argTypes).invoke(menuHelper, true);
-                    } catch (Exception e) {
-                    }
-
-                    ChatMessage chatMsg = currentMsg;
-
-                    if (!chatMsg.uuid.equals(uuid)) {
-                        popupMenu.getMenu().findItem(R.id.menu_chat_delete).setVisible(false);
-                    }
-                    if (user.getContributor().getAdmin()) {
-                        popupMenu.getMenu().findItem(R.id.menu_chat_delete).setVisible(true);
-                    }
-                    popupMenu.getMenu().findItem(R.id.menu_chat_copy_as_todo).setVisible(false);
-                    popupMenu.getMenu().findItem(R.id.menu_chat_send_pm).setVisible(false);
-
-                    popupMenu.show();
-
-                    // Try to force some horizontal offset
-                    try {
-                        Field fListPopup = menuHelper.getClass().getDeclaredField("mPopup");
-                        fListPopup.setAccessible(true);
-                        Object listPopup = fListPopup.get(menuHelper);
-                        argTypes = new Class[]{int.class};
-                        Class listPopupClass = listPopup.getClass();
-
-                        // Get the width of the popup window
-                        int width = (Integer) listPopupClass.getDeclaredMethod("getWidth").invoke(listPopup);
-
-                        // Invoke setHorizontalOffset() with the negative width to move left by that distance
-                        listPopupClass.getDeclaredMethod("setHorizontalOffset", argTypes).invoke(listPopup, -width);
-
-                        // Invoke show() to update the window's position
-                        listPopupClass.getDeclaredMethod("show").invoke(listPopup);
-                    } catch (Exception e) {
-
-                    }
-
-                    return;
-                }
-            }
-
-            if (tvLikes == v) {
-                toggleLike();
-
-                return;
-            }
-        }
-
-        private void toggleLike() {
-            int newCount = currentUserLikedPost ? --likeCount : ++likeCount;
-            currentUserLikedPost = !currentUserLikedPost;
-
-            setLikeProperties(newCount);
-
-            EventBus.getDefault().post(new ToggleLikeMessageCommand(groupId, currentMsg));
-        }
-
-        @Override
-        public boolean onMenuItemClick(MenuItem item) {
-            switch (item.getItemId()) {
-                case R.id.menu_chat_delete: {
-                    new AlertDialog.Builder(context)
-                            .setTitle(R.string.confirm_delete_tag_title)
-                            .setMessage(R.string.confirm_delete_tag_message)
-                            .setIcon(android.R.drawable.ic_dialog_alert)
-                            .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {
-                                Toast.makeText(context, R.string.edit_tag_btn_done, Toast.LENGTH_SHORT).show();
-                                EventBus.getDefault().post(new DeleteChatMessageCommand(groupId, currentMsg));
-                            })
-                            .setNegativeButton(android.R.string.no, null).show();
-                    break;
-                }
-                case R.id.menu_chat_flag: {
-                    EventBus.getDefault().post(new FlagChatMessageCommand(groupId, currentMsg));
-
-                    break;
-                }
-                case R.id.menu_chat_copy_as_todo: {
-                    EventBus.getDefault().post(new CopyChatAsTodoCommand(groupId, currentMsg));
-
-                    break;
-                }
-
-                case R.id.menu_chat_send_pm: {
-                    EventBus.getDefault().post(new OpenNewPMActivityCommand());
-
-                    break;
-                }
-
-                case R.id.menu_chat_copy: {
-                    EventBus.getDefault().post(new CopyChatMessageCommand(groupId, currentMsg));
-
-                    break;
-                }
-            }
-
-            return false;
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.social;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.PopupMenu;
+import android.support.v7.widget.RecyclerView;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.CopyChatAsTodoCommand;
+import com.habitrpg.android.habitica.events.commands.CopyChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
+import com.habitrpg.android.habitica.events.commands.OpenNewPMActivityCommand;
+import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+
+import net.pherth.android.emoji_library.EmojiTextView;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerViewAdapter.ChatRecyclerViewHolder> {
+
+    private List<ChatMessage> messages;
+    private HabitRPGUser user;
+    private String uuid;
+    private String groupId;
+    private boolean isInboxChat = false;
+    private String replyToUserUUID;
+    private HabitRPGUser sendingUser;
+
+    public ChatRecyclerViewAdapter(List<ChatMessage> messages, HabitRPGUser user, String groupId) {
+        this.messages = messages;
+        this.user = user;
+        if (user != null) this.uuid = user.getId();
+        this.groupId = groupId;
+    }
+
+    public void setToInboxChat(String replyToUserUUID) {
+        this.replyToUserUUID = replyToUserUUID;
+        this.isInboxChat = true;
+    }
+
+    public void setSendingUser(@Nullable HabitRPGUser user) {
+        this.sendingUser = user;
+    }
+
+    public void setMessages(List<ChatMessage> messages) {
+        this.messages = messages;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public ChatRecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.tavern_chat_item, parent, false);
+        return new ChatRecyclerViewHolder(view, viewType, uuid, groupId);
+    }
+
+    @Override
+    public void onBindViewHolder(ChatRecyclerViewHolder holder, int position) {
+        holder.bind(messages.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return messages != null ? messages.size() : 0;
+    }
+
+    public class ChatRecyclerViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, PopupMenu.OnMenuItemClickListener {
+
+        @BindView(R.id.btn_options)
+        ImageView btnOptions;
+        @BindView(R.id.user_background_layout)
+        LinearLayout userBackground;
+        @BindView(R.id.like_background_layout)
+        LinearLayout likeBackground;
+        @BindView(R.id.user_label)
+        TextView userLabel;
+        @BindView(R.id.message_text)
+        EmojiTextView messageText;
+        @BindView(R.id.ago_label)
+        TextView agoLabel;
+        @BindView(R.id.tvLikes)
+        TextView tvLikes;
+
+        Context context;
+        Resources res;
+        int likeCount = 0;
+        boolean currentUserLikedPost = false;
+        private int layoutType;
+        private String uuid;
+        private String groupId;
+        private ChatMessage currentMsg;
+
+        public ChatRecyclerViewHolder(View itemView, int layoutType, String currentUserId, String groupId) {
+            super(itemView);
+            this.layoutType = layoutType;
+            this.uuid = currentUserId;
+            this.groupId = groupId;
+
+            ButterKnife.bind(this, itemView);
+
+            context = itemView.getContext();
+
+            res = context.getResources();
+
+            if (btnOptions != null) {
+                btnOptions.setOnClickListener(this);
+            }
+            if (tvLikes != null) {
+                tvLikes.setOnClickListener(this);
+            }
+        }
+
+        public void bind(final ChatMessage msg) {
+            currentMsg = msg;
+
+            setLikeProperties(msg);
+
+            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("")) {
+                msg.user = "system";
+            }
+
+            if (userLabel != null) {
+                if (msg.sent != null && msg.sent.equals("true")) {
+                    userLabel.setText(sendingUser.getProfile().getName());
+                } else {
+                    userLabel.setText(msg.user);
+                }
+
+                userLabel.setClickable(true);
+                userLabel.setOnClickListener(view -> {
+                    OpenFullProfileCommand cmd = new OpenFullProfileCommand(msg.uuid);
+
+                    EventBus.getDefault().post(cmd);
+                });
+            }
+
+            DataBindingUtils.setForegroundTintColor(userLabel, msg.getContributorForegroundColor());
+
+            if (messageText != null) {
+                messageText.setText(msg.parsedText);
+                if (msg.parsedText == null) {
+                    messageText.setText(msg.text);
+                }
+                this.messageText.setMovementMethod(LinkMovementMethod.getInstance());
+            }
+
+            if (agoLabel != null) {
+                agoLabel.setText(msg.getAgoString(res));
+            }
+        }
+
+        private void setLikeProperties(ChatMessage msg) {
+            likeCount = 0;
+            currentUserLikedPost = false;
+
+            if (msg != null && msg.likes != null) {
+                for (Map.Entry<String, Boolean> e : msg.likes.entrySet()) {
+                    if (e.getValue()) {
+                        likeCount++;
+                    }
+
+                    if (e.getKey().equals(uuid)) {
+                        currentUserLikedPost = true;
+                    }
+                }
+            }
+
+            setLikeProperties(likeCount);
+        }
+
+        private void setLikeProperties(int likeCount) {
+            if (tvLikes != null) {
+                tvLikes.setText("+" + likeCount);
+            }
+
+            int backgroundColorRes;
+            int foregroundColorRes;
+
+            if (likeCount != 0) {
+                if (currentUserLikedPost) {
+                    backgroundColorRes = R.color.tavern_userliked_background;
+                    foregroundColorRes = R.color.tavern_userliked_foreground;
+                } else {
+                    backgroundColorRes = R.color.tavern_somelikes_background;
+                    foregroundColorRes = R.color.tavern_somelikes_foreground;
+                }
+            } else {
+                backgroundColorRes = R.color.tavern_nolikes_background;
+                foregroundColorRes = R.color.tavern_nolikes_foreground;
+            }
+
+            DataBindingUtils.setRoundedBackground(likeBackground, ContextCompat.getColor(context, backgroundColorRes));
+            tvLikes.setTextColor(ContextCompat.getColor(context, foregroundColorRes));
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (currentMsg != null) {
+                if (btnOptions == v) {
+                    PopupMenu popupMenu = new PopupMenu(context, v);
+
+                    //set my own listener giving the View that activates the event onClick (i.e. YOUR ImageView)
+                    popupMenu.setOnMenuItemClickListener(this);
+                    //inflate your PopUpMenu
+                    popupMenu.getMenuInflater().inflate(R.menu.chat_message, popupMenu.getMenu());
+
+                    // Force icons to show
+                    Object menuHelper = null;
+                    Class[] argTypes;
+                    try {
+                        Field fMenuHelper = PopupMenu.class.getDeclaredField("mPopup");
+                        fMenuHelper.setAccessible(true);
+                        menuHelper = fMenuHelper.get(popupMenu);
+                        argTypes = new Class[]{boolean.class};
+                        menuHelper.getClass().getDeclaredMethod("setForceShowIcon", argTypes).invoke(menuHelper, true);
+                    } catch (Exception e) {
+                    }
+
+                    ChatMessage chatMsg = currentMsg;
+
+                    if (!chatMsg.uuid.equals(uuid)) {
+                        popupMenu.getMenu().findItem(R.id.menu_chat_delete).setVisible(false);
+                    }
+                    if (user.getContributor().getAdmin()) {
+                        popupMenu.getMenu().findItem(R.id.menu_chat_delete).setVisible(true);
+                    }
+                    popupMenu.getMenu().findItem(R.id.menu_chat_copy_as_todo).setVisible(false);
+                    popupMenu.getMenu().findItem(R.id.menu_chat_send_pm).setVisible(false);
+
+                    popupMenu.show();
+
+                    // Try to force some horizontal offset
+                    try {
+                        Field fListPopup = menuHelper.getClass().getDeclaredField("mPopup");
+                        fListPopup.setAccessible(true);
+                        Object listPopup = fListPopup.get(menuHelper);
+                        argTypes = new Class[]{int.class};
+                        Class listPopupClass = listPopup.getClass();
+
+                        // Get the width of the popup window
+                        int width = (Integer) listPopupClass.getDeclaredMethod("getWidth").invoke(listPopup);
+
+                        // Invoke setHorizontalOffset() with the negative width to move left by that distance
+                        listPopupClass.getDeclaredMethod("setHorizontalOffset", argTypes).invoke(listPopup, -width);
+
+                        // Invoke show() to update the window's position
+                        listPopupClass.getDeclaredMethod("show").invoke(listPopup);
+                    } catch (Exception e) {
+
+                    }
+
+                    return;
+                }
+            }
+
+            if (tvLikes == v) {
+                toggleLike();
+
+                return;
+            }
+        }
+
+        private void toggleLike() {
+            int newCount = currentUserLikedPost ? --likeCount : ++likeCount;
+            currentUserLikedPost = !currentUserLikedPost;
+
+            setLikeProperties(newCount);
+
+            EventBus.getDefault().post(new ToggleLikeMessageCommand(groupId, currentMsg));
+        }
+
+        @Override
+        public boolean onMenuItemClick(MenuItem item) {
+            switch (item.getItemId()) {
+                case R.id.menu_chat_delete: {
+                    new AlertDialog.Builder(context)
+                            .setTitle(R.string.confirm_delete_tag_title)
+                            .setMessage(R.string.confirm_delete_tag_message)
+                            .setIcon(android.R.drawable.ic_dialog_alert)
+                            .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {
+                                Toast.makeText(context, R.string.edit_tag_btn_done, Toast.LENGTH_SHORT).show();
+                                EventBus.getDefault().post(new DeleteChatMessageCommand(groupId, currentMsg));
+                            })
+                            .setNegativeButton(android.R.string.no, null).show();
+                    break;
+                }
+                case R.id.menu_chat_flag: {
+                    EventBus.getDefault().post(new FlagChatMessageCommand(groupId, currentMsg));
+
+                    break;
+                }
+                case R.id.menu_chat_copy_as_todo: {
+                    EventBus.getDefault().post(new CopyChatAsTodoCommand(groupId, currentMsg));
+
+                    break;
+                }
+
+                case R.id.menu_chat_send_pm: {
+                    EventBus.getDefault().post(new OpenNewPMActivityCommand());
+
+                    break;
+                }
+
+                case R.id.menu_chat_copy: {
+                    EventBus.getDefault().post(new CopyChatMessageCommand(groupId, currentMsg));
+
+                    break;
+                }
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
index c56a5adbb..4c7714404 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
@@ -1,147 +1,147 @@
-package com.habitrpg.android.habitica.ui.adapter.social;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.databinding.ValueBarBinding;
-import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
-import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
-import com.habitrpg.android.habitica.ui.AvatarView;
-import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.databinding.DataBindingUtil;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMemberRecyclerViewAdapter.MemberViewHolder> {
-
-
-    public Context context;
-    private List<HabitRPGUser> memberList;
-    private boolean isMemberSelection;
-
-    public void setMemberList(List<HabitRPGUser> memberList, boolean isMemberSelection) {
-        this.memberList = memberList;
-        this.isMemberSelection = isMemberSelection;
-        this.notifyDataSetChanged();
-    }
-
-
-    @Override
-    public MemberViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.party_member, parent, false);
-
-        return new MemberViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(MemberViewHolder holder, int position) {
-        holder.bind(memberList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return memberList == null ? 0 : memberList.size();
-    }
-
-    class MemberViewHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.avatarView)
-        AvatarView avatarView;
-
-        @BindView(R.id.username)
-        TextView userName;
-
-        @BindView(R.id.user_lvl)
-        TextView lvl;
-
-        @BindView(R.id.class_label)
-        TextView classLabel;
-
-        @BindView(R.id.class_background_layout)
-        View classBackground;
-
-        ValueBarBinding hpBar;
-
-        Resources resources;
-
-        public MemberViewHolder(View itemView) {
-            super(itemView);
-
-            ButterKnife.bind(this, itemView);
-
-            View hpBarView = itemView.findViewById(R.id.hpBar);
-
-            hpBar = DataBindingUtil.bind(hpBarView);
-            hpBar.setPartyMembers(true);
-
-            resources = itemView.getResources();
-        }
-
-        public void bind(HabitRPGUser user) {
-            android.content.Context ctx = itemView.getContext();
-
-            avatarView.setUser(user);
-
-            AvatarWithBarsViewModel.setHpBarData(hpBar, user.getStats(), ctx);
-
-            lvl.setText(context.getString(R.string.user_level, user.getStats().getLvl()));
-
-            classLabel.setText(user.getStats().getTranslatedClassName(context));
-
-            int colorResourceID;
-            switch (user.getStats()._class) {
-                case healer: {
-                    colorResourceID = R.color.class_healer;
-                    break;
-                }
-                case warrior: {
-                    colorResourceID = R.color.class_warrior;
-                    break;
-                }
-                case rogue: {
-                    colorResourceID = R.color.class_rogue;
-                    break;
-                }
-                case wizard: {
-                    colorResourceID = R.color.class_wizard;
-                    break;
-                }
-                default:
-                    colorResourceID = R.color.task_gray;
-            }
-            ViewHelper.SetBackgroundTint(classBackground, ContextCompat.getColor(context, colorResourceID));
-            userName.setText(user.getProfile().getName());
-
-            itemView.setClickable(true);
-            itemView.setOnClickListener(view -> {
-                if (isMemberSelection) {
-                    SelectMemberCommand cmd = new SelectMemberCommand(user.getId());
-
-                    EventBus.getDefault().post(cmd);
-                } else {
-                    OpenFullProfileCommand cmd = new OpenFullProfileCommand(user.getId());
-
-                    EventBus.getDefault().post(cmd);
-                }
-            });
-        }
-
-
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.social;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.databinding.DataBindingUtil;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.databinding.ValueBarBinding;
+import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
+import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
+import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMemberRecyclerViewAdapter.MemberViewHolder> {
+
+
+    public Context context;
+    private List<HabitRPGUser> memberList;
+    private boolean isMemberSelection;
+
+    public void setMemberList(List<HabitRPGUser> memberList, boolean isMemberSelection) {
+        this.memberList = memberList;
+        this.isMemberSelection = isMemberSelection;
+        this.notifyDataSetChanged();
+    }
+
+
+    @Override
+    public MemberViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.party_member, parent, false);
+
+        return new MemberViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(MemberViewHolder holder, int position) {
+        holder.bind(memberList.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return memberList == null ? 0 : memberList.size();
+    }
+
+    class MemberViewHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.avatarView)
+        AvatarView avatarView;
+
+        @BindView(R.id.username)
+        TextView userName;
+
+        @BindView(R.id.user_lvl)
+        TextView lvl;
+
+        @BindView(R.id.class_label)
+        TextView classLabel;
+
+        @BindView(R.id.class_background_layout)
+        View classBackground;
+
+        ValueBarBinding hpBar;
+
+        Resources resources;
+
+        public MemberViewHolder(View itemView) {
+            super(itemView);
+
+            ButterKnife.bind(this, itemView);
+
+            View hpBarView = itemView.findViewById(R.id.hpBar);
+
+            hpBar = DataBindingUtil.bind(hpBarView);
+            hpBar.setPartyMembers(true);
+
+            resources = itemView.getResources();
+        }
+
+        public void bind(HabitRPGUser user) {
+            android.content.Context ctx = itemView.getContext();
+
+            avatarView.setUser(user);
+
+            AvatarWithBarsViewModel.setHpBarData(hpBar, user.getStats(), ctx);
+
+            lvl.setText(context.getString(R.string.user_level, user.getStats().getLvl()));
+
+            classLabel.setText(user.getStats().getTranslatedClassName(context));
+
+            int colorResourceID;
+            switch (user.getStats()._class) {
+                case healer: {
+                    colorResourceID = R.color.class_healer;
+                    break;
+                }
+                case warrior: {
+                    colorResourceID = R.color.class_warrior;
+                    break;
+                }
+                case rogue: {
+                    colorResourceID = R.color.class_rogue;
+                    break;
+                }
+                case wizard: {
+                    colorResourceID = R.color.class_wizard;
+                    break;
+                }
+                default:
+                    colorResourceID = R.color.task_gray;
+            }
+            ViewHelper.SetBackgroundTint(classBackground, ContextCompat.getColor(context, colorResourceID));
+            userName.setText(user.getProfile().getName());
+
+            itemView.setClickable(true);
+            itemView.setOnClickListener(view -> {
+                if (isMemberSelection) {
+                    SelectMemberCommand cmd = new SelectMemberCommand(user.getId());
+
+                    EventBus.getDefault().post(cmd);
+                } else {
+                    OpenFullProfileCommand cmd = new OpenFullProfileCommand(user.getId());
+
+                    EventBus.getDefault().post(cmd);
+                }
+            });
+        }
+
+
+    }
+}
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 761bb8c43..a6ce88b6c 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,171 +1,171 @@
-package com.habitrpg.android.habitica.ui.adapter.social;
-
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.DisplayFragmentEvent;
-import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
-import com.habitrpg.android.habitica.models.social.Group;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.Filter;
-import android.widget.Filterable;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<PublicGuildsRecyclerViewAdapter.GuildViewHolder> implements Filterable {
-
-    public ApiClient apiClient;
-    private List<Group> publicGuildList;
-    private List<Group> fullPublicGuildList;
-    private List<String> memberGuildIDs;
-
-    public void setPublicGuildList(List<Group> publicGuildList) {
-        this.publicGuildList = publicGuildList;
-        this.fullPublicGuildList = new ArrayList<>(publicGuildList);
-        this.notifyDataSetChanged();
-    }
-
-    public void setMemberGuildIDs(List<String> memberGuildIDs) {
-        this.memberGuildIDs = memberGuildIDs;
-    }
-
-    @Override
-    public GuildViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.item_public_guild, parent, false);
-        GuildViewHolder guildViewHolder = new GuildViewHolder(view);
-        guildViewHolder.itemView.setOnClickListener(v -> {
-            Group guild = (Group) v.getTag();
-            GuildFragment guildFragment = new GuildFragment();
-            guildFragment.setGuild(guild);
-            guildFragment.isMember = isInGroup(guild);
-            DisplayFragmentEvent event = new DisplayFragmentEvent();
-            event.fragment = guildFragment;
-            EventBus.getDefault().post(event);
-        });
-        guildViewHolder.joinLeaveButton.setOnClickListener(v -> {
-            Group guild = (Group) v.getTag();
-            boolean isMember = this.memberGuildIDs != null && this.memberGuildIDs.contains(guild.id);
-            if (isMember) {
-                PublicGuildsRecyclerViewAdapter.this.apiClient.leaveGroup(guild.id)
-
-                        .subscribe(aVoid -> {
-                            memberGuildIDs.remove(guild.id);
-                            int indexOfGroup = publicGuildList.indexOf(guild);
-                            notifyItemChanged(indexOfGroup);
-                        }, throwable -> {
-                        });
-            } else {
-                PublicGuildsRecyclerViewAdapter.this.apiClient.joinGroup(guild.id)
-
-                        .subscribe(group -> {
-                            memberGuildIDs.add(group.id);
-                            int indexOfGroup = publicGuildList.indexOf(group);
-                            notifyItemChanged(indexOfGroup);
-                        }, throwable -> {
-                        });
-            }
-
-        });
-        return guildViewHolder;
-    }
-
-    @Override
-    public void onBindViewHolder(GuildViewHolder holder, int position) {
-        Group guild = publicGuildList.get(position);
-        boolean isInGroup = isInGroup(guild);
-        holder.bind(guild, isInGroup);
-        holder.itemView.setTag(guild);
-        holder.joinLeaveButton.setTag(guild);
-    }
-
-    @Override
-    public int getItemCount() {
-        return this.publicGuildList == null ? 0 : this.publicGuildList.size();
-    }
-
-    private boolean isInGroup(Group guild) {
-        return this.memberGuildIDs != null && this.memberGuildIDs.contains(guild.id);
-    }
-
-    @Override
-    public Filter getFilter() {
-        return new Filter() {
-            @Override
-            protected FilterResults performFiltering(CharSequence constraint) {
-                List<Group> filteredGuilds;
-
-                if (constraint.length() == 0) {
-                    filteredGuilds = fullPublicGuildList;
-                } else {
-                    filteredGuilds = getFilteredResults(constraint.toString().toLowerCase(Locale.US));
-                }
-
-                FilterResults results = new FilterResults();
-                results.values = filteredGuilds;
-                return results;
-            }
-
-            @Override
-            protected void publishResults(CharSequence constraint, FilterResults results) {
-                publicGuildList = (List<Group>) results.values;
-                PublicGuildsRecyclerViewAdapter.this.notifyDataSetChanged();
-            }
-        };
-    }
-
-    protected List<Group> getFilteredResults(String query) {
-        List<Group> filteredGuilds = new ArrayList<>();
-
-        for (Group guild : fullPublicGuildList) {
-            if (guild.name.toLowerCase().contains(query)) {
-                filteredGuilds.add(guild);
-            }
-        }
-
-        return filteredGuilds;
-    }
-
-    static class GuildViewHolder extends RecyclerView.ViewHolder {
-
-        @BindView(R.id.nameTextView)
-        TextView nameTextView;
-
-        @BindView(R.id.memberCountTextView)
-        TextView memberCountTextView;
-
-        @BindView(R.id.descriptionTextView)
-        TextView descriptionTextView;
-
-        @BindView(R.id.joinleaveButton)
-        Button joinLeaveButton;
-
-        public GuildViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-        }
-
-        public void bind(Group guild, boolean isInGroup) {
-            this.nameTextView.setText(guild.name);
-            this.memberCountTextView.setText(String.valueOf(guild.memberCount));
-            this.descriptionTextView.setText(guild.description);
-            if (isInGroup) {
-                this.joinLeaveButton.setText(R.string.leave);
-            } else {
-                this.joinLeaveButton.setText(R.string.join);
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.social;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.Filter;
+import android.widget.Filterable;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.events.DisplayFragmentEvent;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<PublicGuildsRecyclerViewAdapter.GuildViewHolder> implements Filterable {
+
+    public ApiClient apiClient;
+    private List<Group> publicGuildList;
+    private List<Group> fullPublicGuildList;
+    private List<String> memberGuildIDs;
+
+    public void setPublicGuildList(List<Group> publicGuildList) {
+        this.publicGuildList = publicGuildList;
+        this.fullPublicGuildList = new ArrayList<>(publicGuildList);
+        this.notifyDataSetChanged();
+    }
+
+    public void setMemberGuildIDs(List<String> memberGuildIDs) {
+        this.memberGuildIDs = memberGuildIDs;
+    }
+
+    @Override
+    public GuildViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.item_public_guild, parent, false);
+        GuildViewHolder guildViewHolder = new GuildViewHolder(view);
+        guildViewHolder.itemView.setOnClickListener(v -> {
+            Group guild = (Group) v.getTag();
+            GuildFragment guildFragment = new GuildFragment();
+            guildFragment.setGuild(guild);
+            guildFragment.isMember = isInGroup(guild);
+            DisplayFragmentEvent event = new DisplayFragmentEvent();
+            event.fragment = guildFragment;
+            EventBus.getDefault().post(event);
+        });
+        guildViewHolder.joinLeaveButton.setOnClickListener(v -> {
+            Group guild = (Group) v.getTag();
+            boolean isMember = this.memberGuildIDs != null && this.memberGuildIDs.contains(guild.id);
+            if (isMember) {
+                PublicGuildsRecyclerViewAdapter.this.apiClient.leaveGroup(guild.id)
+
+                        .subscribe(aVoid -> {
+                            memberGuildIDs.remove(guild.id);
+                            int indexOfGroup = publicGuildList.indexOf(guild);
+                            notifyItemChanged(indexOfGroup);
+                        }, throwable -> {
+                        });
+            } else {
+                PublicGuildsRecyclerViewAdapter.this.apiClient.joinGroup(guild.id)
+
+                        .subscribe(group -> {
+                            memberGuildIDs.add(group.id);
+                            int indexOfGroup = publicGuildList.indexOf(group);
+                            notifyItemChanged(indexOfGroup);
+                        }, throwable -> {
+                        });
+            }
+
+        });
+        return guildViewHolder;
+    }
+
+    @Override
+    public void onBindViewHolder(GuildViewHolder holder, int position) {
+        Group guild = publicGuildList.get(position);
+        boolean isInGroup = isInGroup(guild);
+        holder.bind(guild, isInGroup);
+        holder.itemView.setTag(guild);
+        holder.joinLeaveButton.setTag(guild);
+    }
+
+    @Override
+    public int getItemCount() {
+        return this.publicGuildList == null ? 0 : this.publicGuildList.size();
+    }
+
+    private boolean isInGroup(Group guild) {
+        return this.memberGuildIDs != null && this.memberGuildIDs.contains(guild.id);
+    }
+
+    @Override
+    public Filter getFilter() {
+        return new Filter() {
+            @Override
+            protected FilterResults performFiltering(CharSequence constraint) {
+                List<Group> filteredGuilds;
+
+                if (constraint.length() == 0) {
+                    filteredGuilds = fullPublicGuildList;
+                } else {
+                    filteredGuilds = getFilteredResults(constraint.toString().toLowerCase(Locale.US));
+                }
+
+                FilterResults results = new FilterResults();
+                results.values = filteredGuilds;
+                return results;
+            }
+
+            @Override
+            protected void publishResults(CharSequence constraint, FilterResults results) {
+                publicGuildList = (List<Group>) results.values;
+                PublicGuildsRecyclerViewAdapter.this.notifyDataSetChanged();
+            }
+        };
+    }
+
+    protected List<Group> getFilteredResults(String query) {
+        List<Group> filteredGuilds = new ArrayList<>();
+
+        for (Group guild : fullPublicGuildList) {
+            if (guild.name.toLowerCase().contains(query)) {
+                filteredGuilds.add(guild);
+            }
+        }
+
+        return filteredGuilds;
+    }
+
+    static class GuildViewHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.nameTextView)
+        TextView nameTextView;
+
+        @BindView(R.id.memberCountTextView)
+        TextView memberCountTextView;
+
+        @BindView(R.id.descriptionTextView)
+        TextView descriptionTextView;
+
+        @BindView(R.id.joinleaveButton)
+        Button joinLeaveButton;
+
+        public GuildViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+        }
+
+        public void bind(Group guild, boolean isInGroup) {
+            this.nameTextView.setText(guild.name);
+            this.memberCountTextView.setText(String.valueOf(guild.memberCount));
+            this.descriptionTextView.setText(guild.description);
+            if (isInGroup) {
+                this.joinLeaveButton.setText(R.string.leave);
+            } else {
+                this.joinLeaveButton.setText(R.string.join);
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
index c1e626767..8e3bbaa30 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
@@ -1,84 +1,84 @@
-package com.habitrpg.android.habitica.ui.adapter.social;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.inventory.QuestProgress;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-
-import android.net.Uri;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class QuestCollectRecyclerViewAdapter extends RecyclerView.Adapter<QuestCollectRecyclerViewAdapter.QuestCollectViewHolder> {
-
-    private ArrayList<String> collect = new ArrayList<>();
-
-    private QuestProgress progress;
-    private QuestContent quest;
-
-    public void setQuestProgress(QuestProgress progress) {
-        this.progress = progress;
-        collect.clear();
-        collect.addAll(progress.collect.keySet());
-        this.notifyDataSetChanged();
-    }
-
-    public void setQuestContent(QuestContent quest) {
-        this.quest = quest;
-        this.notifyDataSetChanged();
-    }
-
-    @Override
-    public QuestCollectViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.fragment_quest_collect, parent, false);
-
-        return new QuestCollectViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(QuestCollectViewHolder holder, int position) {
-        holder.bind(collect.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return collect == null ? 0 : collect.size();
-    }
-
-    class QuestCollectViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.image)
-        SimpleDraweeView image;
-
-        @BindView(R.id.name)
-        TextView name;
-
-        @BindView(R.id.count)
-        TextView count;
-
-        View view;
-
-        public QuestCollectViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            this.view = itemView;
-        }
-
-        public void bind(String key) {
-            image.setImageURI(Uri.parse("https://habitica-assets.s3.amazonaws.com/mobileApp/images/" + "quest_" + quest.getKey() + "_" + key + ".png"));
-            if (quest.getCollect().get(key) != null) {
-                name.setText(quest.getCollect().get(key).text);
-                count.setText(progress.collect.get(key) + " / " + quest.getCollect().get(key).count);
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.social;
+
+import android.net.Uri;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.inventory.QuestProgress;
+
+import java.util.ArrayList;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class QuestCollectRecyclerViewAdapter extends RecyclerView.Adapter<QuestCollectRecyclerViewAdapter.QuestCollectViewHolder> {
+
+    private ArrayList<String> collect = new ArrayList<>();
+
+    private QuestProgress progress;
+    private QuestContent quest;
+
+    public void setQuestProgress(QuestProgress progress) {
+        this.progress = progress;
+        collect.clear();
+        collect.addAll(progress.collect.keySet());
+        this.notifyDataSetChanged();
+    }
+
+    public void setQuestContent(QuestContent quest) {
+        this.quest = quest;
+        this.notifyDataSetChanged();
+    }
+
+    @Override
+    public QuestCollectViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.fragment_quest_collect, parent, false);
+
+        return new QuestCollectViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(QuestCollectViewHolder holder, int position) {
+        holder.bind(collect.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return collect == null ? 0 : collect.size();
+    }
+
+    class QuestCollectViewHolder extends RecyclerView.ViewHolder {
+        @BindView(R.id.image)
+        SimpleDraweeView image;
+
+        @BindView(R.id.name)
+        TextView name;
+
+        @BindView(R.id.count)
+        TextView count;
+
+        View view;
+
+        public QuestCollectViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+            this.view = itemView;
+        }
+
+        public void bind(String key) {
+            image.setImageURI(Uri.parse("https://habitica-assets.s3.amazonaws.com/mobileApp/images/" + "quest_" + quest.getKey() + "_" + key + ".png"));
+            if (quest.getCollect().get(key) != null) {
+                name.setText(quest.getCollect().get(key).text);
+                count.setText(progress.collect.get(key) + " / " + quest.getCollect().get(key).count);
+            }
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.java
index cfeabd044..5d46d29c1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengesFilterRecyclerViewAdapter.java
@@ -1,105 +1,105 @@
-package com.habitrpg.android.habitica.ui.adapter.social.challenges;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.TextView;
-
-import com.github.underscore.$;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.social.Group;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class ChallengesFilterRecyclerViewAdapter extends RecyclerView.Adapter<ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder> {
-
-
-    private List<Group> entries;
-    private List<ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder> holderList;
-
-    public ChallengesFilterRecyclerViewAdapter(Collection<Group> entries) {
-
-        this.entries = new ArrayList<>(entries);
-        this.holderList = new ArrayList<>();
-    }
-
-    @Override
-    public ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.dialog_challenge_filter_group_item, parent, false);
-
-        ChallengeViewHolder challengeViewHolder = new ChallengeViewHolder(view);
-        holderList.add(challengeViewHolder);
-
-        return challengeViewHolder;
-    }
-
-    @Override
-    public void onBindViewHolder(ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder holder, int position) {
-        holder.bind(entries.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return entries.size();
-    }
-
-    public void deSelectAll(){
-        for (ChallengeViewHolder h : holderList) {
-            h.checkbox.setChecked(false);
-        }
-    }
-
-    public void selectAll(){
-        for (ChallengeViewHolder h : holderList) {
-            h.checkbox.setChecked(true);
-        }
-    }
-
-    public void selectAll(List<Group> groupsToCheck){
-        for (ChallengeViewHolder h : holderList) {
-            h.checkbox.setChecked($.find(groupsToCheck, g -> h.group.id == g.id).isPresent());
-        }
-    }
-    public List<Group> getCheckedEntries(){
-        ArrayList<Group> result = new ArrayList<>();
-
-        for (ChallengeViewHolder h : holderList) {
-            if(h.checkbox.isChecked()){
-                result.add(h.group);
-            }
-        }
-
-        return result;
-    }
-
-    public static class ChallengeViewHolder extends RecyclerView.ViewHolder {
-        @BindView(R.id.challenge_filter_group_checkbox)
-        CheckBox checkbox;
-
-        @BindView(R.id.challenge_filter_group_label)
-        TextView label;
-
-        public Group group;
-
-        public ChallengeViewHolder(View itemView) {
-            super(itemView);
-
-            ButterKnife.bind(this, itemView);
-        }
-
-        public void bind(Group group) {
-            this.group = group;
-
-            label.setText(group.name);
-        }
-
-    }
+package com.habitrpg.android.habitica.ui.adapter.social.challenges;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import com.github.underscore.$;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.social.Group;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class ChallengesFilterRecyclerViewAdapter extends RecyclerView.Adapter<ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder> {
+
+
+    private List<Group> entries;
+    private List<ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder> holderList;
+
+    public ChallengesFilterRecyclerViewAdapter(Collection<Group> entries) {
+
+        this.entries = new ArrayList<>(entries);
+        this.holderList = new ArrayList<>();
+    }
+
+    @Override
+    public ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.dialog_challenge_filter_group_item, parent, false);
+
+        ChallengeViewHolder challengeViewHolder = new ChallengeViewHolder(view);
+        holderList.add(challengeViewHolder);
+
+        return challengeViewHolder;
+    }
+
+    @Override
+    public void onBindViewHolder(ChallengesFilterRecyclerViewAdapter.ChallengeViewHolder holder, int position) {
+        holder.bind(entries.get(position));
+    }
+
+    @Override
+    public int getItemCount() {
+        return entries.size();
+    }
+
+    public void deSelectAll(){
+        for (ChallengeViewHolder h : holderList) {
+            h.checkbox.setChecked(false);
+        }
+    }
+
+    public void selectAll(){
+        for (ChallengeViewHolder h : holderList) {
+            h.checkbox.setChecked(true);
+        }
+    }
+
+    public void selectAll(List<Group> groupsToCheck){
+        for (ChallengeViewHolder h : holderList) {
+            h.checkbox.setChecked($.find(groupsToCheck, g -> h.group.id == g.id).isPresent());
+        }
+    }
+    public List<Group> getCheckedEntries(){
+        ArrayList<Group> result = new ArrayList<>();
+
+        for (ChallengeViewHolder h : holderList) {
+            if(h.checkbox.isChecked()){
+                result.add(h.group);
+            }
+        }
+
+        return result;
+    }
+
+    public static class ChallengeViewHolder extends RecyclerView.ViewHolder {
+        @BindView(R.id.challenge_filter_group_checkbox)
+        CheckBox checkbox;
+
+        @BindView(R.id.challenge_filter_group_label)
+        TextView label;
+
+        public Group group;
+
+        public ChallengeViewHolder(View itemView) {
+            super(itemView);
+
+            ButterKnife.bind(this, itemView);
+        }
+
+        public void bind(Group group) {
+            this.group = group;
+
+            label.setText(group.name);
+        }
+
+    }
 }
\ No newline at end of file
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 dc3a05ba3..ce4a4b4ad 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java
@@ -1,178 +1,178 @@
-package com.habitrpg.android.habitica.ui.adapter.tasks;
-
-import android.content.Context;
-import android.databinding.ObservableArrayList;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
-import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder>
-        extends RecyclerView.Adapter<VH> {
-    private final String userID;
-    public String taskType;
-    @Inject
-    protected CrashlyticsProxy crashlyticsProxy;
-    @Inject
-    protected TaskRepository taskRepository;
-    protected List<Task> content;
-    protected List<Task> filteredContent;
-    private int layoutResource;
-    Context context;
-    private TaskFilterHelper taskFilterHelper;
-
-    public BaseTasksRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
-                                        Context newContext, @Nullable String userID) {
-        this.setHasStableIds(true);
-        this.taskType = taskType;
-        this.context = newContext.getApplicationContext();
-        this.taskFilterHelper = taskFilterHelper;
-        this.userID = userID;
-        this.filteredContent = new ArrayList<>();
-        injectThis(HabiticaBaseApplication.getComponent());
-
-        if (loadFromDatabase()) {
-            this.loadContent(true);
-        }
-
-        this.layoutResource = layoutResource;
-    }
-
-    protected abstract void injectThis(AppComponent component);
-
-    @Override
-    public void onBindViewHolder(VH holder, int position) {
-        Task item = filteredContent.get(position);
-
-        holder.bindHolder(item, position);
-
-        /*if (this.displayedChecklist != null && ChecklistedViewHolder.class.isAssignableFrom(holder.getClass())) {
-            ChecklistedViewHolder checklistedHolder = (ChecklistedViewHolder) holder;
-            checklistedHolder.setDisplayChecklist(this.displayedChecklist == position);
-        }*/
-    }
-
-    @Override
-    public long getItemId(int position) {
-        Task task = filteredContent.get(position);
-        return task.getId().hashCode();
-    }
-
-    @Override
-    public int getItemCount() {
-        return filteredContent != null ? filteredContent.size() : 0;
-    }
-
-    View getContentView(ViewGroup parent) {
-        return getContentView(parent, layoutResource);
-    }
-
-    protected View getContentView(ViewGroup parent, int layoutResource) {
-        return LayoutInflater.from(parent.getContext()).inflate(layoutResource, parent, false);
-    }
-
-    public void updateTask(Task task) {
-        if (!taskType.equals(task.getType()))
-            return;
-        int i;
-        for (i = 0; i < this.content.size(); ++i) {
-            if (content.get(i).getId().equals(task.getId())) {
-                break;
-            }
-        }
-        if (i < content.size()) {
-            content.set(i, task);
-        }
-        filter();
-    }
-
-    public void filter() {
-        if (this.taskFilterHelper == null || this.taskFilterHelper.howMany(taskType) == 0) {
-            filteredContent = content;
-        } else {
-            filteredContent = new ObservableArrayList<>();
-            filteredContent.addAll(this.taskFilterHelper.filter(content));
-        }
-
-        this.notifyDataSetChanged();
-    }
-
-    public void loadContent(boolean forced) {
-        if (this.content == null || forced) {
-            taskRepository.getTasks(this.taskType, this.userID)
-                    .flatMap(Observable::from)
-                    .map(task -> {
-                        task.parseMarkdown();
-                        return task;
-                    })
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .toList()
-                    .subscribe(this::setTasks, crashlyticsProxy::logException);
-        }
-    }
-
-    public void setTasks(List<Task> tasks) {
-        this.content = new ObservableArrayList<>();
-        this.content.addAll(tasks);
-        filter();
-    }
-
-    public boolean loadFromDatabase() {
-        return true;
-    }
-
-    public void checkTask(Task task, Boolean completed) {
-        if (!taskType.equals(task.getType()))
-            return;
-
-        if (completed && task.getType().equals("todo")) {
-            // remove from the list
-            content.remove(task);
-        }
-        this.updateTask(task);
-        filter();
-    }
-
-    public void addTask(Task task) {
-        if (!taskType.equals(task.getType()))
-            return;
-
-        content.add(0, task);
-        filter();
-    }
-
-    public void removeTask(String deletedTaskId) {
-        Task taskToDelete = null;
-
-        for (Task t : content) {
-            if (t.getId().equals(deletedTaskId)) {
-                taskToDelete = t;
-                break;
-            }
-        }
-
-        if (taskToDelete != null) {
-            content.remove(taskToDelete);
-            filter();
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.tasks;
+
+import android.content.Context;
+import android.databinding.ObservableArrayList;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder>
+        extends RecyclerView.Adapter<VH> {
+    private final String userID;
+    public String taskType;
+    @Inject
+    protected CrashlyticsProxy crashlyticsProxy;
+    @Inject
+    protected TaskRepository taskRepository;
+    protected List<Task> content;
+    protected List<Task> filteredContent;
+    private int layoutResource;
+    Context context;
+    private TaskFilterHelper taskFilterHelper;
+
+    public BaseTasksRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
+                                        Context newContext, @Nullable String userID) {
+        this.setHasStableIds(true);
+        this.taskType = taskType;
+        this.context = newContext.getApplicationContext();
+        this.taskFilterHelper = taskFilterHelper;
+        this.userID = userID;
+        this.filteredContent = new ArrayList<>();
+        injectThis(HabiticaBaseApplication.getComponent());
+
+        if (loadFromDatabase()) {
+            this.loadContent(true);
+        }
+
+        this.layoutResource = layoutResource;
+    }
+
+    protected abstract void injectThis(AppComponent component);
+
+    @Override
+    public void onBindViewHolder(VH holder, int position) {
+        Task item = filteredContent.get(position);
+
+        holder.bindHolder(item, position);
+
+        /*if (this.displayedChecklist != null && ChecklistedViewHolder.class.isAssignableFrom(holder.getClass())) {
+            ChecklistedViewHolder checklistedHolder = (ChecklistedViewHolder) holder;
+            checklistedHolder.setDisplayChecklist(this.displayedChecklist == position);
+        }*/
+    }
+
+    @Override
+    public long getItemId(int position) {
+        Task task = filteredContent.get(position);
+        return task.getId().hashCode();
+    }
+
+    @Override
+    public int getItemCount() {
+        return filteredContent != null ? filteredContent.size() : 0;
+    }
+
+    View getContentView(ViewGroup parent) {
+        return getContentView(parent, layoutResource);
+    }
+
+    protected View getContentView(ViewGroup parent, int layoutResource) {
+        return LayoutInflater.from(parent.getContext()).inflate(layoutResource, parent, false);
+    }
+
+    public void updateTask(Task task) {
+        if (!taskType.equals(task.getType()))
+            return;
+        int i;
+        for (i = 0; i < this.content.size(); ++i) {
+            if (content.get(i).getId().equals(task.getId())) {
+                break;
+            }
+        }
+        if (i < content.size()) {
+            content.set(i, task);
+        }
+        filter();
+    }
+
+    public void filter() {
+        if (this.taskFilterHelper == null || this.taskFilterHelper.howMany(taskType) == 0) {
+            filteredContent = content;
+        } else {
+            filteredContent = new ObservableArrayList<>();
+            filteredContent.addAll(this.taskFilterHelper.filter(content));
+        }
+
+        this.notifyDataSetChanged();
+    }
+
+    public void loadContent(boolean forced) {
+        if (this.content == null || forced) {
+            taskRepository.getTasks(this.taskType, this.userID)
+                    .flatMap(Observable::from)
+                    .map(task -> {
+                        task.parseMarkdown();
+                        return task;
+                    })
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .toList()
+                    .subscribe(this::setTasks, crashlyticsProxy::logException);
+        }
+    }
+
+    public void setTasks(List<Task> tasks) {
+        this.content = new ObservableArrayList<>();
+        this.content.addAll(tasks);
+        filter();
+    }
+
+    public boolean loadFromDatabase() {
+        return true;
+    }
+
+    public void checkTask(Task task, Boolean completed) {
+        if (!taskType.equals(task.getType()))
+            return;
+
+        if (completed && task.getType().equals("todo")) {
+            // remove from the list
+            content.remove(task);
+        }
+        this.updateTask(task);
+        filter();
+    }
+
+    public void addTask(Task task) {
+        if (!taskType.equals(task.getType()))
+            return;
+
+        content.add(0, task);
+        filter();
+    }
+
+    public void removeTask(String deletedTaskId) {
+        Task taskToDelete = null;
+
+        for (Task t : content) {
+            if (t.getId().equals(deletedTaskId)) {
+                taskToDelete = t;
+                break;
+            }
+        }
+
+        if (taskToDelete != null) {
+            content.remove(taskToDelete);
+            filter();
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
index 35b5681c8..c4c46ffc1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
@@ -1,137 +1,137 @@
-package com.habitrpg.android.habitica.ui.adapter.tasks;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
-import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-
-import net.pherth.android.emoji_library.EmojiEditText;
-
-import android.graphics.Color;
-import android.support.v7.widget.RecyclerView;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * Created by franzejr on 15/11/15.
- */
-public class CheckListAdapter extends RecyclerView.Adapter<CheckListAdapter.ItemViewHolder>
-        implements ItemTouchHelperAdapter {
-
-    private final List<ChecklistItem> items = new ArrayList<>();
-
-    public CheckListAdapter(List<ChecklistItem> checklistItems) {
-        items.addAll(checklistItems);
-    }
-
-    @Override
-    public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.checklist_item, parent, false);
-        ItemViewHolder itemViewHolder = new ItemViewHolder(view);
-        return itemViewHolder;
-    }
-
-    @Override
-    public void onBindViewHolder(final ItemViewHolder holder, int position) {
-        holder.textWatcher.position = position;
-        holder.checkListTextView.setText(items.get(position).getText());
-    }
-
-    public void addItem(ChecklistItem item) {
-        items.add(item);
-        notifyItemInserted(items.size() - 1);
-    }
-
-    public List<ChecklistItem> getCheckListItems() {
-        return items;
-    }
-
-    @Override
-    public int getItemCount() {
-        return items.size();
-    }
-
-
-    @Override
-    public void onItemDismiss(int position) {
-        if (position >= 0 && position < items.size()) {
-            items.remove(position);
-            notifyItemRemoved(position);
-        }
-    }
-
-
-    @Override
-    public void onItemMove(int fromPosition, int toPosition) {
-        ChecklistItem item = items.get(fromPosition);
-        items.remove(fromPosition);
-        items.add(toPosition, item);
-        notifyItemMoved(fromPosition, toPosition);
-    }
-
-    public class ItemViewHolder extends RecyclerView.ViewHolder implements
-            ItemTouchHelperViewHolder, Button.OnClickListener {
-
-        public ChecklistTextWatcher textWatcher;
-        @BindView(R.id.item_edittext)
-        EmojiEditText checkListTextView;
-        @BindView(R.id.delete_item_button)
-        Button deleteButton;
-
-        public ItemViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            deleteButton.setOnClickListener(this);
-
-            textWatcher = new ChecklistTextWatcher();
-            checkListTextView.addTextChangedListener(textWatcher);
-        }
-
-        @Override
-        public void onItemSelected() {
-            itemView.setBackgroundColor(Color.LTGRAY);
-        }
-
-        @Override
-        public void onItemClear() {
-            itemView.setBackgroundColor(0);
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (v == deleteButton) {
-                CheckListAdapter.this.onItemDismiss(getAdapterPosition());
-            }
-        }
-
-        private class ChecklistTextWatcher implements TextWatcher {
-
-            public int position;
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                items.get(position).setText(checkListTextView.getText().toString());
-            }
-
-            @Override
-            public void afterTextChanged(Editable s) {
-
-            }
-        }
-    }
+package com.habitrpg.android.habitica.ui.adapter.tasks;
+
+import android.graphics.Color;
+import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
+import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
+
+import net.pherth.android.emoji_library.EmojiEditText;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by franzejr on 15/11/15.
+ */
+public class CheckListAdapter extends RecyclerView.Adapter<CheckListAdapter.ItemViewHolder>
+        implements ItemTouchHelperAdapter {
+
+    private final List<ChecklistItem> items = new ArrayList<>();
+
+    public CheckListAdapter(List<ChecklistItem> checklistItems) {
+        items.addAll(checklistItems);
+    }
+
+    @Override
+    public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.checklist_item, parent, false);
+        ItemViewHolder itemViewHolder = new ItemViewHolder(view);
+        return itemViewHolder;
+    }
+
+    @Override
+    public void onBindViewHolder(final ItemViewHolder holder, int position) {
+        holder.textWatcher.position = position;
+        holder.checkListTextView.setText(items.get(position).getText());
+    }
+
+    public void addItem(ChecklistItem item) {
+        items.add(item);
+        notifyItemInserted(items.size() - 1);
+    }
+
+    public List<ChecklistItem> getCheckListItems() {
+        return items;
+    }
+
+    @Override
+    public int getItemCount() {
+        return items.size();
+    }
+
+
+    @Override
+    public void onItemDismiss(int position) {
+        if (position >= 0 && position < items.size()) {
+            items.remove(position);
+            notifyItemRemoved(position);
+        }
+    }
+
+
+    @Override
+    public void onItemMove(int fromPosition, int toPosition) {
+        ChecklistItem item = items.get(fromPosition);
+        items.remove(fromPosition);
+        items.add(toPosition, item);
+        notifyItemMoved(fromPosition, toPosition);
+    }
+
+    public class ItemViewHolder extends RecyclerView.ViewHolder implements
+            ItemTouchHelperViewHolder, Button.OnClickListener {
+
+        public ChecklistTextWatcher textWatcher;
+        @BindView(R.id.item_edittext)
+        EmojiEditText checkListTextView;
+        @BindView(R.id.delete_item_button)
+        Button deleteButton;
+
+        public ItemViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+            deleteButton.setOnClickListener(this);
+
+            textWatcher = new ChecklistTextWatcher();
+            checkListTextView.addTextChangedListener(textWatcher);
+        }
+
+        @Override
+        public void onItemSelected() {
+            itemView.setBackgroundColor(Color.LTGRAY);
+        }
+
+        @Override
+        public void onItemClear() {
+            itemView.setBackgroundColor(0);
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (v == deleteButton) {
+                CheckListAdapter.this.onItemDismiss(getAdapterPosition());
+            }
+        }
+
+        private class ChecklistTextWatcher implements TextWatcher {
+
+            public int position;
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                items.get(position).setText(checkListTextView.getText().toString());
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        }
+    }
 }
\ No newline at end of file
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 80abc53a8..2c7dc1243 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
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks;
 
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.view.ViewGroup;
+
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.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;
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 fc0ba7a74..2a304cebb 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
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks;
 
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.view.ViewGroup;
+
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder;
 
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.view.ViewGroup;
-
 public class HabitsRecyclerViewAdapter extends SortableTasksRecyclerViewAdapter<HabitViewHolder> {
 
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
index 3de2e6358..a4195f791 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
@@ -1,140 +1,140 @@
-package com.habitrpg.android.habitica.ui.adapter.tasks;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.helpers.RemindersManager;
-import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
-import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-
-import android.graphics.Color;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.EditText;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * Created by keithholliday on 5/31/16.
- */
-public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.ItemViewHolder>
-        implements ItemTouchHelperAdapter, RemindersManager.ReminderTimeSelectedCallback {
-
-    private final List<RemindersItem> reminders = new ArrayList<>();
-    private final String taskType;
-    private RemindersManager remindersManager;
-
-    public RemindersAdapter(List<RemindersItem> remindersInc, String taskType) {
-        this.reminders.addAll(remindersInc);
-        this.remindersManager = new RemindersManager(taskType);
-        this.taskType = taskType;
-    }
-
-    @Override
-    public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.reminder_item, parent, false);
-        return new ItemViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(final ItemViewHolder holder, int position) {
-        Date time = reminders.get(position).getTime();
-        holder.reminderItemTextView.setText(remindersManager.reminderTimeToString(time));
-        holder.hour = time.getHours();
-        holder.minute = time.getMinutes();
-    }
-
-    public void addItem(RemindersItem item) {
-        reminders.add(item);
-        notifyItemInserted(reminders.size() - 1);
-    }
-
-    public List<RemindersItem> getRemindersItems() {
-        return reminders;
-    }
-
-    @Override
-    public int getItemCount() {
-        return reminders.size();
-    }
-
-
-    @Override
-    public void onItemDismiss(int position) {
-        if (position >= 0 && position < reminders.size()) {
-            reminders.get(position).async().delete();
-            reminders.remove(position);
-            notifyItemRemoved(position);
-        }
-    }
-
-    @Override
-    public void onItemMove(int fromPosition, int toPosition) {
-        Collections.swap(reminders, fromPosition, toPosition);
-        notifyItemMoved(fromPosition, toPosition);
-    }
-
-    @Override
-    public void onReminderTimeSelected(@Nullable RemindersItem remindersItem) {
-        if (remindersItem == null) {
-            return;
-        }
-        for (int pos = 0; pos < reminders.size(); pos++) {
-            if (remindersItem.getId().equals(reminders.get(pos).getId())) {
-                reminders.set(pos, remindersItem);
-                notifyItemChanged(pos);
-                break;
-            }
-        }
-    }
-
-    class ItemViewHolder extends RecyclerView.ViewHolder implements
-            ItemTouchHelperViewHolder, Button.OnClickListener {
-
-        @BindView(R.id.item_edittext)
-        EditText reminderItemTextView;
-
-        @BindView(R.id.delete_item_button)
-        Button deleteButton;
-
-        int hour, minute;
-
-        ItemViewHolder(View itemView) {
-            super(itemView);
-            ButterKnife.bind(this, itemView);
-            deleteButton.setOnClickListener(this);
-
-            reminderItemTextView.setOnClickListener(v -> {
-                RemindersItem reminder = reminders.get(getAdapterPosition());
-
-                remindersManager.createReminderTimeDialog(RemindersAdapter.this, taskType, v.getContext(), reminder);
-            });
-        }
-
-        @Override
-        public void onItemSelected() {
-            itemView.setBackgroundColor(Color.LTGRAY);
-        }
-
-        @Override
-        public void onItemClear() {
-            itemView.setBackgroundColor(0);
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (v == deleteButton) {
-                RemindersAdapter.this.onItemDismiss(getAdapterPosition());
-            }
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.tasks;
+
+import android.graphics.Color;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.helpers.RemindersManager;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
+import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by keithholliday on 5/31/16.
+ */
+public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.ItemViewHolder>
+        implements ItemTouchHelperAdapter, RemindersManager.ReminderTimeSelectedCallback {
+
+    private final List<RemindersItem> reminders = new ArrayList<>();
+    private final String taskType;
+    private RemindersManager remindersManager;
+
+    public RemindersAdapter(List<RemindersItem> remindersInc, String taskType) {
+        this.reminders.addAll(remindersInc);
+        this.remindersManager = new RemindersManager(taskType);
+        this.taskType = taskType;
+    }
+
+    @Override
+    public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.reminder_item, parent, false);
+        return new ItemViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(final ItemViewHolder holder, int position) {
+        Date time = reminders.get(position).getTime();
+        holder.reminderItemTextView.setText(remindersManager.reminderTimeToString(time));
+        holder.hour = time.getHours();
+        holder.minute = time.getMinutes();
+    }
+
+    public void addItem(RemindersItem item) {
+        reminders.add(item);
+        notifyItemInserted(reminders.size() - 1);
+    }
+
+    public List<RemindersItem> getRemindersItems() {
+        return reminders;
+    }
+
+    @Override
+    public int getItemCount() {
+        return reminders.size();
+    }
+
+
+    @Override
+    public void onItemDismiss(int position) {
+        if (position >= 0 && position < reminders.size()) {
+            reminders.get(position).async().delete();
+            reminders.remove(position);
+            notifyItemRemoved(position);
+        }
+    }
+
+    @Override
+    public void onItemMove(int fromPosition, int toPosition) {
+        Collections.swap(reminders, fromPosition, toPosition);
+        notifyItemMoved(fromPosition, toPosition);
+    }
+
+    @Override
+    public void onReminderTimeSelected(@Nullable RemindersItem remindersItem) {
+        if (remindersItem == null) {
+            return;
+        }
+        for (int pos = 0; pos < reminders.size(); pos++) {
+            if (remindersItem.getId().equals(reminders.get(pos).getId())) {
+                reminders.set(pos, remindersItem);
+                notifyItemChanged(pos);
+                break;
+            }
+        }
+    }
+
+    class ItemViewHolder extends RecyclerView.ViewHolder implements
+            ItemTouchHelperViewHolder, Button.OnClickListener {
+
+        @BindView(R.id.item_edittext)
+        EditText reminderItemTextView;
+
+        @BindView(R.id.delete_item_button)
+        Button deleteButton;
+
+        int hour, minute;
+
+        ItemViewHolder(View itemView) {
+            super(itemView);
+            ButterKnife.bind(this, itemView);
+            deleteButton.setOnClickListener(this);
+
+            reminderItemTextView.setOnClickListener(v -> {
+                RemindersItem reminder = reminders.get(getAdapterPosition());
+
+                remindersManager.createReminderTimeDialog(RemindersAdapter.this, taskType, v.getContext(), reminder);
+            });
+        }
+
+        @Override
+        public void onItemSelected() {
+            itemView.setBackgroundColor(Color.LTGRAY);
+        }
+
+        @Override
+        public void onItemClear() {
+            itemView.setBackgroundColor(0);
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (v == deleteButton) {
+                RemindersAdapter.this.onItemDismiss(getAdapterPosition());
+            }
+        }
+    }
+}
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 f2e135d53..594d7372e 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,106 +1,99 @@
-package com.habitrpg.android.habitica.ui.adapter.tasks;
-
-
-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.TaskFilterHelper;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import android.content.Context;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import rx.Observable;
-
-public class RewardsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter<RewardViewHolder> {
-
-    private final ContentCache contentCache;
-    private final HabitRPGUser user;
-    private ApiClient apiClient;
-
-    public RewardsRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource, Context newContext, HabitRPGUser user, ApiClient apiClient) {
-        super(taskType, taskFilterHelper, layoutResource, newContext, user != null ? user.getId() : null);
-        this.user = user;
-        this.apiClient = apiClient;
-        this.contentCache = new ContentCache(apiClient);
-    }
-
-    @Override
-    public RewardViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        return new RewardViewHolder(getContentView(parent));
-    }
-
-    private void loadEquipmentRewards() {
-        if (apiClient != null) {
-            apiClient.getInventoryBuyableGear()
-                    .flatMap(items -> {
-                        // get itemdata list
-                        ArrayList<String> itemKeys = new ArrayList<>();
-                        for (ItemData item : items) {
-                            itemKeys.add(item.key);
-                        }
-                        itemKeys.add("potion");
-                        if (user.getFlags().getArmoireEnabled()) {
-                            itemKeys.add("armoire");
-                        }
-                        return Observable.create((Observable.OnSubscribe<List<Task>>) subscriber -> contentCache.getItemDataList(itemKeys, obj -> {
-                            ArrayList<Task> buyableItems = new ArrayList<>();
-                            if (obj != null) {
-                                for (ItemData item : obj) {
-                                    Task reward = new Task();
-                                    reward.text = item.text;
-                                    reward.notes = item.notes;
-                                    reward.value = item.value;
-                                    reward.setType("reward");
-                                    reward.specialTag = "item";
-                                    reward.setId(item.key);
-
-                                    if ("armoire".equals(item.key)) {
-                                        if (user.getFlags().getArmoireEmpty()) {
-                                            reward.notes = context.getResources().getString(R.string.armoireNotesEmpty);
-                                        } else {
-                                            long gearCount = new Select().count()
-                                                    .from(ItemData.class)
-                                                    .where(Condition.CombinedCondition.begin(Condition.column("klass").eq("armoire"))
-                                                            .and(Condition.column("owned").isNull())
-                                                    ).count();
-                                            reward.notes = context.getResources().getString(R.string.armoireNotesFull, gearCount);
-                                        }
-                                    }
-
-                                    buyableItems.add(reward);
-                                }
-                            }
-                            subscriber.onNext(buyableItems);
-                            subscriber.onCompleted();
-                        }));
-                    })
-                    .subscribe(items -> {
-                        this.filteredContent.addAll(items);
-                        notifyDataSetChanged();
-                    }, throwable -> {
-                    });
-        }
-    }
-
-    @Override
-    protected void injectThis(AppComponent component) {
-        HabiticaBaseApplication.getComponent().inject(this);
-    }
-
-    @Override
-    public void setTasks(List<Task> tasks) {
-        super.setTasks(tasks);
-        this.loadEquipmentRewards();
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.tasks;
+
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.view.ViewGroup;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+
+public class RewardsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter<RewardViewHolder> {
+
+    private final InventoryRepository inventoryRepository;
+    @Nullable
+    private final HabitRPGUser user;
+
+    public RewardsRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource, Context newContext, @Nullable HabitRPGUser user, InventoryRepository inventoryRepository) {
+        super(taskType, taskFilterHelper, layoutResource, newContext, user != null ? user.getId() : null);
+        this.user = user;
+        this.inventoryRepository = inventoryRepository;
+    }
+
+    @Override
+    public RewardViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new RewardViewHolder(getContentView(parent));
+    }
+
+    private void loadEquipmentRewards() {
+        if (inventoryRepository != null) {
+            inventoryRepository.getInventoryBuyableGear()
+                    .flatMap(items -> {
+                        // get itemdata list
+                        ArrayList<String> itemKeys = new ArrayList<>();
+                        for (ItemData item : items) {
+                            itemKeys.add(item.key);
+                        }
+                        itemKeys.add("potion");
+                        if (user != null && user.getFlags().getArmoireEnabled()) {
+                            itemKeys.add("armoire");
+                        }
+                        return Observable.create((Observable.OnSubscribe<List<Task>>) subscriber -> inventoryRepository.getItems(itemKeys).subscribe(obj -> {
+                            ArrayList<Task> buyableItems = new ArrayList<>();
+                            if (obj != null) {
+                                for (ItemData item : obj) {
+                                    Task reward = new Task();
+                                    reward.text = item.text;
+                                    reward.notes = item.notes;
+                                    reward.value = item.value;
+                                    reward.setType("reward");
+                                    reward.specialTag = "item";
+                                    reward.setId(item.key);
+
+                                    if ("armoire".equals(item.key)) {
+                                        if (user != null && user.getFlags().getArmoireEmpty()) {
+                                            reward.notes = context.getResources().getString(R.string.armoireNotesEmpty);
+                                        } else {
+                                            long gearCount = inventoryRepository.getArmoireRemainingCount();
+                                            reward.notes = context.getResources().getString(R.string.armoireNotesFull, gearCount);
+                                        }
+                                    }
+
+                                    buyableItems.add(reward);
+                                }
+                            }
+                            subscriber.onNext(buyableItems);
+                            subscriber.onCompleted();
+                        }, throwable -> {}));
+                    })
+                    .subscribe(items -> {
+                        this.filteredContent.addAll(items);
+                        notifyDataSetChanged();
+                    }, throwable -> {
+                    });
+        }
+    }
+
+    @Override
+    protected void injectThis(AppComponent component) {
+        HabiticaBaseApplication.getComponent().inject(this);
+    }
+
+    @Override
+    public void setTasks(List<Task> tasks) {
+        super.setTasks(tasks);
+        this.loadEquipmentRewards();
+    }
+}
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 efb6f5123..2dc883dda 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,52 +1,52 @@
-package com.habitrpg.android.habitica.ui.adapter.tasks;
-
-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.habitrpg.android.habitica.models.tasks.Task;
-
-import android.content.Context;
-import android.support.annotation.Nullable;
-
-import java.util.Collections;
-
-/**
- * Created by ell on 7/21/16.
- */
-public abstract class SortableTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder>
-        extends BaseTasksRecyclerViewAdapter<VH> implements ItemTouchHelperAdapter, ItemTouchHelperDropCallback {
-
-    private SortTasksCallback sortCallback;
-
-    public SortableTasksRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
-                                            Context newContext, String userID, @Nullable SortTasksCallback sortCallback) {
-        super(taskType, taskFilterHelper, layoutResource, newContext, userID);
-        this.sortCallback = sortCallback;
-    }
-
-    @Override
-    public void onItemMove(int fromPosition, int toPosition) {
-        if (filteredContent.size() <= fromPosition || filteredContent.size() <= toPosition) {
-            return;
-        }
-        Collections.swap(filteredContent, fromPosition, toPosition);
-        notifyItemMoved(fromPosition, toPosition);
-    }
-
-    @Override
-    public void onItemDismiss(int position) {
-        //NO OP
-    }
-
-    @Override
-    public void onDrop(int from, int to) {
-        if (this.sortCallback != null && from != to) {
-            this.sortCallback.onMove(filteredContent.get(to), from, to);
-        }
-    }
-
-    public interface SortTasksCallback {
-        void onMove(Task task, int from, int to);
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.tasks;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.tasks.Task;
+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 java.util.Collections;
+
+/**
+ * Created by ell on 7/21/16.
+ */
+public abstract class SortableTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder>
+        extends BaseTasksRecyclerViewAdapter<VH> implements ItemTouchHelperAdapter, ItemTouchHelperDropCallback {
+
+    private SortTasksCallback sortCallback;
+
+    public SortableTasksRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
+                                            Context newContext, String userID, @Nullable SortTasksCallback sortCallback) {
+        super(taskType, taskFilterHelper, layoutResource, newContext, userID);
+        this.sortCallback = sortCallback;
+    }
+
+    @Override
+    public void onItemMove(int fromPosition, int toPosition) {
+        if (filteredContent.size() <= fromPosition || filteredContent.size() <= toPosition) {
+            return;
+        }
+        Collections.swap(filteredContent, fromPosition, toPosition);
+        notifyItemMoved(fromPosition, toPosition);
+    }
+
+    @Override
+    public void onItemDismiss(int position) {
+        //NO OP
+    }
+
+    @Override
+    public void onDrop(int from, int to) {
+        if (this.sortCallback != null && from != to) {
+            this.sortCallback.onMove(filteredContent.get(to), from, to);
+        }
+    }
+
+    public interface SortTasksCallback {
+        void onMove(Task task, int from, int to);
+    }
+}
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 cdefd913b..0516b8846 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
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks;
 
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.view.ViewGroup;
+
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.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, TaskFilterHelper taskFilterHelper, int layoutResource,
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java
index d91d325e3..fda5a1c7c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
-import com.habitrpg.android.habitica.R;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -15,6 +13,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
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 31dd4db65..c94270c9f 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,137 +1,125 @@
-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.models.TutorialStep;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.squareup.leakcanary.RefWatcher;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.EventBusException;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
-
-public abstract class BaseFragment extends DialogFragment {
-
-    public String tutorialStepIdentifier;
-    public String tutorialText;
-    public Unbinder unbinder;
-    protected boolean tutorialCanBeDeferred = true;
-    private TransactionListener<TutorialStep> tutorialStepTransactionListener = new TransactionListener<TutorialStep>() {
-        @Override
-        public void onResultReceived(TutorialStep step) {
-            if (step != null && step.shouldDisplay()) {
-                DisplayTutorialEvent event = new DisplayTutorialEvent();
-                event.step = step;
-                if (tutorialText != null) {
-                    event.tutorialText = tutorialText;
-                } else {
-                    event.tutorialTexts = tutorialTexts;
-                }
-                event.canBeDeferred = tutorialCanBeDeferred;
-                EventBus.getDefault().post(event);
-            }
-        }
-
-        @Override
-        public boolean onReady(BaseTransaction<TutorialStep> baseTransaction) {
-            return true;
-        }
-
-        @Override
-        public boolean hasResult(BaseTransaction<TutorialStep> baseTransaction, TutorialStep step) {
-            return true;
-        }
-    };
-    public List<String> tutorialTexts;
-
-    @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (isVisibleToUser) {
-            if (this.tutorialStepIdentifier != null) {
-                new Select().from(TutorialStep.class).where(Condition.column("identifier").eq(tutorialStepIdentifier)).async().querySingle(tutorialStepTransactionListener);
-            }
-
-            String displayedClassName = this.getDisplayedClassName();
-
-            if (displayedClassName != null) {
-                Map<String, Object> additionalData = new HashMap<>();
-                additionalData.put("page", displayedClassName);
-                AmplitudeManager.sendEvent("navigate", AmplitudeManager.EVENT_CATEGORY_NAVIGATION, AmplitudeManager.EVENT_HITTYPE_PAGEVIEW, additionalData);
-            }
-        }
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        injectFragment(HabiticaBaseApplication.getComponent());
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-
-        // Receive Events
-        try {
-            EventBus.getDefault().register(this);
-        } catch (EventBusException ignored) {
-
-        }
-
-        return null;
-    }
-
-    public abstract void injectFragment(AppComponent component);
-
-    @CallSuper
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        if (unbinder == null) {
-            unbinder = ButterKnife.bind(this, view);
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        if (EventBus.getDefault().isRegistered(this)) {
-            EventBus.getDefault().unregister(this);
-        }
-        if (unbinder != null) {
-            unbinder.unbind();
-            unbinder = null;
-        }
-
-        super.onDestroyView();
-        RefWatcher refWatcher = HabiticaApplication.getInstance(getContext()).refWatcher;
-        refWatcher.watch(this);
-    }
-
-    public String getDisplayedClassName() {
-        return this.getClass().getSimpleName();
-    }
-
-
-}
+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.data.TutorialRepository;
+import com.habitrpg.android.habitica.events.DisplayTutorialEvent;
+import com.habitrpg.android.habitica.helpers.AmplitudeManager;
+import com.squareup.leakcanary.RefWatcher;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.EventBusException;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+public abstract class BaseFragment extends DialogFragment {
+
+    @Inject
+    protected
+    TutorialRepository tutorialRepository;
+
+    public String tutorialStepIdentifier;
+    public String tutorialText;
+    public Unbinder unbinder;
+    protected boolean tutorialCanBeDeferred = true;
+    public List<String> tutorialTexts;
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser) {
+            if (this.tutorialStepIdentifier != null && tutorialRepository != null) {
+                tutorialRepository.getTutorialStep(this.tutorialStepIdentifier).subscribe(step -> {
+                    if (step != null && step.shouldDisplay()) {
+                        DisplayTutorialEvent event = new DisplayTutorialEvent();
+                        event.step = step;
+                        if (tutorialText != null) {
+                            event.tutorialText = tutorialText;
+                        } else {
+                            event.tutorialTexts = tutorialTexts;
+                        }
+                        event.canBeDeferred = tutorialCanBeDeferred;
+                        EventBus.getDefault().post(event);
+                    }
+                }, throwable -> {});
+            }
+
+            String displayedClassName = this.getDisplayedClassName();
+
+            if (displayedClassName != null) {
+                Map<String, Object> additionalData = new HashMap<>();
+                additionalData.put("page", displayedClassName);
+                AmplitudeManager.sendEvent("navigate", AmplitudeManager.EVENT_CATEGORY_NAVIGATION, AmplitudeManager.EVENT_HITTYPE_PAGEVIEW, additionalData);
+            }
+        }
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        injectFragment(HabiticaBaseApplication.getComponent());
+        super.onCreate(savedInstanceState);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+        // Receive Events
+        try {
+            EventBus.getDefault().register(this);
+        } catch (EventBusException ignored) {
+
+        }
+
+        return null;
+    }
+
+    public abstract void injectFragment(AppComponent component);
+
+    @CallSuper
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        if (unbinder == null) {
+            unbinder = ButterKnife.bind(this, view);
+        }
+    }
+
+    @Override
+    public void onDestroyView() {
+        if (EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().unregister(this);
+        }
+        if (unbinder != null) {
+            unbinder.unbind();
+            unbinder = null;
+        }
+
+        super.onDestroyView();
+        RefWatcher refWatcher = HabiticaApplication.getInstance(getContext()).refWatcher;
+        refWatcher.watch(this);
+    }
+
+    public String getDisplayedClassName() {
+        return this.getClass().getSimpleName();
+    }
+
+
+}
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 ce2450760..e288d4fce 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,140 +1,138 @@
-package com.habitrpg.android.habitica.ui.fragments;
-
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.roughike.bottombar.BottomBar;
-
-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 javax.inject.Inject;
-
-public abstract class BaseMainFragment extends BaseFragment {
-
-    @Inject
-    public ApiClient apiClient;
-    @Inject
-    UserRepository userRepository;
-    @Nullable
-    public MainActivity activity;
-    @Nullable
-    public TabLayout tabLayout;
-    @Nullable
-    public BottomBar bottomNavigation;
-    public ViewGroup floatingMenuWrapper;
-    public boolean usesTabLayout;
-    public boolean usesBottomNavigation = false;
-    public int fragmentSidebarPosition;
-    @Inject
-    protected SoundManager soundManager;
-    @Nullable
-    protected HabitRPGUser user;
-
-    public void setUser(@Nullable HabitRPGUser user) {
-        this.user = user;
-    }
-
-    public void updateUserData(HabitRPGUser user) {
-        this.user = user;
-    }
-
-    public void setTabLayout(@Nullable TabLayout tabLayout) {
-        this.tabLayout = tabLayout;
-    }
-
-    public void setBottomNavigation(@Nullable BottomBar bottomNavigation) {
-        this.bottomNavigation = bottomNavigation;
-    }
-
-    public void setFloatingMenuWrapper(ViewGroup view) {
-        this.floatingMenuWrapper = view;
-    }
-
-    public void setActivity(@Nullable MainActivity activity) {
-        this.activity = activity;
-    }
-
-    @Override
-    public void onViewStateRestored(Bundle savedInstanceState) {
-        super.onViewStateRestored(savedInstanceState);
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        if (getActivity().getClass().equals(MainActivity.class)) {
-            this.activity = (MainActivity) getActivity();
-        }
-    }
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        if (savedInstanceState != null && savedInstanceState.containsKey("userId")) {
-            String userId = savedInstanceState.getString("userId");
-            if (userId != null) {
-                userRepository.getUser(userId).subscribe(habitRPGUser -> user = habitRPGUser, throwable -> {});
-            }
-        }
-
-        if (tabLayout != null) {
-            if (this.usesTabLayout) {
-                tabLayout.removeAllTabs();
-                tabLayout.setVisibility(View.VISIBLE);
-                tabLayout.setTabMode(TabLayout.MODE_FIXED);
-            } else {
-                tabLayout.setVisibility(View.GONE);
-            }
-        }
-
-        if (bottomNavigation != null) {
-            if (this.usesBottomNavigation) {
-                bottomNavigation.removeOnTabSelectListener();
-                bottomNavigation.removeOnTabReselectListener();
-                bottomNavigation.setVisibility(View.VISIBLE);
-            } else {
-                bottomNavigation.setVisibility(View.GONE);
-            }
-        }
-
-        if (floatingMenuWrapper != null) {
-            floatingMenuWrapper.removeAllViews();
-        }
-
-        setHasOptionsMenu(true);
-
-        if (activity != null) {
-            activity.setActiveFragment(this);
-        }
-
-        return null;
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        if (user != null) {
-            outState.putString("userId", user.getId());
-        }
-
-        super.onSaveInstanceState(outState);
-    }
-
-    public String customTitle() {
-        return "";
-    }
-
-
-}
+package com.habitrpg.android.habitica.ui.fragments;
+
+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 com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.helpers.SoundManager;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.roughike.bottombar.BottomBar;
+
+import javax.inject.Inject;
+
+public abstract class BaseMainFragment extends BaseFragment {
+
+    @Inject
+    public ApiClient apiClient;
+    @Inject
+    UserRepository userRepository;
+    @Nullable
+    public MainActivity activity;
+    @Nullable
+    public TabLayout tabLayout;
+    @Nullable
+    public BottomBar bottomNavigation;
+    public ViewGroup floatingMenuWrapper;
+    public boolean usesTabLayout;
+    public boolean usesBottomNavigation = false;
+    public int fragmentSidebarPosition;
+    @Inject
+    protected SoundManager soundManager;
+    @Nullable
+    protected HabitRPGUser user;
+
+    public void setUser(@Nullable HabitRPGUser user) {
+        this.user = user;
+    }
+
+    public void updateUserData(HabitRPGUser user) {
+        this.user = user;
+    }
+
+    public void setTabLayout(@Nullable TabLayout tabLayout) {
+        this.tabLayout = tabLayout;
+    }
+
+    public void setBottomNavigation(@Nullable BottomBar bottomNavigation) {
+        this.bottomNavigation = bottomNavigation;
+    }
+
+    public void setFloatingMenuWrapper(ViewGroup view) {
+        this.floatingMenuWrapper = view;
+    }
+
+    public void setActivity(@Nullable MainActivity activity) {
+        this.activity = activity;
+    }
+
+    @Override
+    public void onViewStateRestored(Bundle savedInstanceState) {
+        super.onViewStateRestored(savedInstanceState);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+        if (getActivity().getClass().equals(MainActivity.class)) {
+            this.activity = (MainActivity) getActivity();
+        }
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        if (savedInstanceState != null && savedInstanceState.containsKey("userId")) {
+            String userId = savedInstanceState.getString("userId");
+            if (userId != null) {
+                userRepository.getUser(userId).subscribe(habitRPGUser -> user = habitRPGUser, throwable -> {});
+            }
+        }
+
+        if (tabLayout != null) {
+            if (this.usesTabLayout) {
+                tabLayout.removeAllTabs();
+                tabLayout.setVisibility(View.VISIBLE);
+                tabLayout.setTabMode(TabLayout.MODE_FIXED);
+            } else {
+                tabLayout.setVisibility(View.GONE);
+            }
+        }
+
+        if (bottomNavigation != null) {
+            if (this.usesBottomNavigation) {
+                bottomNavigation.removeOnTabSelectListener();
+                bottomNavigation.removeOnTabReselectListener();
+                bottomNavigation.setVisibility(View.VISIBLE);
+            } else {
+                bottomNavigation.setVisibility(View.GONE);
+            }
+        }
+
+        if (floatingMenuWrapper != null) {
+            floatingMenuWrapper.removeAllViews();
+        }
+
+        setHasOptionsMenu(true);
+
+        if (activity != null) {
+            activity.setActiveFragment(this);
+        }
+
+        return null;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        if (user != null) {
+            outState.putString("userId", user.getId());
+        }
+
+        super.onSaveInstanceState(outState);
+    }
+
+    public String customTitle() {
+        return "";
+    }
+
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
index f88f09816..59bb44ee5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java
@@ -1,5 +1,13 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.util.Log;
+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.helpers.PurchaseTypes;
@@ -14,14 +22,6 @@ 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;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
 import javax.inject.Inject;
 
 import butterknife.BindView;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java
index b9b633037..82c21fe51 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NewsFragment.java
@@ -1,15 +1,15 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
 
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
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 dac10da15..8e7785272 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,306 +1,306 @@
-package com.habitrpg.android.habitica.ui.fragments;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-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.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.solovyev.android.checkout.ActivityCheckout;
-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;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-public class SubscriptionFragment extends BaseFragment implements GemPurchaseActivity.CheckoutFragment {
-
-    @Inject
-    CrashlyticsProxy crashlyticsProxy;
-
-    @Inject
-    ApiClient apiClient;
-
-    @BindView(R.id.subscribe_listitem1_box)
-    View subscribeListitem1Box;
-    @BindView(R.id.subscribe_listitem2_box)
-    View subscribeListitem2Box;
-    @BindView(R.id.subscribe_listitem3_box)
-    View subscribeListitem3Box;
-    @BindView(R.id.subscribe_listitem4_box)
-    View subscribeListitem4Box;
-
-    @BindView(R.id.subscribe_listitem1_expand)
-    ImageView subscribeListitem1Button;
-    @BindView(R.id.subscribe_listitem2_expand)
-    ImageView subscribeListitem2Button;
-    @BindView(R.id.subscribe_listitem3_expand)
-    ImageView subscribeListitem3Button;
-    @BindView(R.id.subscribe_listitem4_expand)
-    ImageView subscribeListitem4Button;
-
-    @BindView(R.id.subscribe_listitem1_description)
-    TextView subscribeListItem1Description;
-    @BindView(R.id.subscribe_listitem2_description)
-    TextView subscribeListItem2Description;
-    @BindView(R.id.subscribe_listitem3_description)
-    TextView subscribeListItem3Description;
-    @BindView(R.id.subscribe_listitem4_description)
-    TextView subscribeListItem4Description;
-
-    @BindView(R.id.loadingIndicator)
-    ProgressBar loadingIndicator;
-
-    @BindView(R.id.subscriptionOptions)
-    View subscriptionOptions;
-
-    @BindView(R.id.subscription1month)
-    SubscriptionOptionView subscription1MonthView;
-    @BindView(R.id.subscription3month)
-    SubscriptionOptionView subscription3MonthView;
-    @BindView(R.id.subscription6month)
-    SubscriptionOptionView subscription6MonthView;
-    @BindView(R.id.subscription12month)
-    SubscriptionOptionView subscription12MonthView;
-
-    @BindView(R.id.subscribeButton)
-    Button subscriptionButton;
-
-    @BindView(R.id.subscriptionDetails)
-    SubscriptionDetailsView subscriptionDetailsView;
-
-    @BindView(R.id.subscribeBenefitsTitle)
-    TextView subscribeBenefitsTitle;
-
-    @Nullable
-    Sku selectedSubscriptionSku;
-    List<Sku> skus;
-
-    private GemPurchaseActivity listener;
-    private BillingRequests billingRequests;
-
-    private HabitRPGUser user;
-    private boolean hasLoadedSubscriptionOptions;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-
-        super.onCreateView(inflater, container, savedInstanceState);
-
-        fetchUser(null);
-
-        return inflater.inflate(R.layout.fragment_subscription, container, false);
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-    }
-
-    @Subscribe
-    public void fetchUser(@Nullable UserSubscribedEvent event) {
-        apiClient.getUser().subscribe(this::setUser, throwable -> {
-                });
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        subscriptionOptions.setVisibility(View.GONE);
-        subscriptionDetailsView.setVisibility(View.GONE);
-
-        this.subscription1MonthView.setOnPurchaseClickListener(view1 -> selectSubscription(PurchaseTypes.Subscription1Month));
-        this.subscription3MonthView.setOnPurchaseClickListener(view1 -> selectSubscription(PurchaseTypes.Subscription3Month));
-        this.subscription6MonthView.setOnPurchaseClickListener(view1 -> selectSubscription(PurchaseTypes.Subscription6Month));
-        this.subscription12MonthView.setOnPurchaseClickListener(view1 -> selectSubscription(PurchaseTypes.Subscription12Month));
-
-        this.subscribeListitem1Box.setOnClickListener(view1 -> toggleDescriptionView(this.subscribeListitem1Button, this.subscribeListItem1Description));
-        this.subscribeListitem2Box.setOnClickListener(view1 -> toggleDescriptionView(this.subscribeListitem2Button, this.subscribeListItem2Description));
-        this.subscribeListitem3Box.setOnClickListener(view1 -> toggleDescriptionView(this.subscribeListitem3Button, this.subscribeListItem3Description));
-        this.subscribeListitem4Box.setOnClickListener(view1 -> toggleDescriptionView(this.subscribeListitem4Button, this.subscribeListItem4Description));
-    }
-
-    private void toggleDescriptionView(ImageView button, TextView descriptionView) {
-        if (descriptionView.getVisibility() == View.VISIBLE) {
-            descriptionView.setVisibility(View.GONE);
-            button.setImageResource(R.drawable.ic_keyboard_arrow_down_black_24dp);
-        } else {
-            descriptionView.setVisibility(View.VISIBLE);
-            button.setImageResource(R.drawable.ic_keyboard_arrow_up_black_24dp);
-        }
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void setupCheckout() {
-        final ActivityCheckout checkout = listener.getActivityCheckout();
-        if (checkout != null) {
-            Inventory inventory = checkout.makeInventory();
-
-            inventory.load(Inventory.Request.create()
-                            .loadAllPurchases().loadSkus(ProductTypes.SUBSCRIPTION, PurchaseTypes.allSubscriptionTypes),
-                    products -> {
-                        Inventory.Product subscriptions = products.get(ProductTypes.SUBSCRIPTION);
-
-                        skus = subscriptions.getSkus();
-
-                        for (Sku sku : skus) {
-                            updateButtonLabel(sku, sku.price, subscriptions);
-                        }
-                        selectSubscription(PurchaseTypes.Subscription1Month);
-                        hasLoadedSubscriptionOptions = true;
-                        updateSubscriptionInfo();
-                    });
-        }
-    }
-
-    private void updateButtonLabel(Sku sku, String price, Inventory.Product subscriptions) {
-        SubscriptionOptionView matchingView = buttonForSku(sku);
-        if (matchingView != null) {
-            matchingView.setPriceText(price);
-            matchingView.setSku(sku.id.code);
-            matchingView.setIsPurchased(subscriptions.isPurchased(sku));
-        }
-    }
-
-    private void selectSubscription(String sku) {
-        for (Sku thisSku : skus) {
-            if (thisSku.id.code.equals(sku)) {
-                selectSubscription(thisSku);
-                return;
-            }
-        }
-    }
-
-    private void selectSubscription(Sku sku) {
-        if (this.selectedSubscriptionSku != null) {
-            SubscriptionOptionView oldButton = buttonForSku(this.selectedSubscriptionSku);
-            if (oldButton != null) {
-                oldButton.setIsPurchased(false);
-            }
-        }
-        this.selectedSubscriptionSku = sku;
-        SubscriptionOptionView subscriptionOptionButton = buttonForSku(this.selectedSubscriptionSku);
-        if (subscriptionOptionButton != null) {
-            subscriptionOptionButton.setIsPurchased(true);
-        }
-        this.subscriptionButton.setEnabled(true);
-    }
-
-    @Nullable
-    private SubscriptionOptionView buttonForSku(Sku sku) {
-        return buttonForSku(sku.id.code);
-    }
-
-    @Nullable
-    private SubscriptionOptionView buttonForSku(String sku) {
-        if (sku.equals(PurchaseTypes.Subscription1Month)) {
-            return subscription1MonthView;
-        } else if (sku.equals(PurchaseTypes.Subscription3Month)) {
-            return subscription3MonthView;
-        } else if (sku.equals(PurchaseTypes.Subscription6Month)) {
-            return subscription6MonthView;
-        } else if (sku.equals(PurchaseTypes.Subscription12Month)) {
-            return subscription12MonthView;
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public void setListener(GemPurchaseActivity listener) {
-        this.listener = listener;
-    }
-
-    @Override
-    public void setBillingRequests(BillingRequests billingRequests) {
-        this.billingRequests = billingRequests;
-    }
-
-    private void purchaseSubscription() {
-        if (selectedSubscriptionSku != null) {
-            billingRequests.isPurchased(ProductTypes.SUBSCRIPTION, this.selectedSubscriptionSku.id.code, new RequestListener<Boolean>() {
-                @Override
-                public void onSuccess(@NonNull Boolean aBoolean) {
-                    if (!aBoolean) {
-                        // no current product exist
-                        final ActivityCheckout checkout = listener.getActivityCheckout();
-                        billingRequests.purchase(ProductTypes.SUBSCRIPTION, selectedSubscriptionSku.id.code, null, checkout.getPurchaseFlow());
-                    }
-                }
-
-                @Override
-                public void onError(int i, @NonNull Exception e) {
-                    crashlyticsProxy.fabricLogE("Purchase", "Error", e);
-                }
-            });
-        }
-    }
-
-    public void setUser(HabitRPGUser newUser) {
-        user = newUser;
-        this.updateSubscriptionInfo();
-    }
-
-    private void updateSubscriptionInfo() {
-        if (user != null) {
-            SubscriptionPlan plan = user.getPurchased().getPlan();
-            boolean isSubscribed = false;
-            if (plan != null) {
-                if (plan.isActive()) {
-                    isSubscribed = true;
-                }
-            }
-
-            if (isSubscribed) {
-                this.subscriptionDetailsView.setVisibility(View.VISIBLE);
-                this.subscriptionDetailsView.setPlan(plan);
-                this.subscribeBenefitsTitle.setText(R.string.subscribe_prompt_thanks);
-                this.subscriptionOptions.setVisibility(View.GONE);
-            } else {
-                if (!hasLoadedSubscriptionOptions) {
-                    return;
-                }
-                this.subscriptionOptions.setVisibility(View.VISIBLE);
-                this.subscriptionDetailsView.setVisibility(View.GONE);
-            }
-            this.loadingIndicator.setVisibility(View.GONE);
-        }
-    }
-
-    @OnClick(R.id.subscribeButton)
-    public void subscribeUser() {
-        purchaseSubscription();
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+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.data.ApiClient;
+import com.habitrpg.android.habitica.events.UserSubscribedEvent;
+import com.habitrpg.android.habitica.helpers.PurchaseTypes;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
+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 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;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+public class SubscriptionFragment extends BaseFragment implements GemPurchaseActivity.CheckoutFragment {
+
+    @Inject
+    CrashlyticsProxy crashlyticsProxy;
+
+    @Inject
+    ApiClient apiClient;
+
+    @BindView(R.id.subscribe_listitem1_box)
+    View subscribeListitem1Box;
+    @BindView(R.id.subscribe_listitem2_box)
+    View subscribeListitem2Box;
+    @BindView(R.id.subscribe_listitem3_box)
+    View subscribeListitem3Box;
+    @BindView(R.id.subscribe_listitem4_box)
+    View subscribeListitem4Box;
+
+    @BindView(R.id.subscribe_listitem1_expand)
+    ImageView subscribeListitem1Button;
+    @BindView(R.id.subscribe_listitem2_expand)
+    ImageView subscribeListitem2Button;
+    @BindView(R.id.subscribe_listitem3_expand)
+    ImageView subscribeListitem3Button;
+    @BindView(R.id.subscribe_listitem4_expand)
+    ImageView subscribeListitem4Button;
+
+    @BindView(R.id.subscribe_listitem1_description)
+    TextView subscribeListItem1Description;
+    @BindView(R.id.subscribe_listitem2_description)
+    TextView subscribeListItem2Description;
+    @BindView(R.id.subscribe_listitem3_description)
+    TextView subscribeListItem3Description;
+    @BindView(R.id.subscribe_listitem4_description)
+    TextView subscribeListItem4Description;
+
+    @BindView(R.id.loadingIndicator)
+    ProgressBar loadingIndicator;
+
+    @BindView(R.id.subscriptionOptions)
+    View subscriptionOptions;
+
+    @BindView(R.id.subscription1month)
+    SubscriptionOptionView subscription1MonthView;
+    @BindView(R.id.subscription3month)
+    SubscriptionOptionView subscription3MonthView;
+    @BindView(R.id.subscription6month)
+    SubscriptionOptionView subscription6MonthView;
+    @BindView(R.id.subscription12month)
+    SubscriptionOptionView subscription12MonthView;
+
+    @BindView(R.id.subscribeButton)
+    Button subscriptionButton;
+
+    @BindView(R.id.subscriptionDetails)
+    SubscriptionDetailsView subscriptionDetailsView;
+
+    @BindView(R.id.subscribeBenefitsTitle)
+    TextView subscribeBenefitsTitle;
+
+    @Nullable
+    Sku selectedSubscriptionSku;
+    List<Sku> skus;
+
+    private GemPurchaseActivity listener;
+    private BillingRequests billingRequests;
+
+    private HabitRPGUser user;
+    private boolean hasLoadedSubscriptionOptions;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        super.onCreateView(inflater, container, savedInstanceState);
+
+        fetchUser(null);
+
+        return inflater.inflate(R.layout.fragment_subscription, container, false);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+    }
+
+    @Subscribe
+    public void fetchUser(@Nullable UserSubscribedEvent event) {
+        apiClient.getUser().subscribe(this::setUser, throwable -> {
+                });
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        subscriptionOptions.setVisibility(View.GONE);
+        subscriptionDetailsView.setVisibility(View.GONE);
+
+        this.subscription1MonthView.setOnPurchaseClickListener(view1 -> selectSubscription(PurchaseTypes.Subscription1Month));
+        this.subscription3MonthView.setOnPurchaseClickListener(view1 -> selectSubscription(PurchaseTypes.Subscription3Month));
+        this.subscription6MonthView.setOnPurchaseClickListener(view1 -> selectSubscription(PurchaseTypes.Subscription6Month));
+        this.subscription12MonthView.setOnPurchaseClickListener(view1 -> selectSubscription(PurchaseTypes.Subscription12Month));
+
+        this.subscribeListitem1Box.setOnClickListener(view1 -> toggleDescriptionView(this.subscribeListitem1Button, this.subscribeListItem1Description));
+        this.subscribeListitem2Box.setOnClickListener(view1 -> toggleDescriptionView(this.subscribeListitem2Button, this.subscribeListItem2Description));
+        this.subscribeListitem3Box.setOnClickListener(view1 -> toggleDescriptionView(this.subscribeListitem3Button, this.subscribeListItem3Description));
+        this.subscribeListitem4Box.setOnClickListener(view1 -> toggleDescriptionView(this.subscribeListitem4Button, this.subscribeListItem4Description));
+    }
+
+    private void toggleDescriptionView(ImageView button, TextView descriptionView) {
+        if (descriptionView.getVisibility() == View.VISIBLE) {
+            descriptionView.setVisibility(View.GONE);
+            button.setImageResource(R.drawable.ic_keyboard_arrow_down_black_24dp);
+        } else {
+            descriptionView.setVisibility(View.VISIBLE);
+            button.setImageResource(R.drawable.ic_keyboard_arrow_up_black_24dp);
+        }
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void setupCheckout() {
+        final ActivityCheckout checkout = listener.getActivityCheckout();
+        if (checkout != null) {
+            Inventory inventory = checkout.makeInventory();
+
+            inventory.load(Inventory.Request.create()
+                            .loadAllPurchases().loadSkus(ProductTypes.SUBSCRIPTION, PurchaseTypes.allSubscriptionTypes),
+                    products -> {
+                        Inventory.Product subscriptions = products.get(ProductTypes.SUBSCRIPTION);
+
+                        skus = subscriptions.getSkus();
+
+                        for (Sku sku : skus) {
+                            updateButtonLabel(sku, sku.price, subscriptions);
+                        }
+                        selectSubscription(PurchaseTypes.Subscription1Month);
+                        hasLoadedSubscriptionOptions = true;
+                        updateSubscriptionInfo();
+                    });
+        }
+    }
+
+    private void updateButtonLabel(Sku sku, String price, Inventory.Product subscriptions) {
+        SubscriptionOptionView matchingView = buttonForSku(sku);
+        if (matchingView != null) {
+            matchingView.setPriceText(price);
+            matchingView.setSku(sku.id.code);
+            matchingView.setIsPurchased(subscriptions.isPurchased(sku));
+        }
+    }
+
+    private void selectSubscription(String sku) {
+        for (Sku thisSku : skus) {
+            if (thisSku.id.code.equals(sku)) {
+                selectSubscription(thisSku);
+                return;
+            }
+        }
+    }
+
+    private void selectSubscription(Sku sku) {
+        if (this.selectedSubscriptionSku != null) {
+            SubscriptionOptionView oldButton = buttonForSku(this.selectedSubscriptionSku);
+            if (oldButton != null) {
+                oldButton.setIsPurchased(false);
+            }
+        }
+        this.selectedSubscriptionSku = sku;
+        SubscriptionOptionView subscriptionOptionButton = buttonForSku(this.selectedSubscriptionSku);
+        if (subscriptionOptionButton != null) {
+            subscriptionOptionButton.setIsPurchased(true);
+        }
+        this.subscriptionButton.setEnabled(true);
+    }
+
+    @Nullable
+    private SubscriptionOptionView buttonForSku(Sku sku) {
+        return buttonForSku(sku.id.code);
+    }
+
+    @Nullable
+    private SubscriptionOptionView buttonForSku(String sku) {
+        if (sku.equals(PurchaseTypes.Subscription1Month)) {
+            return subscription1MonthView;
+        } else if (sku.equals(PurchaseTypes.Subscription3Month)) {
+            return subscription3MonthView;
+        } else if (sku.equals(PurchaseTypes.Subscription6Month)) {
+            return subscription6MonthView;
+        } else if (sku.equals(PurchaseTypes.Subscription12Month)) {
+            return subscription12MonthView;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public void setListener(GemPurchaseActivity listener) {
+        this.listener = listener;
+    }
+
+    @Override
+    public void setBillingRequests(BillingRequests billingRequests) {
+        this.billingRequests = billingRequests;
+    }
+
+    private void purchaseSubscription() {
+        if (selectedSubscriptionSku != null) {
+            billingRequests.isPurchased(ProductTypes.SUBSCRIPTION, this.selectedSubscriptionSku.id.code, new RequestListener<Boolean>() {
+                @Override
+                public void onSuccess(@NonNull Boolean aBoolean) {
+                    if (!aBoolean) {
+                        // no current product exist
+                        final ActivityCheckout checkout = listener.getActivityCheckout();
+                        billingRequests.purchase(ProductTypes.SUBSCRIPTION, selectedSubscriptionSku.id.code, null, checkout.getPurchaseFlow());
+                    }
+                }
+
+                @Override
+                public void onError(int i, @NonNull Exception e) {
+                    crashlyticsProxy.fabricLogE("Purchase", "Error", e);
+                }
+            });
+        }
+    }
+
+    public void setUser(HabitRPGUser newUser) {
+        user = newUser;
+        this.updateSubscriptionInfo();
+    }
+
+    private void updateSubscriptionInfo() {
+        if (user != null) {
+            SubscriptionPlan plan = user.getPurchased().getPlan();
+            boolean isSubscribed = false;
+            if (plan != null) {
+                if (plan.isActive()) {
+                    isSubscribed = true;
+                }
+            }
+
+            if (isSubscribed) {
+                this.subscriptionDetailsView.setVisibility(View.VISIBLE);
+                this.subscriptionDetailsView.setPlan(plan);
+                this.subscribeBenefitsTitle.setText(R.string.subscribe_prompt_thanks);
+                this.subscriptionOptions.setVisibility(View.GONE);
+            } else {
+                if (!hasLoadedSubscriptionOptions) {
+                    return;
+                }
+                this.subscriptionOptions.setVisibility(View.VISIBLE);
+                this.subscriptionDetailsView.setVisibility(View.GONE);
+            }
+            this.loadingIndicator.setVisibility(View.GONE);
+        }
+    }
+
+    @OnClick(R.id.subscribeButton)
+    public void subscribeUser() {
+        purchaseSubscription();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java
index ca9b94b3a..952d21181 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragment.java
@@ -1,57 +1,57 @@
-package com.habitrpg.android.habitica.ui.fragments.faq;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.habitrpg.android.habitica.models.FAQArticle;
-
-import android.os.Bundle;
-import android.text.method.LinkMovementMethod;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class FAQDetailFragment extends BaseMainFragment {
-    @BindView(R.id.questionTextView)
-    TextView questionTextView;
-
-    @BindView(R.id.answerTextView)
-    TextView answerTextView;
-
-    private FAQArticle article;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View view = inflater.inflate(R.layout.fragment_faq_detail, container, false);
-
-        unbinder = ButterKnife.bind(this, view);
-
-        if (this.article != null) {
-            this.questionTextView.setText(this.article.getQuestion());
-            this.answerTextView.setText(MarkdownParser.parseMarkdown(this.article.getAnswer()));
-        }
-        this.answerTextView.setMovementMethod(LinkMovementMethod.getInstance());
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-    }
-
-    public void setArticle(FAQArticle article) {
-        this.article = article;
-        if (this.questionTextView != null) {
-            this.questionTextView.setText(this.article.getQuestion());
-        }
-        if (this.answerTextView != null) {
-            this.answerTextView.setText(MarkdownParser.parseMarkdown(this.article.getAnswer()));
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.faq;
+
+import android.os.Bundle;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.models.FAQArticle;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class FAQDetailFragment extends BaseMainFragment {
+    @BindView(R.id.questionTextView)
+    TextView questionTextView;
+
+    @BindView(R.id.answerTextView)
+    TextView answerTextView;
+
+    private FAQArticle article;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View view = inflater.inflate(R.layout.fragment_faq_detail, container, false);
+
+        unbinder = ButterKnife.bind(this, view);
+
+        if (this.article != null) {
+            this.questionTextView.setText(this.article.getQuestion());
+            this.answerTextView.setText(MarkdownParser.parseMarkdown(this.article.getAnswer()));
+        }
+        this.answerTextView.setMovementMethod(LinkMovementMethod.getInstance());
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+    }
+
+    public void setArticle(FAQArticle article) {
+        this.article = article;
+        if (this.questionTextView != null) {
+            this.questionTextView.setText(this.article.getQuestion());
+        }
+        if (this.answerTextView != null) {
+            this.answerTextView.setText(MarkdownParser.parseMarkdown(this.article.getAnswer()));
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
index 391fc8a7c..ea9cd8f7c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
@@ -1,73 +1,68 @@
-package com.habitrpg.android.habitica.ui.fragments.faq;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.ui.adapter.FAQOverviewRecyclerAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-import com.habitrpg.android.habitica.models.FAQArticle;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class FAQOverviewFragment extends BaseMainFragment {
-    @Inject
-    UserRepository userRepository;
-
-    @BindView(R.id.recyclerView)
-    RecyclerView recyclerView;
-
-    FAQOverviewRecyclerAdapter adapter;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
-
-        unbinder = ButterKnife.bind(this, view);
-        adapter = new FAQOverviewRecyclerAdapter();
-        adapter.getResetWalkthroughEvents().subscribe(aVoid -> this.userRepository.resetTutorial(user), throwable -> {});
-        adapter.activity = activity;
-        recyclerView.setLayoutManager(new LinearLayoutManager(activity));
-        recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
-        recyclerView.setAdapter(adapter);
-        this.loadArticles();
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void loadArticles() {
-        if (user == null || adapter == null) {
-            return;
-        }
-
-        List<FAQArticle> articles = new Select()
-                .from(FAQArticle.class).queryList();
-
-        adapter.setArticles(articles);
-    }
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.FAQ);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.faq;
+
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+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.data.FAQRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.ui.adapter.FAQOverviewRecyclerAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class FAQOverviewFragment extends BaseMainFragment {
+    @Inject
+    UserRepository userRepository;
+    @Inject
+    FAQRepository faqRepository;
+
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+
+    FAQOverviewRecyclerAdapter adapter;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+
+        unbinder = ButterKnife.bind(this, view);
+        adapter = new FAQOverviewRecyclerAdapter();
+        adapter.getResetWalkthroughEvents().subscribe(aVoid -> this.userRepository.resetTutorial(user), throwable -> {});
+        adapter.activity = activity;
+        recyclerView.setLayoutManager(new LinearLayoutManager(activity));
+        recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
+        recyclerView.setAdapter(adapter);
+        this.loadArticles();
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void loadArticles() {
+        if (user == null || adapter == null) {
+            return;
+        }
+        faqRepository.getArticles().subscribe(adapter::setArticles, throwable -> {});
+    }
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.FAQ);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
index ba56075f7..79841247a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
@@ -1,191 +1,164 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.customization;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.adapter.CustomizationRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
-import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Preferences;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.OrderBy;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.sql.language.Where;
-
-import android.os.Bundle;
-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 java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * Created by viirus on 12/01/16.
- */
-public class AvatarCustomizationFragment extends BaseMainFragment {
-
-    public String type;
-    public String category;
-    public String activeCustomization;
-
-    @BindView(R.id.recyclerView)
-    RecyclerView recyclerView;
-
-    CustomizationRecyclerViewAdapter adapter;
-    GridLayoutManager layoutManager;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
-
-        unbinder = ButterKnife.bind(this, view);
-        adapter = new CustomizationRecyclerViewAdapter();
-
-        layoutManager = new GridLayoutManager(activity, 2);
-        layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
-            @Override
-            public int getSpanSize(int position) {
-                if (adapter.getItemViewType(position) == 0) {
-                    return layoutManager.getSpanCount();
-                } else {
-                    return 1;
-                }
-            }
-        });
-        setGridSpanCount(container.getWidth());
-        recyclerView.setLayoutManager(layoutManager);
-        recyclerView.addItemDecoration(new MarginDecoration(activity));
-
-        recyclerView.setAdapter(adapter);
-        this.loadCustomizations();
-
-        this.updateActiveCustomization();
-        this.adapter.userSize = this.user.getPreferences().getSize();
-        this.adapter.hairColor = this.user.getPreferences().getHair().getColor();
-        this.adapter.gemBalance = user.getBalance() * 4;
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void loadCustomizations() {
-        if (user == null || adapter == null) {
-            return;
-        }
-
-        Where<Customization> select = new Select()
-                .from(Customization.class)
-                .where(Condition.column("type").eq(this.type))
-                .and(Condition.CombinedCondition.begin(Condition.column("purchased").eq(true))
-                        .or(Condition.column("price").eq(0))
-                        .or(Condition.column("price").isNull())
-                        .or(Condition.column("isBuyable").eq(true))
-                        .or(Condition.column("isBuyable").isNull())
-                        .or(Condition.CombinedCondition.begin(
-                                Condition.CombinedCondition.begin(Condition.column("availableUntil").isNull())
-                                        .or(Condition.column("availableUntil").greaterThanOrEq(new Date().getTime())))
-                                .and(Condition.CombinedCondition.begin(Condition.column("availableFrom").isNull())
-                                        .or(Condition.column("availableFrom").lessThanOrEq(new Date().getTime()))
-                                )
-                        )
-                );
-        if (this.category != null) {
-            select = select.and(Condition.column("category").eq(this.category));
-        }
-        if (this.type != null && this.type.equals("background")) {
-            select.orderBy(OrderBy.columns("customizationSetName").descending());
-        } else {
-            select.orderBy(true, "customizationSet");
-        }
-
-        List<Customization> customizations = select.queryList();
-        adapter.setCustomizationList(customizations);
-    }
-
-    private void setGridSpanCount(int width) {
-        float itemWidth;
-        if (this.type != null && this.type.equals("background")) {
-            itemWidth = getContext().getResources().getDimension(R.dimen.avatar_width);
-        } else {
-            itemWidth = getContext().getResources().getDimension(R.dimen.customization_width);
-        }
-
-        int spanCount = (int) (width / itemWidth);
-        if (spanCount == 0) {
-            spanCount = 1;
-        }
-        layoutManager.setSpanCount(spanCount);
-    }
-
-    @Override
-    public void updateUserData(HabitRPGUser user) {
-        super.updateUserData(user);
-        this.adapter.gemBalance = user.getBalance() * 4;
-        this.updateActiveCustomization();
-        if (adapter.getCustomizationList() != null) {
-            List<String> ownedCustomizations = new ArrayList<>();
-            for (Customization customization : user.getPurchased().customizations) {
-                if (customization.getType().equals(this.type)) {
-                    ownedCustomizations.add(customization.getId());
-                }
-            }
-            adapter.updateOwnership(ownedCustomizations);
-        } else {
-            this.loadCustomizations();
-        }
-    }
-
-    private void updateActiveCustomization() {
-        Preferences prefs = this.user.getPreferences();
-        if (this.type == null) {
-            return;
-        }
-        switch (this.type) {
-            case "skin":
-                this.activeCustomization = prefs.getSkin();
-                break;
-            case "shirt":
-                this.activeCustomization = prefs.getShirt();
-                break;
-            case "background":
-                this.activeCustomization = prefs.getBackground();
-                break;
-            case "hair":
-                switch (this.category) {
-                    case "bangs":
-                        this.activeCustomization = String.valueOf(prefs.getHair().getBangs());
-                        break;
-                    case "base":
-                        this.activeCustomization = String.valueOf(prefs.getHair().getBase());
-                        break;
-                    case "color":
-                        this.activeCustomization = prefs.getHair().getColor();
-                        break;
-                    case "flower":
-                        this.activeCustomization = String.valueOf(prefs.getHair().getFlower());
-                        break;
-                    case "beard":
-                        this.activeCustomization = String.valueOf(prefs.getHair().getBeard());
-                        break;
-                    case "mustache":
-                        this.activeCustomization = String.valueOf(prefs.getHair().getMustache());
-                        break;
-                }
-        }
-        this.adapter.setActiveCustomization(this.activeCustomization);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.customization;
+
+import android.os.Bundle;
+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.data.CustomizationRepository;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Preferences;
+import com.habitrpg.android.habitica.ui.adapter.CustomizationRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class AvatarCustomizationFragment extends BaseMainFragment {
+
+    @Inject
+    CustomizationRepository customizationRepository;
+
+    public String type;
+    public String category;
+    public String activeCustomization;
+
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+
+    CustomizationRecyclerViewAdapter adapter;
+    GridLayoutManager layoutManager;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+
+        unbinder = ButterKnife.bind(this, view);
+        adapter = new CustomizationRecyclerViewAdapter();
+
+        layoutManager = new GridLayoutManager(activity, 2);
+        layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+            @Override
+            public int getSpanSize(int position) {
+                if (adapter.getItemViewType(position) == 0) {
+                    return layoutManager.getSpanCount();
+                } else {
+                    return 1;
+                }
+            }
+        });
+        setGridSpanCount(container.getWidth());
+        recyclerView.setLayoutManager(layoutManager);
+        recyclerView.addItemDecoration(new MarginDecoration(getContext()));
+
+        recyclerView.setAdapter(adapter);
+        this.loadCustomizations();
+
+        this.updateActiveCustomization();
+        if (this.user != null) {
+            this.adapter.userSize = this.user.getPreferences().getSize();
+            this.adapter.hairColor = this.user.getPreferences().getHair().getColor();
+            this.adapter.gemBalance = user.getBalance() * 4;
+        }
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void loadCustomizations() {
+        if (user == null || adapter == null) {
+            return;
+        }
+        customizationRepository.getCustomizations(type, category).subscribe(adapter::setCustomizationList, throwable -> {});
+    }
+
+    private void setGridSpanCount(int width) {
+        float itemWidth;
+        if (this.type != null && this.type.equals("background")) {
+            itemWidth = getContext().getResources().getDimension(R.dimen.avatar_width);
+        } else {
+            itemWidth = getContext().getResources().getDimension(R.dimen.customization_width);
+        }
+
+        int spanCount = (int) (width / itemWidth);
+        if (spanCount == 0) {
+            spanCount = 1;
+        }
+        layoutManager.setSpanCount(spanCount);
+    }
+
+    @Override
+    public void updateUserData(HabitRPGUser user) {
+        super.updateUserData(user);
+        this.adapter.gemBalance = user.getBalance() * 4;
+        this.updateActiveCustomization();
+        if (adapter.getCustomizationList() != null) {
+            List<String> ownedCustomizations = new ArrayList<>();
+            for (Customization customization : user.getPurchased().customizations) {
+                if (customization.getType().equals(this.type)) {
+                    ownedCustomizations.add(customization.getId());
+                }
+            }
+            adapter.updateOwnership(ownedCustomizations);
+        } else {
+            this.loadCustomizations();
+        }
+    }
+
+    private void updateActiveCustomization() {
+        if (this.type == null || this.user == null || this.user.getPreferences() == null) {
+            return;
+        }
+        Preferences prefs = this.user.getPreferences();
+        switch (this.type) {
+            case "skin":
+                this.activeCustomization = prefs.getSkin();
+                break;
+            case "shirt":
+                this.activeCustomization = prefs.getShirt();
+                break;
+            case "background":
+                this.activeCustomization = prefs.getBackground();
+                break;
+            case "hair":
+                switch (this.category) {
+                    case "bangs":
+                        this.activeCustomization = String.valueOf(prefs.getHair().getBangs());
+                        break;
+                    case "base":
+                        this.activeCustomization = String.valueOf(prefs.getHair().getBase());
+                        break;
+                    case "color":
+                        this.activeCustomization = prefs.getHair().getColor();
+                        break;
+                    case "flower":
+                        this.activeCustomization = String.valueOf(prefs.getHair().getFlower());
+                        break;
+                    case "beard":
+                        this.activeCustomization = String.valueOf(prefs.getHair().getBeard());
+                        break;
+                    case "mustache":
+                        this.activeCustomization = String.valueOf(prefs.getHair().getMustache());
+                        break;
+                }
+        }
+        this.adapter.setActiveCustomization(this.activeCustomization);
+    }
+}
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 631e23091..789f7add9 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
@@ -1,161 +1,161 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.customization;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.databinding.FragmentAvatarOverviewBinding;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.models.user.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;
-import android.widget.AdapterView;
-import android.widget.Spinner;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class AvatarOverviewFragment extends BaseMainFragment implements AdapterView.OnItemSelectedListener {
-
-    FragmentAvatarOverviewBinding viewBinding;
-
-    @BindView(R.id.avatar_size_spinner)
-    Spinner avatarSizeSpinner;
-
-    @BindView(R.id.avatar_shirt)
-    View avatarShirtView;
-
-    @BindView(R.id.avatar_skin)
-    View avatarSkinView;
-
-    @BindView(R.id.avatar_hair_color)
-    View avatarHairColorView;
-
-    @BindView(R.id.avatar_hair_base)
-    View avatarHairBaseView;
-
-    @BindView(R.id.avatar_hair_bangs)
-    View avatarHairBangsView;
-
-    @BindView(R.id.avatar_hair_flower)
-    View avatarHairFlowerView;
-
-    @BindView(R.id.avatar_hair_beard)
-    View avatarHairBeardView;
-
-    @BindView(R.id.avatar_hair_mustache)
-    View avatarHairMustacheView;
-
-    @BindView(R.id.avatar_background)
-    View avatarBackgroundView;
-
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (apiClient != null) {
-            apiClient.getContent()
-                    .subscribe(contentResult -> {}, throwable -> {});
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View view = inflater.inflate(R.layout.fragment_avatar_overview, container, false);
-
-        if (this.user == null) {
-            return view;
-        }
-
-        viewBinding = DataBindingUtil.bind(view);
-        viewBinding.setPreferences(this.user.getPreferences());
-
-        unbinder = ButterKnife.bind(this, view);
-
-        this.setSize(this.user.getPreferences().getSize());
-        avatarSizeSpinner.setOnItemSelectedListener(this);
-
-        avatarShirtView.setOnClickListener(v1 -> displayCustomizationFragment("shirt", null));
-
-        avatarSkinView.setOnClickListener(v1 -> displayCustomizationFragment("skin", null));
-
-        avatarHairColorView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "color"));
-        avatarHairBangsView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "bangs"));
-        avatarHairBaseView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "base"));
-        avatarHairFlowerView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "flower"));
-        avatarHairBeardView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "beard"));
-        avatarHairMustacheView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "mustache"));
-        avatarBackgroundView.setOnClickListener(v1 -> displayCustomizationFragment("background", null));
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void displayCustomizationFragment(String type, @Nullable String category) {
-        AvatarCustomizationFragment fragment = new AvatarCustomizationFragment();
-        fragment.type = type;
-        fragment.category = category;
-        if (activity != null) {
-            activity.displayFragment(fragment);
-        }
-    }
-
-    @Override
-    public void updateUserData(HabitRPGUser user) {
-        super.updateUserData(user);
-        if (user != null && viewBinding != null) {
-            viewBinding.setPreferences(user.getPreferences());
-            this.setSize(user.getPreferences().getSize());
-        }
-    }
-
-    private void setSize(String size) {
-        if (size.equals("slim")) {
-            avatarSizeSpinner.setSelection(0, false);
-        } else {
-            avatarSizeSpinner.setSelection(1, false);
-        }
-    }
-
-    @Override
-    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        String newSize;
-        if (position == 0) {
-            newSize = "slim";
-        } else {
-            newSize = "broad";
-        }
-
-        if (this.user != null && !this.user.getPreferences().getSize().equals(newSize)) {
-            Map<String, Object> updateData = new HashMap<>();
-            updateData.put("preferences.size", newSize);
-            apiClient.updateUser(updateData)
-                    .subscribe(new MergeUserCallback(activity, user), throwable -> {
-                    });
-        }
-    }
-
-    @Override
-    public void onNothingSelected(AdapterView<?> parent) {
-    }
-
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.sidebar_avatar);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.customization;
+
+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;
+import android.widget.AdapterView;
+import android.widget.Spinner;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.databinding.FragmentAvatarOverviewBinding;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class AvatarOverviewFragment extends BaseMainFragment implements AdapterView.OnItemSelectedListener {
+
+    FragmentAvatarOverviewBinding viewBinding;
+
+    @BindView(R.id.avatar_size_spinner)
+    Spinner avatarSizeSpinner;
+
+    @BindView(R.id.avatar_shirt)
+    View avatarShirtView;
+
+    @BindView(R.id.avatar_skin)
+    View avatarSkinView;
+
+    @BindView(R.id.avatar_hair_color)
+    View avatarHairColorView;
+
+    @BindView(R.id.avatar_hair_base)
+    View avatarHairBaseView;
+
+    @BindView(R.id.avatar_hair_bangs)
+    View avatarHairBangsView;
+
+    @BindView(R.id.avatar_hair_flower)
+    View avatarHairFlowerView;
+
+    @BindView(R.id.avatar_hair_beard)
+    View avatarHairBeardView;
+
+    @BindView(R.id.avatar_hair_mustache)
+    View avatarHairMustacheView;
+
+    @BindView(R.id.avatar_background)
+    View avatarBackgroundView;
+
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (apiClient != null) {
+            apiClient.getContent()
+                    .subscribe(contentResult -> {}, throwable -> {});
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View view = inflater.inflate(R.layout.fragment_avatar_overview, container, false);
+
+        if (this.user == null) {
+            return view;
+        }
+
+        viewBinding = DataBindingUtil.bind(view);
+        viewBinding.setPreferences(this.user.getPreferences());
+
+        unbinder = ButterKnife.bind(this, view);
+
+        this.setSize(this.user.getPreferences().getSize());
+        avatarSizeSpinner.setOnItemSelectedListener(this);
+
+        avatarShirtView.setOnClickListener(v1 -> displayCustomizationFragment("shirt", null));
+
+        avatarSkinView.setOnClickListener(v1 -> displayCustomizationFragment("skin", null));
+
+        avatarHairColorView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "color"));
+        avatarHairBangsView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "bangs"));
+        avatarHairBaseView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "base"));
+        avatarHairFlowerView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "flower"));
+        avatarHairBeardView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "beard"));
+        avatarHairMustacheView.setOnClickListener(v1 -> displayCustomizationFragment("hair", "mustache"));
+        avatarBackgroundView.setOnClickListener(v1 -> displayCustomizationFragment("background", null));
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void displayCustomizationFragment(String type, @Nullable String category) {
+        AvatarCustomizationFragment fragment = new AvatarCustomizationFragment();
+        fragment.type = type;
+        fragment.category = category;
+        if (activity != null) {
+            activity.displayFragment(fragment);
+        }
+    }
+
+    @Override
+    public void updateUserData(HabitRPGUser user) {
+        super.updateUserData(user);
+        if (user != null && viewBinding != null) {
+            viewBinding.setPreferences(user.getPreferences());
+            this.setSize(user.getPreferences().getSize());
+        }
+    }
+
+    private void setSize(String size) {
+        if (size.equals("slim")) {
+            avatarSizeSpinner.setSelection(0, false);
+        } else {
+            avatarSizeSpinner.setSelection(1, false);
+        }
+    }
+
+    @Override
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+        String newSize;
+        if (position == 0) {
+            newSize = "slim";
+        } else {
+            newSize = "broad";
+        }
+
+        if (this.user != null && !this.user.getPreferences().getSize().equals(newSize)) {
+            Map<String, Object> updateData = new HashMap<>();
+            updateData.put("preferences.size", newSize);
+            apiClient.updateUser(updateData)
+                    .subscribe(new MergeUserCallback(activity, user), throwable -> {
+                    });
+        }
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+    }
+
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_avatar);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
index ced7840db..b17ce3a7f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
@@ -1,76 +1,70 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.equipment;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class EquipmentDetailFragment extends BaseMainFragment {
-
-    public String type;
-    public String equippedGear;
-    public Boolean isCostume;
-
-    @BindView(R.id.recyclerView)
-    RecyclerView recyclerView;
-
-    EquipmentRecyclerViewAdapter adapter;
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_recyclerview, container, false);
-
-        unbinder = ButterKnife.bind(this, v);
-
-        this.adapter = new EquipmentRecyclerViewAdapter();
-        this.adapter.equippedGear = this.equippedGear;
-        this.adapter.isCostume = this.isCostume;
-        this.adapter.type = this.type;
-        this.recyclerView.setLayoutManager(new LinearLayoutManager(activity));
-        this.recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
-
-        this.recyclerView.setAdapter(this.adapter);
-
-        this.loadGear();
-
-        return v;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void loadGear() {
-        if (user == null || adapter == null) {
-            return;
-        }
-
-        List<ItemData> gear = new Select()
-                .from(ItemData.class)
-                .where(Condition.CombinedCondition.begin(Condition.column("type").eq(this.type))
-                        .and(Condition.column("owned").eq(true))
-                ).queryList();
-
-        adapter.setGearList(gear);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.equipment;
+
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+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.data.InventoryRepository;
+import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class EquipmentDetailFragment extends BaseMainFragment {
+
+    @Inject
+    InventoryRepository inventoryRepository;
+
+    public String type;
+    public String equippedGear;
+    public Boolean isCostume;
+
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+
+    EquipmentRecyclerViewAdapter adapter;
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+
+        unbinder = ButterKnife.bind(this, v);
+
+        this.adapter = new EquipmentRecyclerViewAdapter();
+        this.adapter.equippedGear = this.equippedGear;
+        this.adapter.isCostume = this.isCostume;
+        this.adapter.type = this.type;
+        this.recyclerView.setLayoutManager(new LinearLayoutManager(activity));
+        this.recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
+
+        this.recyclerView.setAdapter(this.adapter);
+
+        this.loadGear();
+
+        return v;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void loadGear() {
+        if (user == null || adapter == null) {
+            return;
+        }
+        inventoryRepository.getOwnedEquipment(type).subscribe(adapter::setGearList, throwable -> {});
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
index c414ba8d1..1fae83f1a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
@@ -1,174 +1,164 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.equipment;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.databinding.FragmentEquipmentOverviewBinding;
-import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.databinding.DataBindingUtil;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Switch;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class EquipmentOverviewFragment extends BaseMainFragment implements TransactionListener<List<ItemData>> {
-
-    FragmentEquipmentOverviewBinding viewBinding;
-
-    @BindView(R.id.battle_gear_group)
-    View battleGearGroupView;
-
-    @BindView(R.id.costume_group)
-    View costumeGroupView;
-
-    View battleGearHeadView;
-    View battleGearHeadAccessoryView;
-    View battleGearEyewearView;
-    View battleGearArmorView;
-    View battleGearBackView;
-    View battleGearBodyView;
-    View battleGearWeaponView;
-    View battleGearShieldView;
-
-    View costumeHeadView;
-    View costumeHeadAccessoryView;
-    View costumeEyewearView;
-    View costumeArmorView;
-    View costumeBackView;
-    View costumeBodyView;
-    View costumeWeaponView;
-    View costumeShieldView;
-
-    @BindView(R.id.costume_switch)
-    Switch costumeSwitch;
-
-    HashMap<String, String> nameMapping;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_equipment_overview, container, false);
-
-        if (this.user == null) {
-            return v;
-        }
-
-        viewBinding = DataBindingUtil.bind(v);
-        viewBinding.setCurrentBattleGear(this.user.getItems().getGear().getEquipped());
-        viewBinding.setCurrentCostume(this.user.getItems().getGear().getCostume());
-        viewBinding.setUsingCostume(this.user.getPreferences().getCostume());
-
-        unbinder = ButterKnife.bind(this, v);
-
-        battleGearHeadView = battleGearGroupView.findViewById(R.id.outfit_head);
-        battleGearHeadAccessoryView = battleGearGroupView.findViewById(R.id.outfit_head_accessory);
-        battleGearEyewearView = battleGearGroupView.findViewById(R.id.outfit_Eyewear);
-        battleGearArmorView = battleGearGroupView.findViewById(R.id.outfit_Armor);
-        battleGearBackView = battleGearGroupView.findViewById(R.id.outfit_back);
-        battleGearBodyView = battleGearGroupView.findViewById(R.id.outfit_Body);
-        battleGearWeaponView = battleGearGroupView.findViewById(R.id.outfit_weapon);
-        battleGearShieldView = battleGearGroupView.findViewById(R.id.outfit_shield);
-
-        costumeHeadView = costumeGroupView.findViewById(R.id.outfit_head);
-        costumeHeadAccessoryView = costumeGroupView.findViewById(R.id.outfit_head_accessory);
-        costumeEyewearView = costumeGroupView.findViewById(R.id.outfit_Eyewear);
-        costumeArmorView = costumeGroupView.findViewById(R.id.outfit_Armor);
-        costumeBackView = costumeGroupView.findViewById(R.id.outfit_back);
-        costumeBodyView = costumeGroupView.findViewById(R.id.outfit_Body);
-        costumeWeaponView = costumeGroupView.findViewById(R.id.outfit_weapon);
-        costumeShieldView = costumeGroupView.findViewById(R.id.outfit_shield);
-
-        battleGearHeadView.setOnClickListener(v1 -> displayEquipmentDetailList("head", user.getItems().getGear().getEquipped().getHead(), false));
-        battleGearHeadAccessoryView.setOnClickListener(v1 -> displayEquipmentDetailList("headAccessory", user.getItems().getGear().getEquipped().getHeadAccessory(), false));
-        battleGearEyewearView.setOnClickListener(v1 -> displayEquipmentDetailList("eyewear", user.getItems().getGear().getEquipped().getEyeWear(), false));
-        battleGearArmorView.setOnClickListener(v1 -> displayEquipmentDetailList("armor", user.getItems().getGear().getEquipped().getArmor(), false));
-        battleGearBackView.setOnClickListener(v1 -> displayEquipmentDetailList("back", user.getItems().getGear().getEquipped().getBack(), false));
-        battleGearBodyView.setOnClickListener(v1 -> displayEquipmentDetailList("body", user.getItems().getGear().getEquipped().getBody(), false));
-        battleGearWeaponView.setOnClickListener(v1 -> displayEquipmentDetailList("weapon", user.getItems().getGear().getEquipped().getWeapon(), false));
-        battleGearShieldView.setOnClickListener(v1 -> displayEquipmentDetailList("shield", user.getItems().getGear().getEquipped().getShield(), false));
-
-
-        costumeHeadView.setOnClickListener(v1 -> displayEquipmentDetailList("head", user.getItems().getGear().getCostume().getHead(), true));
-        costumeHeadAccessoryView.setOnClickListener(v1 -> displayEquipmentDetailList("headAccessory", user.getItems().getGear().getCostume().getHeadAccessory(), true));
-        costumeEyewearView.setOnClickListener(v1 -> displayEquipmentDetailList("eyewear", user.getItems().getGear().getCostume().getEyeWear(), true));
-        costumeArmorView.setOnClickListener(v1 -> displayEquipmentDetailList("armor", user.getItems().getGear().getCostume().getArmor(), true));
-        costumeBackView.setOnClickListener(v1 -> displayEquipmentDetailList("back", user.getItems().getGear().getCostume().getBack(), true));
-        costumeBodyView.setOnClickListener(v1 -> displayEquipmentDetailList("body", user.getItems().getGear().getCostume().getBody(), true));
-        costumeWeaponView.setOnClickListener(v1 -> displayEquipmentDetailList("weapon", user.getItems().getGear().getCostume().getWeapon(), true));
-        costumeShieldView.setOnClickListener(v1 -> displayEquipmentDetailList("shield", user.getItems().getGear().getCostume().getShield(), true));
-
-        this.costumeSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            UpdateUserCommand command = new UpdateUserCommand();
-            Map<String, Object> updateData = new HashMap<>();
-            updateData.put("preferences.costume", isChecked);
-            command.updateData = updateData;
-
-            EventBus.getDefault().post(command);
-        });
-
-        if (this.nameMapping == null) {
-            new Select().from(ItemData.class).where(Condition.column("owned").eq(true)).async().queryList(this);
-        } else {
-            this.viewBinding.setEquipmentNames(this.nameMapping);
-        }
-
-        return v;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void displayEquipmentDetailList(String type, String equipped, Boolean isCostume) {
-        EquipmentDetailFragment fragment = new EquipmentDetailFragment();
-        fragment.type = type;
-        fragment.isCostume = isCostume;
-        fragment.equippedGear = equipped;
-        activity.displayFragment(fragment);
-    }
-
-    @Override
-    public void onResultReceived(List<ItemData> result) {
-        this.nameMapping = new HashMap<>();
-
-        for (ItemData gear : result) {
-            this.nameMapping.put(gear.key, gear.text);
-        }
-
-        this.viewBinding.setEquipmentNames(this.nameMapping);
-    }
-
-    @Override
-    public boolean onReady(BaseTransaction<List<ItemData>> transaction) {
-        return true;
-    }
-
-    @Override
-    public boolean hasResult(BaseTransaction<List<ItemData>> transaction, List<ItemData> result) {
-        return true;
-    }
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.sidebar_equipment);
-    }
-
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.equipment;
+
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Switch;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.databinding.FragmentEquipmentOverviewBinding;
+import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class EquipmentOverviewFragment extends BaseMainFragment {
+
+    @Inject
+    InventoryRepository inventoryRepository;
+
+    FragmentEquipmentOverviewBinding viewBinding;
+
+    @BindView(R.id.battle_gear_group)
+    View battleGearGroupView;
+
+    @BindView(R.id.costume_group)
+    View costumeGroupView;
+
+    View battleGearHeadView;
+    View battleGearHeadAccessoryView;
+    View battleGearEyewearView;
+    View battleGearArmorView;
+    View battleGearBackView;
+    View battleGearBodyView;
+    View battleGearWeaponView;
+    View battleGearShieldView;
+
+    View costumeHeadView;
+    View costumeHeadAccessoryView;
+    View costumeEyewearView;
+    View costumeArmorView;
+    View costumeBackView;
+    View costumeBodyView;
+    View costumeWeaponView;
+    View costumeShieldView;
+
+    @BindView(R.id.costume_switch)
+    Switch costumeSwitch;
+
+    HashMap<String, String> nameMapping;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_equipment_overview, container, false);
+
+        if (this.user == null) {
+            return v;
+        }
+
+        viewBinding = DataBindingUtil.bind(v);
+        viewBinding.setCurrentBattleGear(this.user.getItems().getGear().getEquipped());
+        viewBinding.setCurrentCostume(this.user.getItems().getGear().getCostume());
+        viewBinding.setUsingCostume(this.user.getPreferences().getCostume());
+
+        unbinder = ButterKnife.bind(this, v);
+
+        battleGearHeadView = battleGearGroupView.findViewById(R.id.outfit_head);
+        battleGearHeadAccessoryView = battleGearGroupView.findViewById(R.id.outfit_head_accessory);
+        battleGearEyewearView = battleGearGroupView.findViewById(R.id.outfit_Eyewear);
+        battleGearArmorView = battleGearGroupView.findViewById(R.id.outfit_Armor);
+        battleGearBackView = battleGearGroupView.findViewById(R.id.outfit_back);
+        battleGearBodyView = battleGearGroupView.findViewById(R.id.outfit_Body);
+        battleGearWeaponView = battleGearGroupView.findViewById(R.id.outfit_weapon);
+        battleGearShieldView = battleGearGroupView.findViewById(R.id.outfit_shield);
+
+        costumeHeadView = costumeGroupView.findViewById(R.id.outfit_head);
+        costumeHeadAccessoryView = costumeGroupView.findViewById(R.id.outfit_head_accessory);
+        costumeEyewearView = costumeGroupView.findViewById(R.id.outfit_Eyewear);
+        costumeArmorView = costumeGroupView.findViewById(R.id.outfit_Armor);
+        costumeBackView = costumeGroupView.findViewById(R.id.outfit_back);
+        costumeBodyView = costumeGroupView.findViewById(R.id.outfit_Body);
+        costumeWeaponView = costumeGroupView.findViewById(R.id.outfit_weapon);
+        costumeShieldView = costumeGroupView.findViewById(R.id.outfit_shield);
+
+        battleGearHeadView.setOnClickListener(v1 -> displayEquipmentDetailList("head", user.getItems().getGear().getEquipped().getHead(), false));
+        battleGearHeadAccessoryView.setOnClickListener(v1 -> displayEquipmentDetailList("headAccessory", user.getItems().getGear().getEquipped().getHeadAccessory(), false));
+        battleGearEyewearView.setOnClickListener(v1 -> displayEquipmentDetailList("eyewear", user.getItems().getGear().getEquipped().getEyeWear(), false));
+        battleGearArmorView.setOnClickListener(v1 -> displayEquipmentDetailList("armor", user.getItems().getGear().getEquipped().getArmor(), false));
+        battleGearBackView.setOnClickListener(v1 -> displayEquipmentDetailList("back", user.getItems().getGear().getEquipped().getBack(), false));
+        battleGearBodyView.setOnClickListener(v1 -> displayEquipmentDetailList("body", user.getItems().getGear().getEquipped().getBody(), false));
+        battleGearWeaponView.setOnClickListener(v1 -> displayEquipmentDetailList("weapon", user.getItems().getGear().getEquipped().getWeapon(), false));
+        battleGearShieldView.setOnClickListener(v1 -> displayEquipmentDetailList("shield", user.getItems().getGear().getEquipped().getShield(), false));
+
+
+        costumeHeadView.setOnClickListener(v1 -> displayEquipmentDetailList("head", user.getItems().getGear().getCostume().getHead(), true));
+        costumeHeadAccessoryView.setOnClickListener(v1 -> displayEquipmentDetailList("headAccessory", user.getItems().getGear().getCostume().getHeadAccessory(), true));
+        costumeEyewearView.setOnClickListener(v1 -> displayEquipmentDetailList("eyewear", user.getItems().getGear().getCostume().getEyeWear(), true));
+        costumeArmorView.setOnClickListener(v1 -> displayEquipmentDetailList("armor", user.getItems().getGear().getCostume().getArmor(), true));
+        costumeBackView.setOnClickListener(v1 -> displayEquipmentDetailList("back", user.getItems().getGear().getCostume().getBack(), true));
+        costumeBodyView.setOnClickListener(v1 -> displayEquipmentDetailList("body", user.getItems().getGear().getCostume().getBody(), true));
+        costumeWeaponView.setOnClickListener(v1 -> displayEquipmentDetailList("weapon", user.getItems().getGear().getCostume().getWeapon(), true));
+        costumeShieldView.setOnClickListener(v1 -> displayEquipmentDetailList("shield", user.getItems().getGear().getCostume().getShield(), true));
+
+        this.costumeSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            UpdateUserCommand command = new UpdateUserCommand();
+            Map<String, Object> updateData = new HashMap<>();
+            updateData.put("preferences.costume", isChecked);
+            command.updateData = updateData;
+
+            EventBus.getDefault().post(command);
+        });
+
+        if (this.nameMapping == null) {
+            inventoryRepository.getOwnedEquipment().subscribe(items -> {
+                this.nameMapping = new HashMap<>();
+
+                for (ItemData gear : items) {
+                    this.nameMapping.put(gear.key, gear.text);
+                }
+
+                this.viewBinding.setEquipmentNames(this.nameMapping);
+            }, throwable -> {});
+        } else {
+            this.viewBinding.setEquipmentNames(this.nameMapping);
+        }
+
+        return v;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void displayEquipmentDetailList(String type, String equipped, Boolean isCostume) {
+        EquipmentDetailFragment fragment = new EquipmentDetailFragment();
+        fragment.type = type;
+        fragment.isCostume = isCostume;
+        fragment.equippedGear = equipped;
+        if (activity != null) {
+            activity.displayFragment(fragment);
+        }
+    }
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_equipment);
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
index 345b7c9c6..2e7d2063b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
@@ -1,258 +1,217 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.items;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.ContentReloadedEvent;
-import com.habitrpg.android.habitica.events.OpenedMysteryItemEvent;
-import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.inventory.Egg;
-import com.habitrpg.android.habitica.models.inventory.Food;
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.Item;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.inventory.SpecialItem;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.From;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
-
-public class ItemRecyclerFragment extends BaseFragment {
-    private static final String ITEM_TYPE_KEY = "CLASS_TYPE_KEY";
-    @BindView(R.id.recyclerView)
-    public RecyclerViewEmptySupport recyclerView;
-    @BindView(R.id.empty_view)
-    public View emptyView;
-    @BindView(R.id.empty_text_view)
-    public TextView emptyTextView;
-    @BindView(R.id.titleTextView)
-    public TextView titleView;
-    @BindView(R.id.footerTextView)
-    public TextView footerView;
-    @BindView(R.id.openMarketButton)
-    public Button openMarketButton;
-    public ItemRecyclerAdapter adapter;
-    public String itemType;
-    public String itemTypeText;
-    public Boolean isHatching;
-    public Boolean isFeeding;
-    public Item hatchingItem;
-    public Pet feedingPet;
-    public HashMap<String, Integer> ownedPets;
-    @Nullable
-    public HabitRPGUser user;
-    LinearLayoutManager layoutManager = null;
-
-    private View view;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        if (view == null) {
-            view = inflater.inflate(R.layout.fragment_items, container, false);
-        }
-        unbinder = ButterKnife.bind(this, view);
-
-        recyclerView.setEmptyView(emptyView);
-        emptyTextView.setText(getString(R.string.empty_items, itemTypeText));
-
-        android.support.v4.app.FragmentActivity context = getActivity();
-
-        layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
-
-        if (layoutManager == null) {
-            layoutManager = new LinearLayoutManager(context);
-
-            recyclerView.setLayoutManager(layoutManager);
-        }
-
-        adapter = (ItemRecyclerAdapter) recyclerView.getAdapter();
-        if (adapter == null) {
-            adapter = new ItemRecyclerAdapter();
-            adapter.context = this.getActivity();
-            adapter.isHatching = this.isHatching;
-            adapter.isFeeding = this.isFeeding;
-            adapter.fragment = this;
-            adapter.ownedPets = this.ownedPets;
-            if (this.hatchingItem != null) {
-                adapter.hatchingItem = this.hatchingItem;
-            }
-            if (this.feedingPet != null) {
-                adapter.feedingPet = this.feedingPet;
-            }
-            recyclerView.setAdapter(adapter);
-        }
-        recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
-
-        if (savedInstanceState != null) {
-            this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, "");
-        }
-
-        if (this.isHatching != null && this.isHatching) {
-            getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
-            this.titleView.setText(getString(R.string.hatch_with, this.hatchingItem.getText()));
-            this.titleView.setVisibility(View.VISIBLE);
-            this.footerView.setText(getString(R.string.hatching_market_info));
-            this.footerView.setVisibility(View.VISIBLE);
-            this.openMarketButton.setVisibility(View.VISIBLE);
-        } else if (this.isFeeding != null && this.isFeeding) {
-            getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
-            this.titleView.setText(getString(R.string.dialog_feeding, this.feedingPet.getColorText(), this.feedingPet.getAnimalText()));
-            this.titleView.setVisibility(View.VISIBLE);
-            this.footerView.setText(getString(R.string.feeding_market_info));
-            this.footerView.setVisibility(View.VISIBLE);
-            this.openMarketButton.setVisibility(View.VISIBLE);
-        } else {
-            this.titleView.setVisibility(View.GONE);
-            this.footerView.setVisibility(View.GONE);
-            this.openMarketButton.setVisibility(View.GONE);
-        }
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        this.loadItems();
-    }
-
-    @Override
-    public void onResume() {
-        if (this.isHatching != null && this.isHatching && getDialog().getWindow() != null) {
-            ViewGroup.LayoutParams params = getDialog().getWindow().getAttributes();
-            params.width = ViewGroup.LayoutParams.MATCH_PARENT;
-            params.height = ViewGroup.LayoutParams.MATCH_PARENT;
-            getDialog().getWindow().setAttributes((android.view.WindowManager.LayoutParams) params);
-        }
-
-        super.onResume();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(ITEM_TYPE_KEY, this.itemType);
-    }
-
-    @Subscribe
-    public void reloadedContent(ContentReloadedEvent event) {
-        this.loadItems();
-    }
-
-    private void loadItems() {
-        From from = null;
-        if (this.itemType == null) {
-            return;
-        }
-        switch (this.itemType) {
-            case "eggs":
-                from = new Select().from(Egg.class);
-                break;
-            case "hatchingPotions":
-                from = new Select().from(HatchingPotion.class);
-                break;
-            case "food":
-                from = new Select().from(Food.class);
-                break;
-            case "quests":
-                from = new Select().from(QuestContent.class);
-        }
-
-        List<Item> items = new ArrayList<>();
-        if (from != null) {
-            items.addAll(from.where(Condition.column("owned").greaterThan(0)).queryList());
-        }
-
-        if (this.itemType.equals("special")) {
-            if (user != null && user.getPurchased() != null && user.getPurchased().getPlan().isActive()) {
-                Item mysterItem = SpecialItem.makeMysteryItem(getContext());
-                mysterItem.setOwned(user.getPurchased().getPlan().mysteryItems.size());
-                items.add(mysterItem);
-            }
-        }
-
-        if (items.size() > 0) {
-            adapter.setItemList(items);
-        }
-    }
-
-    @OnClick(R.id.openMarketButton)
-    public void onOpenMarketClicked() {
-        dismiss();
-        openMarket();
-    }
-
-    @OnClick(R.id.openEmptyMarketButton)
-    public void onEmptyOpenMarketButtonClicked() {
-        openMarket();
-    }
-
-    private void openMarket() {
-        OpenMenuItemCommand command = new OpenMenuItemCommand();
-        command.identifier = MainDrawerBuilder.SIDEBAR_SHOPS;
-        EventBus.getDefault().post(command);
-    }
-
-    @Subscribe
-    public void openedMysteryItem(OpenedMysteryItemEvent event) {
-        this.adapter.openedMysteryItem(event.numberLeft);
-        new Select().from(ItemData.class).where(Condition.column("key").eq(event.mysteryItem.getKey())).async().querySingle(new TransactionListener<ItemData>() {
-            @Override
-            public void onResultReceived(ItemData result) {
-                result.setOwned(true);
-                result.async().save();
-                MainActivity activity = (MainActivity) getActivity();
-                showSnackbar(activity, activity.floatingMenuWrapper, getString(R.string.notification_mystery_item, result.getText()), UiUtils.SnackbarDisplayType.NORMAL);
-            }
-
-            @Override
-            public boolean onReady(BaseTransaction<ItemData> transaction) {
-                return true;
-            }
-
-            @Override
-            public boolean hasResult(BaseTransaction<ItemData> transaction, ItemData result) {
-                return true;
-            }
-        });
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.items;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.Button;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.events.ContentReloadedEvent;
+import com.habitrpg.android.habitica.events.OpenedMysteryItemEvent;
+import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.SpecialItem;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
+import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.HashMap;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
+
+public class ItemRecyclerFragment extends BaseFragment {
+
+    @Inject
+    InventoryRepository inventoryRepository;
+
+    private static final String ITEM_TYPE_KEY = "CLASS_TYPE_KEY";
+    @BindView(R.id.recyclerView)
+    public RecyclerViewEmptySupport recyclerView;
+    @BindView(R.id.empty_view)
+    public View emptyView;
+    @BindView(R.id.empty_text_view)
+    public TextView emptyTextView;
+    @BindView(R.id.titleTextView)
+    public TextView titleView;
+    @BindView(R.id.footerTextView)
+    public TextView footerView;
+    @BindView(R.id.openMarketButton)
+    public Button openMarketButton;
+    public ItemRecyclerAdapter adapter;
+    public String itemType;
+    public String itemTypeText;
+    public Boolean isHatching;
+    public Boolean isFeeding;
+    public Item hatchingItem;
+    public Pet feedingPet;
+    public HashMap<String, Integer> ownedPets;
+    @Nullable
+    public HabitRPGUser user;
+    LinearLayoutManager layoutManager = null;
+
+    private View view;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        if (view == null) {
+            view = inflater.inflate(R.layout.fragment_items, container, false);
+        }
+        unbinder = ButterKnife.bind(this, view);
+
+        recyclerView.setEmptyView(emptyView);
+        emptyTextView.setText(getString(R.string.empty_items, itemTypeText));
+
+        android.support.v4.app.FragmentActivity context = getActivity();
+
+        layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+
+        if (layoutManager == null) {
+            layoutManager = new LinearLayoutManager(context);
+
+            recyclerView.setLayoutManager(layoutManager);
+        }
+
+        adapter = (ItemRecyclerAdapter) recyclerView.getAdapter();
+        if (adapter == null) {
+            adapter = new ItemRecyclerAdapter();
+            adapter.context = this.getActivity();
+            adapter.isHatching = this.isHatching;
+            adapter.isFeeding = this.isFeeding;
+            adapter.fragment = this;
+            adapter.ownedPets = this.ownedPets;
+            if (this.hatchingItem != null) {
+                adapter.hatchingItem = this.hatchingItem;
+            }
+            if (this.feedingPet != null) {
+                adapter.feedingPet = this.feedingPet;
+            }
+            recyclerView.setAdapter(adapter);
+        }
+        recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
+
+        if (savedInstanceState != null) {
+            this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, "");
+        }
+
+        if (this.isHatching != null && this.isHatching) {
+            getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
+            this.titleView.setText(getString(R.string.hatch_with, this.hatchingItem.getText()));
+            this.titleView.setVisibility(View.VISIBLE);
+            this.footerView.setText(getString(R.string.hatching_market_info));
+            this.footerView.setVisibility(View.VISIBLE);
+            this.openMarketButton.setVisibility(View.VISIBLE);
+        } else if (this.isFeeding != null && this.isFeeding) {
+            getDialog().requestWindowFeature(Window.FEATURE_NO_TITLE);
+            this.titleView.setText(getString(R.string.dialog_feeding, this.feedingPet.getColorText(), this.feedingPet.getAnimalText()));
+            this.titleView.setVisibility(View.VISIBLE);
+            this.footerView.setText(getString(R.string.feeding_market_info));
+            this.footerView.setVisibility(View.VISIBLE);
+            this.openMarketButton.setVisibility(View.VISIBLE);
+        } else {
+            this.titleView.setVisibility(View.GONE);
+            this.footerView.setVisibility(View.GONE);
+            this.openMarketButton.setVisibility(View.GONE);
+        }
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        this.loadItems();
+    }
+
+    @Override
+    public void onResume() {
+        if (this.isHatching != null && this.isHatching && getDialog().getWindow() != null) {
+            ViewGroup.LayoutParams params = getDialog().getWindow().getAttributes();
+            params.width = ViewGroup.LayoutParams.MATCH_PARENT;
+            params.height = ViewGroup.LayoutParams.MATCH_PARENT;
+            getDialog().getWindow().setAttributes((android.view.WindowManager.LayoutParams) params);
+        }
+
+        super.onResume();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(ITEM_TYPE_KEY, this.itemType);
+    }
+
+    @Subscribe
+    public void reloadedContent(ContentReloadedEvent event) {
+        this.loadItems();
+    }
+
+    private void loadItems() {
+        inventoryRepository.getOwnedItems(itemType).subscribe(items -> {
+            if (this.itemType.equals("special")) {
+                if (user != null && user.getPurchased() != null && user.getPurchased().getPlan().isActive()) {
+                    Item mysterItem = SpecialItem.makeMysteryItem(getContext());
+                    mysterItem.setOwned(user.getPurchased().getPlan().mysteryItems.size());
+                    items.add(mysterItem);
+                }
+            }
+
+            if (items.size() > 0) {
+                adapter.setItemList(items);
+            }
+        }, throwable -> {});
+    }
+
+    @OnClick(R.id.openMarketButton)
+    public void onOpenMarketClicked() {
+        dismiss();
+        openMarket();
+    }
+
+    @OnClick(R.id.openEmptyMarketButton)
+    public void onEmptyOpenMarketButtonClicked() {
+        openMarket();
+    }
+
+    private void openMarket() {
+        OpenMenuItemCommand command = new OpenMenuItemCommand();
+        command.identifier = MainDrawerBuilder.SIDEBAR_SHOPS;
+        EventBus.getDefault().post(command);
+    }
+
+    @Subscribe
+    public void openedMysteryItem(OpenedMysteryItemEvent event) {
+        this.adapter.openedMysteryItem(event.numberLeft);
+        inventoryRepository.getEquipment(event.mysteryItem.getKey()).subscribe(itemData -> {
+            MainActivity activity = (MainActivity) getActivity();
+            showSnackbar(activity, activity.floatingMenuWrapper, getString(R.string.notification_mystery_item, itemData.getText()), UiUtils.SnackbarDisplayType.NORMAL);
+        });
+    }
+}
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 7dcd075ac..0471434e3 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
@@ -1,5 +1,14 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.items;
 
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+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.events.commands.HatchingCommand;
@@ -11,15 +20,6 @@ import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
 public class ItemsFragment extends BaseMainFragment {
 
     public ViewPager viewPager;
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 38a3af4b3..cef769dc3 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,143 +1,143 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.shops;
-
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.UpdateGoldGemsPurchasedevent;
-import com.habitrpg.android.habitica.ui.adapter.inventory.ShopRecyclerAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
-import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.shops.Shop;
-import com.habitrpg.android.habitica.models.shops.ShopCategory;
-import com.habitrpg.android.habitica.models.shops.ShopItem;
-
-import org.greenrobot.eventbus.Subscribe;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class ShopFragment extends BaseFragment {
-    private static final String SHOP_IDENTIFIER_KEY = "SHOP_IDENTIFIER_KEY";
-
-    @BindView(R.id.recyclerView)
-    public RecyclerViewEmptySupport recyclerView;
-    @BindView(R.id.empty_view)
-    public TextView emptyView;
-    public ShopRecyclerAdapter adapter;
-    public String shopIdentifier;
-    public HabitRPGUser user;
-    public Shop shop;
-    @Inject
-    ApiClient apiClient;
-    private View view;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        boolean setupViews = false;
-        if (view == null) {
-            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
-            setupViews = true;
-        }
-
-        unbinder = ButterKnife.bind(this, view);
-
-        if (setupViews) {
-            recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
-        }
-
-
-        adapter = (ShopRecyclerAdapter) recyclerView.getAdapter();
-        if (adapter == null) {
-            adapter = new ShopRecyclerAdapter();
-            recyclerView.setAdapter(adapter);
-        }
-        LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
-        if (layoutManager == null) {
-            layoutManager = new LinearLayoutManager(getContext());
-
-            recyclerView.setLayoutManager(layoutManager);
-        }
-
-        if (savedInstanceState != null) {
-            this.shopIdentifier = savedInstanceState.getString(SHOP_IDENTIFIER_KEY, "");
-        }
-
-        if (shop == null) {
-            loadShopInventory();
-        } else {
-            adapter.setShop(shop);
-        }
-
-        return view;
-    }
-
-    private void loadShopInventory() {
-        String shopUrl = "";
-        switch (this.shopIdentifier) {
-            case Shop.MARKET:
-                shopUrl = "market";
-                break;
-            case Shop.QUEST_SHOP:
-                shopUrl = "quests";
-                break;
-            case Shop.TIME_TRAVELERS_SHOP:
-                shopUrl = "time-travelers";
-                break;
-            case Shop.SEASONAL_SHOP:
-                shopUrl = "seasonal";
-                break;
-        }
-        this.apiClient.fetchShopInventory(shopUrl)
-                .map(shop1 -> {
-                    if (shop1.identifier.equals(Shop.MARKET)) {
-                        if (user.getPurchased().getPlan().isActive()) {
-                            ShopCategory specialCategory = new ShopCategory();
-                            specialCategory.text = getString(R.string.special);
-                            specialCategory.items = new ArrayList<>();
-                            ShopItem item = ShopItem.makeGemItem(getContext().getResources());
-                            item.limitedNumberLeft = user.getPurchased().getPlan().numberOfGemsLeft();
-                            specialCategory.items.add(item);
-                            shop1.categories.add(specialCategory);
-                        }
-                    }
-                    return shop1;
-                })
-                .subscribe(shop -> {
-                    this.shop = shop;
-                    this.adapter.setShop(shop);
-                }, throwable -> {
-                });
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(SHOP_IDENTIFIER_KEY, this.shopIdentifier);
-    }
-
-    @Subscribe
-    public void updateGoldGemCount(UpdateGoldGemsPurchasedevent event) {
-        this.adapter.updateGoldGemCount(event.numberLeft);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.shops;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.events.UpdateGoldGemsPurchasedevent;
+import com.habitrpg.android.habitica.models.shops.Shop;
+import com.habitrpg.android.habitica.models.shops.ShopCategory;
+import com.habitrpg.android.habitica.models.shops.ShopItem;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.adapter.inventory.ShopRecyclerAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
+import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
+
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class ShopFragment extends BaseFragment {
+    private static final String SHOP_IDENTIFIER_KEY = "SHOP_IDENTIFIER_KEY";
+
+    @BindView(R.id.recyclerView)
+    public RecyclerViewEmptySupport recyclerView;
+    @BindView(R.id.empty_view)
+    public TextView emptyView;
+    public ShopRecyclerAdapter adapter;
+    public String shopIdentifier;
+    public HabitRPGUser user;
+    public Shop shop;
+    @Inject
+    ApiClient apiClient;
+    private View view;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        boolean setupViews = false;
+        if (view == null) {
+            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+            setupViews = true;
+        }
+
+        unbinder = ButterKnife.bind(this, view);
+
+        if (setupViews) {
+            recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
+        }
+
+
+        adapter = (ShopRecyclerAdapter) recyclerView.getAdapter();
+        if (adapter == null) {
+            adapter = new ShopRecyclerAdapter();
+            recyclerView.setAdapter(adapter);
+        }
+        LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+        if (layoutManager == null) {
+            layoutManager = new LinearLayoutManager(getContext());
+
+            recyclerView.setLayoutManager(layoutManager);
+        }
+
+        if (savedInstanceState != null) {
+            this.shopIdentifier = savedInstanceState.getString(SHOP_IDENTIFIER_KEY, "");
+        }
+
+        if (shop == null) {
+            loadShopInventory();
+        } else {
+            adapter.setShop(shop);
+        }
+
+        return view;
+    }
+
+    private void loadShopInventory() {
+        String shopUrl = "";
+        switch (this.shopIdentifier) {
+            case Shop.MARKET:
+                shopUrl = "market";
+                break;
+            case Shop.QUEST_SHOP:
+                shopUrl = "quests";
+                break;
+            case Shop.TIME_TRAVELERS_SHOP:
+                shopUrl = "time-travelers";
+                break;
+            case Shop.SEASONAL_SHOP:
+                shopUrl = "seasonal";
+                break;
+        }
+        this.apiClient.fetchShopInventory(shopUrl)
+                .map(shop1 -> {
+                    if (shop1.identifier.equals(Shop.MARKET)) {
+                        if (user.getPurchased().getPlan().isActive()) {
+                            ShopCategory specialCategory = new ShopCategory();
+                            specialCategory.text = getString(R.string.special);
+                            specialCategory.items = new ArrayList<>();
+                            ShopItem item = ShopItem.makeGemItem(getContext().getResources());
+                            item.limitedNumberLeft = user.getPurchased().getPlan().numberOfGemsLeft();
+                            specialCategory.items.add(item);
+                            shop1.categories.add(specialCategory);
+                        }
+                    }
+                    return shop1;
+                })
+                .subscribe(shop -> {
+                    this.shop = shop;
+                    this.adapter.setShop(shop);
+                }, throwable -> {
+                });
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(SHOP_IDENTIFIER_KEY, this.shopIdentifier);
+    }
+
+    @Subscribe
+    public void updateGoldGemCount(UpdateGoldGemsPurchasedevent event) {
+        this.adapter.updateGoldGemCount(event.numberLeft);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java
index 9c0d4c87c..377d5273e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java
@@ -1,106 +1,106 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.shops;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.models.shops.Shop;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-public class ShopsFragment extends BaseMainFragment {
-
-    public ViewPager viewPager;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        this.usesTabLayout = true;
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
-
-        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
-
-        viewPager.setCurrentItem(0);
-
-        setViewPagerAdapter();
-
-        return v;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    public void setViewPagerAdapter() {
-        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
-
-        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
-
-            @Override
-            public Fragment getItem(int position) {
-
-                ShopFragment fragment = new ShopFragment();
-
-                switch (position) {
-                    case 0: {
-                        fragment.shopIdentifier = Shop.MARKET;
-                        break;
-                    }
-                    case 1: {
-                        fragment.shopIdentifier = Shop.QUEST_SHOP;
-                        break;
-                    }
-                    //case 2: {
-                    //    fragment.shopIdentifier = Shop.TIME_TRAVELERS_SHOP;
-                    //    break;
-                    //}
-                    case 2: {
-                        fragment.shopIdentifier = Shop.SEASONAL_SHOP;
-                        break;
-                    }
-                }
-                fragment.user = ShopsFragment.this.user;
-
-                return fragment;
-            }
-
-            @Override
-            public int getCount() {
-                return 3;
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                switch (position) {
-                    case 0:
-                        return activity.getString(R.string.market);
-                    case 1:
-                        return activity.getString(R.string.quests);
-                    //case 2:
-                    //    return activity.getString(R.string.timeTravelers);
-                    case 2:
-                        return activity.getString(R.string.seasonalShop);
-                }
-                return "";
-            }
-        });
-
-        if (tabLayout != null && viewPager != null) {
-            tabLayout.setupWithViewPager(viewPager);
-        }
-    }
-
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.sidebar_shops);
-    }
-
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.shops;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+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.models.shops.Shop;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+
+public class ShopsFragment extends BaseMainFragment {
+
+    public ViewPager viewPager;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        this.usesTabLayout = true;
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
+
+        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
+
+        viewPager.setCurrentItem(0);
+
+        setViewPagerAdapter();
+
+        return v;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    public void setViewPagerAdapter() {
+        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
+
+        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
+
+            @Override
+            public Fragment getItem(int position) {
+
+                ShopFragment fragment = new ShopFragment();
+
+                switch (position) {
+                    case 0: {
+                        fragment.shopIdentifier = Shop.MARKET;
+                        break;
+                    }
+                    case 1: {
+                        fragment.shopIdentifier = Shop.QUEST_SHOP;
+                        break;
+                    }
+                    //case 2: {
+                    //    fragment.shopIdentifier = Shop.TIME_TRAVELERS_SHOP;
+                    //    break;
+                    //}
+                    case 2: {
+                        fragment.shopIdentifier = Shop.SEASONAL_SHOP;
+                        break;
+                    }
+                }
+                fragment.user = ShopsFragment.this.user;
+
+                return fragment;
+            }
+
+            @Override
+            public int getCount() {
+                return 3;
+            }
+
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return activity.getString(R.string.market);
+                    case 1:
+                        return activity.getString(R.string.quests);
+                    //case 2:
+                    //    return activity.getString(R.string.timeTravelers);
+                    case 2:
+                        return activity.getString(R.string.seasonalShop);
+                }
+                return "";
+            }
+        });
+
+        if (tabLayout != null && viewPager != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
+    }
+
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_shops);
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
index 3f7702e52..2cf24b9c5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
@@ -1,114 +1,116 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.adapter.inventory.MountDetailRecyclerAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
-import com.habitrpg.android.habitica.models.inventory.Mount;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-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 java.util.List;
-
-public class MountDetailRecyclerFragment extends BaseMainFragment {
-    private static final String ANIMAL_TYPE_KEY = "ANIMAL_TYPE_KEY";
-    public RecyclerView recyclerView;
-    public MountDetailRecyclerAdapter adapter;
-    public String animalType;
-    public String animalGroup;
-    public List<Mount> animals;
-    GridLayoutManager layoutManager = null;
-
-    private View view;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        this.usesTabLayout = false;
-        super.onCreateView(inflater, container, savedInstanceState);
-        if (view == null) {
-            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
-
-            recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
-
-            android.support.v4.app.FragmentActivity context = getActivity();
-
-            layoutManager = new GridLayoutManager(getActivity(), 2);
-            recyclerView.setLayoutManager(layoutManager);
-            recyclerView.addItemDecoration(new MarginDecoration(getActivity()));
-
-            adapter = (MountDetailRecyclerAdapter) recyclerView.getAdapter();
-            if (adapter == null) {
-                adapter = new MountDetailRecyclerAdapter();
-                adapter.context = this.getActivity();
-                adapter.itemType = this.animalType;
-                recyclerView.setAdapter(adapter);
-                this.loadItems();
-
-            }
-        }
-
-        if (savedInstanceState != null) {
-            this.animalType = savedInstanceState.getString(ANIMAL_TYPE_KEY, "");
-        }
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        final View finalView = view;
-        finalView.post(() -> setGridSpanCount(finalView.getWidth()));
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(ANIMAL_TYPE_KEY, this.animalType);
-    }
-
-
-    private void setGridSpanCount(int width) {
-        float itemWidth;
-        itemWidth = getContext().getResources().getDimension(R.dimen.pet_width);
-
-        int spanCount = (int) (width / itemWidth);
-        if (spanCount == 0) {
-            spanCount = 1;
-        }
-        layoutManager.setSpanCount(spanCount);
-        layoutManager.requestLayout();
-    }
-
-    private void loadItems() {
-        Runnable itemsRunnable = () -> {
-            List<Mount> items = new Select().from(Mount.class).where(Condition.CombinedCondition
-                    .begin(Condition.column("animal").eq(animalType))
-                    .and(Condition.column("animalGroup").eq(animalGroup))).orderBy(true, "color").queryList();
-            adapter.setItemList(items);
-            animals = items;
-            adapter.setOwnedMapping(user.getItems().getMounts());
-        };
-        itemsRunnable.run();
-
-    }
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.mounts);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+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.data.InventoryRepository;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.ui.adapter.inventory.MountDetailRecyclerAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+public class MountDetailRecyclerFragment extends BaseMainFragment {
+    private static final String ANIMAL_TYPE_KEY = "ANIMAL_TYPE_KEY";
+
+    @Inject
+    InventoryRepository inventoryRepository;
+
+    public RecyclerView recyclerView;
+    public MountDetailRecyclerAdapter adapter;
+    public String animalType;
+    public String animalGroup;
+    public List<Mount> animals;
+    GridLayoutManager layoutManager = null;
+
+    private View view;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        this.usesTabLayout = false;
+        super.onCreateView(inflater, container, savedInstanceState);
+        if (view == null) {
+            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+
+            recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
+
+            android.support.v4.app.FragmentActivity context = getActivity();
+
+            layoutManager = new GridLayoutManager(getActivity(), 2);
+            recyclerView.setLayoutManager(layoutManager);
+            recyclerView.addItemDecoration(new MarginDecoration(getActivity()));
+
+            adapter = (MountDetailRecyclerAdapter) recyclerView.getAdapter();
+            if (adapter == null) {
+                adapter = new MountDetailRecyclerAdapter();
+                adapter.context = this.getActivity();
+                adapter.itemType = this.animalType;
+                recyclerView.setAdapter(adapter);
+                this.loadItems();
+
+            }
+        }
+
+        if (savedInstanceState != null) {
+            this.animalType = savedInstanceState.getString(ANIMAL_TYPE_KEY, "");
+        }
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        final View finalView = view;
+        finalView.post(() -> setGridSpanCount(finalView.getWidth()));
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(ANIMAL_TYPE_KEY, this.animalType);
+    }
+
+
+    private void setGridSpanCount(int width) {
+        float itemWidth;
+        itemWidth = getContext().getResources().getDimension(R.dimen.pet_width);
+
+        int spanCount = (int) (width / itemWidth);
+        if (spanCount == 0) {
+            spanCount = 1;
+        }
+        layoutManager.setSpanCount(spanCount);
+        layoutManager.requestLayout();
+    }
+
+    private void loadItems() {
+        inventoryRepository.getMounts().subscribe(mounts -> {
+            adapter.setItemList(mounts);
+            animals = mounts;
+            if (user != null) {
+                adapter.setOwnedMapping(user.getItems().getMounts());
+            }
+        });
+    }
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.mounts);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
index 694d1d942..2262efa47 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
@@ -1,138 +1,141 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.commands.FeedCommand;
-import com.habitrpg.android.habitica.ui.adapter.inventory.PetDetailRecyclerAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
-import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import org.greenrobot.eventbus.Subscribe;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-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 java.util.List;
-
-public class PetDetailRecyclerFragment extends BaseMainFragment {
-    private static final String ANIMAL_TYPE_KEY = "ANIMAL_TYPE_KEY";
-    public RecyclerView recyclerView;
-    public PetDetailRecyclerAdapter adapter;
-    public String animalType;
-    public String animalGroup;
-    public List<Pet> animals;
-    GridLayoutManager layoutManager = null;
-
-    private View view;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        this.usesTabLayout = false;
-        super.onCreateView(inflater, container, savedInstanceState);
-        if (view == null) {
-            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
-
-            recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
-
-            android.support.v4.app.FragmentActivity context = getActivity();
-
-            layoutManager = new GridLayoutManager(getActivity(), 2);
-            recyclerView.setLayoutManager(layoutManager);
-            recyclerView.addItemDecoration(new MarginDecoration(getActivity()));
-
-            adapter = (PetDetailRecyclerAdapter) recyclerView.getAdapter();
-            if (adapter == null) {
-                adapter = new PetDetailRecyclerAdapter();
-                adapter.context = this.getActivity();
-                adapter.itemType = this.animalType;
-                recyclerView.setAdapter(adapter);
-                this.loadItems();
-
-            }
-        }
-
-        if (savedInstanceState != null) {
-            this.animalType = savedInstanceState.getString(ANIMAL_TYPE_KEY, "");
-        }
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        final View finalView = view;
-        finalView.post(() -> setGridSpanCount(finalView.getWidth()));
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(ANIMAL_TYPE_KEY, this.animalType);
-    }
-
-    private void setGridSpanCount(int width) {
-        float itemWidth;
-        itemWidth = getContext().getResources().getDimension(R.dimen.pet_width);
-
-        int spanCount = (int) (width / itemWidth);
-        if (spanCount == 0) {
-            spanCount = 1;
-        }
-        layoutManager.setSpanCount(spanCount);
-        layoutManager.requestLayout();
-    }
-
-    private void loadItems() {
-        Runnable itemsRunnable = () -> {
-            List<Pet> items = new Select().from(Pet.class).where(Condition.CombinedCondition
-                    .begin(Condition.column("animal").eq(animalType))
-                    .and(Condition.column("animalGroup").eq(animalGroup))).orderBy(true, "color").queryList();
-            adapter.setItemList(items);
-            animals = items;
-            adapter.setOwnedMapping(user.getItems().getPets());
-            adapter.setOwnedMountsMapping(user.getItems().getMounts());
-        };
-        itemsRunnable.run();
-    }
-
-    @Subscribe
-    public void showFeedingDialog(FeedCommand event) {
-        if (event.usingPet == null || event.usingFood == null) {
-            ItemRecyclerFragment fragment = new ItemRecyclerFragment();
-            fragment.feedingPet = event.usingPet;
-            fragment.isFeeding = true;
-            fragment.isHatching = false;
-            fragment.itemType = "food";
-            fragment.itemTypeText = getString(R.string.food);
-            fragment.show(getFragmentManager(), "feedDialog");
-        }
-    }
-
-    @Override
-    public void updateUserData(HabitRPGUser user) {
-        super.updateUserData(user);
-        adapter.setOwnedMapping(user.getItems().getPets());
-        adapter.setOwnedMountsMapping(user.getItems().getMounts());
-    }
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.pets);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+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.data.InventoryRepository;
+import com.habitrpg.android.habitica.events.commands.FeedCommand;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.adapter.inventory.PetDetailRecyclerAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
+import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
+
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+public class PetDetailRecyclerFragment extends BaseMainFragment {
+    private static final String ANIMAL_TYPE_KEY = "ANIMAL_TYPE_KEY";
+
+    @Inject
+    InventoryRepository inventoryRepository;
+
+    public RecyclerView recyclerView;
+    public PetDetailRecyclerAdapter adapter;
+    public String animalType;
+    public String animalGroup;
+    public List<Pet> animals;
+    GridLayoutManager layoutManager = null;
+
+    private View view;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        this.usesTabLayout = false;
+        super.onCreateView(inflater, container, savedInstanceState);
+        if (view == null) {
+            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+
+            recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
+
+            android.support.v4.app.FragmentActivity context = getActivity();
+
+            layoutManager = new GridLayoutManager(getActivity(), 2);
+            recyclerView.setLayoutManager(layoutManager);
+            recyclerView.addItemDecoration(new MarginDecoration(getActivity()));
+
+            adapter = (PetDetailRecyclerAdapter) recyclerView.getAdapter();
+            if (adapter == null) {
+                adapter = new PetDetailRecyclerAdapter();
+                adapter.context = this.getActivity();
+                adapter.itemType = this.animalType;
+                recyclerView.setAdapter(adapter);
+                this.loadItems();
+
+            }
+        }
+
+        if (savedInstanceState != null) {
+            this.animalType = savedInstanceState.getString(ANIMAL_TYPE_KEY, "");
+        }
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        final View finalView = view;
+        finalView.post(() -> setGridSpanCount(finalView.getWidth()));
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(ANIMAL_TYPE_KEY, this.animalType);
+    }
+
+    private void setGridSpanCount(int width) {
+        float itemWidth;
+        itemWidth = getContext().getResources().getDimension(R.dimen.pet_width);
+
+        int spanCount = (int) (width / itemWidth);
+        if (spanCount == 0) {
+            spanCount = 1;
+        }
+        layoutManager.setSpanCount(spanCount);
+        layoutManager.requestLayout();
+    }
+
+    private void loadItems() {
+        inventoryRepository.getPets(animalType, animalGroup).subscribe(pets -> {
+            adapter.setItemList(pets);
+            animals = pets;
+            if (user != null) {
+                adapter.setOwnedMapping(user.getItems().getPets());
+                adapter.setOwnedMountsMapping(user.getItems().getMounts());
+            }
+        }, throwable -> {});
+    }
+
+    @Subscribe
+    public void showFeedingDialog(FeedCommand event) {
+        if (event.usingPet == null || event.usingFood == null) {
+            ItemRecyclerFragment fragment = new ItemRecyclerFragment();
+            fragment.feedingPet = event.usingPet;
+            fragment.isFeeding = true;
+            fragment.isHatching = false;
+            fragment.itemType = "food";
+            fragment.itemTypeText = getString(R.string.food);
+            fragment.show(getFragmentManager(), "feedDialog");
+        }
+    }
+
+    @Override
+    public void updateUserData(HabitRPGUser user) {
+        super.updateUserData(user);
+        adapter.setOwnedMapping(user.getItems().getPets());
+        adapter.setOwnedMountsMapping(user.getItems().getMounts());
+    }
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.pets);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java
index 28af11859..d49e4487c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java
@@ -1,9 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentPagerAdapter;
@@ -12,6 +8,10 @@ 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.fragments.BaseMainFragment;
+
 public class StableFragment extends BaseMainFragment {
 
     public ViewPager viewPager;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
index f07caa0d7..278356f1b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
@@ -1,215 +1,206 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.ContentReloadedEvent;
-import com.habitrpg.android.habitica.events.ReloadContentEvent;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
-import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.inventory.Animal;
-import com.habitrpg.android.habitica.models.inventory.Mount;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.sql.language.Where;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-public class StableRecyclerFragment extends BaseFragment {
-    private static final String ITEM_TYPE_KEY = "CLASS_TYPE_KEY";
-    @BindView(R.id.recyclerView)
-    public RecyclerViewEmptySupport recyclerView;
-    @BindView(R.id.empty_view)
-    public TextView emptyView;
-    public StableRecyclerAdapter adapter;
-    public String itemType;
-    public String itemTypeText;
-    public HabitRPGUser user;
-    GridLayoutManager layoutManager = null;
-
-    private View view;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        boolean setupViews = false;
-        if (view == null) {
-            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
-            setupViews = true;
-        }
-
-        unbinder = ButterKnife.bind(this, view);
-
-        if (setupViews) {
-            recyclerView.setEmptyView(emptyView);
-            emptyView.setText(getString(R.string.empty_items, itemTypeText));
-
-            layoutManager = new GridLayoutManager(getActivity(), 2);
-            layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
-                @Override
-                public int getSpanSize(int position) {
-                    if (adapter.getItemViewType(position) == 0) {
-                        return layoutManager.getSpanCount();
-                    } else {
-                        return 1;
-                    }
-                }
-            });
-            recyclerView.setLayoutManager(layoutManager);
-            recyclerView.addItemDecoration(new MarginDecoration(getActivity()));
-        }
-
-
-        adapter = (StableRecyclerAdapter) recyclerView.getAdapter();
-        if (adapter == null) {
-            adapter = new StableRecyclerAdapter();
-            adapter.activity = (MainActivity) this.getActivity();
-            adapter.itemType = this.itemType;
-            recyclerView.setAdapter(adapter);
-        }
-
-        if (savedInstanceState != null) {
-            this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, "");
-        }
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        this.loadItems();
-        final View finalView = view;
-        finalView.post(() -> setGridSpanCount(finalView.getWidth()));
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(ITEM_TYPE_KEY, this.itemType);
-    }
-
-
-    private void setGridSpanCount(int width) {
-        float itemWidth;
-        itemWidth = getContext().getResources().getDimension(R.dimen.pet_width);
-
-        int spanCount = (int) (width / itemWidth);
-        if (spanCount == 0) {
-            spanCount = 1;
-        }
-        layoutManager.setSpanCount(spanCount);
-    }
-
-    private void loadItems() {
-        Observable.defer(() -> {
-            if (itemType == null) {
-                throw new IllegalArgumentException();
-            }
-            List<Object> items = new ArrayList<>();
-
-            Where<? extends Animal> query = null;
-            switch (itemType) {
-                case "pets":
-                    query = new Select().from(Pet.class).orderBy(true, "animalGroup", "animal", "color");
-                    break;
-                case "mounts":
-                    query = new Select().from(Mount.class).orderBy(true, "animalGroup", "animal", "color");
-                    break;
-            }
-            if (query == null) {
-                throw new IllegalArgumentException();
-            }
-            List<? extends Animal> unsortedAnimals = query.queryList();
-            if (unsortedAnimals.size() == 0) {
-                ReloadContentEvent event = new ReloadContentEvent();
-                EventBus.getDefault().post(event);
-                return Observable.just(items);
-            }
-            String lastSectionTitle = "";
-
-            Animal lastAnimal = unsortedAnimals.get(0);
-            for (Animal animal : unsortedAnimals) {
-                if (!animal.getAnimal().equals(lastAnimal.getAnimal())) {
-                    if (!((lastAnimal.getAnimalGroup().equals("premiumPets") || lastAnimal.getAnimalGroup().equals("specialPets")
-                            || lastAnimal.getAnimalGroup().equals("specialMounts") || lastAnimal.getAnimalGroup().equals("premiumMounts"))
-                            && lastAnimal.getNumberOwned() == 0)) {
-                        items.add(lastAnimal);
-                    }
-                    lastAnimal = animal;
-                }
-                if (!animal.getAnimalGroup().equals(lastSectionTitle)) {
-                    if (items.size() > 0 && items.get(items.size() - 1).getClass().equals(String.class)) {
-                        items.remove(items.size() - 1);
-                    }
-                    items.add(animal.getAnimalGroup());
-                    lastSectionTitle = animal.getAnimalGroup();
-                }
-                if (user != null && user.getItems() != null) {
-                    switch (itemType) {
-                        case "pets":
-                            if (user.getItems().getPets() != null
-                                    && user.getItems().getPets().containsKey(animal.getKey())
-                                    && user.getItems().getPets().get(animal.getKey()) != null
-                                    && user.getItems().getPets().get(animal.getKey()) > 0) {
-                                if (lastAnimal.getNumberOwned() == 0) {
-                                    lastAnimal.setColor(animal.getColor());
-                                }
-                                lastAnimal.setNumberOwned(lastAnimal.getNumberOwned() + 1);
-                            }
-                            break;
-                        case "mounts":
-                            if (user.getItems().getMounts() != null
-                                    && user.getItems().getMounts().containsKey(animal.getKey())
-                                    && user.getItems().getMounts().get(animal.getKey()) != null
-                                    && user.getItems().getMounts().get(animal.getKey())) {
-                                if (lastAnimal.getNumberOwned() == 0) {
-                                    lastAnimal.setColor(animal.getColor());
-                                }
-                                lastAnimal.setNumberOwned(lastAnimal.getNumberOwned() + 1);
-                            }
-                            break;
-                    }
-                }
-            }
-            return Observable.just(items);
-        })
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(items -> {
-                    adapter.setItemList(items);
-                }, throwable -> {
-                });
-    }
-
-    @Subscribe
-    public void reloadedContent(ContentReloadedEvent event) {
-        this.loadItems();
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.GridLayoutManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.events.ContentReloadedEvent;
+import com.habitrpg.android.habitica.events.ReloadContentEvent;
+import com.habitrpg.android.habitica.models.inventory.Animal;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
+import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+public class StableRecyclerFragment extends BaseFragment {
+    private static final String ITEM_TYPE_KEY = "CLASS_TYPE_KEY";
+
+    @Inject
+    InventoryRepository inventoryRepository;
+
+    @BindView(R.id.recyclerView)
+    public RecyclerViewEmptySupport recyclerView;
+    @BindView(R.id.empty_view)
+    public TextView emptyView;
+    public StableRecyclerAdapter adapter;
+    public String itemType;
+    public String itemTypeText;
+    public HabitRPGUser user;
+    GridLayoutManager layoutManager = null;
+
+    private View view;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        boolean setupViews = false;
+        if (view == null) {
+            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+            setupViews = true;
+        }
+
+        unbinder = ButterKnife.bind(this, view);
+
+        if (setupViews) {
+            recyclerView.setEmptyView(emptyView);
+            emptyView.setText(getString(R.string.empty_items, itemTypeText));
+
+            layoutManager = new GridLayoutManager(getActivity(), 2);
+            layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+                @Override
+                public int getSpanSize(int position) {
+                    if (adapter.getItemViewType(position) == 0) {
+                        return layoutManager.getSpanCount();
+                    } else {
+                        return 1;
+                    }
+                }
+            });
+            recyclerView.setLayoutManager(layoutManager);
+            recyclerView.addItemDecoration(new MarginDecoration(getActivity()));
+        }
+
+
+        adapter = (StableRecyclerAdapter) recyclerView.getAdapter();
+        if (adapter == null) {
+            adapter = new StableRecyclerAdapter();
+            adapter.activity = (MainActivity) this.getActivity();
+            adapter.itemType = this.itemType;
+            recyclerView.setAdapter(adapter);
+        }
+
+        if (savedInstanceState != null) {
+            this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, "");
+        }
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        this.loadItems();
+        final View finalView = view;
+        finalView.post(() -> setGridSpanCount(finalView.getWidth()));
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(ITEM_TYPE_KEY, this.itemType);
+    }
+
+
+    private void setGridSpanCount(int width) {
+        float itemWidth;
+        itemWidth = getContext().getResources().getDimension(R.dimen.pet_width);
+
+        int spanCount = (int) (width / itemWidth);
+        if (spanCount == 0) {
+            spanCount = 1;
+        }
+        layoutManager.setSpanCount(spanCount);
+    }
+
+    private void loadItems() {
+        Observable<? extends Animal> observable;
+
+        if ("pets".equals(itemType)) {
+            observable = inventoryRepository.getPets().flatMap(Observable::from);
+        } else {
+            observable = inventoryRepository.getMounts().flatMap(Observable::from);
+        }
+
+        observable.toList().flatMap(unsortedAnimals -> {
+            List<Object> items = new ArrayList<>();
+            if (unsortedAnimals.size() == 0) {
+                ReloadContentEvent event = new ReloadContentEvent();
+                EventBus.getDefault().post(event);
+                return Observable.just(items);
+            }
+            String lastSectionTitle = "";
+
+            Animal lastAnimal = unsortedAnimals.get(0);
+            for (Animal animal : unsortedAnimals) {
+                if (!animal.getAnimal().equals(lastAnimal.getAnimal())) {
+                    if (!((lastAnimal.getAnimalGroup().equals("premiumPets") || lastAnimal.getAnimalGroup().equals("specialPets")
+                            || lastAnimal.getAnimalGroup().equals("specialMounts") || lastAnimal.getAnimalGroup().equals("premiumMounts"))
+                            && lastAnimal.getNumberOwned() == 0)) {
+                        items.add(lastAnimal);
+                    }
+                    lastAnimal = animal;
+                }
+                if (!animal.getAnimalGroup().equals(lastSectionTitle)) {
+                    if (items.size() > 0 && items.get(items.size() - 1).getClass().equals(String.class)) {
+                        items.remove(items.size() - 1);
+                    }
+                    items.add(animal.getAnimalGroup());
+                    lastSectionTitle = animal.getAnimalGroup();
+                }
+                if (user != null && user.getItems() != null) {
+                    switch (itemType) {
+                        case "pets":
+                            if (user.getItems().getPets() != null
+                                    && user.getItems().getPets().containsKey(animal.getKey())
+                                    && user.getItems().getPets().get(animal.getKey()) != null
+                                    && user.getItems().getPets().get(animal.getKey()) > 0) {
+                                if (lastAnimal.getNumberOwned() == 0) {
+                                    lastAnimal.setColor(animal.getColor());
+                                }
+                                lastAnimal.setNumberOwned(lastAnimal.getNumberOwned() + 1);
+                            }
+                            break;
+                        case "mounts":
+                            if (user.getItems().getMounts() != null
+                                    && user.getItems().getMounts().containsKey(animal.getKey())
+                                    && user.getItems().getMounts().get(animal.getKey()) != null
+                                    && user.getItems().getMounts().get(animal.getKey())) {
+                                if (lastAnimal.getNumberOwned() == 0) {
+                                    lastAnimal.setColor(animal.getColor());
+                                }
+                                lastAnimal.setNumberOwned(lastAnimal.getNumberOwned() + 1);
+                            }
+                            break;
+                    }
+                }
+            }
+            return Observable.just(items);
+        })
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(items -> adapter.setItemList(items), throwable -> {});
+    }
+
+    @Subscribe
+    public void reloadedContent(ContentReloadedEvent event) {
+        this.loadItems();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
index 58ecc84d0..74b14b4dc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
@@ -1,99 +1,99 @@
-package com.habitrpg.android.habitica.ui.fragments.preferences;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.Preference;
-import android.widget.Toast;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
-import com.habitrpg.android.habitica.helpers.QrCodeManager;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
-import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-public class AccountDetailsFragment extends BasePreferencesFragment {
-
-    @Inject
-    UserRepository userRepository;
-
-    private QrCodeManager qrCodeManager;
-    private HabitRPGUser user;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        HabiticaBaseApplication.getComponent().inject(this);
-
-        String userID = getPreferenceManager().getSharedPreferences().getString(getContext().getString(R.string.SP_userID), null);
-        if (userID != null) {
-            userRepository.getUser(userID).subscribe(this::setUser, throwable -> {});
-        }
-    }
-
-    public void setUser(HabitRPGUser user) {
-        this.user = user;
-    }
-
-    @Override
-    protected void setupPreferences() {
-        for (Map.Entry<String, ?> preference : getPreferenceScreen().getSharedPreferences().getAll().entrySet()) {
-            String key = preference.getKey();
-            if (getAccountDetailsPreferences().contains(key) && preference.getValue() != null) {
-                findPreference(key).setSummary(preference.getValue().toString());
-            }
-        }
-
-        qrCodeManager = new QrCodeManager(this.getContext());
-    }
-
-    protected List<String> getAccountDetailsPreferences() {
-        return Arrays.asList(getString(R.string.SP_username), getString(R.string.SP_email),
-                getString(R.string.SP_APIToken), getString(R.string.SP_userID), getString(R.string.SP_user_qr_code));
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference.getKey().equals("SP_user_qr_code")) {
-            qrCodeManager.showDialogue();
-        } else if (preference.getKey().equals("subscription_status")) {
-            if (user != null && user.getPurchased() != null && user.getPurchased().getPlan() != null) {
-                SubscriptionPlan plan = user.getPurchased().getPlan();
-                if (plan.isActive()) {
-                    showSubscriptionStatusDialog();
-                    return super.onPreferenceTreeClick(preference);
-                }
-            }
-            EventBus.getDefault().post(new OpenGemPurchaseFragmentCommand());
-        } else {
-            ClipboardManager clipMan = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
-            clipMan.setPrimaryClip(ClipData.newPlainText(preference.getKey(), preference.getSummary()));
-            Toast.makeText(getActivity(), "Copied " + preference.getKey() + " to clipboard.", Toast.LENGTH_SHORT).show();
-        }
-        return super.onPreferenceTreeClick(preference);
-    }
-
-    private void showSubscriptionStatusDialog() {
-        SubscriptionDetailsView view = new SubscriptionDetailsView(getContext());
-        view.setPlan(user.getPurchased().getPlan());
-        final AlertDialog dialog = new AlertDialog.Builder(getContext())
-                .setView(view)
-                .setTitle(R.string.subscription_status)
-                .setPositiveButton(R.string.close, (dialogInterface, i) -> dialogInterface.dismiss()).create();
-        dialog.show();
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.preferences;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.preference.Preference;
+import android.widget.Toast;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
+import com.habitrpg.android.habitica.helpers.QrCodeManager;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
+import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+public class AccountDetailsFragment extends BasePreferencesFragment {
+
+    @Inject
+    UserRepository userRepository;
+
+    private QrCodeManager qrCodeManager;
+    private HabitRPGUser user;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        HabiticaBaseApplication.getComponent().inject(this);
+
+        String userID = getPreferenceManager().getSharedPreferences().getString(getContext().getString(R.string.SP_userID), null);
+        if (userID != null) {
+            userRepository.getUser(userID).subscribe(this::setUser, throwable -> {});
+        }
+    }
+
+    public void setUser(HabitRPGUser user) {
+        this.user = user;
+    }
+
+    @Override
+    protected void setupPreferences() {
+        for (Map.Entry<String, ?> preference : getPreferenceScreen().getSharedPreferences().getAll().entrySet()) {
+            String key = preference.getKey();
+            if (getAccountDetailsPreferences().contains(key) && preference.getValue() != null) {
+                findPreference(key).setSummary(preference.getValue().toString());
+            }
+        }
+
+        qrCodeManager = new QrCodeManager(userRepository, this.getContext());
+    }
+
+    protected List<String> getAccountDetailsPreferences() {
+        return Arrays.asList(getString(R.string.SP_username), getString(R.string.SP_email),
+                getString(R.string.SP_APIToken), getString(R.string.SP_userID), getString(R.string.SP_user_qr_code));
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (preference.getKey().equals("SP_user_qr_code")) {
+            qrCodeManager.showDialogue();
+        } else if (preference.getKey().equals("subscription_status")) {
+            if (user != null && user.getPurchased() != null && user.getPurchased().getPlan() != null) {
+                SubscriptionPlan plan = user.getPurchased().getPlan();
+                if (plan.isActive()) {
+                    showSubscriptionStatusDialog();
+                    return super.onPreferenceTreeClick(preference);
+                }
+            }
+            EventBus.getDefault().post(new OpenGemPurchaseFragmentCommand());
+        } else {
+            ClipboardManager clipMan = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+            clipMan.setPrimaryClip(ClipData.newPlainText(preference.getKey(), preference.getSummary()));
+            Toast.makeText(getActivity(), "Copied " + preference.getKey() + " to clipboard.", Toast.LENGTH_SHORT).show();
+        }
+        return super.onPreferenceTreeClick(preference);
+    }
+
+    private void showSubscriptionStatusDialog() {
+        SubscriptionDetailsView view = new SubscriptionDetailsView(getContext());
+        view.setPlan(user.getPurchased().getPlan());
+        final AlertDialog dialog = new AlertDialog.Builder(getContext())
+                .setView(view)
+                .setTitle(R.string.subscription_status)
+                .setPositiveButton(R.string.close, (dialogInterface, i) -> dialogInterface.dismiss()).create();
+        dialog.show();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.java
index 1600f402a..56ecddf5b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.java
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
-import com.habitrpg.android.habitica.R;
-
 import android.os.Bundle;
 import android.support.v7.preference.PreferenceFragmentCompat;
 
+import com.habitrpg.android.habitica.R;
+
 public abstract class BasePreferencesFragment extends PreferenceFragmentCompat {
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.java
index 64aa94695..49eb20efb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.java
@@ -1,9 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.prefs.TimePreference;
-
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
@@ -14,6 +11,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TimePicker;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.prefs.TimePreference;
+
 import java.text.DateFormat;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
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 aac3f7d3f..490f0f407 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,279 +1,279 @@
-package com.habitrpg.android.habitica.ui.fragments.preferences;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
-
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
-import com.habitrpg.android.habitica.helpers.LanguageHelper;
-import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Preferences;
-import com.habitrpg.android.habitica.prefs.TimePreference;
-import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-public class PreferencesFragment extends BasePreferencesFragment implements
-        SharedPreferences.OnSharedPreferenceChangeListener {
-
-    @Inject
-    public ApiClient apiClient;
-    @Inject
-    public SoundManager soundManager;
-    @Inject
-    UserRepository userRepository;
-    private Context context;
-    private TimePreference timePreference;
-    private PreferenceScreen pushNotificationsPreference;
-    private Preference classSelectionPreference;
-    private HabitRPGUser user;
-    @Inject
-    PushNotificationManager pushNotificationManager;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        HabiticaBaseApplication.getComponent().inject(this);
-        context = getActivity();
-
-        String userID = getPreferenceManager().getSharedPreferences().getString(context.getString(R.string.SP_userID), null);
-        if (userID != null) {
-            userRepository.getUser(userID).subscribe(PreferencesFragment.this::setUser, throwable -> {});
-        }
-    }
-
-    @Override
-    protected void setupPreferences() {
-        timePreference = (TimePreference) findPreference("reminder_time");
-        boolean useReminder = getPreferenceManager().getSharedPreferences().getBoolean("use_reminder", false);
-        timePreference.setEnabled(useReminder);
-
-
-        pushNotificationsPreference = (PreferenceScreen) findPreference("pushNotifications");
-        boolean userPushNotifications = getPreferenceManager().getSharedPreferences().getBoolean("usePushNotifications", true);
-        pushNotificationsPreference.setEnabled(userPushNotifications);
-
-
-        classSelectionPreference = findPreference("choose_class");
-        classSelectionPreference.setVisible(false);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
-
-    }
-
-    @Override
-    public void onPause() {
-        getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
-        super.onPause();
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference.getKey().equals("logout")) {
-            HabiticaApplication.logout(context);
-            getActivity().finish();
-        } else if (preference.getKey().equals("choose_class")) {
-            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());
-            if (!user.getFlags().getClassSelected()) {
-                bundle.putBoolean("isInitialSelection", true);
-            } else {
-                bundle.putBoolean("isInitialSelection", false);
-            }
-
-            Intent intent = new Intent(getActivity(), ClassSelectionActivity.class);
-            intent.putExtras(bundle);
-
-            if (user.getFlags().getClassSelected() && !user.getPreferences().getDisableClasses()) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
-                        .setTitle(getString(R.string.change_class_confirmation))
-                        .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> dialog.dismiss())
-                        .setPositiveButton(getString(R.string.change_class), (dialog, which) -> startActivityForResult(intent, MainActivity.SELECT_CLASS_RESULT));
-                AlertDialog alert = builder.create();
-                alert.show();
-            } else {
-                startActivityForResult(intent, MainActivity.SELECT_CLASS_RESULT);
-            }
-            return true;
-        } else if (preference.getKey().equals("reload_content")) {
-            apiClient.getContent().subscribe(contentResult -> {}, throwable -> {});
-        }
-        return super.onPreferenceTreeClick(preference);
-    }
-
-
-    @Override
-    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-        switch (key) {
-            case "use_reminder":
-                boolean use_reminder = sharedPreferences.getBoolean(key, false);
-                timePreference.setEnabled(use_reminder);
-                if (use_reminder) {
-                    TaskAlarmManager.scheduleDailyReminder(context);
-                } else {
-                    TaskAlarmManager.removeDailyReminder(context);
-                }
-                break;
-            case "reminder_time":
-                TaskAlarmManager.removeDailyReminder(context);
-                TaskAlarmManager.scheduleDailyReminder(context);
-                break;
-            case "usePushNotifications":
-                boolean userPushNotifications = sharedPreferences.getBoolean(key, false);
-                pushNotificationsPreference.setEnabled(userPushNotifications);
-                if (userPushNotifications) {
-                    pushNotificationManager.addPushDeviceUsingStoredToken();
-                } else {
-                    pushNotificationManager.removePushDeviceUsingStoredToken();
-                }
-                break;
-            case "cds_time":
-                String timeval = sharedPreferences.getString("cds_time", "00:00");
-                String[] pieces = timeval.split(":");
-                int hour = Integer.parseInt(pieces[0]);
-                Map<String, Object> updateObject = new HashMap<>();
-                updateObject.put("dayStart", hour);
-                apiClient.changeCustomDayStart(updateObject)
-                        .subscribe(user -> {
-                        }, throwable -> {
-                        });
-                break;
-            case "language": {
-                LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString(key, "en"));
-
-                Locale.setDefault(languageHelper.getLocale());
-                Configuration configuration = new Configuration();
-                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
-                    configuration.locale = languageHelper.getLocale();
-                } else {
-                    configuration.setLocale(languageHelper.getLocale());
-                }
-                getActivity().getResources().updateConfiguration(configuration,
-                        getActivity().getResources().getDisplayMetrics());
-                userRepository.updateUser(user, "preferences.language", languageHelper.getLanguageCode())
-                        .subscribe(habitRPGUser -> {
-                        }, throwable -> {
-                        });
-
-                Preferences preferences = user.getPreferences();
-                preferences.setLanguage(languageHelper.getLanguageCode());
-                apiClient.setLanguageCode(preferences.getLanguage());
-                apiClient.getContent()
-                        .subscribe(contentResult -> {
-                        }, throwable -> {
-                        });
-
-                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
-                    Intent intent = new Intent(getActivity(), MainActivity.class);
-                    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                    startActivity(intent);
-                } else {
-                    Intent intent = new Intent(getActivity(), MainActivity.class);
-                    this.startActivity(intent);
-                    getActivity().finishAffinity();
-                }
-                EventBus.getDefault().post(new RefreshUserCommand());
-
-                break;
-            }
-            case "audioTheme": {
-                String newAudioTheme = sharedPreferences.getString(key, "off");
-                userRepository.updateUser(user, "preferences.sound", newAudioTheme)
-                        .subscribe(habitRPGUser -> {
-                        }, throwable -> {
-                        });
-
-                Preferences preferences = user.getPreferences();
-                preferences.setSound(newAudioTheme);
-
-                soundManager.setSoundTheme(newAudioTheme);
-
-                soundManager.preloadAllFiles();
-                break;
-            }
-            case "dailyDueDefaultView":
-                userRepository.updateUser(user, "preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
-                        .subscribe(habitRPGUser -> {
-                        }, throwable -> {
-                        });
-                break;
-        }
-    }
-
-    @Override
-    public void onDisplayPreferenceDialog(Preference preference) {
-        if (preference instanceof TimePreference) {
-            if (preference.getKey().equals("cds_time")) {
-                if (getFragmentManager().findFragmentByTag(DayStartPreferenceDialogFragment.TAG) == null) {
-                    DayStartPreferenceDialogFragment.newInstance(this, preference.getKey())
-                            .show(getFragmentManager(), DayStartPreferenceDialogFragment.TAG);
-                }
-            } else {
-                if (getFragmentManager().findFragmentByTag(TimePreferenceDialogFragment.TAG) == null) {
-                    TimePreferenceDialogFragment.newInstance(this, preference.getKey())
-                            .show(getFragmentManager(), TimePreferenceDialogFragment.TAG);
-                }
-            }
-        } else {
-            super.onDisplayPreferenceDialog(preference);
-        }
-    }
-
-    public void setUser(HabitRPGUser user) {
-        this.user = user;
-        if (user != null && user.getFlags() != null && user.getStats() != null) {
-            if (user.getStats().getLvl() >= 10) {
-                if (user.getFlags().getClassSelected()) {
-                    if (user.getPreferences().getDisableClasses()) {
-                        classSelectionPreference.setTitle(getString(R.string.enable_class));
-                    } else {
-                        classSelectionPreference.setTitle(getString(R.string.change_class));
-                        classSelectionPreference.setSummary(getString(R.string.change_class_description));
-                    }
-                    classSelectionPreference.setVisible(true);
-                } else {
-                    classSelectionPreference.setTitle(getString(R.string.enable_class));
-                    classSelectionPreference.setVisible(true);
-                }
-            }
-        }
-        if (user != null && user.getPreferences() != null) {
-            TimePreference cdsTimePreference = (TimePreference) findPreference("cds_time");
-            cdsTimePreference.setText(user.getPreferences().getDayStart() + ":00");
-            findPreference("dailyDueDefaultView").setDefaultValue(user.getPreferences().getDailyDueDefaultView());
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.preferences;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
+import com.habitrpg.android.habitica.helpers.LanguageHelper;
+import com.habitrpg.android.habitica.helpers.SoundManager;
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
+import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Preferences;
+import com.habitrpg.android.habitica.prefs.TimePreference;
+import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+public class PreferencesFragment extends BasePreferencesFragment implements
+        SharedPreferences.OnSharedPreferenceChangeListener {
+
+    @Inject
+    public ApiClient apiClient;
+    @Inject
+    public SoundManager soundManager;
+    @Inject
+    UserRepository userRepository;
+    private Context context;
+    private TimePreference timePreference;
+    private PreferenceScreen pushNotificationsPreference;
+    private Preference classSelectionPreference;
+    private HabitRPGUser user;
+    @Inject
+    PushNotificationManager pushNotificationManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        HabiticaBaseApplication.getComponent().inject(this);
+        context = getActivity();
+
+        String userID = getPreferenceManager().getSharedPreferences().getString(context.getString(R.string.SP_userID), null);
+        if (userID != null) {
+            userRepository.getUser(userID).subscribe(PreferencesFragment.this::setUser, throwable -> {});
+        }
+    }
+
+    @Override
+    protected void setupPreferences() {
+        timePreference = (TimePreference) findPreference("reminder_time");
+        boolean useReminder = getPreferenceManager().getSharedPreferences().getBoolean("use_reminder", false);
+        timePreference.setEnabled(useReminder);
+
+
+        pushNotificationsPreference = (PreferenceScreen) findPreference("pushNotifications");
+        boolean userPushNotifications = getPreferenceManager().getSharedPreferences().getBoolean("usePushNotifications", true);
+        pushNotificationsPreference.setEnabled(userPushNotifications);
+
+
+        classSelectionPreference = findPreference("choose_class");
+        classSelectionPreference.setVisible(false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+
+    }
+
+    @Override
+    public void onPause() {
+        getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+        super.onPause();
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        if (preference.getKey().equals("logout")) {
+            HabiticaApplication.logout(context);
+            getActivity().finish();
+        } else if (preference.getKey().equals("choose_class")) {
+            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());
+            if (!user.getFlags().getClassSelected()) {
+                bundle.putBoolean("isInitialSelection", true);
+            } else {
+                bundle.putBoolean("isInitialSelection", false);
+            }
+
+            Intent intent = new Intent(getActivity(), ClassSelectionActivity.class);
+            intent.putExtras(bundle);
+
+            if (user.getFlags().getClassSelected() && !user.getPreferences().getDisableClasses()) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+                        .setTitle(getString(R.string.change_class_confirmation))
+                        .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> dialog.dismiss())
+                        .setPositiveButton(getString(R.string.change_class), (dialog, which) -> startActivityForResult(intent, MainActivity.SELECT_CLASS_RESULT));
+                AlertDialog alert = builder.create();
+                alert.show();
+            } else {
+                startActivityForResult(intent, MainActivity.SELECT_CLASS_RESULT);
+            }
+            return true;
+        } else if (preference.getKey().equals("reload_content")) {
+            apiClient.getContent().subscribe(contentResult -> {}, throwable -> {});
+        }
+        return super.onPreferenceTreeClick(preference);
+    }
+
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        switch (key) {
+            case "use_reminder":
+                boolean use_reminder = sharedPreferences.getBoolean(key, false);
+                timePreference.setEnabled(use_reminder);
+                if (use_reminder) {
+                    TaskAlarmManager.scheduleDailyReminder(context);
+                } else {
+                    TaskAlarmManager.removeDailyReminder(context);
+                }
+                break;
+            case "reminder_time":
+                TaskAlarmManager.removeDailyReminder(context);
+                TaskAlarmManager.scheduleDailyReminder(context);
+                break;
+            case "usePushNotifications":
+                boolean userPushNotifications = sharedPreferences.getBoolean(key, false);
+                pushNotificationsPreference.setEnabled(userPushNotifications);
+                if (userPushNotifications) {
+                    pushNotificationManager.addPushDeviceUsingStoredToken();
+                } else {
+                    pushNotificationManager.removePushDeviceUsingStoredToken();
+                }
+                break;
+            case "cds_time":
+                String timeval = sharedPreferences.getString("cds_time", "00:00");
+                String[] pieces = timeval.split(":");
+                int hour = Integer.parseInt(pieces[0]);
+                Map<String, Object> updateObject = new HashMap<>();
+                updateObject.put("dayStart", hour);
+                apiClient.changeCustomDayStart(updateObject)
+                        .subscribe(user -> {
+                        }, throwable -> {
+                        });
+                break;
+            case "language": {
+                LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString(key, "en"));
+
+                Locale.setDefault(languageHelper.getLocale());
+                Configuration configuration = new Configuration();
+                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
+                    configuration.locale = languageHelper.getLocale();
+                } else {
+                    configuration.setLocale(languageHelper.getLocale());
+                }
+                getActivity().getResources().updateConfiguration(configuration,
+                        getActivity().getResources().getDisplayMetrics());
+                userRepository.updateUser(user, "preferences.language", languageHelper.getLanguageCode())
+                        .subscribe(habitRPGUser -> {
+                        }, throwable -> {
+                        });
+
+                Preferences preferences = user.getPreferences();
+                preferences.setLanguage(languageHelper.getLanguageCode());
+                apiClient.setLanguageCode(preferences.getLanguage());
+                apiClient.getContent()
+                        .subscribe(contentResult -> {
+                        }, throwable -> {
+                        });
+
+                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
+                    Intent intent = new Intent(getActivity(), MainActivity.class);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                    startActivity(intent);
+                } else {
+                    Intent intent = new Intent(getActivity(), MainActivity.class);
+                    this.startActivity(intent);
+                    getActivity().finishAffinity();
+                }
+                EventBus.getDefault().post(new RefreshUserCommand());
+
+                break;
+            }
+            case "audioTheme": {
+                String newAudioTheme = sharedPreferences.getString(key, "off");
+                userRepository.updateUser(user, "preferences.sound", newAudioTheme)
+                        .subscribe(habitRPGUser -> {
+                        }, throwable -> {
+                        });
+
+                Preferences preferences = user.getPreferences();
+                preferences.setSound(newAudioTheme);
+
+                soundManager.setSoundTheme(newAudioTheme);
+
+                soundManager.preloadAllFiles();
+                break;
+            }
+            case "dailyDueDefaultView":
+                userRepository.updateUser(user, "preferences.dailyDueDefaultView", sharedPreferences.getBoolean(key, false))
+                        .subscribe(habitRPGUser -> {
+                        }, throwable -> {
+                        });
+                break;
+        }
+    }
+
+    @Override
+    public void onDisplayPreferenceDialog(Preference preference) {
+        if (preference instanceof TimePreference) {
+            if (preference.getKey().equals("cds_time")) {
+                if (getFragmentManager().findFragmentByTag(DayStartPreferenceDialogFragment.TAG) == null) {
+                    DayStartPreferenceDialogFragment.newInstance(this, preference.getKey())
+                            .show(getFragmentManager(), DayStartPreferenceDialogFragment.TAG);
+                }
+            } else {
+                if (getFragmentManager().findFragmentByTag(TimePreferenceDialogFragment.TAG) == null) {
+                    TimePreferenceDialogFragment.newInstance(this, preference.getKey())
+                            .show(getFragmentManager(), TimePreferenceDialogFragment.TAG);
+                }
+            }
+        } else {
+            super.onDisplayPreferenceDialog(preference);
+        }
+    }
+
+    public void setUser(HabitRPGUser user) {
+        this.user = user;
+        if (user != null && user.getFlags() != null && user.getStats() != null) {
+            if (user.getStats().getLvl() >= 10) {
+                if (user.getFlags().getClassSelected()) {
+                    if (user.getPreferences().getDisableClasses()) {
+                        classSelectionPreference.setTitle(getString(R.string.enable_class));
+                    } else {
+                        classSelectionPreference.setTitle(getString(R.string.change_class));
+                        classSelectionPreference.setSummary(getString(R.string.change_class_description));
+                    }
+                    classSelectionPreference.setVisible(true);
+                } else {
+                    classSelectionPreference.setTitle(getString(R.string.enable_class));
+                    classSelectionPreference.setVisible(true);
+                }
+            }
+        }
+        if (user != null && user.getPreferences() != null) {
+            TimePreference cdsTimePreference = (TimePreference) findPreference("cds_time");
+            cdsTimePreference.setText(user.getPreferences().getDayStart() + ":00");
+            findPreference("dailyDueDefaultView").setDefaultValue(user.getPreferences().getDailyDueDefaultView());
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.java
index 6641d346b..53c4c8427 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.java
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
-import com.habitrpg.android.habitica.prefs.TimePreference;
-
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
@@ -10,6 +8,8 @@ import android.support.v7.preference.PreferenceFragmentCompat;
 import android.view.View;
 import android.widget.TimePicker;
 
+import com.habitrpg.android.habitica.prefs.TimePreference;
+
 import java.util.Locale;
 
 public class TimePreferenceDialogFragment extends PreferenceDialogFragmentCompat {
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 cbb83d5cb..6e556f19d 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,271 +1,271 @@
-package com.habitrpg.android.habitica.ui.fragments.setup;
-
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
-import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
-import com.habitrpg.android.habitica.ui.AvatarView;
-import com.habitrpg.android.habitica.ui.SpeechBubbleView;
-import com.habitrpg.android.habitica.ui.activities.SetupActivity;
-import com.habitrpg.android.habitica.ui.adapter.setup.CustomizationSetupAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.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.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.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;
-    @BindView(R.id.speech_bubble)
-    SpeechBubbleView speechBubbleView;
-
-    CustomizationSetupAdapter adapter;
-    LinearLayoutManager layoutManager;
-    @Inject
-    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
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        if (view == null) {
-            view = inflater.inflate(R.layout.fragment_setup_avatar, container, false);
-        }
-
-        unbinder = ButterKnife.bind(this, view);
-        this.adapter = new CustomizationSetupAdapter();
-        if (this.user != null) {
-            this.adapter.userSize = this.user.getPreferences().getSize();
-        } else {
-            this.adapter.userSize = "slim";
-        }
-        this.adapter.user = this.user;
-        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 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.selectedBodyCategory();
-
-        this.random = new Random();
-
-        if (this.user != null) {
-            this.updateAvatar();
-        }
-        return view;
-    }
-
-    @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (isVisibleToUser && getContext() != null) {
-            speechBubbleView.animateText(getContext().getString(R.string.avatar_setup_description));
-        }
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void loadCustomizations() {
-        if (this.user == null || this.adapter == null || this.activeCategory == null) {
-            return;
-        }
-
-        this.adapter.setCustomizationList(customizationRepository.getCustomizations(activeCategory, activeSubCategory, user));
-    }
-
-    public void setUser(@Nullable HabitRPGUser user) {
-        this.user = user;
-        if (avatarView != null) {
-            updateAvatar();
-        }
-        if (this.adapter != null) {
-            this.adapter.user = user;
-            this.adapter.notifyDataSetChanged();
-        }
-    }
-
-    private void updateAvatar() {
-        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("bangs", "color", "ponytail");
-        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_bangs));
-        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_color));
-        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);
-    }
-
-    @Nullable
-    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);
-        }
-
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.setup;
+
+import android.content.res.Resources;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+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 com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
+import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
+import com.habitrpg.android.habitica.models.SetupCustomization;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.SpeechBubbleView;
+import com.habitrpg.android.habitica.ui.activities.SetupActivity;
+import com.habitrpg.android.habitica.ui.adapter.setup.CustomizationSetupAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+import com.habitrpg.android.habitica.ui.views.setup.AvatarCategoryView;
+
+import org.greenrobot.eventbus.EventBus;
+
+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.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;
+    @BindView(R.id.speech_bubble)
+    SpeechBubbleView speechBubbleView;
+
+    CustomizationSetupAdapter adapter;
+    LinearLayoutManager layoutManager;
+    @Inject
+    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
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        if (view == null) {
+            view = inflater.inflate(R.layout.fragment_setup_avatar, container, false);
+        }
+
+        unbinder = ButterKnife.bind(this, view);
+        this.adapter = new CustomizationSetupAdapter();
+        if (this.user != null) {
+            this.adapter.userSize = this.user.getPreferences().getSize();
+        } else {
+            this.adapter.userSize = "slim";
+        }
+        this.adapter.user = this.user;
+        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 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.selectedBodyCategory();
+
+        this.random = new Random();
+
+        if (this.user != null) {
+            this.updateAvatar();
+        }
+        return view;
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser && getContext() != null) {
+            speechBubbleView.animateText(getContext().getString(R.string.avatar_setup_description));
+        }
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void loadCustomizations() {
+        if (this.user == null || this.adapter == null || this.activeCategory == null) {
+            return;
+        }
+
+        this.adapter.setCustomizationList(customizationRepository.getCustomizations(activeCategory, activeSubCategory, user));
+    }
+
+    public void setUser(@Nullable HabitRPGUser user) {
+        this.user = user;
+        if (avatarView != null) {
+            updateAvatar();
+        }
+        if (this.adapter != null) {
+            this.adapter.user = user;
+            this.adapter.notifyDataSetChanged();
+        }
+    }
+
+    private void updateAvatar() {
+        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("bangs", "color", "ponytail");
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_bangs));
+        this.subCategoryTabs.addTab(subCategoryTabs.newTab().setText(R.string.avatar_hair_color));
+        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);
+    }
+
+    @Nullable
+    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/IntroFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.java
index 5db9cde2a..4b4378ab7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/IntroFragment.java
@@ -1,9 +1,5 @@
 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.fragments.BaseFragment;
-
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -13,6 +9,10 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
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 89ac4b104..4d9a41b39 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,188 +1,188 @@
-package com.habitrpg.android.habitica.ui.fragments.setup;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-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.SpeechBubbleView;
-import com.habitrpg.android.habitica.ui.activities.SetupActivity;
-import com.habitrpg.android.habitica.ui.adapter.setup.TaskSetupAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.tasks.Days;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class TaskSetupFragment 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.speech_bubble)
-    SpeechBubbleView speechBubbleView;
-    TaskSetupAdapter adapter;
-    private String[][] taskGroups;
-    private Object[][] tasks;
-    private HabitRPGUser user;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        if (view == null)
-            view = inflater.inflate(R.layout.fragment_setup_tasks, container, false);
-
-        this.setTasks();
-
-        unbinder = ButterKnife.bind(this, view);
-        this.adapter = new TaskSetupAdapter();
-        this.adapter.setTaskList(this.taskGroups);
-        this.recyclerView.setLayoutManager(new GridLayoutManager(activity, 2));
-        this.recyclerView.setAdapter(this.adapter);
-
-        if (this.user != null) {
-            this.updateAvatar();
-        }
-
-        return view;
-    }
-
-    @Override
-    public void setUserVisibleHint(boolean isVisibleToUser) {
-        super.setUserVisibleHint(isVisibleToUser);
-        if (isVisibleToUser && getContext() != null) {
-            speechBubbleView.animateText(getContext().getString(R.string.task_setup_description));
-        }
-    }
-
-    public void setUser(@Nullable HabitRPGUser user) {
-        this.user = user;
-        if (avatarView != null) {
-            updateAvatar();
-        }
-    }
-
-    private void updateAvatar() {
-        avatarView.setUser(user);
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void setTasks() {
-        this.taskGroups = new String[][]{
-                {getString(R.string.setup_group_work), "work"},
-                {getString(R.string.setup_group_exercise), "exercise"},
-                {getString(R.string.setup_group_health), "healthWellness"},
-                {getString(R.string.setup_group_school), "school"},
-                {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[][]{
-                {"work", "habit", getString(R.string.setup_task_work_1), true, false},
-                {"work", "daily", getString(R.string.setup_task_work_2)},
-                {"work", "todo", getString(R.string.setup_task_work_3)},
-
-                {"exercise", "habit", getString(R.string.setup_task_exercise_1), true, false},
-                {"exercise", "daily", getString(R.string.setup_task_exercise_2)},
-                {"exercise", "todo", getString(R.string.setup_task_exercise_3)},
-
-                {"healthWellness", "habit", getString(R.string.setup_task_healthWellness_1), true, true},
-                {"healthWellness", "daily", getString(R.string.setup_task_healthWellness_2)},
-                {"healthWellness", "todo", getString(R.string.setup_task_healthWellness_3)},
-
-                {"school", "habit", getString(R.string.setup_task_school_1), true, true},
-                {"school", "daily", getString(R.string.setup_task_school_2)},
-                {"school", "todo", getString(R.string.setup_task_school_3)},
-
-                {"teams", "habit", getString(R.string.setup_task_teams_1), true, false},
-                {"teams", "daily", getString(R.string.setup_task_teams_2)},
-                {"teams", "todo", getString(R.string.setup_task_teams_3)},
-
-                {"chores", "habit", getString(R.string.setup_task_chores_1), true, false},
-                {"chores", "daily", getString(R.string.setup_task_chores_2)},
-                {"chores", "todo", getString(R.string.setup_task_chores_3)},
-
-                {"creativity", "habit", getString(R.string.setup_task_creativity_1), true, false},
-                {"creativity", "daily", getString(R.string.setup_task_creativity_2)},
-                {"creativity", "todo", getString(R.string.setup_task_creativity_3)},
-        };
-    }
-
-    public List<Task> createSampleTasks() {
-        List<String> groups = new ArrayList<>();
-        int i = 0;
-        for (Boolean checked : this.adapter.checkedList) {
-            if (checked) {
-                groups.add(this.taskGroups[i][1]);
-            }
-            i++;
-        }
-        List<Task> tasks = new ArrayList<>();
-        for (Object[] task : this.tasks) {
-            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]);
-                } else {
-                    taskObject = this.makeTaskObject((String) task[1], (String) task[2], null, null);
-                }
-                tasks.add(taskObject);
-            }
-        }
-        return tasks;
-    }
-
-    private Task makeTaskObject(String type, String text, @Nullable Boolean up, @Nullable Boolean down) {
-        Task task = new Task();
-        task.text = text;
-        task.priority = 1.0f;
-        task.type = type;
-
-        if (type.equals("habit")) {
-            task.up = up;
-            task.down = down;
-        }
-
-        if (type.equals("daily")) {
-            task.frequency = "weekly";
-            task.startDate = new Date();
-            Days days = new Days();
-            days.setM(true);
-            days.setT(true);
-            days.setW(true);
-            days.setTh(true);
-            days.setF(true);
-            days.setS(true);
-            days.setSu(true);
-            task.repeat = days;
-        }
-
-        return task;
-    }
-
-}
+package com.habitrpg.android.habitica.ui.fragments.setup;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+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.models.tasks.Days;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.SpeechBubbleView;
+import com.habitrpg.android.habitica.ui.activities.SetupActivity;
+import com.habitrpg.android.habitica.ui.adapter.setup.TaskSetupAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class TaskSetupFragment 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.speech_bubble)
+    SpeechBubbleView speechBubbleView;
+    TaskSetupAdapter adapter;
+    private String[][] taskGroups;
+    private Object[][] tasks;
+    private HabitRPGUser user;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        if (view == null)
+            view = inflater.inflate(R.layout.fragment_setup_tasks, container, false);
+
+        this.setTasks();
+
+        unbinder = ButterKnife.bind(this, view);
+        this.adapter = new TaskSetupAdapter();
+        this.adapter.setTaskList(this.taskGroups);
+        this.recyclerView.setLayoutManager(new GridLayoutManager(activity, 2));
+        this.recyclerView.setAdapter(this.adapter);
+
+        if (this.user != null) {
+            this.updateAvatar();
+        }
+
+        return view;
+    }
+
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (isVisibleToUser && getContext() != null) {
+            speechBubbleView.animateText(getContext().getString(R.string.task_setup_description));
+        }
+    }
+
+    public void setUser(@Nullable HabitRPGUser user) {
+        this.user = user;
+        if (avatarView != null) {
+            updateAvatar();
+        }
+    }
+
+    private void updateAvatar() {
+        avatarView.setUser(user);
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void setTasks() {
+        this.taskGroups = new String[][]{
+                {getString(R.string.setup_group_work), "work"},
+                {getString(R.string.setup_group_exercise), "exercise"},
+                {getString(R.string.setup_group_health), "healthWellness"},
+                {getString(R.string.setup_group_school), "school"},
+                {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[][]{
+                {"work", "habit", getString(R.string.setup_task_work_1), true, false},
+                {"work", "daily", getString(R.string.setup_task_work_2)},
+                {"work", "todo", getString(R.string.setup_task_work_3)},
+
+                {"exercise", "habit", getString(R.string.setup_task_exercise_1), true, false},
+                {"exercise", "daily", getString(R.string.setup_task_exercise_2)},
+                {"exercise", "todo", getString(R.string.setup_task_exercise_3)},
+
+                {"healthWellness", "habit", getString(R.string.setup_task_healthWellness_1), true, true},
+                {"healthWellness", "daily", getString(R.string.setup_task_healthWellness_2)},
+                {"healthWellness", "todo", getString(R.string.setup_task_healthWellness_3)},
+
+                {"school", "habit", getString(R.string.setup_task_school_1), true, true},
+                {"school", "daily", getString(R.string.setup_task_school_2)},
+                {"school", "todo", getString(R.string.setup_task_school_3)},
+
+                {"teams", "habit", getString(R.string.setup_task_teams_1), true, false},
+                {"teams", "daily", getString(R.string.setup_task_teams_2)},
+                {"teams", "todo", getString(R.string.setup_task_teams_3)},
+
+                {"chores", "habit", getString(R.string.setup_task_chores_1), true, false},
+                {"chores", "daily", getString(R.string.setup_task_chores_2)},
+                {"chores", "todo", getString(R.string.setup_task_chores_3)},
+
+                {"creativity", "habit", getString(R.string.setup_task_creativity_1), true, false},
+                {"creativity", "daily", getString(R.string.setup_task_creativity_2)},
+                {"creativity", "todo", getString(R.string.setup_task_creativity_3)},
+        };
+    }
+
+    public List<Task> createSampleTasks() {
+        List<String> groups = new ArrayList<>();
+        int i = 0;
+        for (Boolean checked : this.adapter.checkedList) {
+            if (checked) {
+                groups.add(this.taskGroups[i][1]);
+            }
+            i++;
+        }
+        List<Task> tasks = new ArrayList<>();
+        for (Object[] task : this.tasks) {
+            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]);
+                } else {
+                    taskObject = this.makeTaskObject((String) task[1], (String) task[2], null, null);
+                }
+                tasks.add(taskObject);
+            }
+        }
+        return tasks;
+    }
+
+    private Task makeTaskObject(String type, String text, @Nullable Boolean up, @Nullable Boolean down) {
+        Task task = new Task();
+        task.text = text;
+        task.priority = 1.0f;
+        task.type = type;
+
+        if (type.equals("habit")) {
+            task.up = up;
+            task.down = down;
+        }
+
+        if (type.equals("daily")) {
+            task.frequency = "weekly";
+            task.startDate = new Date();
+            Days days = new Days();
+            days.setM(true);
+            days.setT(true);
+            days.setW(true);
+            days.setTh(true);
+            days.setF(true);
+            days.setS(true);
+            days.setSu(true);
+            task.repeat = days;
+        }
+
+        return task;
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
index e191769a9..62ed4e1ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/WelcomeFragment.java
@@ -1,39 +1,37 @@
-package com.habitrpg.android.habitica.ui.fragments.setup;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.ui.SpeechBubbleView;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class WelcomeFragment extends BaseFragment {
-
-    @BindView(R.id.speech_bubble)
-    SpeechBubbleView speechBubbleView;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_welcome, container, false);
-
-        unbinder = ButterKnife.bind(this, v);
-
-        speechBubbleView.animateText(getContext().getString(R.string.welcome_text));
-
-        return v;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {}
-}
+package com.habitrpg.android.habitica.ui.fragments.setup;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+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.SpeechBubbleView;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class WelcomeFragment extends BaseFragment {
+
+    @BindView(R.id.speech_bubble)
+    SpeechBubbleView speechBubbleView;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_welcome, container, false);
+
+        unbinder = ButterKnife.bind(this, v);
+
+        speechBubbleView.animateText(getContext().getString(R.string.welcome_text));
+
+        return v;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {}
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java
index 7e939a9a7..b752045cd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java
@@ -1,13 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.skills;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand;
-import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-
-import org.greenrobot.eventbus.EventBus;
-
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
@@ -16,6 +8,14 @@ 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.events.commands.AddNewTaskCommand;
+import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+
+import org.greenrobot.eventbus.EventBus;
+
 public class SkillTasksRecyclerViewFragment extends BaseFragment implements View.OnClickListener {
     public RecyclerView mRecyclerView;
     public RecyclerView.Adapter mAdapter;
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 5c9f92d77..a0a429bda 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
@@ -1,206 +1,206 @@
-package com.habitrpg.android.habitica.ui.fragments.skills;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-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.callbacks.SkillCallback;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.SkillUsedEvent;
-import com.habitrpg.android.habitica.events.commands.UseSkillCommand;
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
-import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
-import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-
-import org.greenrobot.eventbus.Subscribe;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import rx.Observable;
-
-public class SkillsFragment extends BaseMainFragment {
-
-    private final int TASK_SELECTION_ACTIVITY = 10;
-    private final int MEMBER_SELECTION_ACTIVITY = 11;
-
-    @Inject
-    UserRepository userRepository;
-
-    @BindView(R.id.recyclerView)
-    RecyclerView recyclerView;
-    SkillsRecyclerViewAdapter adapter;
-    private View view;
-    private Skill selectedSkill;
-    private ProgressDialog progressDialog;
-
-    static public Double round(Double value, int n) {
-        return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n));
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        if (view == null)
-            view = inflater.inflate(R.layout.fragment_skills, container, false);
-
-        adapter = new SkillsRecyclerViewAdapter();
-        checkUserLoadSkills();
-
-        this.tutorialStepIdentifier = "skills";
-        this.tutorialText = getString(R.string.tutorial_skills);
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        recyclerView.invalidateItemDecorations();
-        recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
-        recyclerView.setLayoutManager(new LinearLayoutManager(activity));
-        recyclerView.setAdapter(adapter);
-    }
-
-    private void checkUserLoadSkills() {
-        if (user == null || adapter == null) {
-            return;
-        }
-
-        adapter.mana = this.user.getStats().getMp();
-
-        Observable.concat(userRepository.getSkills(user).flatMap(Observable::from), userRepository.getSpecialItems(user).flatMap(Observable::from))
-                .toList()
-                .subscribe(skills -> adapter.setSkillList(skills), throwable -> {});
-    }
-
-    @Override
-    public void setUser(HabitRPGUser user) {
-        super.setUser(user);
-
-        checkUserLoadSkills();
-    }
-
-    @Subscribe
-    public void onEvent(UseSkillCommand command) {
-        Skill skill = command.skill;
-
-        if (skill.isSpecialItem) {
-            selectedSkill = skill;
-            Intent intent = new Intent(activity, SkillMemberActivity.class);
-            startActivityForResult(intent, MEMBER_SELECTION_ACTIVITY);
-        } else if (skill.target.equals("task")) {
-            selectedSkill = skill;
-            Intent intent = new Intent(activity, SkillTasksActivity.class);
-            startActivityForResult(intent, TASK_SELECTION_ACTIVITY);
-        } else {
-            useSkill(skill);
-        }
-    }
-
-    @Subscribe
-    public void onEvent(SkillUsedEvent event) {
-        removeProgressDialog();
-        Skill skill = event.usedSkill;
-        adapter.setMana(event.newMana);
-        StringBuilder message = new StringBuilder();
-        if (skill.isSpecialItem) {
-            message.append(getContext().getString(R.string.used_skill_without_mana, skill.text));
-        } else {
-            message.append(getContext().getString(R.string.used_skill, skill.text, skill.mana));
-        }
-
-        if (event.xp != 0) {
-            message.append(" + ").append(round(event.xp, 2)).append(" XP");
-        }
-        if (event.hp != 0) {
-            message.append(" + ").append(round(event.hp, 2)).append(" HP");
-        }
-        if (event.gold != 0) {
-            message.append(" + ").append(round(event.gold, 2)).append(" GP");
-        }
-        if (activity != null) {
-            UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), message.toString(), UiUtils.SnackbarDisplayType.NORMAL);
-        }
-        userRepository.retrieveUser(false)
-                .subscribe(habitRPGUser -> {
-                    if (activity != null) {
-                        activity.onUserReceived(habitRPGUser);
-                    }
-                }, throwable -> {
-                });
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode) {
-            case (TASK_SELECTION_ACTIVITY): {
-                if (resultCode == Activity.RESULT_OK) {
-                    useSkill(selectedSkill, data.getStringExtra("task_id"));
-                }
-                break;
-            }
-            case (MEMBER_SELECTION_ACTIVITY): {
-                if (resultCode == Activity.RESULT_OK) {
-                    useSkill(selectedSkill, data.getStringExtra("member_id"));
-                }
-                break;
-            }
-        }
-    }
-
-    private void useSkill(Skill skill) {
-        useSkill(skill, null);
-    }
-
-    private void useSkill(Skill skill, @Nullable String taskId) {
-        displayProgressDialog();
-        Observable<SkillResponse> observable;
-        if (taskId != null) {
-            observable = userRepository.useSkill(user, skill.key, skill.target, taskId);
-        } else {
-            observable = userRepository.useSkill(user, skill.key, skill.target);
-        }
-        observable.subscribe(new SkillCallback(activity, user, skill), throwable -> removeProgressDialog());
-    }
-
-    private void displayProgressDialog() {
-        if (progressDialog != null) {
-            progressDialog.dismiss();
-        }
-        progressDialog = ProgressDialog.show(activity, getContext().getString(R.string.skill_progress_title), null, true);
-    }
-
-    private void removeProgressDialog() {
-        if (progressDialog != null) {
-            progressDialog.dismiss();
-        }
-    }
-
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_skills);	}
-
-}
+package com.habitrpg.android.habitica.ui.fragments.skills;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+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.callbacks.SkillCallback;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.SkillUsedEvent;
+import com.habitrpg.android.habitica.events.commands.UseSkillCommand;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
+import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
+import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
+
+import org.greenrobot.eventbus.Subscribe;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import rx.Observable;
+
+public class SkillsFragment extends BaseMainFragment {
+
+    private final int TASK_SELECTION_ACTIVITY = 10;
+    private final int MEMBER_SELECTION_ACTIVITY = 11;
+
+    @Inject
+    UserRepository userRepository;
+
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+    SkillsRecyclerViewAdapter adapter;
+    private View view;
+    private Skill selectedSkill;
+    private ProgressDialog progressDialog;
+
+    static public Double round(Double value, int n) {
+        return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n));
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        if (view == null)
+            view = inflater.inflate(R.layout.fragment_skills, container, false);
+
+        adapter = new SkillsRecyclerViewAdapter();
+        checkUserLoadSkills();
+
+        this.tutorialStepIdentifier = "skills";
+        this.tutorialText = getString(R.string.tutorial_skills);
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        recyclerView.invalidateItemDecorations();
+        recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
+        recyclerView.setLayoutManager(new LinearLayoutManager(activity));
+        recyclerView.setAdapter(adapter);
+    }
+
+    private void checkUserLoadSkills() {
+        if (user == null || adapter == null) {
+            return;
+        }
+
+        adapter.mana = this.user.getStats().getMp();
+
+        Observable.concat(userRepository.getSkills(user).flatMap(Observable::from), userRepository.getSpecialItems(user).flatMap(Observable::from))
+                .toList()
+                .subscribe(skills -> adapter.setSkillList(skills), throwable -> {});
+    }
+
+    @Override
+    public void setUser(HabitRPGUser user) {
+        super.setUser(user);
+
+        checkUserLoadSkills();
+    }
+
+    @Subscribe
+    public void onEvent(UseSkillCommand command) {
+        Skill skill = command.skill;
+
+        if (skill.isSpecialItem) {
+            selectedSkill = skill;
+            Intent intent = new Intent(activity, SkillMemberActivity.class);
+            startActivityForResult(intent, MEMBER_SELECTION_ACTIVITY);
+        } else if (skill.target.equals("task")) {
+            selectedSkill = skill;
+            Intent intent = new Intent(activity, SkillTasksActivity.class);
+            startActivityForResult(intent, TASK_SELECTION_ACTIVITY);
+        } else {
+            useSkill(skill);
+        }
+    }
+
+    @Subscribe
+    public void onEvent(SkillUsedEvent event) {
+        removeProgressDialog();
+        Skill skill = event.usedSkill;
+        adapter.setMana(event.newMana);
+        StringBuilder message = new StringBuilder();
+        if (skill.isSpecialItem) {
+            message.append(getContext().getString(R.string.used_skill_without_mana, skill.text));
+        } else {
+            message.append(getContext().getString(R.string.used_skill, skill.text, skill.mana));
+        }
+
+        if (event.xp != 0) {
+            message.append(" + ").append(round(event.xp, 2)).append(" XP");
+        }
+        if (event.hp != 0) {
+            message.append(" + ").append(round(event.hp, 2)).append(" HP");
+        }
+        if (event.gold != 0) {
+            message.append(" + ").append(round(event.gold, 2)).append(" GP");
+        }
+        if (activity != null) {
+            UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), message.toString(), UiUtils.SnackbarDisplayType.NORMAL);
+        }
+        userRepository.retrieveUser(false)
+                .subscribe(habitRPGUser -> {
+                    if (activity != null) {
+                        activity.onUserReceived(habitRPGUser);
+                    }
+                }, throwable -> {
+                });
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case (TASK_SELECTION_ACTIVITY): {
+                if (resultCode == Activity.RESULT_OK) {
+                    useSkill(selectedSkill, data.getStringExtra("task_id"));
+                }
+                break;
+            }
+            case (MEMBER_SELECTION_ACTIVITY): {
+                if (resultCode == Activity.RESULT_OK) {
+                    useSkill(selectedSkill, data.getStringExtra("member_id"));
+                }
+                break;
+            }
+        }
+    }
+
+    private void useSkill(Skill skill) {
+        useSkill(skill, null);
+    }
+
+    private void useSkill(Skill skill, @Nullable String taskId) {
+        displayProgressDialog();
+        Observable<SkillResponse> observable;
+        if (taskId != null) {
+            observable = userRepository.useSkill(user, skill.key, skill.target, taskId);
+        } else {
+            observable = userRepository.useSkill(user, skill.key, skill.target);
+        }
+        observable.subscribe(new SkillCallback(activity, user, skill), throwable -> removeProgressDialog());
+    }
+
+    private void displayProgressDialog() {
+        if (progressDialog != null) {
+            progressDialog.dismiss();
+        }
+        progressDialog = ProgressDialog.show(activity, getContext().getString(R.string.skill_progress_title), null, true);
+    }
+
+    private void removeProgressDialog() {
+        if (progressDialog != null) {
+            progressDialog.dismiss();
+        }
+    }
+
+	@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 6d9f65cf3..ff707859a 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,252 +1,252 @@
-package com.habitrpg.android.habitica.ui.fragments.social;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
-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.data.SocialRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
-import com.habitrpg.android.habitica.events.commands.CopyChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
-import com.habitrpg.android.habitica.events.commands.SendNewGroupMessageCommand;
-import com.habitrpg.android.habitica.events.commands.ToggleInnCommand;
-import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import rx.functions.Action1;
-
-public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout.OnRefreshListener, Action1<List<ChatMessage>> {
-
-    public String seenGroupId;
-    @Inject
-    SocialRepository socialRepository;
-    @Inject
-    UserRepository userRepository;
-    public boolean isTavern;
-    @BindView(R.id.recyclerView)
-    RecyclerView mRecyclerView;
-    @BindView(R.id.refresh_layout)
-    SwipeRefreshLayout swipeRefreshLayout;
-    LinearLayoutManager layoutManager;
-    private String groupId;
-    private HabitRPGUser user;
-    private String userId;
-    private ChatRecyclerViewAdapter chatAdapter;
-    private View view;
-    private List<ChatMessage> currentChatMessages;
-    private boolean navigatedOnceToFragment = false;
-    private boolean gotNewMessages = false;
-
-    public void configure(String groupId, @Nullable HabitRPGUser user, boolean isTavern) {
-        this.groupId = groupId;
-        this.user = user;
-        if (this.user != null) {
-            this.userId = this.user.getId();
-        }
-        this.isTavern = isTavern;
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        if (savedInstanceState != null) {
-            if (savedInstanceState.containsKey("groupId")) {
-                this.groupId = savedInstanceState.getString("groupId");
-            }
-
-            if (savedInstanceState.containsKey("isTavern")) {
-                this.isTavern = savedInstanceState.getBoolean("isTavern");
-            }
-
-            if (savedInstanceState.containsKey("userId")) {
-                this.userId = savedInstanceState.getString("userId");
-                if (this.userId != null) {
-                    userRepository.getUser(userId).subscribe(habitRPGUser -> this.user = habitRPGUser, throwable -> {});
-                }
-            }
-
-        }
-
-        if (view == null)
-            view = inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false);
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(final View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        ButterKnife.bind(this, view);
-
-        swipeRefreshLayout.setOnRefreshListener(this);
-
-        layoutManager = (LinearLayoutManager) mRecyclerView.getLayoutManager();
-
-        if (layoutManager == null) {
-            layoutManager = new LinearLayoutManager(getContext());
-
-            mRecyclerView.setLayoutManager(layoutManager);
-        }
-
-        chatAdapter = new ChatRecyclerViewAdapter(new ArrayList<>(), user, groupId);
-
-        mRecyclerView.setAdapter(chatAdapter);
-
-        onRefresh();
-    }
-
-    @Override
-    public void onRefresh() {
-        swipeRefreshLayout.setRefreshing(true);
-
-        socialRepository.getGroupChat(groupId)
-                .subscribe(this, throwable -> {
-                });
-    }
-
-    public void setNavigatedToFragment(String groupId) {
-        seenGroupId = groupId;
-        navigatedOnceToFragment = true;
-
-        markMessagesAsSeen();
-    }
-
-    private void markMessagesAsSeen() {
-        if (!isTavern && seenGroupId != null && !seenGroupId.isEmpty()
-                && gotNewMessages && navigatedOnceToFragment) {
-
-            gotNewMessages = false;
-
-            socialRepository.markMessagesSeen(seenGroupId);
-        }
-    }
-
-    @Subscribe
-    public void onEvent(CopyChatMessageCommand cmd) {
-        ClipboardManager clipMan = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
-        ClipData chatMessage = ClipData.newPlainText("Chat message", cmd.chatMessage.text);
-        clipMan.setPrimaryClip(chatMessage);
-        MainActivity activity = (MainActivity) getActivity();
-        UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), getString(R.string.chat_message_copied), UiUtils.SnackbarDisplayType.NORMAL);
-    }
-
-    @Subscribe
-    public void onEvent(final FlagChatMessageCommand cmd) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setMessage(R.string.chat_flag_confirmation)
-                .setPositiveButton(R.string.flag_confirm, (dialog, id) -> socialRepository.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);
-                        }, throwable -> {
-                        }))
-                .setNegativeButton(R.string.action_cancel, (dialog, id) -> {
-                });
-        builder.show();
-    }
-
-    @Subscribe
-    public void onEvent(final ToggleLikeMessageCommand cmd) {
-        socialRepository.likeMessage(cmd.groupId, cmd.chatMessage.id)
-                .subscribe(voids -> {
-                }, throwable -> {
-                });
-    }
-
-    @Subscribe
-    public void onEvent(final DeleteChatMessageCommand cmd) {
-        socialRepository.deleteMessage(cmd.groupId, cmd.chatMessage.id)
-                .subscribe(aVoid -> {
-                    if (currentChatMessages != null) {
-                        currentChatMessages.remove(cmd.chatMessage);
-                        ChatListFragment.this.call(currentChatMessages);
-                    }
-                }, throwable -> {
-                });
-    }
-
-    @Subscribe
-    public void onEvent(SendNewGroupMessageCommand cmd) {
-        socialRepository.postGroupChat(cmd.targetGroupId, cmd.message)
-                .subscribe(postChatMessageResult -> {
-                    if (currentChatMessages != null) {
-                        currentChatMessages.add(0, postChatMessageResult.message);
-                        ChatListFragment.this.call(currentChatMessages);
-                    }
-                }, throwable -> {
-                });
-
-        UiUtils.dismissKeyboard(getActivity());
-    }
-
-    // If the ChatList is Tavern, we're able to toggle the sleep-mode
-    @Subscribe
-    public void onEvent(ToggleInnCommand event) {
-        userRepository.sleep(user)
-                .subscribe(habitRPGUser -> {
-                    ToggledInnStateEvent innState = new ToggledInnStateEvent();
-                    innState.Inn = habitRPGUser.getPreferences().getSleep();
-                    EventBus.getDefault().post(innState);
-                }, throwable -> {
-                });
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putString("userId", this.userId);
-        outState.putString("groupId", this.groupId);
-        outState.putBoolean("isTavern", this.isTavern);
-        super.onSaveInstanceState(outState);
-    }
-
-    @Override
-    public void call(List<ChatMessage> chatMessages) {
-        currentChatMessages = chatMessages;
-
-        if (chatAdapter != null) {
-            chatAdapter.setMessages(chatMessages);
-        }
-
-        if (swipeRefreshLayout != null) {
-            swipeRefreshLayout.setRefreshing(false);
-        }
-        gotNewMessages = true;
-
-        markMessagesAsSeen();
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.LinearLayoutManager;
+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.data.SocialRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
+import com.habitrpg.android.habitica.events.commands.CopyChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
+import com.habitrpg.android.habitica.events.commands.SendNewGroupMessageCommand;
+import com.habitrpg.android.habitica.events.commands.ToggleInnCommand;
+import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import rx.functions.Action1;
+
+public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout.OnRefreshListener, Action1<List<ChatMessage>> {
+
+    public String seenGroupId;
+    @Inject
+    SocialRepository socialRepository;
+    @Inject
+    UserRepository userRepository;
+    public boolean isTavern;
+    @BindView(R.id.recyclerView)
+    RecyclerView mRecyclerView;
+    @BindView(R.id.refresh_layout)
+    SwipeRefreshLayout swipeRefreshLayout;
+    LinearLayoutManager layoutManager;
+    private String groupId;
+    private HabitRPGUser user;
+    private String userId;
+    private ChatRecyclerViewAdapter chatAdapter;
+    private View view;
+    private List<ChatMessage> currentChatMessages;
+    private boolean navigatedOnceToFragment = false;
+    private boolean gotNewMessages = false;
+
+    public void configure(String groupId, @Nullable HabitRPGUser user, boolean isTavern) {
+        this.groupId = groupId;
+        this.user = user;
+        if (this.user != null) {
+            this.userId = this.user.getId();
+        }
+        this.isTavern = isTavern;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        if (savedInstanceState != null) {
+            if (savedInstanceState.containsKey("groupId")) {
+                this.groupId = savedInstanceState.getString("groupId");
+            }
+
+            if (savedInstanceState.containsKey("isTavern")) {
+                this.isTavern = savedInstanceState.getBoolean("isTavern");
+            }
+
+            if (savedInstanceState.containsKey("userId")) {
+                this.userId = savedInstanceState.getString("userId");
+                if (this.userId != null) {
+                    userRepository.getUser(userId).subscribe(habitRPGUser -> this.user = habitRPGUser, throwable -> {});
+                }
+            }
+
+        }
+
+        if (view == null)
+            view = inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false);
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(final View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        ButterKnife.bind(this, view);
+
+        swipeRefreshLayout.setOnRefreshListener(this);
+
+        layoutManager = (LinearLayoutManager) mRecyclerView.getLayoutManager();
+
+        if (layoutManager == null) {
+            layoutManager = new LinearLayoutManager(getContext());
+
+            mRecyclerView.setLayoutManager(layoutManager);
+        }
+
+        chatAdapter = new ChatRecyclerViewAdapter(new ArrayList<>(), user, groupId);
+
+        mRecyclerView.setAdapter(chatAdapter);
+
+        onRefresh();
+    }
+
+    @Override
+    public void onRefresh() {
+        swipeRefreshLayout.setRefreshing(true);
+
+        socialRepository.getGroupChat(groupId)
+                .subscribe(this, throwable -> {
+                });
+    }
+
+    public void setNavigatedToFragment(String groupId) {
+        seenGroupId = groupId;
+        navigatedOnceToFragment = true;
+
+        markMessagesAsSeen();
+    }
+
+    private void markMessagesAsSeen() {
+        if (!isTavern && seenGroupId != null && !seenGroupId.isEmpty()
+                && gotNewMessages && navigatedOnceToFragment) {
+
+            gotNewMessages = false;
+
+            socialRepository.markMessagesSeen(seenGroupId);
+        }
+    }
+
+    @Subscribe
+    public void onEvent(CopyChatMessageCommand cmd) {
+        ClipboardManager clipMan = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData chatMessage = ClipData.newPlainText("Chat message", cmd.chatMessage.text);
+        clipMan.setPrimaryClip(chatMessage);
+        MainActivity activity = (MainActivity) getActivity();
+        UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), getString(R.string.chat_message_copied), UiUtils.SnackbarDisplayType.NORMAL);
+    }
+
+    @Subscribe
+    public void onEvent(final FlagChatMessageCommand cmd) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setMessage(R.string.chat_flag_confirmation)
+                .setPositiveButton(R.string.flag_confirm, (dialog, id) -> socialRepository.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);
+                        }, throwable -> {
+                        }))
+                .setNegativeButton(R.string.action_cancel, (dialog, id) -> {
+                });
+        builder.show();
+    }
+
+    @Subscribe
+    public void onEvent(final ToggleLikeMessageCommand cmd) {
+        socialRepository.likeMessage(cmd.groupId, cmd.chatMessage.id)
+                .subscribe(voids -> {
+                }, throwable -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(final DeleteChatMessageCommand cmd) {
+        socialRepository.deleteMessage(cmd.groupId, cmd.chatMessage.id)
+                .subscribe(aVoid -> {
+                    if (currentChatMessages != null) {
+                        currentChatMessages.remove(cmd.chatMessage);
+                        ChatListFragment.this.call(currentChatMessages);
+                    }
+                }, throwable -> {
+                });
+    }
+
+    @Subscribe
+    public void onEvent(SendNewGroupMessageCommand cmd) {
+        socialRepository.postGroupChat(cmd.targetGroupId, cmd.message)
+                .subscribe(postChatMessageResult -> {
+                    if (currentChatMessages != null) {
+                        currentChatMessages.add(0, postChatMessageResult.message);
+                        ChatListFragment.this.call(currentChatMessages);
+                    }
+                }, throwable -> {
+                });
+
+        UiUtils.dismissKeyboard(getActivity());
+    }
+
+    // If the ChatList is Tavern, we're able to toggle the sleep-mode
+    @Subscribe
+    public void onEvent(ToggleInnCommand event) {
+        userRepository.sleep(user)
+                .subscribe(habitRPGUser -> {
+                    ToggledInnStateEvent innState = new ToggledInnStateEvent();
+                    innState.Inn = habitRPGUser.getPreferences().getSleep();
+                    EventBus.getDefault().post(innState);
+                }, throwable -> {
+                });
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        outState.putString("userId", this.userId);
+        outState.putString("groupId", this.groupId);
+        outState.putBoolean("isTavern", this.isTavern);
+        super.onSaveInstanceState(outState);
+    }
+
+    @Override
+    public void call(List<ChatMessage> chatMessages) {
+        currentChatMessages = chatMessages;
+
+        if (chatAdapter != null) {
+            chatAdapter.setMessages(chatMessages);
+        }
+
+        if (swipeRefreshLayout != null) {
+            swipeRefreshLayout.setRefreshing(false);
+        }
+        gotNewMessages = true;
+
+        markMessagesAsSeen();
+    }
+}
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 e85481bf1..b6447ed13 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,358 +1,361 @@
-package com.habitrpg.android.habitica.ui.fragments.social;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.CardView;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-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.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-public class GroupInformationFragment extends BaseFragment {
-
-
-    FragmentGroupInfoBinding viewBinding;
-
-    @Inject
-    ApiClient apiClient;
-
-    @BindView(R.id.questMemberView)
-    LinearLayout questMemberView;
-
-    @BindView(R.id.collectionStats)
-    RecyclerView collectionStats;
-
-    @BindView(R.id.qrLayout)
-    @Nullable
-    LinearLayout qrLayout;
-
-    @BindView(R.id.qrWrapper)
-    @Nullable
-    CardView qrWrapper;
-
-    private View view;
-    @Nullable
-    private Group group;
-    @Nullable
-    private HabitRPGUser user;
-    private QuestContent quest;
-    private ValueBarBinding bossHpBar;
-    private ValueBarBinding bossRageBar;
-
-    private QuestCollectRecyclerViewAdapter questCollectViewAdapter;
-
-    public GroupInformationFragment() {
-
-    }
-
-    public static GroupInformationFragment newInstance(@Nullable Group group, @Nullable HabitRPGUser user) {
-        Bundle args = new Bundle();
-
-        GroupInformationFragment fragment = new GroupInformationFragment();
-        fragment.setArguments(args);
-        fragment.group = group;
-        fragment.user = user;
-        return fragment;
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        if (view == null)
-            view = inflater.inflate(R.layout.fragment_group_info, container, false);
-        questCollectViewAdapter = new QuestCollectRecyclerViewAdapter();
-
-        viewBinding = DataBindingUtil.bind(view);
-        viewBinding.setHideParticipantCard(false);
-
-        if (user != null) {
-            viewBinding.setUser(user);
-        }
-
-        if (group != null) {
-            setGroup(group);
-        }
-
-        unbinder = ButterKnife.bind(this, view);
-
-        collectionStats.setLayoutManager(new LinearLayoutManager(getContext()));
-        collectionStats.setAdapter(questCollectViewAdapter);
-        bossHpBar = DataBindingUtil.bind(view.findViewById(R.id.bossHpBar));
-        bossRageBar = DataBindingUtil.bind(view.findViewById(R.id.bossRageBar));
-
-        if (this.group == null) {
-            QrCodeManager qrCodeManager = new QrCodeManager(this.getContext());
-            qrCodeManager.setUpView(qrLayout);
-
-            if (user != null && user.getInvitations().getParty() != null && user.getInvitations().getParty().getId() != null) {
-                viewBinding.setInvitation(user.getInvitations().getParty());
-            }
-        }
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-    }
-
-    public void setGroup(@Nullable Group group) {
-        if (group == null) {
-            this.group = null;
-            return;
-        }
-        if (viewBinding != null) {
-            viewBinding.setGroup(group);
-        }
-
-        if (questMemberView != null) {
-            updateQuestMember(group);
-        }
-
-        this.group = group;
-
-        if (isAdded()) {
-            updateQuestProgress(group, quest);
-        }
-    }
-
-    public void setQuestContent(@Nullable QuestContent quest) {
-        if (quest == null) {
-            return;
-        }
-        if (viewBinding != null) {
-            viewBinding.setQuest(quest);
-        }
-
-        updateQuestProgress(group, quest);
-
-        this.quest = quest;
-    }
-
-    private void updateQuestProgress(@Nullable Group group, QuestContent quest) {
-        if (group == null || quest == null) {
-            return;
-        }
-        if (questCollectViewAdapter != null) {
-            questCollectViewAdapter.setQuestContent(quest);
-            if (group.quest.getProgress() != null) {
-                questCollectViewAdapter.setQuestProgress(group.quest.getProgress());
-            }
-        }
-
-        bossHpBar.valueBarLayout.setVisibility((quest.boss != null && quest.boss.hp > 0) ? View.VISIBLE : View.GONE);
-        bossRageBar.valueBarLayout.setVisibility((quest.boss != null && quest.boss.rage_value > 0) ? View.VISIBLE : View.GONE);
-
-        if (group.quest.members == null) {
-            viewBinding.setHideParticipantCard(true);
-        }
-    }
-
-    private void updateQuestMember(Group group) {
-        questMemberView.removeAllViewsInLayout();
-        if (group.quest == null || group.quest.key == null) return;
-        Context context = getContext();
-        if (context == null && group.quest.members != null) {
-            viewBinding.setHideParticipantCard(true);
-            return;
-        }
-        if (group.quest.members == null || group.members == null) {
-            viewBinding.setHideParticipantCard(true);
-            return;
-        }
-        viewBinding.setHideParticipantCard(false);
-        LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        for (HabitRPGUser member : group.members) {
-            final LinearLayout itemView = (LinearLayout) layoutInflater.inflate(R.layout.party_member_quest, questMemberView, false);
-            TextView questResponse = (TextView) itemView.findViewById(R.id.rsvpneeded);
-            TextView userName = (TextView) itemView.findViewById(R.id.username);
-            userName.setText(member.getProfile().getName());
-
-            if (!group.quest.members.containsKey(member.getId()))
-                continue;
-            Boolean questresponse = group.quest.members.get(member.getId());
-            if (group.quest.active) {
-                questResponse.setText("");
-            } else if (questresponse == null) {
-                questResponse.setText(R.string.quest_pending);
-            } else if (questresponse) {
-                questResponse.setText(R.string.quest_accepted);
-                questResponse.setTextColor(ContextCompat.getColor(context, R.color.good_10));
-            } else {
-                questResponse.setText(R.string.quest_rejected);
-                questResponse.setTextColor(ContextCompat.getColor(context, R.color.worse_10));
-            }
-            questMemberView.post(() -> {
-                if (questMemberView != null) {
-                    questMemberView.addView(itemView);
-                }
-            });
-        }
-    }
-
-
-    @OnClick(R.id.btnQuestAccept)
-    public void onQuestAccept() {
-        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() {
-        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 -> {
-                    });
-        }
-    }
-
-
-    @OnClick(R.id.btnQuestLeave)
-    public void onQuestLeave() {
-        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) -> {
-                    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) -> {
-
-                });
-        builder.show();
-    }
-
-    @OnClick(R.id.btnQuestBegin)
-    public void onQuestBegin() {
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
-                .setMessage(R.string.quest_begin_message)
-                .setPositiveButton(R.string.yes, (dialog, which) -> {
-                    if (group != null) {
-                        apiClient.forceStartQuest(group.id, group)
-                                .subscribe(quest -> {
-                                    group.quest = quest;
-                                    setGroup(group);
-                                }, throwable -> {
-                                });
-                    }
-                }).setNegativeButton(R.string.no, (dialog, which) -> {
-
-                });
-        builder.show();
-    }
-
-    @OnClick(R.id.btnQuestCancel)
-    public void onQuestCancel() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
-                .setMessage(R.string.quest_cancel_message)
-                .setPositiveButton(R.string.yes, (dialog, which) -> {
-                    if (group != null) {
-                        apiClient.cancelQuest(group.id)
-                                .subscribe(aVoid -> {
-                                    setGroup(group);
-                                    setQuestContent(null);
-                                }, throwable -> {
-                                });
-                    }
-                }).setNegativeButton(R.string.no, (dialog, which) -> {
-
-                });
-        builder.show();
-    }
-
-    @OnClick(R.id.btnQuestAbort)
-    public void onQuestAbort() {
-        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) -> {
-                    if (group != null) {
-                        apiClient.abortQuest(group.id)
-                                .subscribe(quest -> {
-                                    group.quest = quest;
-                                    setGroup(group);
-                                    setQuestContent(null);
-                                }, throwable -> {
-                                });
-                    }
-                }).setNegativeButton("No", (dialog, which) -> {
-
-                });
-        builder.show();
-    }
-
-    @OnClick(R.id.btnPartyInviteAccept)
-    public void onPartyInviteAccepted() {
-        if (user != null) {
-            apiClient.joinGroup(user.getInvitations().getParty().getId())
-                    .subscribe(group -> {
-                        setGroup(group);
-                        viewBinding.setInvitation(null);
-                    }, throwable -> {
-                    });
-        }
-    }
-
-    @OnClick(R.id.btnPartyInviteReject)
-    public void onPartyInviteRejected() {
-        if (user != null) {
-            apiClient.rejectGroupInvite(user.getInvitations().getParty().getId())
-                    .subscribe(aVoid -> viewBinding.setInvitation(null), throwable -> {});
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+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.data.ApiClient;
+import com.habitrpg.android.habitica.data.UserRepository;
+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.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.adapter.social.QuestCollectRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class GroupInformationFragment extends BaseFragment {
+
+
+    FragmentGroupInfoBinding viewBinding;
+
+    @Inject
+    ApiClient apiClient;
+    @Inject
+    UserRepository userRepository;
+
+    @BindView(R.id.questMemberView)
+    LinearLayout questMemberView;
+
+    @BindView(R.id.collectionStats)
+    RecyclerView collectionStats;
+
+    @BindView(R.id.qrLayout)
+    @Nullable
+    LinearLayout qrLayout;
+
+    @BindView(R.id.qrWrapper)
+    @Nullable
+    CardView qrWrapper;
+
+    private View view;
+    @Nullable
+    private Group group;
+    @Nullable
+    private HabitRPGUser user;
+    private QuestContent quest;
+    private ValueBarBinding bossHpBar;
+    private ValueBarBinding bossRageBar;
+
+    private QuestCollectRecyclerViewAdapter questCollectViewAdapter;
+
+    public GroupInformationFragment() {
+
+    }
+
+    public static GroupInformationFragment newInstance(@Nullable Group group, @Nullable HabitRPGUser user) {
+        Bundle args = new Bundle();
+
+        GroupInformationFragment fragment = new GroupInformationFragment();
+        fragment.setArguments(args);
+        fragment.group = group;
+        fragment.user = user;
+        return fragment;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        if (view == null)
+            view = inflater.inflate(R.layout.fragment_group_info, container, false);
+        questCollectViewAdapter = new QuestCollectRecyclerViewAdapter();
+
+        viewBinding = DataBindingUtil.bind(view);
+        viewBinding.setHideParticipantCard(false);
+
+        if (user != null) {
+            viewBinding.setUser(user);
+        }
+
+        if (group != null) {
+            setGroup(group);
+        }
+
+        unbinder = ButterKnife.bind(this, view);
+
+        collectionStats.setLayoutManager(new LinearLayoutManager(getContext()));
+        collectionStats.setAdapter(questCollectViewAdapter);
+        bossHpBar = DataBindingUtil.bind(view.findViewById(R.id.bossHpBar));
+        bossRageBar = DataBindingUtil.bind(view.findViewById(R.id.bossRageBar));
+
+        if (this.group == null) {
+            QrCodeManager qrCodeManager = new QrCodeManager(userRepository, this.getContext());
+            qrCodeManager.setUpView(qrLayout);
+
+            if (user != null && user.getInvitations().getParty() != null && user.getInvitations().getParty().getId() != null) {
+                viewBinding.setInvitation(user.getInvitations().getParty());
+            }
+        }
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+    }
+
+    public void setGroup(@Nullable Group group) {
+        if (group == null) {
+            this.group = null;
+            return;
+        }
+        if (viewBinding != null) {
+            viewBinding.setGroup(group);
+        }
+
+        if (questMemberView != null) {
+            updateQuestMember(group);
+        }
+
+        this.group = group;
+
+        if (isAdded()) {
+            updateQuestProgress(group, quest);
+        }
+    }
+
+    public void setQuestContent(@Nullable QuestContent quest) {
+        if (quest == null) {
+            return;
+        }
+        if (viewBinding != null) {
+            viewBinding.setQuest(quest);
+        }
+
+        updateQuestProgress(group, quest);
+
+        this.quest = quest;
+    }
+
+    private void updateQuestProgress(@Nullable Group group, QuestContent quest) {
+        if (group == null || quest == null) {
+            return;
+        }
+        if (questCollectViewAdapter != null) {
+            questCollectViewAdapter.setQuestContent(quest);
+            if (group.quest.getProgress() != null) {
+                questCollectViewAdapter.setQuestProgress(group.quest.getProgress());
+            }
+        }
+
+        bossHpBar.valueBarLayout.setVisibility((quest.boss != null && quest.boss.hp > 0) ? View.VISIBLE : View.GONE);
+        bossRageBar.valueBarLayout.setVisibility((quest.boss != null && quest.boss.rage_value > 0) ? View.VISIBLE : View.GONE);
+
+        if (group.quest.members == null) {
+            viewBinding.setHideParticipantCard(true);
+        }
+    }
+
+    private void updateQuestMember(Group group) {
+        questMemberView.removeAllViewsInLayout();
+        if (group.quest == null || group.quest.key == null) return;
+        Context context = getContext();
+        if (context == null && group.quest.members != null) {
+            viewBinding.setHideParticipantCard(true);
+            return;
+        }
+        if (group.quest.members == null || group.members == null) {
+            viewBinding.setHideParticipantCard(true);
+            return;
+        }
+        viewBinding.setHideParticipantCard(false);
+        LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        for (HabitRPGUser member : group.members) {
+            final LinearLayout itemView = (LinearLayout) layoutInflater.inflate(R.layout.party_member_quest, questMemberView, false);
+            TextView questResponse = (TextView) itemView.findViewById(R.id.rsvpneeded);
+            TextView userName = (TextView) itemView.findViewById(R.id.username);
+            userName.setText(member.getProfile().getName());
+
+            if (!group.quest.members.containsKey(member.getId()))
+                continue;
+            Boolean questresponse = group.quest.members.get(member.getId());
+            if (group.quest.active) {
+                questResponse.setText("");
+            } else if (questresponse == null) {
+                questResponse.setText(R.string.quest_pending);
+            } else if (questresponse) {
+                questResponse.setText(R.string.quest_accepted);
+                questResponse.setTextColor(ContextCompat.getColor(context, R.color.good_10));
+            } else {
+                questResponse.setText(R.string.quest_rejected);
+                questResponse.setTextColor(ContextCompat.getColor(context, R.color.worse_10));
+            }
+            questMemberView.post(() -> {
+                if (questMemberView != null) {
+                    questMemberView.addView(itemView);
+                }
+            });
+        }
+    }
+
+
+    @OnClick(R.id.btnQuestAccept)
+    public void onQuestAccept() {
+        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() {
+        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 -> {
+                    });
+        }
+    }
+
+
+    @OnClick(R.id.btnQuestLeave)
+    public void onQuestLeave() {
+        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) -> {
+                    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) -> {
+
+                });
+        builder.show();
+    }
+
+    @OnClick(R.id.btnQuestBegin)
+    public void onQuestBegin() {
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+                .setMessage(R.string.quest_begin_message)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    if (group != null) {
+                        apiClient.forceStartQuest(group.id, group)
+                                .subscribe(quest -> {
+                                    group.quest = quest;
+                                    setGroup(group);
+                                }, throwable -> {
+                                });
+                    }
+                }).setNegativeButton(R.string.no, (dialog, which) -> {
+
+                });
+        builder.show();
+    }
+
+    @OnClick(R.id.btnQuestCancel)
+    public void onQuestCancel() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
+                .setMessage(R.string.quest_cancel_message)
+                .setPositiveButton(R.string.yes, (dialog, which) -> {
+                    if (group != null) {
+                        apiClient.cancelQuest(group.id)
+                                .subscribe(aVoid -> {
+                                    setGroup(group);
+                                    setQuestContent(null);
+                                }, throwable -> {
+                                });
+                    }
+                }).setNegativeButton(R.string.no, (dialog, which) -> {
+
+                });
+        builder.show();
+    }
+
+    @OnClick(R.id.btnQuestAbort)
+    public void onQuestAbort() {
+        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) -> {
+                    if (group != null) {
+                        apiClient.abortQuest(group.id)
+                                .subscribe(quest -> {
+                                    group.quest = quest;
+                                    setGroup(group);
+                                    setQuestContent(null);
+                                }, throwable -> {
+                                });
+                    }
+                }).setNegativeButton("No", (dialog, which) -> {
+
+                });
+        builder.show();
+    }
+
+    @OnClick(R.id.btnPartyInviteAccept)
+    public void onPartyInviteAccepted() {
+        if (user != null) {
+            apiClient.joinGroup(user.getInvitations().getParty().getId())
+                    .subscribe(group -> {
+                        setGroup(group);
+                        viewBinding.setInvitation(null);
+                    }, throwable -> {
+                    });
+        }
+    }
+
+    @OnClick(R.id.btnPartyInviteReject)
+    public void onPartyInviteRejected() {
+        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 e02ca8e63..52285fc2c 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
@@ -1,269 +1,269 @@
-package com.habitrpg.android.habitica.ui.fragments.social;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.models.social.Group;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-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 javax.inject.Inject;
-
-import rx.functions.Action1;
-
-public class GuildFragment extends BaseMainFragment implements Action1<Group> {
-
-    @Inject
-    SocialRepository socialRepository;
-
-    public boolean isMember;
-    public ViewPager viewPager;
-    private Group guild;
-    private GroupInformationFragment guildInformationFragment;
-    private ChatListFragment chatListFragment;
-
-    public void setGuild(Group guild) {
-        this.guild = guild;
-        if (this.guildInformationFragment != null) {
-            this.guildInformationFragment.setGroup(guild);
-        }
-        if (this.guild.chat == null && this.socialRepository != null) {
-            socialRepository.retrieveGroup(this.guild.id)
-                    .subscribe(this, throwable -> {
-                    });
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        this.usesTabLayout = true;
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
-
-        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
-
-        viewPager.setCurrentItem(0);
-
-        setViewPagerAdapter();
-
-        return v;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        if (this.socialRepository != null && this.guild != null) {
-            socialRepository.retrieveGroup(this.guild.id)
-                    .subscribe(this, throwable -> {
-                    });
-        }
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (this.activity != null) {
-            if (this.isMember) {
-                if (this.user != null && this.user.getId().equals(this.guild.leaderID)) {
-                    this.activity.getMenuInflater().inflate(R.menu.guild_admin, menu);
-                } else {
-                    this.activity.getMenuInflater().inflate(R.menu.guild_member, menu);
-                }
-            } else {
-                this.activity.getMenuInflater().inflate(R.menu.guild_nonmember, menu);
-            }
-        }
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-
-        switch (id) {
-            case R.id.menu_guild_join:
-                this.socialRepository.joinGroup(this.guild.id)
-                        .subscribe(this, throwable -> {
-                        });
-                this.isMember = true;
-                return true;
-            case R.id.menu_guild_leave:
-                this.socialRepository.leaveGroup(this.guild.id)
-                        .subscribe(aVoid -> {
-                            if (this.activity != null) {
-                                this.activity.supportInvalidateOptionsMenu();
-                            }
-                        }, throwable -> {
-                        });
-                this.isMember = false;
-                return true;
-            case R.id.menu_guild_edit:
-                this.displayEditForm();
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    public void setViewPagerAdapter() {
-        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
-
-        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
-
-            @Override
-            public Fragment getItem(int position) {
-
-                Fragment fragment;
-
-                switch (position) {
-                    case 0: {
-                        fragment = guildInformationFragment = GroupInformationFragment.newInstance(GuildFragment.this.guild, user);
-                        break;
-                    }
-                    case 1: {
-                        chatListFragment = new ChatListFragment();
-                        chatListFragment.configure(GuildFragment.this.guild.id, user, false);
-                        fragment = chatListFragment;
-                        break;
-                    }
-                    default:
-                        fragment = new Fragment();
-                }
-
-                return fragment;
-            }
-
-            @Override
-            public int getCount() {
-                return 2;
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                switch (position) {
-                    case 0:
-                        return getContext().getString(R.string.guild);
-                    case 1:
-                        return getContext().getString(R.string.chat);
-                }
-                return "";
-            }
-        });
-
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                if (position == 1 && GuildFragment.this.guild != null) {
-                    chatListFragment.setNavigatedToFragment(GuildFragment.this.guild.id);
-                }
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                if (position == 1 && GuildFragment.this.guild != null && chatListFragment != null) {
-                    chatListFragment.setNavigatedToFragment(GuildFragment.this.guild.id);
-                }
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-
-        if (tabLayout != null) {
-            tabLayout.setupWithViewPager(viewPager);
-        }
-    }
-
-    private void displayEditForm() {
-        Bundle bundle = new Bundle();
-        bundle.putString("groupID", this.guild.id);
-        bundle.putString("name", this.guild.name);
-        bundle.putString("description", this.guild.description);
-        bundle.putString("privacy", this.guild.privacy);
-        bundle.putString("leader", this.guild.leaderID);
-
-        Intent intent = new Intent(activity, GroupFormActivity.class);
-        intent.putExtras(bundle);
-        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        startActivityForResult(intent, GroupFormActivity.GROUP_FORM_ACTIVITY);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode) {
-            case (GroupFormActivity.GROUP_FORM_ACTIVITY): {
-                if (resultCode == Activity.RESULT_OK) {
-                    boolean needsSaving = false;
-                    Bundle bundle = data.getExtras();
-                    if (this.guild.name != null && !this.guild.name.equals(bundle.getString("name"))) {
-                        this.guild.name = bundle.getString("name");
-                        needsSaving = true;
-                    }
-                    if (this.guild.description != null && !this.guild.description.equals(bundle.getString("description"))) {
-                        this.guild.description = bundle.getString("description");
-                        needsSaving = true;
-                    }
-                    if (this.guild.leaderID != null && !this.guild.leaderID.equals(bundle.getString("leader"))) {
-                        this.guild.leaderID = bundle.getString("leader");
-                        needsSaving = true;
-                    }
-                    if (this.guild.privacy != null && !this.guild.privacy.equals(bundle.getString("privacy"))) {
-                        this.guild.privacy = bundle.getString("privacy");
-                        needsSaving = true;
-                    }
-                    if (needsSaving) {
-                        this.socialRepository.updateGroup(this.guild)
-                                .subscribe(aVoid -> {
-                                }, throwable -> {
-                                });
-                        this.guildInformationFragment.setGroup(guild);
-                    }
-                }
-                break;
-            }
-        }
-    }
-
-    @Override
-    public void call(Group group) {
-        if (group != null) {
-            if (this.guildInformationFragment != null) {
-                this.guildInformationFragment.setGroup(group);
-            }
-
-            if (this.chatListFragment != null) {
-                this.chatListFragment.seenGroupId = group.id;
-            }
-
-            this.guild = group;
-        }
-        if (this.activity != null) {
-            this.activity.supportInvalidateOptionsMenu();
-        }
-    }
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.guild);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+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 com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+
+import javax.inject.Inject;
+
+import rx.functions.Action1;
+
+public class GuildFragment extends BaseMainFragment implements Action1<Group> {
+
+    @Inject
+    SocialRepository socialRepository;
+
+    public boolean isMember;
+    public ViewPager viewPager;
+    private Group guild;
+    private GroupInformationFragment guildInformationFragment;
+    private ChatListFragment chatListFragment;
+
+    public void setGuild(Group guild) {
+        this.guild = guild;
+        if (this.guildInformationFragment != null) {
+            this.guildInformationFragment.setGroup(guild);
+        }
+        if (this.guild.chat == null && this.socialRepository != null) {
+            socialRepository.retrieveGroup(this.guild.id)
+                    .subscribe(this, throwable -> {
+                    });
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        this.usesTabLayout = true;
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
+
+        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
+
+        viewPager.setCurrentItem(0);
+
+        setViewPagerAdapter();
+
+        return v;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (this.socialRepository != null && this.guild != null) {
+            socialRepository.retrieveGroup(this.guild.id)
+                    .subscribe(this, throwable -> {
+                    });
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (this.activity != null) {
+            if (this.isMember) {
+                if (this.user != null && this.user.getId().equals(this.guild.leaderID)) {
+                    this.activity.getMenuInflater().inflate(R.menu.guild_admin, menu);
+                } else {
+                    this.activity.getMenuInflater().inflate(R.menu.guild_member, menu);
+                }
+            } else {
+                this.activity.getMenuInflater().inflate(R.menu.guild_nonmember, menu);
+            }
+        }
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        switch (id) {
+            case R.id.menu_guild_join:
+                this.socialRepository.joinGroup(this.guild.id)
+                        .subscribe(this, throwable -> {
+                        });
+                this.isMember = true;
+                return true;
+            case R.id.menu_guild_leave:
+                this.socialRepository.leaveGroup(this.guild.id)
+                        .subscribe(aVoid -> {
+                            if (this.activity != null) {
+                                this.activity.supportInvalidateOptionsMenu();
+                            }
+                        }, throwable -> {
+                        });
+                this.isMember = false;
+                return true;
+            case R.id.menu_guild_edit:
+                this.displayEditForm();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public void setViewPagerAdapter() {
+        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
+
+        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
+
+            @Override
+            public Fragment getItem(int position) {
+
+                Fragment fragment;
+
+                switch (position) {
+                    case 0: {
+                        fragment = guildInformationFragment = GroupInformationFragment.newInstance(GuildFragment.this.guild, user);
+                        break;
+                    }
+                    case 1: {
+                        chatListFragment = new ChatListFragment();
+                        chatListFragment.configure(GuildFragment.this.guild.id, user, false);
+                        fragment = chatListFragment;
+                        break;
+                    }
+                    default:
+                        fragment = new Fragment();
+                }
+
+                return fragment;
+            }
+
+            @Override
+            public int getCount() {
+                return 2;
+            }
+
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return getContext().getString(R.string.guild);
+                    case 1:
+                        return getContext().getString(R.string.chat);
+                }
+                return "";
+            }
+        });
+
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+                if (position == 1 && GuildFragment.this.guild != null) {
+                    chatListFragment.setNavigatedToFragment(GuildFragment.this.guild.id);
+                }
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                if (position == 1 && GuildFragment.this.guild != null && chatListFragment != null) {
+                    chatListFragment.setNavigatedToFragment(GuildFragment.this.guild.id);
+                }
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+
+        if (tabLayout != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
+    }
+
+    private void displayEditForm() {
+        Bundle bundle = new Bundle();
+        bundle.putString("groupID", this.guild.id);
+        bundle.putString("name", this.guild.name);
+        bundle.putString("description", this.guild.description);
+        bundle.putString("privacy", this.guild.privacy);
+        bundle.putString("leader", this.guild.leaderID);
+
+        Intent intent = new Intent(activity, GroupFormActivity.class);
+        intent.putExtras(bundle);
+        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        startActivityForResult(intent, GroupFormActivity.GROUP_FORM_ACTIVITY);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case (GroupFormActivity.GROUP_FORM_ACTIVITY): {
+                if (resultCode == Activity.RESULT_OK) {
+                    boolean needsSaving = false;
+                    Bundle bundle = data.getExtras();
+                    if (this.guild.name != null && !this.guild.name.equals(bundle.getString("name"))) {
+                        this.guild.name = bundle.getString("name");
+                        needsSaving = true;
+                    }
+                    if (this.guild.description != null && !this.guild.description.equals(bundle.getString("description"))) {
+                        this.guild.description = bundle.getString("description");
+                        needsSaving = true;
+                    }
+                    if (this.guild.leaderID != null && !this.guild.leaderID.equals(bundle.getString("leader"))) {
+                        this.guild.leaderID = bundle.getString("leader");
+                        needsSaving = true;
+                    }
+                    if (this.guild.privacy != null && !this.guild.privacy.equals(bundle.getString("privacy"))) {
+                        this.guild.privacy = bundle.getString("privacy");
+                        needsSaving = true;
+                    }
+                    if (needsSaving) {
+                        this.socialRepository.updateGroup(this.guild)
+                                .subscribe(aVoid -> {
+                                }, throwable -> {
+                                });
+                        this.guildInformationFragment.setGroup(guild);
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    @Override
+    public void call(Group group) {
+        if (group != null) {
+            if (this.guildInformationFragment != null) {
+                this.guildInformationFragment.setGroup(group);
+            }
+
+            if (this.chatListFragment != null) {
+                this.chatListFragment.seenGroupId = group.id;
+            }
+
+            this.guild = group;
+        }
+        if (this.activity != null) {
+            this.activity.supportInvalidateOptionsMenu();
+        }
+    }
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.guild);
+    }
+}
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 825624973..e22d0c678 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
@@ -1,130 +1,130 @@
-package com.habitrpg.android.habitica.ui.fragments.social;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-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.data.SocialRepository;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class GuildsOverviewFragment extends BaseMainFragment implements View.OnClickListener, SwipeRefreshLayout.OnRefreshListener {
-
-    @Inject
-    SocialRepository socialRepository;
-
-    @BindView(R.id.my_guilds_listview)
-    LinearLayout guildsListView;
-
-    @BindView(R.id.publicGuildsButton)
-    Button publicGuildsButton;
-
-    @BindView(R.id.chat_refresh_layout)
-    SwipeRefreshLayout swipeRefreshLayout;
-
-    private List<Group> guilds;
-    private ArrayList<String> guildIDs;
-
-    @Override
-    public void onCreate(Bundle savedInstance) {
-        super.onCreate(savedInstance);
-        this.fetchGuilds();
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_guilds_overview, container, false);
-        unbinder = ButterKnife.bind(this, v);
-        swipeRefreshLayout.setOnRefreshListener(this);
-        this.publicGuildsButton.setOnClickListener(this);
-        if (this.guilds != null) {
-            this.setGuildsOnListView();
-        }
-        return v;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onRefresh() {
-        swipeRefreshLayout.setRefreshing(true);
-
-        fetchGuilds();
-    }
-
-    private void fetchGuilds() {
-        if (this.socialRepository != null) {
-            this.socialRepository.retrieveGroups("guilds")
-                    .subscribe(groups -> {
-                        GuildsOverviewFragment.this.guilds = groups;
-                        GuildsOverviewFragment.this.setGuildsOnListView();
-                        if (swipeRefreshLayout != null) {
-                            swipeRefreshLayout.setRefreshing(false);
-                        }
-                    }, throwable -> {
-                    });
-        }
-    }
-
-    private void setGuildsOnListView() {
-        if (this.guildsListView == null) {
-            return;
-        }
-        this.guildIDs = new ArrayList<>();
-        this.guildsListView.removeAllViewsInLayout();
-        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        for (Group guild : this.guilds) {
-            TextView entry = (TextView) inflater.inflate(R.layout.plain_list_item, this.guildsListView, false);
-            entry.setText(guild.name);
-            entry.setOnClickListener(this);
-            this.guildsListView.addView(entry);
-            this.guildIDs.add(guild.id);
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        BaseMainFragment fragment;
-        if (v == this.publicGuildsButton) {
-            PublicGuildsFragment publicGuildsFragment = new PublicGuildsFragment();
-            publicGuildsFragment.memberGuildIDs = this.guildIDs;
-            fragment = publicGuildsFragment;
-        } else {
-            Integer guildIndex = ((ViewGroup) v.getParent()).indexOfChild(v);
-            GuildFragment guildFragment = new GuildFragment();
-            guildFragment.setGuild(this.guilds.get(guildIndex));
-            guildFragment.isMember = true;
-            fragment = guildFragment;
-        }
-        if (this.activity != null) {
-            this.activity.displayFragment(fragment);
-        }
-    }
-
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.sidebar_guilds);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+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.data.SocialRepository;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class GuildsOverviewFragment extends BaseMainFragment implements View.OnClickListener, SwipeRefreshLayout.OnRefreshListener {
+
+    @Inject
+    SocialRepository socialRepository;
+
+    @BindView(R.id.my_guilds_listview)
+    LinearLayout guildsListView;
+
+    @BindView(R.id.publicGuildsButton)
+    Button publicGuildsButton;
+
+    @BindView(R.id.chat_refresh_layout)
+    SwipeRefreshLayout swipeRefreshLayout;
+
+    private List<Group> guilds;
+    private ArrayList<String> guildIDs;
+
+    @Override
+    public void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+        this.fetchGuilds();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_guilds_overview, container, false);
+        unbinder = ButterKnife.bind(this, v);
+        swipeRefreshLayout.setOnRefreshListener(this);
+        this.publicGuildsButton.setOnClickListener(this);
+        if (this.guilds != null) {
+            this.setGuildsOnListView();
+        }
+        return v;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onRefresh() {
+        swipeRefreshLayout.setRefreshing(true);
+
+        fetchGuilds();
+    }
+
+    private void fetchGuilds() {
+        if (this.socialRepository != null) {
+            this.socialRepository.retrieveGroups("guilds")
+                    .subscribe(groups -> {
+                        GuildsOverviewFragment.this.guilds = groups;
+                        GuildsOverviewFragment.this.setGuildsOnListView();
+                        if (swipeRefreshLayout != null) {
+                            swipeRefreshLayout.setRefreshing(false);
+                        }
+                    }, throwable -> {
+                    });
+        }
+    }
+
+    private void setGuildsOnListView() {
+        if (this.guildsListView == null) {
+            return;
+        }
+        this.guildIDs = new ArrayList<>();
+        this.guildsListView.removeAllViewsInLayout();
+        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        for (Group guild : this.guilds) {
+            TextView entry = (TextView) inflater.inflate(R.layout.plain_list_item, this.guildsListView, false);
+            entry.setText(guild.name);
+            entry.setOnClickListener(this);
+            this.guildsListView.addView(entry);
+            this.guildIDs.add(guild.id);
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        BaseMainFragment fragment;
+        if (v == this.publicGuildsButton) {
+            PublicGuildsFragment publicGuildsFragment = new PublicGuildsFragment();
+            publicGuildsFragment.memberGuildIDs = this.guildIDs;
+            fragment = publicGuildsFragment;
+        } else {
+            Integer guildIndex = ((ViewGroup) v.getParent()).indexOfChild(v);
+            GuildFragment guildFragment = new GuildFragment();
+            guildFragment.setGuild(this.guilds.get(guildIndex));
+            guildFragment.isMember = true;
+            fragment = guildFragment;
+        }
+        if (this.activity != null) {
+            this.activity.displayFragment(fragment);
+        }
+    }
+
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_guilds);
+    }
+}
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 0d7d6e2fb..844189bef 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
@@ -1,221 +1,221 @@
-package com.habitrpg.android.habitica.ui.fragments.social;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
-import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
-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.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class InboxFragment extends BaseMainFragment
-        implements SwipeRefreshLayout.OnRefreshListener, View.OnClickListener, HabitRPGUserCallback.OnUserReceived {
-
-    @Inject
-    UserRepository userRepository;
-
-    @BindView(R.id.inbox_messages)
-    LinearLayout inboxMessagesListView;
-
-    @BindView(R.id.inbox_refresh_layout)
-    SwipeRefreshLayout swipeRefreshLayout;
-
-    Map<String, ChatMessage> messages;
-    List<String> roomsAdded;
-    private View chooseRecipientDialogView;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-
-        this.apiClient.markPrivateMessagesRead()
-                .subscribe(aVoid -> {
-                }, throwable -> {
-                });
-
-        View v = inflater.inflate(R.layout.fragment_inbox, container, false);
-        unbinder = ButterKnife.bind(this, v);
-
-        swipeRefreshLayout.setOnRefreshListener(this);
-
-        if (this.user != null) {
-            this.messages = this.user.getInbox().getMessages();
-            if (this.messages != null) {
-                this.setInboxMessages();
-            }
-        }
-
-        return v;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (this.activity != null) {
-            this.activity.getMenuInflater().inflate(R.menu.inbox, menu);
-        }
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-
-        switch (id) {
-            case R.id.send_message:
-                openNewMessageDialog();
-                return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void openNewMessageDialog() {
-        assert this.activity != null;
-        this.chooseRecipientDialogView = this.activity.getLayoutInflater().inflate(R.layout.dialog_choose_message_recipient, null);
-
-        Button scaneQRCodeButton = (Button) chooseRecipientDialogView.findViewById(R.id.scanQRCodeButton);
-
-        AlertDialog alert = new AlertDialog.Builder(this.activity)
-                .setTitle(getString(R.string.choose_recipient_title))
-                .setPositiveButton(getString(R.string.action_continue), (dialog, which) -> {
-                    EditText uuidEditText = (EditText) chooseRecipientDialogView.findViewById(R.id.uuidEditText);
-                    openInboxMessages(uuidEditText.getText().toString(), "");
-                })
-                .setNeutralButton(getString(R.string.action_cancel), (dialog, which) -> {
-                    UiUtils.dismissKeyboard(this.activity);
-                    dialog.cancel();
-                })
-                .create();
-        scaneQRCodeButton.setOnClickListener((View v) -> {
-            IntentIntegrator scanIntegrator = new IntentIntegrator(getActivity());
-            scanIntegrator.initiateScan(this);
-        });
-        alert.setView(chooseRecipientDialogView);
-        alert.show();
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onRefresh() {
-        swipeRefreshLayout.setRefreshing(true);
-        this.userRepository.retrieveUser(true)
-                .subscribe(this::onUserReceived, throwable -> {
-                });
-    }
-
-    public void setInboxMessages() {
-        if (this.inboxMessagesListView == null) {
-            return;
-        }
-
-        this.inboxMessagesListView.removeAllViewsInLayout();
-
-        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-        roomsAdded = new ArrayList<>();
-
-        if (this.messages.size() > 0) {
-            for (Object o : this.messages.entrySet()) {
-                Map.Entry pair = (Map.Entry) o;
-
-                ChatMessage message = (ChatMessage) pair.getValue();
-                if (roomsAdded.contains(message.uuid)) {
-                    TextView entry = (TextView) this.inboxMessagesListView.findViewWithTag(message.uuid);
-                    entry.setText(message.user);
-                } else {
-                    roomsAdded.add(message.uuid);
-
-                    TextView entry = (TextView) inflater.inflate(R.layout.plain_list_item, this.inboxMessagesListView, false);
-                    entry.setText(message.user);
-                    entry.setTag(message.uuid);
-                    entry.setOnClickListener(this);
-                    this.inboxMessagesListView.addView(entry);
-                }
-            }
-        } else {
-            TextView tv = new TextView(getContext());
-            tv.setText(R.string.empty_inbox);
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        TextView entry = (TextView) v;
-        String replyToUserName = entry.getText().toString();
-        openInboxMessages(entry.getTag().toString(), replyToUserName);
-    }
-
-    private void openInboxMessages(String userID, String username) {
-        InboxMessageListFragment inboxMessageListFragment = new InboxMessageListFragment();
-        inboxMessageListFragment.setMessages(this.messages, username, userID);
-        if (this.activity != null) {
-            this.activity.displayFragment(inboxMessageListFragment);
-        }
-    }
-
-    @Override
-    public void onUserReceived(HabitRPGUser user) {
-        this.user = user;
-        this.messages = user.getInbox().getMessages();
-        this.setInboxMessages();
-        swipeRefreshLayout.setRefreshing(false);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        IntentResult scanningResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
-
-        if (scanningResult != null && scanningResult.getContents() != null) {
-            if (this.chooseRecipientDialogView != null) {
-                EditText uuidEditText = (EditText) this.chooseRecipientDialogView.findViewById(R.id.uuidEditText);
-                String qrCodeUrl = scanningResult.getContents();
-                Uri uri = Uri.parse(qrCodeUrl);
-                if (uri == null || uri.getPathSegments().size() < 3) {
-                    return;
-                }
-                String userID = uri.getPathSegments().get(2);
-                uuidEditText.setText(userID);
-            }
-        }
-    }
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.sidebar_inbox);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.AlertDialog;
+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.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class InboxFragment extends BaseMainFragment
+        implements SwipeRefreshLayout.OnRefreshListener, View.OnClickListener, HabitRPGUserCallback.OnUserReceived {
+
+    @Inject
+    UserRepository userRepository;
+
+    @BindView(R.id.inbox_messages)
+    LinearLayout inboxMessagesListView;
+
+    @BindView(R.id.inbox_refresh_layout)
+    SwipeRefreshLayout swipeRefreshLayout;
+
+    Map<String, ChatMessage> messages;
+    List<String> roomsAdded;
+    private View chooseRecipientDialogView;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+
+        this.apiClient.markPrivateMessagesRead()
+                .subscribe(aVoid -> {
+                }, throwable -> {
+                });
+
+        View v = inflater.inflate(R.layout.fragment_inbox, container, false);
+        unbinder = ButterKnife.bind(this, v);
+
+        swipeRefreshLayout.setOnRefreshListener(this);
+
+        if (this.user != null) {
+            this.messages = this.user.getInbox().getMessages();
+            if (this.messages != null) {
+                this.setInboxMessages();
+            }
+        }
+
+        return v;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (this.activity != null) {
+            this.activity.getMenuInflater().inflate(R.menu.inbox, menu);
+        }
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        switch (id) {
+            case R.id.send_message:
+                openNewMessageDialog();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void openNewMessageDialog() {
+        assert this.activity != null;
+        this.chooseRecipientDialogView = this.activity.getLayoutInflater().inflate(R.layout.dialog_choose_message_recipient, null);
+
+        Button scaneQRCodeButton = (Button) chooseRecipientDialogView.findViewById(R.id.scanQRCodeButton);
+
+        AlertDialog alert = new AlertDialog.Builder(this.activity)
+                .setTitle(getString(R.string.choose_recipient_title))
+                .setPositiveButton(getString(R.string.action_continue), (dialog, which) -> {
+                    EditText uuidEditText = (EditText) chooseRecipientDialogView.findViewById(R.id.uuidEditText);
+                    openInboxMessages(uuidEditText.getText().toString(), "");
+                })
+                .setNeutralButton(getString(R.string.action_cancel), (dialog, which) -> {
+                    UiUtils.dismissKeyboard(this.activity);
+                    dialog.cancel();
+                })
+                .create();
+        scaneQRCodeButton.setOnClickListener((View v) -> {
+            IntentIntegrator scanIntegrator = new IntentIntegrator(getActivity());
+            scanIntegrator.initiateScan(this);
+        });
+        alert.setView(chooseRecipientDialogView);
+        alert.show();
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onRefresh() {
+        swipeRefreshLayout.setRefreshing(true);
+        this.userRepository.retrieveUser(true)
+                .subscribe(this::onUserReceived, throwable -> {
+                });
+    }
+
+    public void setInboxMessages() {
+        if (this.inboxMessagesListView == null) {
+            return;
+        }
+
+        this.inboxMessagesListView.removeAllViewsInLayout();
+
+        LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        roomsAdded = new ArrayList<>();
+
+        if (this.messages.size() > 0) {
+            for (Object o : this.messages.entrySet()) {
+                Map.Entry pair = (Map.Entry) o;
+
+                ChatMessage message = (ChatMessage) pair.getValue();
+                if (roomsAdded.contains(message.uuid)) {
+                    TextView entry = (TextView) this.inboxMessagesListView.findViewWithTag(message.uuid);
+                    entry.setText(message.user);
+                } else {
+                    roomsAdded.add(message.uuid);
+
+                    TextView entry = (TextView) inflater.inflate(R.layout.plain_list_item, this.inboxMessagesListView, false);
+                    entry.setText(message.user);
+                    entry.setTag(message.uuid);
+                    entry.setOnClickListener(this);
+                    this.inboxMessagesListView.addView(entry);
+                }
+            }
+        } else {
+            TextView tv = new TextView(getContext());
+            tv.setText(R.string.empty_inbox);
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        TextView entry = (TextView) v;
+        String replyToUserName = entry.getText().toString();
+        openInboxMessages(entry.getTag().toString(), replyToUserName);
+    }
+
+    private void openInboxMessages(String userID, String username) {
+        InboxMessageListFragment inboxMessageListFragment = new InboxMessageListFragment();
+        inboxMessageListFragment.setMessages(this.messages, username, userID);
+        if (this.activity != null) {
+            this.activity.displayFragment(inboxMessageListFragment);
+        }
+    }
+
+    @Override
+    public void onUserReceived(HabitRPGUser user) {
+        this.user = user;
+        this.messages = user.getInbox().getMessages();
+        this.setInboxMessages();
+        swipeRefreshLayout.setRefreshing(false);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        IntentResult scanningResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);
+
+        if (scanningResult != null && scanningResult.getContents() != null) {
+            if (this.chooseRecipientDialogView != null) {
+                EditText uuidEditText = (EditText) this.chooseRecipientDialogView.findViewById(R.id.uuidEditText);
+                String qrCodeUrl = scanningResult.getContents();
+                Uri uri = Uri.parse(qrCodeUrl);
+                if (uri == null || uri.getPathSegments().size() < 3) {
+                    return;
+                }
+                String userID = uri.getPathSegments().get(2);
+                uuidEditText.setText(userID);
+            }
+        }
+    }
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_inbox);
+    }
+}
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 ad0be0bf2..b26ef3a74 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java
@@ -1,136 +1,135 @@
-package com.habitrpg.android.habitica.ui.fragments.social;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.commands.SendNewInboxMessageCommand;
-import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import org.greenrobot.eventbus.Subscribe;
-
-import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * Created by keithholliday on 6/20/16.
- */
-public class InboxMessageListFragment extends BaseMainFragment
-        implements SwipeRefreshLayout.OnRefreshListener, HabitRPGUserCallback.OnUserReceived {
-
-    @Inject
-    SocialRepository socialRepository;
-    @Inject
-    UserRepository userRepository;
-
-    @BindView(R.id.refresh_layout)
-    SwipeRefreshLayout swipeRefreshLayout;
-
-    @BindView(R.id.recyclerView)
-    RecyclerView chatRecyclerView;
-
-    List<ChatMessage> messages;
-    ChatRecyclerViewAdapter chatAdapter;
-    String chatRoomUser;
-    String replyToUserUUID;
-
-    public InboxMessageListFragment() {
-        messages = new ArrayList<>();
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-
-        View view = inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false);
-        ButterKnife.bind(this, view);
-        swipeRefreshLayout.setOnRefreshListener(this);
-
-        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this.getActivity());
-        chatRecyclerView.setLayoutManager(layoutManager);
-
-        chatAdapter = new ChatRecyclerViewAdapter(messages, user, null);
-        chatAdapter.setToInboxChat(this.replyToUserUUID);
-        chatAdapter.setSendingUser(this.user);
-        chatRecyclerView.setAdapter(chatAdapter);
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void refreshUserInbox () {
-        this.swipeRefreshLayout.setRefreshing(true);
-        this.userRepository.retrieveUser(true)
-                .subscribe(this::onUserReceived, throwable -> {});
-    }
-
-    @Override
-    public void onRefresh() {
-        this.refreshUserInbox();
-    }
-
-    public void setMessages(Map<String, ChatMessage> messages, String chatRoomUser, String replyToUserUUID) {
-        this.chatRoomUser = chatRoomUser;
-        this.replyToUserUUID = replyToUserUUID;
-
-        this.messages = new ArrayList<>();
-
-        for (Object o : messages.entrySet()) {
-            Map.Entry pair = (Map.Entry) o;
-            ChatMessage message = (ChatMessage) pair.getValue();
-            if (!message.uuid.equals(replyToUserUUID)) continue;
-            this.messages.add(0, message);
-        }
-
-        Collections.sort(this.messages,
-                (message1, message2) -> message2.timestamp.compareTo(message1.timestamp));
-
-        if (this.chatAdapter != null) {
-            chatAdapter.setToInboxChat(replyToUserUUID);
-            this.chatAdapter.setMessages(this.messages);
-        }
-    }
-
-    @Override
-    public void onUserReceived(HabitRPGUser user) {
-        this.user = user;
-        this.setMessages(user.getInbox().getMessages(), this.chatRoomUser, this.replyToUserUUID);
-        swipeRefreshLayout.setRefreshing(false);
-    }
-
-    @Subscribe
-    public void onEvent(SendNewInboxMessageCommand cmd) {
-        socialRepository.postPrivateMessage(cmd.userToSendTo, cmd.message)
-                .subscribe(postChatMessageResult -> this.refreshUserInbox(), throwable -> {
-                });
-        UiUtils.dismissKeyboard(getActivity());
-    }
-
-
-}
+package com.habitrpg.android.habitica.ui.fragments.social;
+
+import android.os.Bundle;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.LinearLayoutManager;
+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.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.commands.SendNewInboxMessageCommand;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by keithholliday on 6/20/16.
+ */
+public class InboxMessageListFragment extends BaseMainFragment
+        implements SwipeRefreshLayout.OnRefreshListener, HabitRPGUserCallback.OnUserReceived {
+
+    @Inject
+    SocialRepository socialRepository;
+    @Inject
+    UserRepository userRepository;
+
+    @BindView(R.id.refresh_layout)
+    SwipeRefreshLayout swipeRefreshLayout;
+
+    @BindView(R.id.recyclerView)
+    RecyclerView chatRecyclerView;
+
+    List<ChatMessage> messages;
+    ChatRecyclerViewAdapter chatAdapter;
+    String chatRoomUser;
+    String replyToUserUUID;
+
+    public InboxMessageListFragment() {
+        messages = new ArrayList<>();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+
+        View view = inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false);
+        ButterKnife.bind(this, view);
+        swipeRefreshLayout.setOnRefreshListener(this);
+
+        RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this.getActivity());
+        chatRecyclerView.setLayoutManager(layoutManager);
+
+        chatAdapter = new ChatRecyclerViewAdapter(messages, user, null);
+        chatAdapter.setToInboxChat(this.replyToUserUUID);
+        chatAdapter.setSendingUser(this.user);
+        chatRecyclerView.setAdapter(chatAdapter);
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void refreshUserInbox () {
+        this.swipeRefreshLayout.setRefreshing(true);
+        this.userRepository.retrieveUser(true)
+                .subscribe(this::onUserReceived, throwable -> {});
+    }
+
+    @Override
+    public void onRefresh() {
+        this.refreshUserInbox();
+    }
+
+    public void setMessages(Map<String, ChatMessage> messages, String chatRoomUser, String replyToUserUUID) {
+        this.chatRoomUser = chatRoomUser;
+        this.replyToUserUUID = replyToUserUUID;
+
+        this.messages = new ArrayList<>();
+
+        for (Object o : messages.entrySet()) {
+            Map.Entry pair = (Map.Entry) o;
+            ChatMessage message = (ChatMessage) pair.getValue();
+            if (!message.uuid.equals(replyToUserUUID)) continue;
+            this.messages.add(0, message);
+        }
+
+        Collections.sort(this.messages,
+                (message1, message2) -> message2.timestamp.compareTo(message1.timestamp));
+
+        if (this.chatAdapter != null) {
+            chatAdapter.setToInboxChat(replyToUserUUID);
+            this.chatAdapter.setMessages(this.messages);
+        }
+    }
+
+    @Override
+    public void onUserReceived(HabitRPGUser user) {
+        this.user = user;
+        this.setMessages(user.getInbox().getMessages(), this.chatRoomUser, this.replyToUserUUID);
+        swipeRefreshLayout.setRefreshing(false);
+    }
+
+    @Subscribe
+    public void onEvent(SendNewInboxMessageCommand cmd) {
+        socialRepository.postPrivateMessage(cmd.userToSendTo, cmd.message)
+                .subscribe(postChatMessageResult -> this.refreshUserInbox(), throwable -> {
+                });
+        UiUtils.dismissKeyboard(getActivity());
+    }
+
+
+}
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 50fa3ce17..6918df866 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
@@ -1,123 +1,123 @@
-package com.habitrpg.android.habitica.ui.fragments.social;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.ui.adapter.social.PublicGuildsRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
-import com.habitrpg.android.habitica.models.social.Group;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SearchView;
-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 java.util.List;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class PublicGuildsFragment extends BaseMainFragment implements SearchView.OnQueryTextListener {
-
-    @Inject
-    SocialRepository socialRepository;
-
-    List<String> memberGuildIDs;
-    List<Group> guilds;
-
-    @BindView(R.id.recyclerView)
-    RecyclerView recyclerView;
-
-    private View view;
-    private PublicGuildsRecyclerViewAdapter viewAdapter;
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        if (view == null) {
-            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
-
-            unbinder = ButterKnife.bind(this, view);
-            recyclerView.setLayoutManager(new LinearLayoutManager(this.activity));
-            recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
-            viewAdapter = new PublicGuildsRecyclerViewAdapter();
-            viewAdapter.setMemberGuildIDs(this.memberGuildIDs);
-            viewAdapter.apiClient = this.apiClient;
-            recyclerView.setAdapter(viewAdapter);
-            if (this.guilds != null) {
-                this.viewAdapter.setPublicGuildList(this.guilds);
-            }
-        }
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstance) {
-        super.onCreate(savedInstance);
-        this.fetchGuilds();
-    }
-
-    private void fetchGuilds() {
-        if (this.socialRepository != null) {
-            this.socialRepository.getGroups("publicGuilds")
-                    .subscribe(groups -> {
-                        PublicGuildsFragment.this.guilds = groups;
-                        if (PublicGuildsFragment.this.viewAdapter != null) {
-                            PublicGuildsFragment.this.viewAdapter.setPublicGuildList(groups);
-                        }
-                    }, throwable -> {
-                    });
-        }
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_public_guild, menu);
-
-        MenuItem searchItem = menu.findItem(R.id.action_guild_search);
-        SearchView guildSearchView = (SearchView) searchItem.getActionView();
-        SearchView.SearchAutoComplete theTextArea = (SearchView.SearchAutoComplete) guildSearchView.findViewById(R.id.search_src_text);
-        theTextArea.setHintTextColor(ContextCompat.getColor(getContext(), R.color.white));
-        guildSearchView.setQueryHint(getString(R.string.guild_search_hint));
-        guildSearchView.setOnQueryTextListener(this);
-
-    }
-
-    @Override
-    public boolean onQueryTextSubmit(String s) {
-        viewAdapter.getFilter().filter(s);
-        if (this.activity != null) {
-            UiUtils.dismissKeyboard(this.activity);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onQueryTextChange(String s) {
-        viewAdapter.getFilter().filter(s);
-        return true;
-    }
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.public_guilds);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SearchView;
+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 com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.ui.adapter.social.PublicGuildsRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class PublicGuildsFragment extends BaseMainFragment implements SearchView.OnQueryTextListener {
+
+    @Inject
+    SocialRepository socialRepository;
+
+    List<String> memberGuildIDs;
+    List<Group> guilds;
+
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+
+    private View view;
+    private PublicGuildsRecyclerViewAdapter viewAdapter;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        if (view == null) {
+            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+
+            unbinder = ButterKnife.bind(this, view);
+            recyclerView.setLayoutManager(new LinearLayoutManager(this.activity));
+            recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
+            viewAdapter = new PublicGuildsRecyclerViewAdapter();
+            viewAdapter.setMemberGuildIDs(this.memberGuildIDs);
+            viewAdapter.apiClient = this.apiClient;
+            recyclerView.setAdapter(viewAdapter);
+            if (this.guilds != null) {
+                this.viewAdapter.setPublicGuildList(this.guilds);
+            }
+        }
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstance) {
+        super.onCreate(savedInstance);
+        this.fetchGuilds();
+    }
+
+    private void fetchGuilds() {
+        if (this.socialRepository != null) {
+            this.socialRepository.getGroups("publicGuilds")
+                    .subscribe(groups -> {
+                        PublicGuildsFragment.this.guilds = groups;
+                        if (PublicGuildsFragment.this.viewAdapter != null) {
+                            PublicGuildsFragment.this.viewAdapter.setPublicGuildList(groups);
+                        }
+                    }, throwable -> {
+                    });
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_public_guild, menu);
+
+        MenuItem searchItem = menu.findItem(R.id.action_guild_search);
+        SearchView guildSearchView = (SearchView) searchItem.getActionView();
+        SearchView.SearchAutoComplete theTextArea = (SearchView.SearchAutoComplete) guildSearchView.findViewById(R.id.search_src_text);
+        theTextArea.setHintTextColor(ContextCompat.getColor(getContext(), R.color.white));
+        guildSearchView.setQueryHint(getString(R.string.guild_search_hint));
+        guildSearchView.setOnQueryTextListener(this);
+
+    }
+
+    @Override
+    public boolean onQueryTextSubmit(String s) {
+        viewAdapter.getFilter().filter(s);
+        if (this.activity != null) {
+            UiUtils.dismissKeyboard(this.activity);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onQueryTextChange(String s) {
+        viewAdapter.getFilter().filter(s);
+        return true;
+    }
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.public_guilds);
+    }
+}
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 0a2df97b3..47fd73f79 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
@@ -1,142 +1,142 @@
-package com.habitrpg.android.habitica.ui.fragments.social;
-
-import com.habitrpg.android.habitica.ContentCache;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.models.social.Group;
-
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import javax.inject.Inject;
-
-public class TavernFragment extends BaseMainFragment {
-
-    @Inject
-    SocialRepository socialRepository;
-
-    public ViewPager viewPager;
-    Group tavern;
-
-    ChatListFragment chatListFragment;
-    GroupInformationFragment questInfoFragment;
-
-    @Inject
-    ContentCache contentCache;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
-
-        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
-
-        viewPager.setCurrentItem(0);
-
-        setViewPagerAdapter();
-
-        this.tutorialStepIdentifier = "tavern";
-        this.tutorialText = getString(R.string.tutorial_tavern);
-
-        return v;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        if (this.socialRepository != null) {
-            socialRepository.getGroup("habitrpg")
-                    .subscribe(group -> {
-                        TavernFragment.this.tavern = group;
-                        if (group.quest != null && group.quest.key != null && TavernFragment.this.isAdded()) {
-                            TavernFragment.this.viewPager.getAdapter().notifyDataSetChanged();
-                            if (TavernFragment.this.tabLayout != null) {
-                                TavernFragment.this.tabLayout.setVisibility(View.VISIBLE);
-                                TavernFragment.this.tabLayout.setupWithViewPager(TavernFragment.this.viewPager);
-                            }
-
-                            contentCache.getQuestContent(group.quest.key, content -> {
-                                if (questInfoFragment != null) {
-                                    questInfoFragment.setQuestContent(content);
-                                }
-                            });
-                        }
-                    }, throwable -> {
-                    });
-        }
-    }
-
-    public void setViewPagerAdapter() {
-        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
-        if (this.user == null) {
-            return;
-        }
-
-        this.viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
-
-            @Override
-            public Fragment getItem(int position) {
-
-                Fragment fragment;
-
-                switch (position) {
-                    case 0: {
-                        chatListFragment = new ChatListFragment();
-                        chatListFragment.configure("habitrpg", user, true);
-                        fragment = chatListFragment;
-                        break;
-                    }
-                    case 1: {
-                        fragment = questInfoFragment = GroupInformationFragment.newInstance(tavern, user);
-                        break;
-                    }
-                    default:
-                        fragment = new Fragment();
-                }
-
-                return fragment;
-            }
-
-            @Override
-            public int getCount() {
-                if (tavern != null && tavern.quest != null && tavern.quest.key != null) {
-                    return 2;
-                }
-                return 1;
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                switch (position) {
-                    case 0:
-                        return getContext().getString(R.string.chat);
-                    case 1:
-                        return getContext().getString(R.string.world_quest);
-                }
-                return "";
-            }
-        });
-
-        if (tabLayout != null) {
-            tabLayout.setupWithViewPager(viewPager);
-        }
-    }
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.sidebar_tavern);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+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.data.InventoryRepository;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+
+import javax.inject.Inject;
+
+public class TavernFragment extends BaseMainFragment {
+
+    @Inject
+    SocialRepository socialRepository;
+
+    public ViewPager viewPager;
+    Group tavern;
+
+    ChatListFragment chatListFragment;
+    GroupInformationFragment questInfoFragment;
+
+    @Inject
+    InventoryRepository inventoryRepository;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
+
+        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
+
+        viewPager.setCurrentItem(0);
+
+        setViewPagerAdapter();
+
+        this.tutorialStepIdentifier = "tavern";
+        this.tutorialText = getString(R.string.tutorial_tavern);
+
+        return v;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        if (this.socialRepository != null) {
+            socialRepository.getGroup("habitrpg")
+                    .subscribe(group -> {
+                        TavernFragment.this.tavern = group;
+                        if (group.quest != null && group.quest.key != null && TavernFragment.this.isAdded()) {
+                            TavernFragment.this.viewPager.getAdapter().notifyDataSetChanged();
+                            if (TavernFragment.this.tabLayout != null) {
+                                TavernFragment.this.tabLayout.setVisibility(View.VISIBLE);
+                                TavernFragment.this.tabLayout.setupWithViewPager(TavernFragment.this.viewPager);
+                            }
+
+                            inventoryRepository.getQuestContent(group.quest.key).subscribe(content -> {
+                                if (questInfoFragment != null) {
+                                    questInfoFragment.setQuestContent(content);
+                                }
+                            }, throwable -> {});
+                        }
+                    }, throwable -> {
+                    });
+        }
+    }
+
+    public void setViewPagerAdapter() {
+        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
+        if (this.user == null) {
+            return;
+        }
+
+        this.viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
+
+            @Override
+            public Fragment getItem(int position) {
+
+                Fragment fragment;
+
+                switch (position) {
+                    case 0: {
+                        chatListFragment = new ChatListFragment();
+                        chatListFragment.configure("habitrpg", user, true);
+                        fragment = chatListFragment;
+                        break;
+                    }
+                    case 1: {
+                        fragment = questInfoFragment = GroupInformationFragment.newInstance(tavern, user);
+                        break;
+                    }
+                    default:
+                        fragment = new Fragment();
+                }
+
+                return fragment;
+            }
+
+            @Override
+            public int getCount() {
+                if (tavern != null && tavern.quest != null && tavern.quest.key != null) {
+                    return 2;
+                }
+                return 1;
+            }
+
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return getContext().getString(R.string.chat);
+                    case 1:
+                        return getContext().getString(R.string.world_quest);
+                }
+                return "";
+            }
+        });
+
+        if (tabLayout != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
+    }
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_tavern);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
index 5e3a76dcd..3170a91d5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
@@ -1,345 +1,345 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges;
-
-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.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.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import net.pherth.android.emoji_library.EmojiParser;
-import net.pherth.android.emoji_library.EmojiTextView;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.ArrayList;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import rx.functions.Action1;
-
-public class ChallengeDetailDialogHolder {
-
-    @BindView(R.id.challenge_not_joined_header)
-    LinearLayout notJoinedHeader;
-
-    @BindView(R.id.challenge_joined_header)
-    LinearLayout joinedHeader;
-
-    @BindView(R.id.challenge_join_btn)
-    Button joinButton;
-
-    @BindView(R.id.challenge_leave_btn)
-    Button leaveButton;
-
-    @BindView(R.id.challenge_name)
-    EmojiTextView challengeName;
-
-    @BindView(R.id.challenge_description)
-    EmojiTextView challengeDescription;
-
-    @BindView(R.id.challenge_leader)
-    TextView challengeLeader;
-
-    @BindView(R.id.gem_amount)
-    TextView gem_amount;
-
-    @BindView(R.id.challenge_member_count)
-    TextView member_count;
-
-    @BindView(R.id.task_group_layout)
-    LinearLayout task_group_layout;
-
-    private AlertDialog dialog;
-    private ApiClient apiClient;
-    @Nullable
-    private HabitRPGUser user;
-    private Challenge challenge;
-    private Action1<Challenge> challengeJoinedAction;
-    private Action1<Challenge> challengeLeftAction;
-    private Activity context;
-
-
-    private ChallengeDetailDialogHolder(View view, Activity context) {
-        this.context = context;
-        ButterKnife.bind(this, view);
-    }
-
-    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);
-
-        ChallengeDetailDialogHolder challengeDetailDialogHolder = new ChallengeDetailDialogHolder(dialogLayout, activity);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
-                .setView(dialogLayout);
-
-        challengeDetailDialogHolder.bind(builder.show(), apiClient, user, challenge, challengeJoinedAction, challengeLeftAction);
-    }
-
-    public void bind(AlertDialog dialog, ApiClient apiClient, @Nullable HabitRPGUser user, Challenge challenge,
-                     Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
-        this.dialog = dialog;
-        this.apiClient = apiClient;
-        this.user = user;
-        this.challenge = challenge;
-        this.challengeJoinedAction = challengeJoinedAction;
-        this.challengeLeftAction = challengeLeftAction;
-
-        changeViewsByChallenge(challenge);
-    }
-
-    private void changeViewsByChallenge(Challenge challenge) {
-        setJoined(challenge.user_id != null && !challenge.user_id.isEmpty());
-
-        challengeName.setText(EmojiParser.parseEmojis(challenge.name));
-        challengeDescription.setText(MarkdownParser.parseMarkdown(challenge.description));
-        challengeLeader.setText(challenge.leaderName);
-
-        gem_amount.setText(String.valueOf(challenge.prize));
-        member_count.setText(String.valueOf(challenge.memberCount));
-
-        apiClient.getChallengeTasks(challenge.id)
-                .subscribe(taskList -> {
-                            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:
-
-                                        habits.add(entry.getValue());
-                                        break;
-                                    case Task.TYPE_DAILY:
-
-                                        dailies.add(entry.getValue());
-                                        break;
-                                    case Task.TYPE_REWARD:
-
-                                        rewards.add(entry.getValue());
-                                        break;
-                                }
-                            }
-
-                            if (habits.size() > 0) {
-                                addHabits(habits);
-                            }
-
-                            if (dailies.size() > 0) {
-                                addDailys(dailies);
-                            }
-
-                            if (todos.size() > 0) {
-                                addTodos(todos);
-                            }
-
-                            if (rewards.size() > 0) {
-                                addRewards(rewards);
-                            }
-                        }
-                        , Throwable::printStackTrace);
-    }
-
-    private void addHabits(ArrayList<Task> habits) {
-        LinearLayout taskGroup = (LinearLayout) context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_task_group, task_group_layout);
-        TextView groupName = (TextView) taskGroup.findViewById(R.id.task_group_name);
-
-        LinearLayout tasks_layout = (LinearLayout) taskGroup.findViewById(R.id.tasks_layout);
-
-        groupName.setText(habits.size() + " " + ChallengesListViewAdapter.ChallengeViewHolder.getLabelByTypeAndCount(context, Challenge.TASK_ORDER_HABITS, habits.size()));
-
-        int size = habits.size();
-        for (int i = 0; i < size; i++) {
-            Task task = habits.get(i);
-
-            View habitEntry = context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_habit, tasks_layout);
-            TextView habitTitle = (TextView) habitEntry.findViewById(R.id.habit_title);
-            ImageView plusImg = (ImageView) habitEntry.findViewById(task.up ? R.id.plus_img_tinted : R.id.plus_img);
-            ImageView minusImg = (ImageView) habitEntry.findViewById(task.down ? R.id.minus_img_tinted : R.id.minus_img);
-
-            plusImg.setVisibility(View.VISIBLE);
-            minusImg.setVisibility(View.VISIBLE);
-
-            habitTitle.setText(EmojiParser.parseEmojis(task.text));
-
-        }
-    }
-
-    private void addDailys(ArrayList<Task> dailies) {
-        LinearLayout taskGroup = (LinearLayout) context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_task_group, task_group_layout);
-        TextView groupName = (TextView) taskGroup.findViewById(R.id.task_group_name);
-
-        LinearLayout tasks_layout = (LinearLayout) taskGroup.findViewById(R.id.tasks_layout);
-
-        int size = dailies.size();
-        groupName.setText(dailies.size() + " " + ChallengesListViewAdapter.ChallengeViewHolder.getLabelByTypeAndCount(context, Challenge.TASK_ORDER_DAILYS, size));
-
-        for (int i = 0; i < size; i++) {
-            Task task = dailies.get(i);
-
-            View entry = context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_daily, tasks_layout);
-            TextView title = (TextView) entry.findViewById(R.id.daily_title);
-            title.setText(EmojiParser.parseEmojis(task.text));
-
-            if (task.checklist != null && !task.checklist.isEmpty()) {
-                View checklistIndicatorWrapper = entry.findViewById(R.id.checklistIndicatorWrapper);
-
-                checklistIndicatorWrapper.setVisibility(View.VISIBLE);
-
-                TextView checkListAllTextView = (TextView) entry.findViewById(R.id.checkListAllTextView);
-                checkListAllTextView.setText(String.valueOf(task.checklist.size()));
-            }
-
-        }
-    }
-
-    private void addTodos(ArrayList<Task> todos) {
-        LinearLayout taskGroup = (LinearLayout) context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_task_group, task_group_layout);
-        TextView groupName = (TextView) taskGroup.findViewById(R.id.task_group_name);
-
-        LinearLayout tasks_layout = (LinearLayout) taskGroup.findViewById(R.id.tasks_layout);
-
-        int size = todos.size();
-        groupName.setText(todos.size() + " " + ChallengesListViewAdapter.ChallengeViewHolder.getLabelByTypeAndCount(context, Challenge.TASK_ORDER_TODOS, size));
-
-        for (int i = 0; i < size; i++) {
-            Task task = todos.get(i);
-
-            View entry = context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_todo, tasks_layout);
-            TextView title = (TextView) entry.findViewById(R.id.todo_title);
-            title.setText(EmojiParser.parseEmojis(task.text));
-
-            if (task.checklist != null && !task.checklist.isEmpty()) {
-                View checklistIndicatorWrapper = entry.findViewById(R.id.checklistIndicatorWrapper);
-
-                checklistIndicatorWrapper.setVisibility(View.VISIBLE);
-
-                TextView checkListAllTextView = (TextView) entry.findViewById(R.id.checkListAllTextView);
-                checkListAllTextView.setText(String.valueOf(task.checklist.size()));
-            }
-        }
-    }
-
-    private void addRewards(ArrayList<Task> rewards) {
-        LinearLayout taskGroup = (LinearLayout) context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_task_group, task_group_layout);
-        TextView groupName = (TextView) taskGroup.findViewById(R.id.task_group_name);
-
-        LinearLayout tasks_layout = (LinearLayout) taskGroup.findViewById(R.id.tasks_layout);
-
-        int size = rewards.size();
-        groupName.setText(rewards.size() + " " + ChallengesListViewAdapter.ChallengeViewHolder.getLabelByTypeAndCount(context, Challenge.TASK_ORDER_REWARDS, size));
-
-        for (int i = 0; i < size; i++) {
-            Task task = rewards.get(i);
-
-            View entry = context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_reward, tasks_layout);
-            TextView title = (TextView) entry.findViewById(R.id.reward_title);
-            title.setText(EmojiParser.parseEmojis(task.text));
-        }
-    }
-
-    private void setJoined(boolean joined) {
-        joinedHeader.setVisibility(joined ? View.VISIBLE : View.GONE);
-        leaveButton.setVisibility(joined ? View.VISIBLE : View.GONE);
-
-        notJoinedHeader.setVisibility(joined ? View.GONE : View.VISIBLE);
-        joinButton.setVisibility(joined ? View.GONE : View.VISIBLE);
-    }
-
-    @OnClick(R.id.challenge_leader)
-    void openLeaderProfile() {
-        EventBus.getDefault().post(new OpenFullProfileCommand(challenge.leaderId));
-    }
-
-    @OnClick(R.id.challenge_go_to_btn)
-    void openChallengeActivity() {
-        Bundle bundle = new Bundle();
-        bundle.putString(ChallengeDetailActivity.CHALLENGE_ID, challenge.id);
-
-        Intent intent = new Intent(context, ChallengeDetailActivity.class);
-        intent.putExtras(bundle);
-        //intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        context.startActivity(intent);
-        this.dialog.dismiss();
-    }
-
-    @OnClick(R.id.challenge_join_btn)
-    void joinChallenge() {
-        this.apiClient.joinChallenge(challenge.id)
-                .subscribe(challenge -> {
-                    if (this.user != null) {
-                        challenge.user_id = this.user.getId();
-                    }
-                    challenge.async().save();
-
-                    if (challengeJoinedAction != null) {
-                        challengeJoinedAction.call(challenge);
-                    }
-
-                    changeViewsByChallenge(challenge);
-                }, throwable -> {
-                });
-    }
-
-    @OnClick(R.id.challenge_leave_btn)
-    void leaveChallenge() {
-        new AlertDialog.Builder(context)
-                .setTitle(context.getString(R.string.challenge_leave_title))
-                .setMessage(context.getString(R.string.challenge_leave_text, challenge.name))
-                .setPositiveButton(context.getString(R.string.yes), (dialog, which) ->
-
-                        showRemoveTasksDialog(keepTasks -> this.apiClient.leaveChallenge(challenge.id, new LeaveChallengeBody(keepTasks))
-                                .subscribe(aVoid -> {
-                                    challenge.user_id = null;
-                                    challenge.async().save();
-
-                                    if (this.user != null) {
-                                        this.user.resetChallengeList();
-                                    }
-
-                                    if (challengeLeftAction != null) {
-                                        challengeLeftAction.call(challenge);
-                                    }
-
-                                    this.dialog.dismiss();
-                                }, throwable -> {
-                                }))).setNegativeButton(context.getString(R.string.no), (dialog, which) -> dialog.dismiss()).show();
-    }
-
-    // refactor as an UseCase later - see ChallengeDetailActivity
-    private void showRemoveTasksDialog(Action1<String> callback){
-        new AlertDialog.Builder(context)
-                .setTitle(context.getString(R.string.challenge_remove_tasks_title))
-                .setMessage(context.getString(R.string.challenge_remove_tasks_text))
-                .setPositiveButton(context.getString(R.string.remove_tasks), (dialog, which) -> {
-                    callback.call("remove-all");
-                    dialog.dismiss();
-                })
-                .setNegativeButton(context.getString(R.string.keep_tasks), (dialog, which) -> {
-                    callback.call("keep-all");
-                    dialog.dismiss();
-                }).show();
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social.challenges;
+
+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.R;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
+import com.habitrpg.android.habitica.models.LeaveChallengeBody;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+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 net.pherth.android.emoji_library.EmojiParser;
+import net.pherth.android.emoji_library.EmojiTextView;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import rx.functions.Action1;
+
+public class ChallengeDetailDialogHolder {
+
+    @BindView(R.id.challenge_not_joined_header)
+    LinearLayout notJoinedHeader;
+
+    @BindView(R.id.challenge_joined_header)
+    LinearLayout joinedHeader;
+
+    @BindView(R.id.challenge_join_btn)
+    Button joinButton;
+
+    @BindView(R.id.challenge_leave_btn)
+    Button leaveButton;
+
+    @BindView(R.id.challenge_name)
+    EmojiTextView challengeName;
+
+    @BindView(R.id.challenge_description)
+    EmojiTextView challengeDescription;
+
+    @BindView(R.id.challenge_leader)
+    TextView challengeLeader;
+
+    @BindView(R.id.gem_amount)
+    TextView gem_amount;
+
+    @BindView(R.id.challenge_member_count)
+    TextView member_count;
+
+    @BindView(R.id.task_group_layout)
+    LinearLayout task_group_layout;
+
+    private AlertDialog dialog;
+    private ApiClient apiClient;
+    @Nullable
+    private HabitRPGUser user;
+    private Challenge challenge;
+    private Action1<Challenge> challengeJoinedAction;
+    private Action1<Challenge> challengeLeftAction;
+    private Activity context;
+
+
+    private ChallengeDetailDialogHolder(View view, Activity context) {
+        this.context = context;
+        ButterKnife.bind(this, view);
+    }
+
+    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);
+
+        ChallengeDetailDialogHolder challengeDetailDialogHolder = new ChallengeDetailDialogHolder(dialogLayout, activity);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+                .setView(dialogLayout);
+
+        challengeDetailDialogHolder.bind(builder.show(), apiClient, user, challenge, challengeJoinedAction, challengeLeftAction);
+    }
+
+    public void bind(AlertDialog dialog, ApiClient apiClient, @Nullable HabitRPGUser user, Challenge challenge,
+                     Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
+        this.dialog = dialog;
+        this.apiClient = apiClient;
+        this.user = user;
+        this.challenge = challenge;
+        this.challengeJoinedAction = challengeJoinedAction;
+        this.challengeLeftAction = challengeLeftAction;
+
+        changeViewsByChallenge(challenge);
+    }
+
+    private void changeViewsByChallenge(Challenge challenge) {
+        setJoined(challenge.user_id != null && !challenge.user_id.isEmpty());
+
+        challengeName.setText(EmojiParser.parseEmojis(challenge.name));
+        challengeDescription.setText(MarkdownParser.parseMarkdown(challenge.description));
+        challengeLeader.setText(challenge.leaderName);
+
+        gem_amount.setText(String.valueOf(challenge.prize));
+        member_count.setText(String.valueOf(challenge.memberCount));
+
+        apiClient.getChallengeTasks(challenge.id)
+                .subscribe(taskList -> {
+                            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:
+
+                                        habits.add(entry.getValue());
+                                        break;
+                                    case Task.TYPE_DAILY:
+
+                                        dailies.add(entry.getValue());
+                                        break;
+                                    case Task.TYPE_REWARD:
+
+                                        rewards.add(entry.getValue());
+                                        break;
+                                }
+                            }
+
+                            if (habits.size() > 0) {
+                                addHabits(habits);
+                            }
+
+                            if (dailies.size() > 0) {
+                                addDailys(dailies);
+                            }
+
+                            if (todos.size() > 0) {
+                                addTodos(todos);
+                            }
+
+                            if (rewards.size() > 0) {
+                                addRewards(rewards);
+                            }
+                        }
+                        , Throwable::printStackTrace);
+    }
+
+    private void addHabits(ArrayList<Task> habits) {
+        LinearLayout taskGroup = (LinearLayout) context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_task_group, task_group_layout);
+        TextView groupName = (TextView) taskGroup.findViewById(R.id.task_group_name);
+
+        LinearLayout tasks_layout = (LinearLayout) taskGroup.findViewById(R.id.tasks_layout);
+
+        groupName.setText(habits.size() + " " + ChallengesListViewAdapter.ChallengeViewHolder.getLabelByTypeAndCount(context, Challenge.TASK_ORDER_HABITS, habits.size()));
+
+        int size = habits.size();
+        for (int i = 0; i < size; i++) {
+            Task task = habits.get(i);
+
+            View habitEntry = context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_habit, tasks_layout);
+            TextView habitTitle = (TextView) habitEntry.findViewById(R.id.habit_title);
+            ImageView plusImg = (ImageView) habitEntry.findViewById(task.up ? R.id.plus_img_tinted : R.id.plus_img);
+            ImageView minusImg = (ImageView) habitEntry.findViewById(task.down ? R.id.minus_img_tinted : R.id.minus_img);
+
+            plusImg.setVisibility(View.VISIBLE);
+            minusImg.setVisibility(View.VISIBLE);
+
+            habitTitle.setText(EmojiParser.parseEmojis(task.text));
+
+        }
+    }
+
+    private void addDailys(ArrayList<Task> dailies) {
+        LinearLayout taskGroup = (LinearLayout) context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_task_group, task_group_layout);
+        TextView groupName = (TextView) taskGroup.findViewById(R.id.task_group_name);
+
+        LinearLayout tasks_layout = (LinearLayout) taskGroup.findViewById(R.id.tasks_layout);
+
+        int size = dailies.size();
+        groupName.setText(dailies.size() + " " + ChallengesListViewAdapter.ChallengeViewHolder.getLabelByTypeAndCount(context, Challenge.TASK_ORDER_DAILYS, size));
+
+        for (int i = 0; i < size; i++) {
+            Task task = dailies.get(i);
+
+            View entry = context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_daily, tasks_layout);
+            TextView title = (TextView) entry.findViewById(R.id.daily_title);
+            title.setText(EmojiParser.parseEmojis(task.text));
+
+            if (task.checklist != null && !task.checklist.isEmpty()) {
+                View checklistIndicatorWrapper = entry.findViewById(R.id.checklistIndicatorWrapper);
+
+                checklistIndicatorWrapper.setVisibility(View.VISIBLE);
+
+                TextView checkListAllTextView = (TextView) entry.findViewById(R.id.checkListAllTextView);
+                checkListAllTextView.setText(String.valueOf(task.checklist.size()));
+            }
+
+        }
+    }
+
+    private void addTodos(ArrayList<Task> todos) {
+        LinearLayout taskGroup = (LinearLayout) context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_task_group, task_group_layout);
+        TextView groupName = (TextView) taskGroup.findViewById(R.id.task_group_name);
+
+        LinearLayout tasks_layout = (LinearLayout) taskGroup.findViewById(R.id.tasks_layout);
+
+        int size = todos.size();
+        groupName.setText(todos.size() + " " + ChallengesListViewAdapter.ChallengeViewHolder.getLabelByTypeAndCount(context, Challenge.TASK_ORDER_TODOS, size));
+
+        for (int i = 0; i < size; i++) {
+            Task task = todos.get(i);
+
+            View entry = context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_todo, tasks_layout);
+            TextView title = (TextView) entry.findViewById(R.id.todo_title);
+            title.setText(EmojiParser.parseEmojis(task.text));
+
+            if (task.checklist != null && !task.checklist.isEmpty()) {
+                View checklistIndicatorWrapper = entry.findViewById(R.id.checklistIndicatorWrapper);
+
+                checklistIndicatorWrapper.setVisibility(View.VISIBLE);
+
+                TextView checkListAllTextView = (TextView) entry.findViewById(R.id.checkListAllTextView);
+                checkListAllTextView.setText(String.valueOf(task.checklist.size()));
+            }
+        }
+    }
+
+    private void addRewards(ArrayList<Task> rewards) {
+        LinearLayout taskGroup = (LinearLayout) context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_task_group, task_group_layout);
+        TextView groupName = (TextView) taskGroup.findViewById(R.id.task_group_name);
+
+        LinearLayout tasks_layout = (LinearLayout) taskGroup.findViewById(R.id.tasks_layout);
+
+        int size = rewards.size();
+        groupName.setText(rewards.size() + " " + ChallengesListViewAdapter.ChallengeViewHolder.getLabelByTypeAndCount(context, Challenge.TASK_ORDER_REWARDS, size));
+
+        for (int i = 0; i < size; i++) {
+            Task task = rewards.get(i);
+
+            View entry = context.getLayoutInflater().inflate(R.layout.dialog_challenge_detail_reward, tasks_layout);
+            TextView title = (TextView) entry.findViewById(R.id.reward_title);
+            title.setText(EmojiParser.parseEmojis(task.text));
+        }
+    }
+
+    private void setJoined(boolean joined) {
+        joinedHeader.setVisibility(joined ? View.VISIBLE : View.GONE);
+        leaveButton.setVisibility(joined ? View.VISIBLE : View.GONE);
+
+        notJoinedHeader.setVisibility(joined ? View.GONE : View.VISIBLE);
+        joinButton.setVisibility(joined ? View.GONE : View.VISIBLE);
+    }
+
+    @OnClick(R.id.challenge_leader)
+    void openLeaderProfile() {
+        EventBus.getDefault().post(new OpenFullProfileCommand(challenge.leaderId));
+    }
+
+    @OnClick(R.id.challenge_go_to_btn)
+    void openChallengeActivity() {
+        Bundle bundle = new Bundle();
+        bundle.putString(ChallengeDetailActivity.CHALLENGE_ID, challenge.id);
+
+        Intent intent = new Intent(context, ChallengeDetailActivity.class);
+        intent.putExtras(bundle);
+        //intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        context.startActivity(intent);
+        this.dialog.dismiss();
+    }
+
+    @OnClick(R.id.challenge_join_btn)
+    void joinChallenge() {
+        this.apiClient.joinChallenge(challenge.id)
+                .subscribe(challenge -> {
+                    if (this.user != null) {
+                        challenge.user_id = this.user.getId();
+                    }
+                    challenge.async().save();
+
+                    if (challengeJoinedAction != null) {
+                        challengeJoinedAction.call(challenge);
+                    }
+
+                    changeViewsByChallenge(challenge);
+                }, throwable -> {
+                });
+    }
+
+    @OnClick(R.id.challenge_leave_btn)
+    void leaveChallenge() {
+        new AlertDialog.Builder(context)
+                .setTitle(context.getString(R.string.challenge_leave_title))
+                .setMessage(context.getString(R.string.challenge_leave_text, challenge.name))
+                .setPositiveButton(context.getString(R.string.yes), (dialog, which) ->
+
+                        showRemoveTasksDialog(keepTasks -> this.apiClient.leaveChallenge(challenge.id, new LeaveChallengeBody(keepTasks))
+                                .subscribe(aVoid -> {
+                                    challenge.user_id = null;
+                                    challenge.async().save();
+
+                                    if (this.user != null) {
+                                        this.user.resetChallengeList();
+                                    }
+
+                                    if (challengeLeftAction != null) {
+                                        challengeLeftAction.call(challenge);
+                                    }
+
+                                    this.dialog.dismiss();
+                                }, throwable -> {
+                                }))).setNegativeButton(context.getString(R.string.no), (dialog, which) -> dialog.dismiss()).show();
+    }
+
+    // refactor as an UseCase later - see ChallengeDetailActivity
+    private void showRemoveTasksDialog(Action1<String> callback){
+        new AlertDialog.Builder(context)
+                .setTitle(context.getString(R.string.challenge_remove_tasks_title))
+                .setMessage(context.getString(R.string.challenge_remove_tasks_text))
+                .setPositiveButton(context.getString(R.string.remove_tasks), (dialog, which) -> {
+                    callback.call("remove-all");
+                    dialog.dismiss();
+                })
+                .setNegativeButton(context.getString(R.string.keep_tasks), (dialog, which) -> {
+                    callback.call("keep-all");
+                    dialog.dismiss();
+                }).show();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.java
index c1e51786d..28375b78d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterDialogHolder.java
@@ -1,142 +1,142 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengesFilterRecyclerViewAdapter;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.Group;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.Button;
-import android.widget.CheckBox;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import rx.functions.Action1;
-
-class ChallengeFilterDialogHolder {
-
-    @BindView(R.id.challenge_filter_recycler_view)
-    RecyclerView groupRecyclerView;
-
-    @BindView(R.id.challenge_filter_button_done)
-    Button doneButton;
-
-    @BindView(R.id.challenge_filter_button_all)
-    Button allButton;
-
-    @BindView(R.id.challenge_filter_button_none)
-    Button noneButton;
-
-    @BindView(R.id.challenge_filter_owned)
-    CheckBox checkboxOwned;
-
-    @BindView(R.id.challenge_filter_not_owned)
-    CheckBox checkboxNotOwned;
-
-    private AlertDialog dialog;
-    private List<Challenge> challengesViewed;
-    private ChallengeFilterOptions currentFilter;
-    private Action1<ChallengeFilterOptions> selectedGroupsCallback;
-    private Activity context;
-    private ChallengesFilterRecyclerViewAdapter adapter;
-
-
-    private ChallengeFilterDialogHolder(View view, Activity context) {
-        this.context = context;
-        ButterKnife.bind(this, view);
-    }
-
-    static void showDialog(Activity activity, List<Challenge> challengesViewed,
-                           ChallengeFilterOptions currentFilter,
-                           Action1<ChallengeFilterOptions> selectedGroupsCallback) {
-        View dialogLayout = activity.getLayoutInflater().inflate(R.layout.dialog_challenge_filter, null);
-
-        ChallengeFilterDialogHolder challengeFilterDialogHolder = new ChallengeFilterDialogHolder(dialogLayout, activity);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
-                .setView(dialogLayout);
-
-        challengeFilterDialogHolder.bind(builder.show(), challengesViewed, currentFilter, selectedGroupsCallback);
-    }
-
-    public void bind(AlertDialog dialog, List<Challenge> challengesViewed,
-                     ChallengeFilterOptions currentFilter,
-                     Action1<ChallengeFilterOptions> selectedGroupsCallback) {
-        this.dialog = dialog;
-        this.challengesViewed = challengesViewed;
-        this.currentFilter = currentFilter;
-        this.selectedGroupsCallback = selectedGroupsCallback;
-
-        fillChallengeGroups();
-
-        if(currentFilter != null ){
-            checkboxOwned.setChecked(currentFilter.showOwned);
-            checkboxNotOwned.setChecked(currentFilter.notOwned);
-        }
-    }
-
-    private void fillChallengeGroups() {
-
-       this.groupRecyclerView.setLayoutManager(new LinearLayoutManager(context));
-       adapter = new ChallengesFilterRecyclerViewAdapter(getGroups(challengesViewed));
-        if(currentFilter != null && currentFilter.showByGroups != null){
-            adapter.selectAll(currentFilter.showByGroups);
-        }
-
-       this.groupRecyclerView.setAdapter(adapter);
-    }
-
-    private Collection<Group> getGroups(@Nullable List<Challenge> challenges){
-        Map<String, Group> groupMap = new HashMap<>();
-
-        if (challenges != null) {
-            for (Challenge challenge : challenges) {
-                if (groupMap.containsKey(challenge.groupName)) {
-                    continue;
-                }
-                Group group = new Group();
-                group.id = challenge.groupId;
-                group.name = challenge.groupName;
-
-                groupMap.put(challenge.groupName, group);
-            }
-        }
-
-        return groupMap.values();
-    }
-
-    @OnClick(R.id.challenge_filter_button_done)
-    void doneClicked() {
-        ChallengeFilterOptions options = new ChallengeFilterOptions();
-        options.showByGroups = this.adapter.getCheckedEntries();
-        options.showOwned = checkboxOwned.isChecked();
-        options.notOwned = checkboxNotOwned.isChecked();
-
-        selectedGroupsCallback.call(options);
-        this.dialog.hide();
-    }
-
-
-    @OnClick(R.id.challenge_filter_button_all)
-    void allClicked() {
-        this.adapter.selectAll();
-    }
-
-    @OnClick(R.id.challenge_filter_button_none)
-    void noneClicked() {
-        this.adapter.deSelectAll();
-    }
-
-}
-
+package com.habitrpg.android.habitica.ui.fragments.social.challenges;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CheckBox;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengesFilterRecyclerViewAdapter;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import rx.functions.Action1;
+
+class ChallengeFilterDialogHolder {
+
+    @BindView(R.id.challenge_filter_recycler_view)
+    RecyclerView groupRecyclerView;
+
+    @BindView(R.id.challenge_filter_button_done)
+    Button doneButton;
+
+    @BindView(R.id.challenge_filter_button_all)
+    Button allButton;
+
+    @BindView(R.id.challenge_filter_button_none)
+    Button noneButton;
+
+    @BindView(R.id.challenge_filter_owned)
+    CheckBox checkboxOwned;
+
+    @BindView(R.id.challenge_filter_not_owned)
+    CheckBox checkboxNotOwned;
+
+    private AlertDialog dialog;
+    private List<Challenge> challengesViewed;
+    private ChallengeFilterOptions currentFilter;
+    private Action1<ChallengeFilterOptions> selectedGroupsCallback;
+    private Activity context;
+    private ChallengesFilterRecyclerViewAdapter adapter;
+
+
+    private ChallengeFilterDialogHolder(View view, Activity context) {
+        this.context = context;
+        ButterKnife.bind(this, view);
+    }
+
+    static void showDialog(Activity activity, List<Challenge> challengesViewed,
+                           ChallengeFilterOptions currentFilter,
+                           Action1<ChallengeFilterOptions> selectedGroupsCallback) {
+        View dialogLayout = activity.getLayoutInflater().inflate(R.layout.dialog_challenge_filter, null);
+
+        ChallengeFilterDialogHolder challengeFilterDialogHolder = new ChallengeFilterDialogHolder(dialogLayout, activity);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+                .setView(dialogLayout);
+
+        challengeFilterDialogHolder.bind(builder.show(), challengesViewed, currentFilter, selectedGroupsCallback);
+    }
+
+    public void bind(AlertDialog dialog, List<Challenge> challengesViewed,
+                     ChallengeFilterOptions currentFilter,
+                     Action1<ChallengeFilterOptions> selectedGroupsCallback) {
+        this.dialog = dialog;
+        this.challengesViewed = challengesViewed;
+        this.currentFilter = currentFilter;
+        this.selectedGroupsCallback = selectedGroupsCallback;
+
+        fillChallengeGroups();
+
+        if(currentFilter != null ){
+            checkboxOwned.setChecked(currentFilter.showOwned);
+            checkboxNotOwned.setChecked(currentFilter.notOwned);
+        }
+    }
+
+    private void fillChallengeGroups() {
+
+       this.groupRecyclerView.setLayoutManager(new LinearLayoutManager(context));
+       adapter = new ChallengesFilterRecyclerViewAdapter(getGroups(challengesViewed));
+        if(currentFilter != null && currentFilter.showByGroups != null){
+            adapter.selectAll(currentFilter.showByGroups);
+        }
+
+       this.groupRecyclerView.setAdapter(adapter);
+    }
+
+    private Collection<Group> getGroups(@Nullable List<Challenge> challenges){
+        Map<String, Group> groupMap = new HashMap<>();
+
+        if (challenges != null) {
+            for (Challenge challenge : challenges) {
+                if (groupMap.containsKey(challenge.groupName)) {
+                    continue;
+                }
+                Group group = new Group();
+                group.id = challenge.groupId;
+                group.name = challenge.groupName;
+
+                groupMap.put(challenge.groupName, group);
+            }
+        }
+
+        return groupMap.values();
+    }
+
+    @OnClick(R.id.challenge_filter_button_done)
+    void doneClicked() {
+        ChallengeFilterOptions options = new ChallengeFilterOptions();
+        options.showByGroups = this.adapter.getCheckedEntries();
+        options.showOwned = checkboxOwned.isChecked();
+        options.notOwned = checkboxNotOwned.isChecked();
+
+        selectedGroupsCallback.call(options);
+        this.dialog.hide();
+    }
+
+
+    @OnClick(R.id.challenge_filter_button_all)
+    void allClicked() {
+        this.adapter.selectAll();
+    }
+
+    @OnClick(R.id.challenge_filter_button_none)
+    void noneClicked() {
+        this.adapter.deSelectAll();
+    }
+
+}
+
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 3518fb0da..d3640627b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeFilterOptions.java
@@ -1,11 +1,11 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges;
-
-import com.habitrpg.android.habitica.models.social.Group;
-
-import java.util.List;
-
-public class ChallengeFilterOptions {
-    public List<Group> showByGroups;
-    public boolean showOwned;
-    public boolean notOwned;
-}
+package com.habitrpg.android.habitica.ui.fragments.social.challenges;
+
+import com.habitrpg.android.habitica.models.social.Group;
+
+import java.util.List;
+
+public class ChallengeFilterOptions {
+    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 abba56a50..88e54e832 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,218 +1,223 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges;
-
-import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-
-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.habitrpg.android.habitica.models.social.Challenge;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.sql.language.Where;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import rx.Observable;
-import rx.functions.Action0;
-
-public class ChallengeListFragment extends BaseMainFragment implements SwipeRefreshLayout.OnRefreshListener {
-
-    @BindView(R.id.challenge_filter_layout)
-    LinearLayout challengeFilterLayout;
-
-    @BindView(R.id.action_filter_icon)
-    View actionFilterIcon;
-
-    @BindView(R.id.challenges_refresh_layout)
-    SwipeRefreshLayout swipeRefreshLayout;
-
-    @BindView(R.id.challenges_refresh_empty)
-    SwipeRefreshLayout swipeRefreshEmptyLayout;
-
-    @BindView(R.id.challenges_list)
-    RecyclerView recyclerView;
-
-    private ChallengesListViewAdapter challengeAdapter;
-    private boolean viewUserChallengesOnly;
-    private Action0 refreshCallback;
-    private boolean withFilter;
-
-    public void setWithFilter(boolean withFilter){
-        this.withFilter = withFilter;
-    }
-
-    public void setViewUserChallengesOnly(boolean only) {
-        this.viewUserChallengesOnly = only;
-    }
-
-    public void setRefreshingCallback(Action0 refreshCallback) {
-        this.refreshCallback = refreshCallback;
-    }
-
-    private List<Challenge> currentChallengesInView;
-
-    private ChallengeFilterOptions lastFilterOptions;
-
-    public void setObservable(Observable<List<Challenge>> listObservable) {
-        listObservable
-                .subscribe(challenges -> {
-
-                    List<Challenge> userChallenges = this.user != null ? this.user.getChallengeList() : new ArrayList<>();
-
-                    HashSet<String> userChallengesHash = new HashSet<>();
-
-                    for (Challenge userChallenge : userChallenges) {
-                        userChallengesHash.add(userChallenge.id);
-                    }
-
-                    userChallenges.clear();
-
-                    for (Challenge challenge : challenges) {
-                        if (userChallengesHash.contains(challenge.id) && challenge.name != null && !challenge.name.isEmpty()) {
-                            challenge.user_id = this.user.getId();
-                            userChallenges.add(challenge);
-                        } else {
-                            challenge.user_id = null;
-                        }
-
-                        challenge.async().save();
-                    }
-
-                    setRefreshingIfVisible(swipeRefreshLayout, false);
-                    setRefreshingIfVisible(swipeRefreshEmptyLayout, false);
-
-                    if (viewUserChallengesOnly) {
-                        setChallengeEntries(userChallenges);
-                    } else {
-                        setChallengeEntries(challenges);
-                    }
-
-
-                }, throwable -> {
-                    Log.e("ChallengeListFragment", "", throwable);
-
-                    setRefreshingIfVisible(swipeRefreshLayout, false);
-                    setRefreshingIfVisible(swipeRefreshEmptyLayout, false);
-                });
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_challengeslist, container, false);
-        unbinder = ButterKnife.bind(this, v);
-
-        challengeAdapter = new ChallengesListViewAdapter(viewUserChallengesOnly, user);
-
-        swipeRefreshLayout.setOnRefreshListener(this);
-        swipeRefreshEmptyLayout.setOnRefreshListener(this);
-
-        challengeFilterLayout.setVisibility(withFilter?View.VISIBLE:View.GONE);
-        challengeFilterLayout.setClickable(true);
-        challengeFilterLayout.setOnClickListener(view -> ChallengeFilterDialogHolder.showDialog(getActivity(), currentChallengesInView, lastFilterOptions, filterOptions -> {
-                    challengeAdapter.setFilterByGroups(filterOptions);
-                    this.lastFilterOptions = filterOptions;
-                }));
-
-        recyclerView.setLayoutManager(new LinearLayoutManager(this.activity));
-        recyclerView.setAdapter(challengeAdapter);
-        if (!viewUserChallengesOnly) {
-            this.recyclerView.setBackgroundResource(R.color.white);
-        }
-
-        fetchLocalChallenges();
-        return v;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onRefresh() {
-        setRefreshingIfVisible(swipeRefreshEmptyLayout, true);
-        setRefreshingIfVisible(swipeRefreshLayout, true);
-
-        fetchOnlineChallenges();
-    }
-
-    private void setRefreshingIfVisible(SwipeRefreshLayout refreshLayout, boolean state) {
-        if (refreshLayout != null && refreshLayout.getVisibility() == View.VISIBLE) {
-            refreshLayout.setRefreshing(state);
-        }
-    }
-
-    private void fetchLocalChallenges() {
-        setRefreshingIfVisible(swipeRefreshLayout, true);
-
-        Where<Challenge> query = new Select().from(Challenge.class).where(Condition.column("name").isNotNull());
-
-        if (viewUserChallengesOnly && user != null) {
-            query = query.and(Condition.column("user_id").is(user.getId()));
-        }
-
-        List<Challenge> challenges = query.queryList();
-
-        if (challenges.size() != 0) {
-            setChallengeEntries(challenges);
-        }
-
-        setRefreshingIfVisible(swipeRefreshLayout, false);
-
-        // load online challenges & save to database
-        onRefresh();
-    }
-
-    private void setChallengeEntries(List<Challenge> challenges) {
-        if (swipeRefreshEmptyLayout == null || swipeRefreshLayout == null) {
-            return;
-        }
-        currentChallengesInView = challenges;
-
-        if (viewUserChallengesOnly && challenges.size() == 0) {
-            swipeRefreshEmptyLayout.setVisibility(View.VISIBLE);
-            swipeRefreshLayout.setRefreshing(false);
-            swipeRefreshLayout.setVisibility(View.GONE);
-        } else {
-            swipeRefreshEmptyLayout.setRefreshing(false);
-            swipeRefreshEmptyLayout.setVisibility(View.GONE);
-            swipeRefreshLayout.setVisibility(View.VISIBLE);
-        }
-
-        challengeAdapter.setChallenges(challenges);
-    }
-
-    private void fetchOnlineChallenges() {
-        if (refreshCallback != null) {
-            refreshCallback.call();
-        }
-    }
-
-    public void addItem(Challenge challenge) {
-        challengeAdapter.addChallenge(challenge);
-    }
-
-    public void updateItem(Challenge challenge) {
-        challengeAdapter.replaceChallenge(challenge);
-    }
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.sidebar_challenges);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social.challenges;
+
+import android.os.Bundle;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import rx.Observable;
+import rx.functions.Action0;
+
+public class ChallengeListFragment extends BaseMainFragment implements SwipeRefreshLayout.OnRefreshListener {
+
+    @Inject
+    SocialRepository socialRepository;
+
+    @BindView(R.id.challenge_filter_layout)
+    LinearLayout challengeFilterLayout;
+
+    @BindView(R.id.action_filter_icon)
+    View actionFilterIcon;
+
+    @BindView(R.id.challenges_refresh_layout)
+    SwipeRefreshLayout swipeRefreshLayout;
+
+    @BindView(R.id.challenges_refresh_empty)
+    SwipeRefreshLayout swipeRefreshEmptyLayout;
+
+    @BindView(R.id.challenges_list)
+    RecyclerView recyclerView;
+
+    private ChallengesListViewAdapter challengeAdapter;
+    private boolean viewUserChallengesOnly;
+    private Action0 refreshCallback;
+    private boolean withFilter;
+
+    public void setWithFilter(boolean withFilter){
+        this.withFilter = withFilter;
+    }
+
+    public void setViewUserChallengesOnly(boolean only) {
+        this.viewUserChallengesOnly = only;
+    }
+
+    public void setRefreshingCallback(Action0 refreshCallback) {
+        this.refreshCallback = refreshCallback;
+    }
+
+    private List<Challenge> currentChallengesInView;
+
+    private ChallengeFilterOptions lastFilterOptions;
+
+    public void setObservable(Observable<List<Challenge>> listObservable) {
+        listObservable
+                .subscribe(challenges -> {
+
+                    List<Challenge> userChallenges = this.user != null ? this.user.getChallengeList() : new ArrayList<>();
+
+                    HashSet<String> userChallengesHash = new HashSet<>();
+
+                    for (Challenge userChallenge : userChallenges) {
+                        userChallengesHash.add(userChallenge.id);
+                    }
+
+                    userChallenges.clear();
+
+                    for (Challenge challenge : challenges) {
+                        if (userChallengesHash.contains(challenge.id) && challenge.name != null && !challenge.name.isEmpty()) {
+                            challenge.user_id = this.user.getId();
+                            userChallenges.add(challenge);
+                        } else {
+                            challenge.user_id = null;
+                        }
+
+                        challenge.async().save();
+                    }
+
+                    setRefreshingIfVisible(swipeRefreshLayout, false);
+                    setRefreshingIfVisible(swipeRefreshEmptyLayout, false);
+
+                    if (viewUserChallengesOnly) {
+                        setChallengeEntries(userChallenges);
+                    } else {
+                        setChallengeEntries(challenges);
+                    }
+
+
+                }, throwable -> {
+                    Log.e("ChallengeListFragment", "", throwable);
+
+                    setRefreshingIfVisible(swipeRefreshLayout, false);
+                    setRefreshingIfVisible(swipeRefreshEmptyLayout, false);
+                });
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_challengeslist, container, false);
+        unbinder = ButterKnife.bind(this, v);
+
+        challengeAdapter = new ChallengesListViewAdapter(viewUserChallengesOnly, user);
+
+        swipeRefreshLayout.setOnRefreshListener(this);
+        swipeRefreshEmptyLayout.setOnRefreshListener(this);
+
+        challengeFilterLayout.setVisibility(withFilter?View.VISIBLE:View.GONE);
+        challengeFilterLayout.setClickable(true);
+        challengeFilterLayout.setOnClickListener(view -> ChallengeFilterDialogHolder.showDialog(getActivity(), currentChallengesInView, lastFilterOptions, filterOptions -> {
+                    challengeAdapter.setFilterByGroups(filterOptions);
+                    this.lastFilterOptions = filterOptions;
+                }));
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(this.activity));
+        recyclerView.setAdapter(challengeAdapter);
+        if (!viewUserChallengesOnly) {
+            this.recyclerView.setBackgroundResource(R.color.white);
+        }
+
+        fetchLocalChallenges();
+        return v;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onRefresh() {
+        setRefreshingIfVisible(swipeRefreshEmptyLayout, true);
+        setRefreshingIfVisible(swipeRefreshLayout, true);
+
+        fetchOnlineChallenges();
+    }
+
+    private void setRefreshingIfVisible(SwipeRefreshLayout refreshLayout, boolean state) {
+        if (refreshLayout != null && refreshLayout.getVisibility() == View.VISIBLE) {
+            refreshLayout.setRefreshing(state);
+        }
+    }
+
+    private void fetchLocalChallenges() {
+        setRefreshingIfVisible(swipeRefreshLayout, true);
+
+        Observable<List<Challenge>> observable;
+
+        if (viewUserChallengesOnly && user != null) {
+            observable = socialRepository.getUserChallenges(user.getId());
+        } else {
+            observable = socialRepository.getChallenges();
+        }
+
+        observable.subscribe(challenges -> {
+            if (challenges.size() != 0) {
+                setChallengeEntries(challenges);
+            }
+
+            setRefreshingIfVisible(swipeRefreshLayout, false);
+
+            // load online challenges & save to database
+            onRefresh();
+        }, throwable -> {});
+    }
+
+    private void setChallengeEntries(List<Challenge> challenges) {
+        if (swipeRefreshEmptyLayout == null || swipeRefreshLayout == null) {
+            return;
+        }
+        currentChallengesInView = challenges;
+
+        if (viewUserChallengesOnly && challenges.size() == 0) {
+            swipeRefreshEmptyLayout.setVisibility(View.VISIBLE);
+            swipeRefreshLayout.setRefreshing(false);
+            swipeRefreshLayout.setVisibility(View.GONE);
+        } else {
+            swipeRefreshEmptyLayout.setRefreshing(false);
+            swipeRefreshEmptyLayout.setVisibility(View.GONE);
+            swipeRefreshLayout.setVisibility(View.VISIBLE);
+        }
+
+        challengeAdapter.setChallenges(challenges);
+    }
+
+    private void fetchOnlineChallenges() {
+        if (refreshCallback != null) {
+            refreshCallback.call();
+        }
+    }
+
+    public void addItem(Challenge challenge) {
+        challengeAdapter.addChallenge(challenge);
+    }
+
+    public void updateItem(Challenge challenge) {
+        challengeAdapter.replaceChallenge(challenge);
+    }
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_challenges);
+    }
+}
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 c6975a336..1b7c33b7e 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,230 +1,230 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges;
-
-
-import android.content.Context;
-import android.databinding.ObservableList;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-public class ChallengeTasksRecyclerViewFragment extends BaseFragment {
-    public RecyclerView recyclerView;
-    public BaseTasksRecyclerViewAdapter recyclerAdapter;
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    String userID;
-
-    ObservableList<Task> tasksOnInitialize;
-
-    LinearLayoutManager layoutManager = null;
-    private HabitRPGUser user;
-    private View view;
-
-    public static ChallengeTasksRecyclerViewFragment newInstance(HabitRPGUser user, ObservableList<Task> tasks) {
-        ChallengeTasksRecyclerViewFragment fragment = new ChallengeTasksRecyclerViewFragment();
-        fragment.setRetainInstance(true);
-        fragment.user = user;
-        fragment.tasksOnInitialize = tasks;
-
-        if (tasks.size() != 0 && fragment.recyclerAdapter != null) {
-            fragment.recyclerAdapter.setTasks(tasks);
-        }
-
-        tasks.addOnListChangedCallback(new ObservableList.OnListChangedCallback<ObservableList<Task>>() {
-            @Override
-            public void onChanged(ObservableList<Task> tasks) {
-            }
-
-            @Override
-            public void onItemRangeChanged(ObservableList<Task> tasks, int i, int i1) {
-
-            }
-
-            @Override
-            public void onItemRangeInserted(ObservableList<Task> tasks, int i, int i1) {
-                fragment.recyclerAdapter.setTasks(tasks);
-            }
-
-            @Override
-            public void onItemRangeMoved(ObservableList<Task> tasks, int i, int i1, int i2) {
-
-            }
-
-
-            @Override
-            public void onItemRangeRemoved(ObservableList<Task> tasks, int i, int i1) {
-
-            }
-        });
-
-        return fragment;
-    }
-
-    public void setInnerAdapter() {
-        this.recyclerAdapter = new ChallengeTasksRecyclerViewAdapter(null, 0, getContext(), userID, null);
-
-        if (tasksOnInitialize != null && tasksOnInitialize.size() != 0 && recyclerAdapter != null && recyclerAdapter.getItemCount() == 0) {
-            recyclerAdapter.setTasks(tasksOnInitialize);
-        }
-    }
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        if (view == null) {
-            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
-
-            recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
-
-            android.support.v4.app.FragmentActivity context = getActivity();
-
-            layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
-
-            if (layoutManager == null) {
-                layoutManager = new LinearLayoutManager(context);
-
-                recyclerView.setLayoutManager(layoutManager);
-            }
-            if (recyclerView.getAdapter() == null) {
-                this.setInnerAdapter();
-            }
-        }
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        recyclerView.setAdapter(recyclerAdapter);
-    }
-
-    @Override
-    public String getDisplayedClassName() {
-        return "ChallengeTasks" + super.getDisplayedClassName();
-    }
-
-
-    // region Challenge specific RecyclerViewAdapters
-
-    public class ChallengeTasksRecyclerViewAdapter extends SortableTasksRecyclerViewAdapter<BaseTaskViewHolder> {
-        private static final int TYPE_HEADER = 0;
-        private static final int TYPE_HABIT = 1;
-        private static final int TYPE_DAILY = 2;
-        private static final int TYPE_TODO = 3;
-        private static final int TYPE_REWARD = 4;
-
-        private int dailyResetOffset = 0;
-
-        public ChallengeTasksRecyclerViewAdapter(@Nullable TaskFilterHelper taskFilterHelper, int layoutResource, Context newContext, String userID, @Nullable SortTasksCallback sortCallback) {
-            super("", taskFilterHelper, layoutResource, newContext, userID, sortCallback);
-
-            if (user != null) {
-                dailyResetOffset = user.getPreferences().getDayStart();
-            }
-        }
-
-        @Override
-        protected void injectThis(AppComponent component) {
-            component.inject(this);
-        }
-
-        @Override
-        public boolean loadFromDatabase() {
-            return false;
-        }
-
-        @Override
-        public int getItemViewType(int position) {
-            Task task = this.filteredContent.get(position);
-
-            if (task.type.equals(Task.TYPE_HABIT))
-                return TYPE_HABIT;
-
-            if (task.type.equals(Task.TYPE_DAILY))
-                return TYPE_DAILY;
-
-            if (task.type.equals(Task.TYPE_TODO))
-                return TYPE_TODO;
-
-            if (task.type.equals(Task.TYPE_REWARD))
-                return TYPE_REWARD;
-
-            return TYPE_HEADER;
-        }
-
-        @Override
-        public BaseTaskViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-            BaseTaskViewHolder viewHolder;
-
-            switch (viewType) {
-                case TYPE_HABIT:
-                    viewHolder = new HabitViewHolder(getContentView(parent, R.layout.habit_item_card));
-                    break;
-                case TYPE_DAILY:
-                    viewHolder = new DailyViewHolder(getContentView(parent, R.layout.daily_item_card), dailyResetOffset);
-                    break;
-                case TYPE_TODO:
-                    viewHolder = new TodoViewHolder(getContentView(parent, R.layout.todo_item_card));
-                    break;
-                case TYPE_REWARD:
-                    viewHolder = new RewardViewHolder(getContentView(parent, R.layout.reward_item_card));
-                    break;
-                default:
-                    viewHolder = new DividerViewHolder(getContentView(parent, R.layout.challenge_task_divider));
-                    break;
-            }
-
-            //viewHolder.setDisabled(true);
-            return viewHolder;
-        }
-    }
-
-    private class DividerViewHolder extends BaseTaskViewHolder {
-
-        private TextView divider_name;
-
-        public DividerViewHolder(View itemView) {
-            super(itemView, false);
-
-            divider_name = (TextView) itemView.findViewById(R.id.divider_name);
-
-            context = itemView.getContext();
-        }
-
-        @Override
-        public void bindHolder(Task newTask, int position) {
-            divider_name.setText(newTask.text);
-        }
-    }
-
-    // endregion
-}
+package com.habitrpg.android.habitica.ui.fragments.social.challenges;
+
+
+import android.content.Context;
+import android.databinding.ObservableList;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+public class ChallengeTasksRecyclerViewFragment extends BaseFragment {
+    public RecyclerView recyclerView;
+    public BaseTasksRecyclerViewAdapter recyclerAdapter;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userID;
+
+    ObservableList<Task> tasksOnInitialize;
+
+    LinearLayoutManager layoutManager = null;
+    private HabitRPGUser user;
+    private View view;
+
+    public static ChallengeTasksRecyclerViewFragment newInstance(HabitRPGUser user, ObservableList<Task> tasks) {
+        ChallengeTasksRecyclerViewFragment fragment = new ChallengeTasksRecyclerViewFragment();
+        fragment.setRetainInstance(true);
+        fragment.user = user;
+        fragment.tasksOnInitialize = tasks;
+
+        if (tasks.size() != 0 && fragment.recyclerAdapter != null) {
+            fragment.recyclerAdapter.setTasks(tasks);
+        }
+
+        tasks.addOnListChangedCallback(new ObservableList.OnListChangedCallback<ObservableList<Task>>() {
+            @Override
+            public void onChanged(ObservableList<Task> tasks) {
+            }
+
+            @Override
+            public void onItemRangeChanged(ObservableList<Task> tasks, int i, int i1) {
+
+            }
+
+            @Override
+            public void onItemRangeInserted(ObservableList<Task> tasks, int i, int i1) {
+                fragment.recyclerAdapter.setTasks(tasks);
+            }
+
+            @Override
+            public void onItemRangeMoved(ObservableList<Task> tasks, int i, int i1, int i2) {
+
+            }
+
+
+            @Override
+            public void onItemRangeRemoved(ObservableList<Task> tasks, int i, int i1) {
+
+            }
+        });
+
+        return fragment;
+    }
+
+    public void setInnerAdapter() {
+        this.recyclerAdapter = new ChallengeTasksRecyclerViewAdapter(null, 0, getContext(), userID, null);
+
+        if (tasksOnInitialize != null && tasksOnInitialize.size() != 0 && recyclerAdapter != null && recyclerAdapter.getItemCount() == 0) {
+            recyclerAdapter.setTasks(tasksOnInitialize);
+        }
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (view == null) {
+            view = inflater.inflate(R.layout.fragment_recyclerview, container, false);
+
+            recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
+
+            android.support.v4.app.FragmentActivity context = getActivity();
+
+            layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+
+            if (layoutManager == null) {
+                layoutManager = new LinearLayoutManager(context);
+
+                recyclerView.setLayoutManager(layoutManager);
+            }
+            if (recyclerView.getAdapter() == null) {
+                this.setInnerAdapter();
+            }
+        }
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        recyclerView.setAdapter(recyclerAdapter);
+    }
+
+    @Override
+    public String getDisplayedClassName() {
+        return "ChallengeTasks" + super.getDisplayedClassName();
+    }
+
+
+    // region Challenge specific RecyclerViewAdapters
+
+    public class ChallengeTasksRecyclerViewAdapter extends SortableTasksRecyclerViewAdapter<BaseTaskViewHolder> {
+        private static final int TYPE_HEADER = 0;
+        private static final int TYPE_HABIT = 1;
+        private static final int TYPE_DAILY = 2;
+        private static final int TYPE_TODO = 3;
+        private static final int TYPE_REWARD = 4;
+
+        private int dailyResetOffset = 0;
+
+        public ChallengeTasksRecyclerViewAdapter(@Nullable TaskFilterHelper taskFilterHelper, int layoutResource, Context newContext, String userID, @Nullable SortTasksCallback sortCallback) {
+            super("", taskFilterHelper, layoutResource, newContext, userID, sortCallback);
+
+            if (user != null) {
+                dailyResetOffset = user.getPreferences().getDayStart();
+            }
+        }
+
+        @Override
+        protected void injectThis(AppComponent component) {
+            component.inject(this);
+        }
+
+        @Override
+        public boolean loadFromDatabase() {
+            return false;
+        }
+
+        @Override
+        public int getItemViewType(int position) {
+            Task task = this.filteredContent.get(position);
+
+            if (task.type.equals(Task.TYPE_HABIT))
+                return TYPE_HABIT;
+
+            if (task.type.equals(Task.TYPE_DAILY))
+                return TYPE_DAILY;
+
+            if (task.type.equals(Task.TYPE_TODO))
+                return TYPE_TODO;
+
+            if (task.type.equals(Task.TYPE_REWARD))
+                return TYPE_REWARD;
+
+            return TYPE_HEADER;
+        }
+
+        @Override
+        public BaseTaskViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            BaseTaskViewHolder viewHolder;
+
+            switch (viewType) {
+                case TYPE_HABIT:
+                    viewHolder = new HabitViewHolder(getContentView(parent, R.layout.habit_item_card));
+                    break;
+                case TYPE_DAILY:
+                    viewHolder = new DailyViewHolder(getContentView(parent, R.layout.daily_item_card), dailyResetOffset);
+                    break;
+                case TYPE_TODO:
+                    viewHolder = new TodoViewHolder(getContentView(parent, R.layout.todo_item_card));
+                    break;
+                case TYPE_REWARD:
+                    viewHolder = new RewardViewHolder(getContentView(parent, R.layout.reward_item_card));
+                    break;
+                default:
+                    viewHolder = new DividerViewHolder(getContentView(parent, R.layout.challenge_task_divider));
+                    break;
+            }
+
+            //viewHolder.setDisabled(true);
+            return viewHolder;
+        }
+    }
+
+    private class DividerViewHolder extends BaseTaskViewHolder {
+
+        private TextView divider_name;
+
+        public DividerViewHolder(View itemView) {
+            super(itemView, false);
+
+            divider_name = (TextView) itemView.findViewById(R.id.divider_name);
+
+            context = itemView.getContext();
+        }
+
+        @Override
+        public void bindHolder(Task newTask, int position) {
+            divider_name.setText(newTask.text);
+        }
+    }
+
+    // endregion
+}
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 979d600fb..5dbf20391 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengesOverviewFragment.java
@@ -1,194 +1,191 @@
-package com.habitrpg.android.habitica.ui.fragments.social.challenges;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
-import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
-import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import org.greenrobot.eventbus.Subscribe;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Stack;
-
-import javax.inject.Inject;
-
-import rx.subjects.PublishSubject;
-
-public class ChallengesOverviewFragment extends BaseMainFragment {
-
-    @Inject
-    SocialRepository socialRepository;
-
-    public ViewPager viewPager;
-    public FragmentStatePagerAdapter statePagerAdapter;
-    int currentPage;
-    private Stack<Integer> pageHistory;
-    private boolean saveToHistory;
-    private PublishSubject<List<Challenge>> getUserChallengesObservable;
-    private ChallengeListFragment userChallengesFragment;
-    private ChallengeListFragment availableChallengesFragment;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        this.usesTabLayout = true;
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
-
-        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
-
-        setViewPagerAdapter();
-
-        getUserChallengesObservable = PublishSubject.create();
-
-        subscribeGetChallenges();
-
-        userChallengesFragment = new ChallengeListFragment();
-        userChallengesFragment.setUser(this.user);
-        userChallengesFragment.setRefreshingCallback(this::subscribeGetChallenges);
-        userChallengesFragment.setObservable(getUserChallengesObservable);
-        userChallengesFragment.setViewUserChallengesOnly(true);
-        userChallengesFragment.setWithFilter(true);
-
-        availableChallengesFragment = new ChallengeListFragment();
-        availableChallengesFragment.setUser(this.user);
-        availableChallengesFragment.setRefreshingCallback(this::subscribeGetChallenges);
-        availableChallengesFragment.setObservable(getUserChallengesObservable);
-        availableChallengesFragment.setViewUserChallengesOnly(false);
-
-        pageHistory = new Stack<>();
-
-        return v;
-    }
-
-    private void subscribeGetChallenges() {
-        this.socialRepository.getUserChallenges()
-                .subscribe(challenges -> getUserChallengesObservable.onNext(challenges),
-                        e -> getUserChallengesObservable.onError(e));
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    public void setViewPagerAdapter() {
-        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
-
-        statePagerAdapter = new FragmentStatePagerAdapter(fragmentManager) {
-
-            @Override
-            public Fragment getItem(int position) {
-                Fragment fragment = new Fragment();
-
-                switch (position) {
-                    case 0:
-                        return userChallengesFragment;
-                    case 1:
-                        return availableChallengesFragment;
-                }
-
-                return fragment;
-            }
-
-            @Override
-            public int getCount() {
-                return 2;
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                switch (position) {
-                    case 0:
-                        return getString(R.string.my_challenges);
-                    case 1:
-                        return getString(R.string.public_challenges);
-                }
-                return "";
-            }
-        };
-        viewPager.setAdapter(statePagerAdapter);
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-
-            @Override
-            public void onPageSelected(int newPageId) {
-                if (saveToHistory)
-                    pageHistory.push(currentPage);
-
-                currentPage = newPageId;
-            }
-
-            @Override
-            public void onPageScrolled(int arg0, float arg1, int arg2) {
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int arg0) {
-            }
-        });
-        saveToHistory = true;
-
-        if (tabLayout != null && viewPager != null) {
-            tabLayout.setupWithViewPager(viewPager);
-        }
-    }
-
-    @Subscribe
-    public void onEvent(ShowChallengeDetailDialogCommand cmd) {
-        Challenge challenge = new Select().from(Challenge.class).where(Condition.column("id").is(cmd.challengeId)).querySingle();
-
-        ChallengeDetailDialogHolder.showDialog(getActivity(), apiClient, user, challenge, challenge1 ->  {
-            // challenge joined
-            userChallengesFragment.addItem(challenge1);
-            availableChallengesFragment.updateItem(challenge1);
-        }, challenge1 -> {
-            // challenge left
-            userChallengesFragment.onRefresh();
-            availableChallengesFragment.onRefresh();
-        });
-    }
-
-    @Subscribe
-    public void onEvent(ShowChallengeDetailActivityCommand cmd) {
-        Bundle bundle = new Bundle();
-        bundle.putString(ChallengeDetailActivity.CHALLENGE_ID, cmd.challengeId);
-
-        Intent intent = new Intent(getActivity(), ChallengeDetailActivity.class);
-        intent.putExtras(bundle);
-        //intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        getActivity().startActivity(intent);
-    }
-
-    public boolean onHandleBackPressed() {
-        if (!pageHistory.empty()) {
-            saveToHistory = false;
-            viewPager.setCurrentItem(pageHistory.pop());
-            saveToHistory = true;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.challenges);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.social.challenges;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.ViewPager;
+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.data.SocialRepository;
+import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
+import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.List;
+import java.util.Stack;
+
+import javax.inject.Inject;
+
+import rx.subjects.PublishSubject;
+
+public class ChallengesOverviewFragment extends BaseMainFragment {
+
+    @Inject
+    SocialRepository socialRepository;
+
+    public ViewPager viewPager;
+    public FragmentStatePagerAdapter statePagerAdapter;
+    int currentPage;
+    private Stack<Integer> pageHistory;
+    private boolean saveToHistory;
+    private PublishSubject<List<Challenge>> getUserChallengesObservable;
+    private ChallengeListFragment userChallengesFragment;
+    private ChallengeListFragment availableChallengesFragment;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        this.usesTabLayout = true;
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
+
+        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
+
+        setViewPagerAdapter();
+
+        getUserChallengesObservable = PublishSubject.create();
+
+        subscribeGetChallenges();
+
+        userChallengesFragment = new ChallengeListFragment();
+        userChallengesFragment.setUser(this.user);
+        userChallengesFragment.setRefreshingCallback(this::subscribeGetChallenges);
+        userChallengesFragment.setObservable(getUserChallengesObservable);
+        userChallengesFragment.setViewUserChallengesOnly(true);
+        userChallengesFragment.setWithFilter(true);
+
+        availableChallengesFragment = new ChallengeListFragment();
+        availableChallengesFragment.setUser(this.user);
+        availableChallengesFragment.setRefreshingCallback(this::subscribeGetChallenges);
+        availableChallengesFragment.setObservable(getUserChallengesObservable);
+        availableChallengesFragment.setViewUserChallengesOnly(false);
+
+        pageHistory = new Stack<>();
+
+        return v;
+    }
+
+    private void subscribeGetChallenges() {
+        this.socialRepository.getUserChallenges()
+                .subscribe(challenges -> getUserChallengesObservable.onNext(challenges),
+                        e -> getUserChallengesObservable.onError(e));
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    public void setViewPagerAdapter() {
+        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
+
+        statePagerAdapter = new FragmentStatePagerAdapter(fragmentManager) {
+
+            @Override
+            public Fragment getItem(int position) {
+                Fragment fragment = new Fragment();
+
+                switch (position) {
+                    case 0:
+                        return userChallengesFragment;
+                    case 1:
+                        return availableChallengesFragment;
+                }
+
+                return fragment;
+            }
+
+            @Override
+            public int getCount() {
+                return 2;
+            }
+
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return getString(R.string.my_challenges);
+                    case 1:
+                        return getString(R.string.public_challenges);
+                }
+                return "";
+            }
+        };
+        viewPager.setAdapter(statePagerAdapter);
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+
+            @Override
+            public void onPageSelected(int newPageId) {
+                if (saveToHistory)
+                    pageHistory.push(currentPage);
+
+                currentPage = newPageId;
+            }
+
+            @Override
+            public void onPageScrolled(int arg0, float arg1, int arg2) {
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int arg0) {
+            }
+        });
+        saveToHistory = true;
+
+        if (tabLayout != null && viewPager != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
+    }
+
+    @Subscribe
+    public void onEvent(ShowChallengeDetailDialogCommand cmd) {
+        socialRepository.getChallenge(cmd.challengeId).subscribe(challenge -> {
+            ChallengeDetailDialogHolder.showDialog(getActivity(), apiClient, user, challenge, challenge1 ->  {
+                // challenge joined
+                userChallengesFragment.addItem(challenge1);
+                availableChallengesFragment.updateItem(challenge1);
+            }, challenge1 -> {
+                // challenge left
+                userChallengesFragment.onRefresh();
+                availableChallengesFragment.onRefresh();
+            });
+        }, throwable -> {});
+    }
+
+    @Subscribe
+    public void onEvent(ShowChallengeDetailActivityCommand cmd) {
+        Bundle bundle = new Bundle();
+        bundle.putString(ChallengeDetailActivity.CHALLENGE_ID, cmd.challengeId);
+
+        Intent intent = new Intent(getActivity(), ChallengeDetailActivity.class);
+        intent.putExtras(bundle);
+        //intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        getActivity().startActivity(intent);
+    }
+
+    public boolean onHandleBackPressed() {
+        if (!pageHistory.empty()) {
+            saveToHistory = false;
+            viewPager.setCurrentItem(pageHistory.pop());
+            saveToHistory = true;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.challenges);
+    }
+}
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 2b38916b9..571d3b69a 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
@@ -1,377 +1,377 @@
-package com.habitrpg.android.habitica.ui.fragments.social.party;
-
-import com.habitrpg.android.habitica.ContentCache;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.SocialRepository;
-import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
-import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity;
-import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.GroupInformationFragment;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.social.UserParty;
-
-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;
-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 java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-
-public class PartyFragment extends BaseMainFragment {
-
-    @Inject
-    SocialRepository socialRepository;
-
-    public ViewPager viewPager;
-    @Inject
-    ContentCache contentCache;
-    @Nullable
-    private Group group;
-    private PartyMemberListFragment partyMemberListFragment;
-    private GroupInformationFragment groupInformationFragment;
-    private ChatListFragment chatListFragment;
-    private FragmentPagerAdapter viewPagerAdapter;
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        this.usesTabLayout = true;
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
-
-        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
-
-        viewPager.setCurrentItem(0);
-
-        // Get the full group data
-        if (this.user != null && this.user.getParty() != null && this.user.getParty().id != null) {
-            socialRepository.getGroup("party")
-                    .filter(group1 -> group1 != null)
-                    .subscribe(group -> {
-                        if (group == null) {
-                            return;
-                        }
-                        PartyFragment.this.group = group;
-
-                        updateGroupUI();
-
-                        socialRepository.getGroupMembers(group.id, true)
-                                .subscribe(members -> {
-                                            PartyFragment.this.group.members = members;
-                                            updateGroupUI();
-                                        },
-                                        throwable -> {
-                                        });
-                    }, throwable -> {
-                    });
-        }
-
-
-        setViewPagerAdapter();
-        this.tutorialStepIdentifier = "party";
-        this.tutorialText = getString(R.string.tutorial_party);
-
-        updateGroupUI();
-
-        return v;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    private void updateGroupUI() {
-        if (viewPagerAdapter != null) {
-            viewPagerAdapter.notifyDataSetChanged();
-        }
-
-        if (tabLayout != null) {
-            if (group == null) {
-                tabLayout.setVisibility(View.GONE);
-                return;
-            } else {
-                tabLayout.setVisibility(View.VISIBLE);
-            }
-        }
-
-        if (partyMemberListFragment != null && group != null) {
-            partyMemberListFragment.setMemberList(group.members);
-        }
-
-        if (groupInformationFragment != null) {
-            groupInformationFragment.setGroup(group);
-        }
-
-        if (chatListFragment != null && group != null) {
-            chatListFragment.seenGroupId = group.id;
-        }
-
-        if (this.activity != null) {
-            this.activity.supportInvalidateOptionsMenu();
-        }
-
-        if (group != null && group.quest != null && group.quest.key != null && !group.quest.key.isEmpty()) {
-            contentCache.getQuestContent(group.quest.key, content -> {
-                if (groupInformationFragment != null) {
-                    groupInformationFragment.setQuestContent(content);
-                }
-            });
-        }
-
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (this.group != null && this.user != null) {
-            if (this.group.leaderID.equals(this.user.getId())) {
-                inflater.inflate(R.menu.menu_party_admin, menu);
-            } else {
-                inflater.inflate(R.menu.menu_party, menu);
-            }
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-
-        switch (id) {
-            case R.id.menu_invite_item:
-                Intent intent = new Intent(getActivity(), PartyInviteActivity.class);
-                startActivityForResult(intent, PartyInviteActivity.RESULT_SEND_INVITES);
-                return true;
-            case R.id.menu_guild_edit:
-                this.displayEditForm();
-                return true;
-            case R.id.menu_guild_leave:
-                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) ->  {
-                            if (this.group != null){
-                                this.socialRepository.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;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void displayEditForm() {
-        Bundle bundle = new Bundle();
-        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);
-
-        Intent intent = new Intent(activity, GroupFormActivity.class);
-        intent.putExtras(bundle);
-        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        startActivityForResult(intent, GroupFormActivity.GROUP_FORM_ACTIVITY);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        switch (requestCode) {
-            case (GroupFormActivity.GROUP_FORM_ACTIVITY): {
-                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;
-                    }
-                    if (this.group.description != null && !this.group.description.equals(bundle.getString("description"))) {
-                        this.group.description = bundle.getString("description");
-                        needsSaving = true;
-                    }
-                    if (this.group.leaderID != null && !this.group.leaderID.equals(bundle.getString("leader"))) {
-                        this.group.leaderID = bundle.getString("leader");
-                        needsSaving = true;
-                    }
-                    if (this.group.privacy != null && !this.group.privacy.equals(bundle.getString("privacy"))) {
-                        this.group.privacy = bundle.getString("privacy");
-                        needsSaving = true;
-                    }
-                    if (needsSaving) {
-                        this.socialRepository.updateGroup(this.group)
-                                .subscribe(aVoid -> {
-                                }, throwable -> {
-                                });
-                        this.groupInformationFragment.setGroup(group);
-                    }
-                }
-                break;
-            }
-            case (PartyInviteActivity.RESULT_SEND_INVITES): {
-                if (resultCode == Activity.RESULT_OK) {
-                    Map<String, Object> inviteData = new HashMap<>();
-                    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<>();
-                        for (String email : emails) {
-                            HashMap<String, String> invite = new HashMap<>();
-                            invite.put("name", "");
-                            invite.put("email", email);
-                            invites.add(invite);
-                        }
-                        inviteData.put("emails", invites);
-                    } else {
-                        String[] userIDs = data.getStringArrayExtra(PartyInviteActivity.USER_IDS_KEY);
-                        List<String> invites = new ArrayList<>();
-                        Collections.addAll(invites, userIDs);
-                        inviteData.put("uuids", invites);
-                    }
-                    if (this.group != null) {
-                        this.socialRepository.inviteToGroup(this.group.id, inviteData)
-                                .subscribe(aVoid -> {
-                                }, throwable -> {
-                                });
-                    }
-                }
-            }
-        }
-    }
-
-    public void setViewPagerAdapter() {
-        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
-        if (this.user == null) {
-            return;
-        }
-
-        UserParty party = this.user.getParty();
-
-        if (party == null) {
-            return;
-        }
-
-        viewPagerAdapter = new FragmentPagerAdapter(fragmentManager) {
-
-            @Override
-            public Fragment getItem(int position) {
-
-                Fragment fragment;
-
-                switch (position) {
-                    case 0: {
-                        fragment = groupInformationFragment = GroupInformationFragment.newInstance(group, user);
-                        break;
-                    }
-                    case 1: {
-                        chatListFragment = new ChatListFragment();
-                        chatListFragment.configure("party", user, false);
-                        fragment = chatListFragment;
-                        break;
-                    }
-                    case 2: {
-                        partyMemberListFragment = new PartyMemberListFragment();
-                        if (group != null) {
-                            partyMemberListFragment.configure(activity, group.members);
-
-                        } else {
-                            partyMemberListFragment.configure(activity, null);
-                        }
-                        fragment = partyMemberListFragment;
-                        break;
-                    }
-                    default:
-                        fragment = new Fragment();
-                }
-
-                return fragment;
-            }
-
-            @Override
-            public int getCount() {
-                if (group == null) {
-                    return 1;
-                } else {
-                    return 3;
-                }
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                switch (position) {
-                    case 0:
-                        return getContext().getString(R.string.party);
-                    case 1:
-                        return getContext().getString(R.string.chat);
-                    case 2:
-                        return getContext().getString(R.string.members);
-                }
-                return "";
-            }
-        };
-        this.viewPager.setAdapter(viewPagerAdapter);
-
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                if (position == 1 && group != null) {
-                    if (chatListFragment != null) {
-                        chatListFragment.setNavigatedToFragment(group.id);
-
-                    }
-                }
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                if (position == 1 && group != null) {
-                    if (chatListFragment != null) {
-                        chatListFragment.setNavigatedToFragment(group.id);
-                    }
-                }
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-        if (tabLayout != null) {
-            tabLayout.setupWithViewPager(viewPager);
-        }
-    }
-
-
-    @Override
-    public String customTitle() {
-        return getString(R.string.sidebar_party);
-    }
-
-}
+package com.habitrpg.android.habitica.ui.fragments.social.party;
+
+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;
+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 com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.social.UserParty;
+import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
+import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity;
+import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.GroupInformationFragment;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+
+public class PartyFragment extends BaseMainFragment {
+
+    @Inject
+    SocialRepository socialRepository;
+
+    public ViewPager viewPager;
+    @Inject
+    InventoryRepository inventoryRepository;
+    @Nullable
+    private Group group;
+    private PartyMemberListFragment partyMemberListFragment;
+    private GroupInformationFragment groupInformationFragment;
+    private ChatListFragment chatListFragment;
+    private FragmentPagerAdapter viewPagerAdapter;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        this.usesTabLayout = true;
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
+
+        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
+
+        viewPager.setCurrentItem(0);
+
+        // Get the full group data
+        if (this.user != null && this.user.getParty() != null && this.user.getParty().id != null) {
+            socialRepository.getGroup("party")
+                    .filter(group1 -> group1 != null)
+                    .subscribe(group -> {
+                        if (group == null) {
+                            return;
+                        }
+                        PartyFragment.this.group = group;
+
+                        updateGroupUI();
+
+                        socialRepository.getGroupMembers(group.id, true)
+                                .subscribe(members -> {
+                                            PartyFragment.this.group.members = members;
+                                            updateGroupUI();
+                                        },
+                                        throwable -> {
+                                        });
+                    }, throwable -> {
+                    });
+        }
+
+
+        setViewPagerAdapter();
+        this.tutorialStepIdentifier = "party";
+        this.tutorialText = getString(R.string.tutorial_party);
+
+        updateGroupUI();
+
+        return v;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    private void updateGroupUI() {
+        if (viewPagerAdapter != null) {
+            viewPagerAdapter.notifyDataSetChanged();
+        }
+
+        if (tabLayout != null) {
+            if (group == null) {
+                tabLayout.setVisibility(View.GONE);
+                return;
+            } else {
+                tabLayout.setVisibility(View.VISIBLE);
+            }
+        }
+
+        if (partyMemberListFragment != null && group != null) {
+            partyMemberListFragment.setMemberList(group.members);
+        }
+
+        if (groupInformationFragment != null) {
+            groupInformationFragment.setGroup(group);
+        }
+
+        if (chatListFragment != null && group != null) {
+            chatListFragment.seenGroupId = group.id;
+        }
+
+        if (this.activity != null) {
+            this.activity.supportInvalidateOptionsMenu();
+        }
+
+        if (group != null && group.quest != null && group.quest.key != null && !group.quest.key.isEmpty()) {
+            inventoryRepository.getQuestContent(group.quest.key).subscribe(content -> {
+                if (groupInformationFragment != null) {
+                    groupInformationFragment.setQuestContent(content);
+                }
+            }, throwable -> {});
+        }
+
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (this.group != null && this.user != null) {
+            if (this.group.leaderID.equals(this.user.getId())) {
+                inflater.inflate(R.menu.menu_party_admin, menu);
+            } else {
+                inflater.inflate(R.menu.menu_party, menu);
+            }
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        switch (id) {
+            case R.id.menu_invite_item:
+                Intent intent = new Intent(getActivity(), PartyInviteActivity.class);
+                startActivityForResult(intent, PartyInviteActivity.RESULT_SEND_INVITES);
+                return true;
+            case R.id.menu_guild_edit:
+                this.displayEditForm();
+                return true;
+            case R.id.menu_guild_leave:
+                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) ->  {
+                            if (this.group != null){
+                                this.socialRepository.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;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void displayEditForm() {
+        Bundle bundle = new Bundle();
+        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);
+
+        Intent intent = new Intent(activity, GroupFormActivity.class);
+        intent.putExtras(bundle);
+        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        startActivityForResult(intent, GroupFormActivity.GROUP_FORM_ACTIVITY);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        switch (requestCode) {
+            case (GroupFormActivity.GROUP_FORM_ACTIVITY): {
+                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;
+                    }
+                    if (this.group.description != null && !this.group.description.equals(bundle.getString("description"))) {
+                        this.group.description = bundle.getString("description");
+                        needsSaving = true;
+                    }
+                    if (this.group.leaderID != null && !this.group.leaderID.equals(bundle.getString("leader"))) {
+                        this.group.leaderID = bundle.getString("leader");
+                        needsSaving = true;
+                    }
+                    if (this.group.privacy != null && !this.group.privacy.equals(bundle.getString("privacy"))) {
+                        this.group.privacy = bundle.getString("privacy");
+                        needsSaving = true;
+                    }
+                    if (needsSaving) {
+                        this.socialRepository.updateGroup(this.group)
+                                .subscribe(aVoid -> {
+                                }, throwable -> {
+                                });
+                        this.groupInformationFragment.setGroup(group);
+                    }
+                }
+                break;
+            }
+            case (PartyInviteActivity.RESULT_SEND_INVITES): {
+                if (resultCode == Activity.RESULT_OK) {
+                    Map<String, Object> inviteData = new HashMap<>();
+                    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<>();
+                        for (String email : emails) {
+                            HashMap<String, String> invite = new HashMap<>();
+                            invite.put("name", "");
+                            invite.put("email", email);
+                            invites.add(invite);
+                        }
+                        inviteData.put("emails", invites);
+                    } else {
+                        String[] userIDs = data.getStringArrayExtra(PartyInviteActivity.USER_IDS_KEY);
+                        List<String> invites = new ArrayList<>();
+                        Collections.addAll(invites, userIDs);
+                        inviteData.put("uuids", invites);
+                    }
+                    if (this.group != null) {
+                        this.socialRepository.inviteToGroup(this.group.id, inviteData)
+                                .subscribe(aVoid -> {
+                                }, throwable -> {
+                                });
+                    }
+                }
+            }
+        }
+    }
+
+    public void setViewPagerAdapter() {
+        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
+        if (this.user == null) {
+            return;
+        }
+
+        UserParty party = this.user.getParty();
+
+        if (party == null) {
+            return;
+        }
+
+        viewPagerAdapter = new FragmentPagerAdapter(fragmentManager) {
+
+            @Override
+            public Fragment getItem(int position) {
+
+                Fragment fragment;
+
+                switch (position) {
+                    case 0: {
+                        fragment = groupInformationFragment = GroupInformationFragment.newInstance(group, user);
+                        break;
+                    }
+                    case 1: {
+                        chatListFragment = new ChatListFragment();
+                        chatListFragment.configure("party", user, false);
+                        fragment = chatListFragment;
+                        break;
+                    }
+                    case 2: {
+                        partyMemberListFragment = new PartyMemberListFragment();
+                        if (group != null) {
+                            partyMemberListFragment.configure(activity, group.members);
+
+                        } else {
+                            partyMemberListFragment.configure(activity, null);
+                        }
+                        fragment = partyMemberListFragment;
+                        break;
+                    }
+                    default:
+                        fragment = new Fragment();
+                }
+
+                return fragment;
+            }
+
+            @Override
+            public int getCount() {
+                if (group == null) {
+                    return 1;
+                } else {
+                    return 3;
+                }
+            }
+
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return getContext().getString(R.string.party);
+                    case 1:
+                        return getContext().getString(R.string.chat);
+                    case 2:
+                        return getContext().getString(R.string.members);
+                }
+                return "";
+            }
+        };
+        this.viewPager.setAdapter(viewPagerAdapter);
+
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+                if (position == 1 && group != null) {
+                    if (chatListFragment != null) {
+                        chatListFragment.setNavigatedToFragment(group.id);
+
+                    }
+                }
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                if (position == 1 && group != null) {
+                    if (chatListFragment != null) {
+                        chatListFragment.setNavigatedToFragment(group.id);
+                    }
+                }
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+        if (tabLayout != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
+    }
+
+
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_party);
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java
index dea24400a..e86e75a73 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragment.java
@@ -1,10 +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.prefs.scanner.IntentIntegrator;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.InputType;
@@ -15,6 +10,11 @@ import android.widget.EditText;
 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.prefs.scanner.IntentIntegrator;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+
 import java.util.ArrayList;
 import java.util.List;
 
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 76628b901..f94d5feea 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,73 +1,73 @@
-package com.habitrpg.android.habitica.ui.fragments.social.party;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-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.adapter.social.PartyMemberRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-
-import java.util.List;
-
-import butterknife.BindView;
-
-/**
- * Created by Negue on 15.09.2015.
- */
-public class PartyMemberListFragment extends BaseFragment {
-
-    @BindView(R.id.recyclerView)
-    RecyclerView mRecyclerView;
-    private Context ctx;
-    private List<HabitRPGUser> members;
-    private PartyMemberRecyclerViewAdapter viewAdapter;
-    private View view;
-
-    public void configure(@Nullable Context ctx, @Nullable List<HabitRPGUser> members) {
-        this.ctx = ctx;
-        this.members = members;
-
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        if (view == null)
-            view = inflater.inflate(R.layout.fragment_party_memberlist, container, false);
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
-        viewAdapter = new PartyMemberRecyclerViewAdapter();
-        viewAdapter.context = this.ctx;
-        mRecyclerView.setAdapter(viewAdapter);
-
-        if (members != null) {
-            setMemberList(members);
-        }
-    }
-
-    public void setMemberList(List<HabitRPGUser> members) {
-        this.members = members;
-        viewAdapter.setMemberList(members, false);
-    }
-
-}
+package com.habitrpg.android.habitica.ui.fragments.social.party;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+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.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+
+import java.util.List;
+
+import butterknife.BindView;
+
+/**
+ * Created by Negue on 15.09.2015.
+ */
+public class PartyMemberListFragment extends BaseFragment {
+
+    @BindView(R.id.recyclerView)
+    RecyclerView mRecyclerView;
+    private Context ctx;
+    private List<HabitRPGUser> members;
+    private PartyMemberRecyclerViewAdapter viewAdapter;
+    private View view;
+
+    public void configure(@Nullable Context ctx, @Nullable List<HabitRPGUser> members) {
+        this.ctx = ctx;
+        this.members = members;
+
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        if (view == null)
+            view = inflater.inflate(R.layout.fragment_party_memberlist, container, false);
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+        viewAdapter = new PartyMemberRecyclerViewAdapter();
+        viewAdapter.context = this.ctx;
+        mRecyclerView.setAdapter(viewAdapter);
+
+        if (members != null) {
+            setMemberList(members);
+        }
+    }
+
+    public void setMemberList(List<HabitRPGUser> members) {
+        this.members = members;
+        viewAdapter.setMemberList(members, false);
+    }
+
+}
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 5ebaf6d17..040d23323 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,378 +1,381 @@
-package com.habitrpg.android.habitica.ui.fragments.tasks;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.TaskCreatedEvent;
-import com.habitrpg.android.habitica.events.TaskRemovedEvent;
-import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
-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.TaskFilterHelper;
-import com.habitrpg.android.habitica.modules.AppModule;
-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;
-import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter;
-import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
-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.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-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, SwipeRefreshLayout.OnRefreshListener {
-    private static final String CLASS_TYPE_KEY = "CLASS_TYPE_KEY";
-    public BaseTasksRecyclerViewAdapter recyclerAdapter;
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    String userID;
-    @Inject
-    ApiClient apiClient;
-    @Inject
-    TaskFilterHelper taskFilterHelper;
-    @Inject
-    UserRepository userRepository;
-
-    LinearLayoutManager layoutManager = null;
-
-    @BindView(R.id.refresh_layout)
-    SwipeRefreshLayout swipeRefreshLayout;
-    @BindView(R.id.recyclerView)
-    public RecyclerViewEmptySupport recyclerView;
-
-    @BindView(R.id.empty_view)
-    ViewGroup emptyView;
-    @BindView(R.id.empty_view_title)
-    TextView emptyViewTitle;
-    @BindView(R.id.empty_view_description)
-    TextView emptyViewDescription;
-
-    @Nullable
-    String classType;
-    @Nullable
-    private HabitRPGUser user;
-    private View view;
-    @Nullable
-    private SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback;
-    private ItemTouchHelper.Callback mItemTouchCallback;
-
-    public static TaskRecyclerViewFragment newInstance(Context context, @Nullable HabitRPGUser user, String classType,
-                                                       @Nullable SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback) {
-        TaskRecyclerViewFragment fragment = new TaskRecyclerViewFragment();
-        fragment.setRetainInstance(true);
-        fragment.user = user;
-        fragment.classType = classType;
-        fragment.sortCallback = sortCallback;
-        List<String> tutorialTexts = null;
-        switch (fragment.classType) {
-            case Task.TYPE_HABIT: {
-                fragment.tutorialStepIdentifier = "habits";
-                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_overview),
-                        context.getString(R.string.tutorial_habits_1),
-                        context.getString(R.string.tutorial_habits_2),
-                        context.getString(R.string.tutorial_habits_3),
-                        context.getString(R.string.tutorial_habits_4));
-                break;
-            }
-            case Task.FREQUENCY_DAILY: {
-                fragment.tutorialStepIdentifier = "dailies";
-                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_dailies_1),
-                        context.getString(R.string.tutorial_dailies_2));
-                break;
-            }
-            case Task.TYPE_TODO: {
-                fragment.tutorialStepIdentifier = "todos";
-                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_todos_1),
-                        context.getString(R.string.tutorial_todos_2));
-                break;
-            }
-            case Task.TYPE_REWARD: {
-                fragment.tutorialStepIdentifier = "rewards";
-                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_rewards_1),
-                        context.getString(R.string.tutorial_rewards_2));
-                break;
-            }
-        }
-
-        if (tutorialTexts != null) {
-            fragment.tutorialTexts = new ArrayList<>(tutorialTexts);
-        }
-        fragment.tutorialCanBeDeferred = false;
-
-        return fragment;
-    }
-
-    // TODO needs a bit of cleanup
-    public void setInnerAdapter() {
-        int layoutOfType;
-        if (this.classType != null) {
-            switch (this.classType) {
-                case Task.TYPE_HABIT:
-                    layoutOfType = R.layout.habit_item_card;
-                    this.recyclerAdapter = new HabitsRecyclerViewAdapter(Task.TYPE_HABIT, taskFilterHelper, layoutOfType, getContext(), userID, sortCallback);
-                    allowReordering();
-                    break;
-                case Task.TYPE_DAILY:
-                    layoutOfType = R.layout.daily_item_card;
-                    int dailyResetOffset = 0;
-                    if (user != null) {
-                        dailyResetOffset = user.getPreferences().getDayStart();
-                    }
-                    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, taskFilterHelper, layoutOfType, getContext(), userID, sortCallback);
-                    allowReordering();
-                    return;
-                case Task.TYPE_REWARD:
-                    layoutOfType = R.layout.reward_item_card;
-                    this.recyclerAdapter = new RewardsRecyclerViewAdapter(Task.TYPE_REWARD, taskFilterHelper, layoutOfType, getContext(), user, apiClient);
-                    break;
-            }
-        }
-    }
-
-    private void allowReordering() {
-        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(mItemTouchCallback);
-        itemTouchHelper.attachToRecyclerView(recyclerView);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-
-        if (Task.TYPE_DAILY.equals(classType)) {
-            if (user != null && user.getPreferences().getDailyDueDefaultView()) {
-                taskFilterHelper.setActiveFilter(Task.TYPE_DAILY, Task.FILTER_ACTIVE);
-            }
-        }
-
-        mItemTouchCallback = new ItemTouchHelper.Callback() {
-            private Integer mFromPosition = null;
-
-            @Override
-            public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
-                super.onSelectedChanged(viewHolder, actionState);
-                if (viewHolder != null) {
-                    viewHolder.itemView.setBackgroundColor(Color.LTGRAY);
-                }
-                if (swipeRefreshLayout != null) {
-                    swipeRefreshLayout.setEnabled(false);
-                }
-            }
-
-            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
-                if (mFromPosition == null) mFromPosition = viewHolder.getAdapterPosition();
-                ((ItemTouchHelperAdapter) recyclerAdapter).onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition());
-                return true;
-            }
-
-            @Override
-            public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-            }
-
-            //defines the enabled move directions in each state (idle, swiping, dragging).
-            @Override
-            public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-                return makeFlag(ItemTouchHelper.ACTION_STATE_DRAG,
-                        ItemTouchHelper.DOWN | ItemTouchHelper.UP);
-            }
-
-            @Override
-            public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
-                super.clearView(recyclerView, viewHolder);
-                if (swipeRefreshLayout != null) {
-                    swipeRefreshLayout.setEnabled(true);
-                }
-                
-                viewHolder.itemView.setBackgroundColor(Color.WHITE);
-                if (mFromPosition != null) {
-                    ((ItemTouchHelperDropCallback) recyclerAdapter).onDrop(mFromPosition, viewHolder.getAdapterPosition());
-                }
-            }
-        };
-
-        if (view == null) {
-            view = inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false);
-
-            ButterKnife.bind(this, view);
-
-            android.support.v4.app.FragmentActivity context = getActivity();
-
-            layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
-
-            if (layoutManager == null) {
-                layoutManager = new LinearLayoutManager(context);
-
-                recyclerView.setLayoutManager(layoutManager);
-            }
-            if (recyclerView.getAdapter() == null) {
-                this.setInnerAdapter();
-            }
-
-            int bottomPadding = (int) (recyclerView.getPaddingBottom() + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 60, getResources().getDisplayMetrics()));
-            recyclerView.setPadding(0, 0, 0, bottomPadding);
-
-            swipeRefreshLayout.setOnRefreshListener(this);
-
-            recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
-                @Override
-                public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
-                    super.onScrollStateChanged(recyclerView, newState);
-                    if (newState == RecyclerView.SCROLL_STATE_IDLE && swipeRefreshLayout != null) {
-                        swipeRefreshLayout.setEnabled(((MainActivity)getActivity()).isAppBarExpanded());
-                    }
-                }
-            });
-
-            if (this.classType != null) {
-                switch (this.classType) {
-                    case Task.TYPE_HABIT: {
-                        this.emptyViewTitle.setText(R.string.empty_title_habits);
-                        this.emptyViewDescription.setText(R.string.empty_description_habits);
-                        break;
-                    }
-                    case Task.FREQUENCY_DAILY: {
-                        this.emptyViewTitle.setText(R.string.empty_title_dailies);
-                        this.emptyViewDescription.setText(R.string.empty_description_dailies);
-                        break;
-                    }
-                    case Task.TYPE_TODO: {
-                        this.emptyViewTitle.setText(R.string.empty_title_todos);
-                        this.emptyViewDescription.setText(R.string.empty_description_todos);
-                        break;
-                    }
-                    case Task.TYPE_REWARD: {
-                        this.emptyViewTitle.setText(R.string.empty_title_rewards);
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (savedInstanceState != null) {
-            this.classType = savedInstanceState.getString(CLASS_TYPE_KEY, "");
-        }
-
-        return view;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        recyclerView.setAdapter(recyclerAdapter);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(CLASS_TYPE_KEY, this.classType);
-    }
-
-    @Override
-    public void onClick(View v) {
-        AddNewTaskCommand event = new AddNewTaskCommand();
-        event.ClassType = this.classType;
-
-        EventBus.getDefault().post(event);
-    }
-
-    @Override
-    public String getDisplayedClassName() {
-        return this.classType + super.getDisplayedClassName();
-    }
-
-    String getClassName() {
-        return this.classType != null ? this.classType : "";
-    }
-
-    @Subscribe
-    public void onEvent(FilterTasksByTagsCommand cmd) {
-        recyclerAdapter.filter();
-    }
-
-    @Subscribe
-    public void onEvent(TaskCheckedCommand event) {
-        recyclerAdapter.checkTask(event.Task, event.completed);
-    }
-
-    @Subscribe
-    public void onEvent(TaskUpdatedEvent event) {
-        recyclerAdapter.updateTask(event.task);
-    }
-
-    @Subscribe
-    public void onEvent(TaskCreatedEvent event) {
-        recyclerAdapter.addTask(event.task);
-    }
-
-    @Subscribe
-    public void onEvent(TaskRemovedEvent event) {
-        recyclerAdapter.removeTask(event.deletedTaskId);
-    }
-
-    @Override
-    public void onRefresh() {
-        swipeRefreshLayout.setRefreshing(true);
-        userRepository.retrieveUser(true)
-                .doOnTerminate(() -> swipeRefreshLayout.setRefreshing(false))
-                .subscribe(
-                        new HabitRPGUserCallback((MainActivity)getActivity()),
-                        throwable -> {}
-                );
-    }
-
-    public void setActiveFilter(String activeFilter) {
-        if (classType != null) {
-            taskFilterHelper.setActiveFilter(classType, activeFilter);
-        }
-        recyclerAdapter.filter();
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.tasks;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.events.TaskCreatedEvent;
+import com.habitrpg.android.habitica.events.TaskRemovedEvent;
+import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
+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.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.modules.AppModule;
+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;
+import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter;
+import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
+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.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+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, SwipeRefreshLayout.OnRefreshListener {
+    private static final String CLASS_TYPE_KEY = "CLASS_TYPE_KEY";
+    public BaseTasksRecyclerViewAdapter recyclerAdapter;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userID;
+    @Inject
+    ApiClient apiClient;
+    @Inject
+    TaskFilterHelper taskFilterHelper;
+    @Inject
+    UserRepository userRepository;
+    @Inject
+    InventoryRepository inventoryRepository;
+
+    LinearLayoutManager layoutManager = null;
+
+    @BindView(R.id.refresh_layout)
+    SwipeRefreshLayout swipeRefreshLayout;
+    @BindView(R.id.recyclerView)
+    public RecyclerViewEmptySupport recyclerView;
+
+    @BindView(R.id.empty_view)
+    ViewGroup emptyView;
+    @BindView(R.id.empty_view_title)
+    TextView emptyViewTitle;
+    @BindView(R.id.empty_view_description)
+    TextView emptyViewDescription;
+
+    @Nullable
+    String classType;
+    @Nullable
+    private HabitRPGUser user;
+    private View view;
+    @Nullable
+    private SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback;
+    private ItemTouchHelper.Callback mItemTouchCallback;
+
+    public static TaskRecyclerViewFragment newInstance(Context context, @Nullable HabitRPGUser user, String classType,
+                                                       @Nullable SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback) {
+        TaskRecyclerViewFragment fragment = new TaskRecyclerViewFragment();
+        fragment.setRetainInstance(true);
+        fragment.user = user;
+        fragment.classType = classType;
+        fragment.sortCallback = sortCallback;
+        List<String> tutorialTexts = null;
+        switch (fragment.classType) {
+            case Task.TYPE_HABIT: {
+                fragment.tutorialStepIdentifier = "habits";
+                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_overview),
+                        context.getString(R.string.tutorial_habits_1),
+                        context.getString(R.string.tutorial_habits_2),
+                        context.getString(R.string.tutorial_habits_3),
+                        context.getString(R.string.tutorial_habits_4));
+                break;
+            }
+            case Task.FREQUENCY_DAILY: {
+                fragment.tutorialStepIdentifier = "dailies";
+                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_dailies_1),
+                        context.getString(R.string.tutorial_dailies_2));
+                break;
+            }
+            case Task.TYPE_TODO: {
+                fragment.tutorialStepIdentifier = "todos";
+                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_todos_1),
+                        context.getString(R.string.tutorial_todos_2));
+                break;
+            }
+            case Task.TYPE_REWARD: {
+                fragment.tutorialStepIdentifier = "rewards";
+                tutorialTexts = Arrays.asList(context.getString(R.string.tutorial_rewards_1),
+                        context.getString(R.string.tutorial_rewards_2));
+                break;
+            }
+        }
+
+        if (tutorialTexts != null) {
+            fragment.tutorialTexts = new ArrayList<>(tutorialTexts);
+        }
+        fragment.tutorialCanBeDeferred = false;
+
+        return fragment;
+    }
+
+    // TODO needs a bit of cleanup
+    public void setInnerAdapter() {
+        int layoutOfType;
+        if (this.classType != null) {
+            switch (this.classType) {
+                case Task.TYPE_HABIT:
+                    layoutOfType = R.layout.habit_item_card;
+                    this.recyclerAdapter = new HabitsRecyclerViewAdapter(Task.TYPE_HABIT, taskFilterHelper, layoutOfType, getContext(), userID, sortCallback);
+                    allowReordering();
+                    break;
+                case Task.TYPE_DAILY:
+                    layoutOfType = R.layout.daily_item_card;
+                    int dailyResetOffset = 0;
+                    if (user != null) {
+                        dailyResetOffset = user.getPreferences().getDayStart();
+                    }
+                    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, taskFilterHelper, layoutOfType, getContext(), userID, sortCallback);
+                    allowReordering();
+                    return;
+                case Task.TYPE_REWARD:
+                    layoutOfType = R.layout.reward_item_card;
+                    this.recyclerAdapter = new RewardsRecyclerViewAdapter(Task.TYPE_REWARD, taskFilterHelper, layoutOfType, getContext(), user, inventoryRepository);
+                    break;
+            }
+        }
+    }
+
+    private void allowReordering() {
+        ItemTouchHelper itemTouchHelper = new ItemTouchHelper(mItemTouchCallback);
+        itemTouchHelper.attachToRecyclerView(recyclerView);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+
+        if (Task.TYPE_DAILY.equals(classType)) {
+            if (user != null && user.getPreferences().getDailyDueDefaultView()) {
+                taskFilterHelper.setActiveFilter(Task.TYPE_DAILY, Task.FILTER_ACTIVE);
+            }
+        }
+
+        mItemTouchCallback = new ItemTouchHelper.Callback() {
+            private Integer mFromPosition = null;
+
+            @Override
+            public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+                super.onSelectedChanged(viewHolder, actionState);
+                if (viewHolder != null) {
+                    viewHolder.itemView.setBackgroundColor(Color.LTGRAY);
+                }
+                if (swipeRefreshLayout != null) {
+                    swipeRefreshLayout.setEnabled(false);
+                }
+            }
+
+            public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+                if (mFromPosition == null) mFromPosition = viewHolder.getAdapterPosition();
+                ((ItemTouchHelperAdapter) recyclerAdapter).onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition());
+                return true;
+            }
+
+            @Override
+            public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+            }
+
+            //defines the enabled move directions in each state (idle, swiping, dragging).
+            @Override
+            public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+                return makeFlag(ItemTouchHelper.ACTION_STATE_DRAG,
+                        ItemTouchHelper.DOWN | ItemTouchHelper.UP);
+            }
+
+            @Override
+            public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+                super.clearView(recyclerView, viewHolder);
+                if (swipeRefreshLayout != null) {
+                    swipeRefreshLayout.setEnabled(true);
+                }
+                
+                viewHolder.itemView.setBackgroundColor(Color.WHITE);
+                if (mFromPosition != null) {
+                    ((ItemTouchHelperDropCallback) recyclerAdapter).onDrop(mFromPosition, viewHolder.getAdapterPosition());
+                }
+            }
+        };
+
+        if (view == null) {
+            view = inflater.inflate(R.layout.fragment_refresh_recyclerview, container, false);
+
+            ButterKnife.bind(this, view);
+
+            android.support.v4.app.FragmentActivity context = getActivity();
+
+            layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+
+            if (layoutManager == null) {
+                layoutManager = new LinearLayoutManager(context);
+
+                recyclerView.setLayoutManager(layoutManager);
+            }
+            if (recyclerView.getAdapter() == null) {
+                this.setInnerAdapter();
+            }
+
+            int bottomPadding = (int) (recyclerView.getPaddingBottom() + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 60, getResources().getDisplayMetrics()));
+            recyclerView.setPadding(0, 0, 0, bottomPadding);
+
+            swipeRefreshLayout.setOnRefreshListener(this);
+
+            recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+                @Override
+                public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                    super.onScrollStateChanged(recyclerView, newState);
+                    if (newState == RecyclerView.SCROLL_STATE_IDLE && swipeRefreshLayout != null) {
+                        swipeRefreshLayout.setEnabled(((MainActivity)getActivity()).isAppBarExpanded());
+                    }
+                }
+            });
+
+            if (this.classType != null) {
+                switch (this.classType) {
+                    case Task.TYPE_HABIT: {
+                        this.emptyViewTitle.setText(R.string.empty_title_habits);
+                        this.emptyViewDescription.setText(R.string.empty_description_habits);
+                        break;
+                    }
+                    case Task.FREQUENCY_DAILY: {
+                        this.emptyViewTitle.setText(R.string.empty_title_dailies);
+                        this.emptyViewDescription.setText(R.string.empty_description_dailies);
+                        break;
+                    }
+                    case Task.TYPE_TODO: {
+                        this.emptyViewTitle.setText(R.string.empty_title_todos);
+                        this.emptyViewDescription.setText(R.string.empty_description_todos);
+                        break;
+                    }
+                    case Task.TYPE_REWARD: {
+                        this.emptyViewTitle.setText(R.string.empty_title_rewards);
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (savedInstanceState != null) {
+            this.classType = savedInstanceState.getString(CLASS_TYPE_KEY, "");
+        }
+
+        return view;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        recyclerView.setAdapter(recyclerAdapter);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString(CLASS_TYPE_KEY, this.classType);
+    }
+
+    @Override
+    public void onClick(View v) {
+        AddNewTaskCommand event = new AddNewTaskCommand();
+        event.ClassType = this.classType;
+
+        EventBus.getDefault().post(event);
+    }
+
+    @Override
+    public String getDisplayedClassName() {
+        return this.classType + super.getDisplayedClassName();
+    }
+
+    String getClassName() {
+        return this.classType != null ? this.classType : "";
+    }
+
+    @Subscribe
+    public void onEvent(FilterTasksByTagsCommand cmd) {
+        recyclerAdapter.filter();
+    }
+
+    @Subscribe
+    public void onEvent(TaskCheckedCommand event) {
+        recyclerAdapter.checkTask(event.Task, event.completed);
+    }
+
+    @Subscribe
+    public void onEvent(TaskUpdatedEvent event) {
+        recyclerAdapter.updateTask(event.task);
+    }
+
+    @Subscribe
+    public void onEvent(TaskCreatedEvent event) {
+        recyclerAdapter.addTask(event.task);
+    }
+
+    @Subscribe
+    public void onEvent(TaskRemovedEvent event) {
+        recyclerAdapter.removeTask(event.deletedTaskId);
+    }
+
+    @Override
+    public void onRefresh() {
+        swipeRefreshLayout.setRefreshing(true);
+        userRepository.retrieveUser(true)
+                .doOnTerminate(() -> swipeRefreshLayout.setRefreshing(false))
+                .subscribe(
+                        new HabitRPGUserCallback((MainActivity)getActivity()),
+                        throwable -> {}
+                );
+    }
+
+    public void setActiveFilter(String activeFilter) {
+        if (classType != null) {
+            taskFilterHelper.setActiveFilter(classType, activeFilter);
+        }
+        recyclerAdapter.filter();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
index 4908b9448..54929a3de 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,497 +1,496 @@
-package com.habitrpg.android.habitica.ui.fragments.tasks;
-
-import android.app.Activity;
-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.view.MenuItemCompat;
-import android.support.v4.view.ViewPager;
-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.widget.RelativeLayout;
-import android.widget.TextView;
-
-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.models.TutorialStep;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
-import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
-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.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.roughike.bottombar.BottomBarTab;
-
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import javax.inject.Inject;
-
-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 TaskFilterHelper taskFilterHelper; // This will be used for this fragment. Currently being used to help filtering
-    MenuItem refreshItem;
-    FloatingActionMenu floatingMenu;
-    SparseArray<TaskRecyclerViewFragment> viewFragmentsDictionary = new SparseArray<>();
-
-    private boolean displayingTaskForm;
-    @Nullable
-    private TextView filterCountTextView;
-
-    public void setActivity(MainActivity activity) {
-        super.setActivity(activity);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-
-        this.usesTabLayout = false;
-        this.usesBottomNavigation = true;
-        this.displayingTaskForm = false;
-        super.onCreateView(inflater, container, savedInstanceState);
-        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
-
-
-        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
-        View view = inflater.inflate(R.layout.floating_menu_tasks, floatingMenuWrapper, true);
-        if (FloatingActionMenu.class.equals(view.getClass())) {
-            floatingMenu = (FloatingActionMenu) view;
-        } else {
-            ViewGroup frame = (ViewGroup) view;
-            floatingMenu = (FloatingActionMenu) frame.findViewById(R.id.fab_menu);
-        }
-        FloatingActionButton habit_fab = (FloatingActionButton) floatingMenu.findViewById(R.id.fab_new_habit);
-        habit_fab.setOnClickListener(v1 -> openNewTaskActivity(Task.TYPE_HABIT));
-        FloatingActionButton daily_fab = (FloatingActionButton) floatingMenu.findViewById(R.id.fab_new_daily);
-        daily_fab.setOnClickListener(v1 -> openNewTaskActivity(Task.TYPE_DAILY));
-        FloatingActionButton todo_fab = (FloatingActionButton) floatingMenu.findViewById(R.id.fab_new_todo);
-        todo_fab.setOnClickListener(v1 -> openNewTaskActivity(Task.TYPE_TODO));
-        FloatingActionButton reward_fab = (FloatingActionButton) floatingMenu.findViewById(R.id.fab_new_reward);
-        reward_fab.setOnClickListener(v1 -> openNewTaskActivity(Task.TYPE_REWARD));
-        floatingMenu.setOnMenuButtonLongClickListener(this::onFloatingMenuLongClicked);
-
-        loadTaskLists();
-
-        if (bottomNavigation != null) {
-            bottomNavigation.setBadgesHideWhenActive(true);
-            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);
-                }
-                updateBottomBarBadges();
-            });
-        }
-
-        return v;
-    }
-
-    private boolean onFloatingMenuLongClicked(View view) {
-        int currentType = viewPager.getCurrentItem();
-        TaskRecyclerViewFragment currentFragment = viewFragmentsDictionary.get(currentType);
-        String className = currentFragment.getClassName();
-        openNewTaskActivity(className);
-        return true;
-    }
-
-    @Override
-    public void injectFragment(AppComponent component) {
-        component.inject(this);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        inflater.inflate(R.menu.menu_main_activity, menu);
-
-        RelativeLayout badgeLayout = (RelativeLayout) MenuItemCompat.getActionView(menu.findItem(R.id.action_search));
-        filterCountTextView = (TextView) badgeLayout.findViewById(R.id.badge_textview);
-        badgeLayout.setOnClickListener(view -> showFilterDialog());
-        updateFilterIcon();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-
-        switch (id) {
-            case R.id.action_search:
-                showFilterDialog();
-                return true;
-            case R.id.action_reload:
-                refreshItem = item;
-                refresh();
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void showFilterDialog() {
-        TaskFilterDialog dialog = new TaskFilterDialog(getContext(), HabiticaBaseApplication.getComponent());
-        if (user != null) {
-            dialog.setTags(user.getTags());
-        }
-        dialog.setActiveTags(taskFilterHelper.getTags());
-        if (getActiveFragment() != null) {
-            String taskType = getActiveFragment().classType;
-            if (taskType != null) {
-                dialog.setTaskType(taskType, taskFilterHelper.getActiveFilter(taskType));
-            }
-        }
-        dialog.setListener((activeTaskFilter, activeTags) -> {
-            int activePos = viewPager.getCurrentItem();
-            if (activePos >= 1 && viewFragmentsDictionary.get(activePos-1).recyclerAdapter != null) {
-                viewFragmentsDictionary.get(activePos-1).recyclerAdapter.filter();
-            }
-            if (activePos < viewPager.getAdapter().getCount()-1 && viewFragmentsDictionary.get(activePos+1).recyclerAdapter != null) {
-                viewFragmentsDictionary.get(activePos+1).recyclerAdapter.filter();
-            }
-            if (getActiveFragment() != null) {
-                getActiveFragment().setActiveFilter(activeTaskFilter);
-            }
-            taskFilterHelper.setTags(activeTags);
-            updateFilterIcon();
-
-        });
-        dialog.show();
-    }
-
-    public void refresh() {
-        if (getActiveFragment() != null) {
-            getActiveFragment().onRefresh();
-        }
-    }
-
-    public void loadTaskLists() {
-        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
-
-        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
-
-            @Override
-            public Fragment getItem(int position) {
-                TaskRecyclerViewFragment fragment;
-                SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback =
-                        (task, from, to) -> {
-                            if (apiClient != null){
-                                apiClient.postTaskNewPosition(task.getId(), String.valueOf(to))
-                                        .subscribe(aVoid -> {
-                                        }, e -> {
-                                        });
-                            }
-                        };
-
-                switch (position) {
-                    case 0:
-                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_HABIT, sortCallback);
-                        break;
-                    case 1:
-                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_DAILY, sortCallback);
-                        break;
-                    case 3:
-                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_REWARD, null);
-                        break;
-                    default:
-                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_TODO,sortCallback);
-                }
-
-                viewFragmentsDictionary.put(position, fragment);
-
-                return fragment;
-            }
-
-            @Override
-            public int getCount() {
-                return 4;
-            }
-
-            @Override
-            public CharSequence getPageTitle(int position) {
-                if (activity != null) {
-                    switch (position) {
-                        case 0:
-                            return activity.getString(R.string.habits);
-                        case 1:
-                            return activity.getString(R.string.dailies);
-                        case 2:
-                            return activity.getString(R.string.todos);
-                        case 3:
-                            return activity.getString(R.string.rewards);
-                    }
-                }
-                return "";
-            }
-        });
-
-        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-            }
-
-            @Override
-            public void onPageSelected(int position) {
-                if (bottomNavigation != null) {
-                    bottomNavigation.selectTabAtPosition(position);
-                }
-                updateFilterIcon();
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int state) {
-
-            }
-        });
-    }
-
-    private void updateFilterIcon() {
-        if (filterCountTextView == null) {
-            return;
-        }
-        int filterCount = 0;
-        if (getActiveFragment() != null) {
-            filterCount = taskFilterHelper.howMany(getActiveFragment().classType);
-        }
-        if (filterCount == 0) {
-            filterCountTextView.setText(null);
-            filterCountTextView.setVisibility(View.GONE);
-        } else {
-            filterCountTextView.setText(String.valueOf(filterCount));
-            filterCountTextView.setVisibility(View.VISIBLE);
-        }
-
-    }
-
-    private void updateBottomBarBadges() {
-        if (bottomNavigation == null) {
-            return;
-        }
-        List<TutorialStep> tutorialSteps = new Select().from(TutorialStep.class).where(Condition.column("identifier").in("habits", "dailies", "todos", "rewards")).queryList();
-
-        List<String> activeTutorialFragments = new ArrayList<>();
-        for (TutorialStep step : tutorialSteps) {
-            int id = -1;
-            String taskType = null;
-            switch (step.getIdentifier()) {
-                case "habits":
-                    id = R.id.tab_habits;
-                    taskType = Task.TYPE_HABIT;
-                    break;
-                case "dailies":
-                    id = R.id.tab_dailies;
-                    taskType = Task.TYPE_DAILY;
-                    break;
-                case "todos":
-                    id = R.id.tab_todos;
-                    taskType = Task.TYPE_TODO;
-                    break;
-                case "rewards":
-                    id = R.id.tab_rewards;
-                    taskType = Task.TYPE_REWARD;
-                    break;
-            }
-            BottomBarTab tab = bottomNavigation.getTabWithId(id);
-            if (step.shouldDisplay()) {
-                tab.setBadgeCount(1);
-                activeTutorialFragments.add(taskType);
-            } else {
-                tab.removeBadge();
-            }
-        }
-        if (activeTutorialFragments.size() == 1) {
-            TaskRecyclerViewFragment fragment = viewFragmentsDictionary.get(indexForTaskType(activeTutorialFragments.get(0)));
-            if (fragment != null && fragment.tutorialTexts != null) {
-                String finalText = getContext().getString(R.string.tutorial_tasks_complete);
-                if (!fragment.tutorialTexts.contains(finalText)) {
-                    fragment.tutorialTexts.add(finalText);
-                }
-            }
-        }
-    }
-    // endregion
-
-    //region Events
-    public void updateUserData(HabitRPGUser user) {
-        super.updateUserData(user);
-        if (this.user != null) {
-            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) fragment.recyclerAdapter;
-                        dailyAdapter.dailyResetOffset = this.user.getPreferences().getDayStart();
-                    }
-                    AsyncTask.execute(() -> adapter.loadContent(true));
-                }
-            }
-        }
-    }
-
-    private void openNewTaskActivity(String type) {
-        if (this.displayingTaskForm) {
-            return;
-        }
-
-        String allocationMode = "";
-        if (HabiticaApplication.User != null && HabiticaApplication.User.getPreferences() != null) {
-            allocationMode = HabiticaApplication.User.getPreferences().getAllocationMode();
-        }
-
-        Bundle bundle = new Bundle();
-        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type);
-        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);
-        intent.putExtras(bundle);
-        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        if (this.isAdded()) {
-            this.displayingTaskForm = true;
-            startActivityForResult(intent, TASK_CREATED_RESULT);
-        }
-    }
-
-    @Subscribe
-    public void onEvent(RefreshUserCommand event) {
-        if (getActiveFragment() != null) {
-            getActiveFragment().onRefresh();
-        }
-    }
-
-    @Nullable
-    private TaskRecyclerViewFragment getActiveFragment() {
-        return viewFragmentsDictionary.get(viewPager.getCurrentItem());
-    }
-
-    @Subscribe
-    public void onEvent(TaskTappedEvent event) {
-        if (this.displayingTaskForm) {
-            return;
-        }
-
-        String allocationMode = "";
-        if (HabiticaApplication.User != null && HabiticaApplication.User.getPreferences() != null) {
-            allocationMode = HabiticaApplication.User.getPreferences().getAllocationMode();
-        }
-
-        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 != null ? this.user.getId() : null);
-        bundle.putString(TaskFormActivity.ALLOCATION_MODE_KEY, allocationMode);
-
-        Intent intent = new Intent(activity, TaskFormActivity.class);
-        intent.putExtras(bundle);
-        this.displayingTaskForm = true;
-        if (isAdded()) {
-            startActivityForResult(intent, TASK_UPDATED_RESULT);
-        }
-    }
-
-    @Subscribe
-    public void onEvent(AddNewTaskCommand event) {
-        openNewTaskActivity(event.ClassType.toLowerCase(Locale.US));
-    }
-
-    @Subscribe
-    public void onEvent(final TaskSaveEvent event) {
-        floatingMenu.close(true);
-    }
-
-    //endregion Events
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        switch (requestCode) {
-            case (TASK_CREATED_RESULT):
-                this.displayingTaskForm = false;
-                onTaskCreatedResult(resultCode, data);
-                break;
-            case (TASK_UPDATED_RESULT):
-                this.displayingTaskForm = false;
-                break;
-        }
-    }
-
-    private void onTaskCreatedResult(int resultCode, Intent data) {
-        if (resultCode == Activity.RESULT_OK) {
-            String taskType = data.getStringExtra(TaskFormActivity.TASK_TYPE_KEY);
-            switchToTaskTab(taskType);
-        }
-    }
-
-    private void switchToTaskTab(String taskType) {
-        int index = indexForTaskType(taskType);
-        if (viewPager != null && index != -1) {
-            viewPager.setCurrentItem(index);
-            updateBottomBarBadges();
-        }
-    }
-
-    private int indexForTaskType(String taskType) {
-        if (taskType != null) {
-            for (int index = 0; index < viewFragmentsDictionary.size(); index++) {
-                TaskRecyclerViewFragment fragment = viewFragmentsDictionary.get(index);
-                if (fragment != null && taskType.equals(fragment.getClassName())) {
-                    return index;
-                }
-            }
-        }
-        return -1;
-    }
-
-    @Nullable
-    @Override
-    public String getDisplayedClassName() {
-        return null;
-    }
-
-    @Nullable
-    @Override
-    public String customTitle() {
-        return null;
-    }
+package com.habitrpg.android.habitica.ui.fragments.tasks;
+
+import android.app.Activity;
+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.view.MenuItemCompat;
+import android.support.v4.view.ViewPager;
+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.widget.RelativeLayout;
+import android.widget.TextView;
+
+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.models.TutorialStep;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
+import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
+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.roughike.bottombar.BottomBarTab;
+
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+import javax.inject.Inject;
+
+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 TaskFilterHelper taskFilterHelper; // This will be used for this fragment. Currently being used to help filtering
+    MenuItem refreshItem;
+    FloatingActionMenu floatingMenu;
+    SparseArray<TaskRecyclerViewFragment> viewFragmentsDictionary = new SparseArray<>();
+
+    private boolean displayingTaskForm;
+    @Nullable
+    private TextView filterCountTextView;
+
+    public void setActivity(MainActivity activity) {
+        super.setActivity(activity);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        this.usesTabLayout = false;
+        this.usesBottomNavigation = true;
+        this.displayingTaskForm = false;
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_viewpager, container, false);
+
+
+        viewPager = (ViewPager) v.findViewById(R.id.view_pager);
+        View view = inflater.inflate(R.layout.floating_menu_tasks, floatingMenuWrapper, true);
+        if (FloatingActionMenu.class.equals(view.getClass())) {
+            floatingMenu = (FloatingActionMenu) view;
+        } else {
+            ViewGroup frame = (ViewGroup) view;
+            floatingMenu = (FloatingActionMenu) frame.findViewById(R.id.fab_menu);
+        }
+        FloatingActionButton habit_fab = (FloatingActionButton) floatingMenu.findViewById(R.id.fab_new_habit);
+        habit_fab.setOnClickListener(v1 -> openNewTaskActivity(Task.TYPE_HABIT));
+        FloatingActionButton daily_fab = (FloatingActionButton) floatingMenu.findViewById(R.id.fab_new_daily);
+        daily_fab.setOnClickListener(v1 -> openNewTaskActivity(Task.TYPE_DAILY));
+        FloatingActionButton todo_fab = (FloatingActionButton) floatingMenu.findViewById(R.id.fab_new_todo);
+        todo_fab.setOnClickListener(v1 -> openNewTaskActivity(Task.TYPE_TODO));
+        FloatingActionButton reward_fab = (FloatingActionButton) floatingMenu.findViewById(R.id.fab_new_reward);
+        reward_fab.setOnClickListener(v1 -> openNewTaskActivity(Task.TYPE_REWARD));
+        floatingMenu.setOnMenuButtonLongClickListener(this::onFloatingMenuLongClicked);
+
+        loadTaskLists();
+
+        if (bottomNavigation != null) {
+            bottomNavigation.setBadgesHideWhenActive(true);
+            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);
+                }
+                updateBottomBarBadges();
+            });
+        }
+
+        return v;
+    }
+
+    private boolean onFloatingMenuLongClicked(View view) {
+        int currentType = viewPager.getCurrentItem();
+        TaskRecyclerViewFragment currentFragment = viewFragmentsDictionary.get(currentType);
+        String className = currentFragment.getClassName();
+        openNewTaskActivity(className);
+        return true;
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_main_activity, menu);
+
+        RelativeLayout badgeLayout = (RelativeLayout) MenuItemCompat.getActionView(menu.findItem(R.id.action_search));
+        filterCountTextView = (TextView) badgeLayout.findViewById(R.id.badge_textview);
+        badgeLayout.setOnClickListener(view -> showFilterDialog());
+        updateFilterIcon();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+
+        switch (id) {
+            case R.id.action_search:
+                showFilterDialog();
+                return true;
+            case R.id.action_reload:
+                refreshItem = item;
+                refresh();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void showFilterDialog() {
+        TaskFilterDialog dialog = new TaskFilterDialog(getContext(), HabiticaBaseApplication.getComponent());
+        if (user != null) {
+            dialog.setTags(user.getTags());
+        }
+        dialog.setActiveTags(taskFilterHelper.getTags());
+        if (getActiveFragment() != null) {
+            String taskType = getActiveFragment().classType;
+            if (taskType != null) {
+                dialog.setTaskType(taskType, taskFilterHelper.getActiveFilter(taskType));
+            }
+        }
+        dialog.setListener((activeTaskFilter, activeTags) -> {
+            int activePos = viewPager.getCurrentItem();
+            if (activePos >= 1 && viewFragmentsDictionary.get(activePos-1).recyclerAdapter != null) {
+                viewFragmentsDictionary.get(activePos-1).recyclerAdapter.filter();
+            }
+            if (activePos < viewPager.getAdapter().getCount()-1 && viewFragmentsDictionary.get(activePos+1).recyclerAdapter != null) {
+                viewFragmentsDictionary.get(activePos+1).recyclerAdapter.filter();
+            }
+            if (getActiveFragment() != null) {
+                getActiveFragment().setActiveFilter(activeTaskFilter);
+            }
+            taskFilterHelper.setTags(activeTags);
+            updateFilterIcon();
+
+        });
+        dialog.show();
+    }
+
+    public void refresh() {
+        if (getActiveFragment() != null) {
+            getActiveFragment().onRefresh();
+        }
+    }
+
+    public void loadTaskLists() {
+        android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
+
+        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
+
+            @Override
+            public Fragment getItem(int position) {
+                TaskRecyclerViewFragment fragment;
+                SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback =
+                        (task, from, to) -> {
+                            if (apiClient != null){
+                                apiClient.postTaskNewPosition(task.getId(), String.valueOf(to))
+                                        .subscribe(aVoid -> {
+                                        }, e -> {
+                                        });
+                            }
+                        };
+
+                switch (position) {
+                    case 0:
+                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_HABIT, sortCallback);
+                        break;
+                    case 1:
+                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_DAILY, sortCallback);
+                        break;
+                    case 3:
+                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_REWARD, null);
+                        break;
+                    default:
+                        fragment = TaskRecyclerViewFragment.newInstance(getContext(), user, Task.TYPE_TODO,sortCallback);
+                }
+
+                viewFragmentsDictionary.put(position, fragment);
+
+                return fragment;
+            }
+
+            @Override
+            public int getCount() {
+                return 4;
+            }
+
+            @Override
+            public CharSequence getPageTitle(int position) {
+                if (activity != null) {
+                    switch (position) {
+                        case 0:
+                            return activity.getString(R.string.habits);
+                        case 1:
+                            return activity.getString(R.string.dailies);
+                        case 2:
+                            return activity.getString(R.string.todos);
+                        case 3:
+                            return activity.getString(R.string.rewards);
+                    }
+                }
+                return "";
+            }
+        });
+
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                if (bottomNavigation != null) {
+                    bottomNavigation.selectTabAtPosition(position);
+                }
+                updateFilterIcon();
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+    }
+
+    private void updateFilterIcon() {
+        if (filterCountTextView == null) {
+            return;
+        }
+        int filterCount = 0;
+        if (getActiveFragment() != null) {
+            filterCount = taskFilterHelper.howMany(getActiveFragment().classType);
+        }
+        if (filterCount == 0) {
+            filterCountTextView.setText(null);
+            filterCountTextView.setVisibility(View.GONE);
+        } else {
+            filterCountTextView.setText(String.valueOf(filterCount));
+            filterCountTextView.setVisibility(View.VISIBLE);
+        }
+
+    }
+
+    private void updateBottomBarBadges() {
+        if (bottomNavigation == null) {
+            return;
+        }
+        tutorialRepository.getTutorialSteps(Arrays.asList("habits", "dailies", "todos", "rewards")).subscribe(tutorialSteps -> {
+            List<String> activeTutorialFragments = new ArrayList<>();
+            for (TutorialStep step : tutorialSteps) {
+                int id = -1;
+                String taskType = null;
+                switch (step.getIdentifier()) {
+                    case "habits":
+                        id = R.id.tab_habits;
+                        taskType = Task.TYPE_HABIT;
+                        break;
+                    case "dailies":
+                        id = R.id.tab_dailies;
+                        taskType = Task.TYPE_DAILY;
+                        break;
+                    case "todos":
+                        id = R.id.tab_todos;
+                        taskType = Task.TYPE_TODO;
+                        break;
+                    case "rewards":
+                        id = R.id.tab_rewards;
+                        taskType = Task.TYPE_REWARD;
+                        break;
+                }
+                BottomBarTab tab = bottomNavigation.getTabWithId(id);
+                if (step.shouldDisplay()) {
+                    tab.setBadgeCount(1);
+                    activeTutorialFragments.add(taskType);
+                } else {
+                    tab.removeBadge();
+                }
+            }
+            if (activeTutorialFragments.size() == 1) {
+                TaskRecyclerViewFragment fragment = viewFragmentsDictionary.get(indexForTaskType(activeTutorialFragments.get(0)));
+                if (fragment != null && fragment.tutorialTexts != null) {
+                    String finalText = getContext().getString(R.string.tutorial_tasks_complete);
+                    if (!fragment.tutorialTexts.contains(finalText)) {
+                        fragment.tutorialTexts.add(finalText);
+                    }
+                }
+            }
+        }, throwable -> {});
+    }
+    // endregion
+
+    //region Events
+    public void updateUserData(HabitRPGUser user) {
+        super.updateUserData(user);
+        if (this.user != null) {
+            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) fragment.recyclerAdapter;
+                        dailyAdapter.dailyResetOffset = this.user.getPreferences().getDayStart();
+                    }
+                    AsyncTask.execute(() -> adapter.loadContent(true));
+                }
+            }
+        }
+    }
+
+    private void openNewTaskActivity(String type) {
+        if (this.displayingTaskForm) {
+            return;
+        }
+
+        String allocationMode = "";
+        if (HabiticaApplication.User != null && HabiticaApplication.User.getPreferences() != null) {
+            allocationMode = HabiticaApplication.User.getPreferences().getAllocationMode();
+        }
+
+        Bundle bundle = new Bundle();
+        bundle.putString(TaskFormActivity.TASK_TYPE_KEY, type);
+        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);
+        intent.putExtras(bundle);
+        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        if (this.isAdded()) {
+            this.displayingTaskForm = true;
+            startActivityForResult(intent, TASK_CREATED_RESULT);
+        }
+    }
+
+    @Subscribe
+    public void onEvent(RefreshUserCommand event) {
+        if (getActiveFragment() != null) {
+            getActiveFragment().onRefresh();
+        }
+    }
+
+    @Nullable
+    private TaskRecyclerViewFragment getActiveFragment() {
+        return viewFragmentsDictionary.get(viewPager.getCurrentItem());
+    }
+
+    @Subscribe
+    public void onEvent(TaskTappedEvent event) {
+        if (this.displayingTaskForm) {
+            return;
+        }
+
+        String allocationMode = "";
+        if (HabiticaApplication.User != null && HabiticaApplication.User.getPreferences() != null) {
+            allocationMode = HabiticaApplication.User.getPreferences().getAllocationMode();
+        }
+
+        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 != null ? this.user.getId() : null);
+        bundle.putString(TaskFormActivity.ALLOCATION_MODE_KEY, allocationMode);
+
+        Intent intent = new Intent(activity, TaskFormActivity.class);
+        intent.putExtras(bundle);
+        this.displayingTaskForm = true;
+        if (isAdded()) {
+            startActivityForResult(intent, TASK_UPDATED_RESULT);
+        }
+    }
+
+    @Subscribe
+    public void onEvent(AddNewTaskCommand event) {
+        openNewTaskActivity(event.ClassType.toLowerCase(Locale.US));
+    }
+
+    @Subscribe
+    public void onEvent(final TaskSaveEvent event) {
+        floatingMenu.close(true);
+    }
+
+    //endregion Events
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        switch (requestCode) {
+            case (TASK_CREATED_RESULT):
+                this.displayingTaskForm = false;
+                onTaskCreatedResult(resultCode, data);
+                break;
+            case (TASK_UPDATED_RESULT):
+                this.displayingTaskForm = false;
+                break;
+        }
+    }
+
+    private void onTaskCreatedResult(int resultCode, Intent data) {
+        if (resultCode == Activity.RESULT_OK) {
+            String taskType = data.getStringExtra(TaskFormActivity.TASK_TYPE_KEY);
+            switchToTaskTab(taskType);
+        }
+    }
+
+    private void switchToTaskTab(String taskType) {
+        int index = indexForTaskType(taskType);
+        if (viewPager != null && index != -1) {
+            viewPager.setCurrentItem(index);
+            updateBottomBarBadges();
+        }
+    }
+
+    private int indexForTaskType(String taskType) {
+        if (taskType != null) {
+            for (int index = 0; index < viewFragmentsDictionary.size(); index++) {
+                TaskRecyclerViewFragment fragment = viewFragmentsDictionary.get(index);
+                if (fragment != null && taskType.equals(fragment.getClassName())) {
+                    return index;
+                }
+            }
+        }
+        return -1;
+    }
+
+    @Nullable
+    @Override
+    public String getDisplayedClassName() {
+        return null;
+    }
+
+    @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/DataBindingUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java
index 8ecb0589c..f63095722 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java
@@ -1,11 +1,5 @@
 package com.habitrpg.android.habitica.ui.helpers;
 
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.databinding.ValueBarBinding;
-
-import net.pherth.android.emoji_library.EmojiTextView;
-
 import android.databinding.BindingAdapter;
 import android.databinding.DataBindingUtil;
 import android.graphics.PorterDuff;
@@ -23,6 +17,12 @@ import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.databinding.ValueBarBinding;
+
+import net.pherth.android.emoji_library.EmojiTextView;
+
 public class DataBindingUtils {
 
     @BindingAdapter("bind:imageName")
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java
index aa892b7b4..a6ffd1454 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java
@@ -1,10 +1,5 @@
 package com.habitrpg.android.habitica.ui.helpers;
 
-import com.habitrpg.android.habitica.R;
-
-import net.pherth.android.emoji_library.EmojiEditText;
-import net.pherth.android.emoji_library.EmojiPopup;
-
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
 import android.view.KeyEvent;
@@ -12,6 +7,11 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.ImageButton;
 
+import com.habitrpg.android.habitica.R;
+
+import net.pherth.android.emoji_library.EmojiEditText;
+import net.pherth.android.emoji_library.EmojiPopup;
+
 /**
  * @author data5tream
  */
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 e0c35a410..5aeb05fda 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
@@ -1,154 +1,154 @@
-package com.habitrpg.android.habitica.ui.helpers;
-
-// https://gist.github.com/lodlock/e3cd12130bad70a098db
-
-import com.github.clans.fab.FloatingActionMenu;
-import com.habitrpg.android.habitica.R;
-
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
-import android.support.v4.view.ViewCompat;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-
-import java.util.List;
-
-public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
-
-    private final int FAB_ANIMATION_DURATION = 500;
-
-    private float mTranslationY;
-
-    private Context context;
-    private boolean isAnimating;
-    private boolean isOffScreen;
-    @Nullable
-    private FloatingActionMenu fab;
-
-    public FloatingActionMenuBehavior(Context context, AttributeSet attrs) {
-        super();
-        this.context = context;
-        isAnimating = false;
-        isOffScreen = false;
-    }
-
-    @Override
-    public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
-        return dependency instanceof Snackbar.SnackbarLayout;
-    }
-
-    @Override
-    public boolean onDependentViewChanged(CoordinatorLayout parent, View child, View dependency) {
-        if (child instanceof FloatingActionMenu && dependency instanceof Snackbar.SnackbarLayout) {
-            this.updateTranslation(parent, child, dependency);
-        }
-
-        return false;
-    }
-
-    private void updateTranslation(CoordinatorLayout parent, View child, View dependency) {
-        float translationY = this.getTranslationY(parent, child);
-        if (translationY != this.mTranslationY) {
-            ViewCompat.animate(child)
-                    .cancel();
-            if (Math.abs(translationY - this.mTranslationY) == (float) dependency.getHeight()) {
-                ViewCompat.animate(child)
-                        .translationY(translationY)
-                        .setListener(null);
-            } else {
-                ViewCompat.setTranslationY(child, translationY);
-            }
-
-            this.mTranslationY = translationY;
-        }
-
-    }
-
-    private float getTranslationY(CoordinatorLayout parent, View child) {
-        float minOffset = 0.0F;
-        List dependencies = parent.getDependencies(child);
-        int i = 0;
-
-        for (int z = dependencies.size(); i < z; ++i) {
-            View view = (View) dependencies.get(i);
-            if (view instanceof Snackbar.SnackbarLayout && parent.doViewsOverlap(child, view)) {
-                minOffset = Math.min(minOffset, ViewCompat.getTranslationY(view) - (float) view.getHeight());
-            }
-        }
-
-        return minOffset;
-    }
-
-    @Override
-    public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, View child, View directTargetChild, View target, int nestedScrollAxes) {
-        ViewGroup fabContainer = (ViewGroup) child.findViewById(R.id.floating_menu_wrapper);
-        if (fabContainer.getChildCount() > 0) {
-            if (fabContainer.getChildAt(0).getClass().equals(FloatingActionMenu.class)) {
-                fab = (FloatingActionMenu) fabContainer.getChildAt(0);
-            }
-        }
-        return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL ||
-                super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target, nestedScrollAxes);
-    }
-
-    @Override
-    public void onNestedScroll(CoordinatorLayout coordinatorLayout, final View child, View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
-        super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
-
-        if (fab == null) {
-            return;
-        }
-
-        /*
-        Logic:
-            - If we're scrolling downwards or we're at the bottom of the screen
-            AND if we're not animating and not on screen > HIDE
-         */
-        if ((dyConsumed > 20 || (dyConsumed == 0 && dyUnconsumed > 0)) && !isAnimating && !isOffScreen) {
-            isAnimating = true;
-            slideFabOffScreen(fab);
-            resetAnimatingStatusWithDelay(fab);
-            isOffScreen = true;
-
-        /*
-         Logic:
-            - If we're not on screen
-            AND we're scrolling upwards and not animating OR we're at the top of the screen > SHOW
-         */
-        } else if (isOffScreen && ((dyConsumed < -10 && !isAnimating) || dyUnconsumed < 0)) {
-            isAnimating = true;
-            slideFabOnScreen(fab);
-            resetAnimatingStatusWithDelay(fab);
-            isOffScreen = false;
-        }
-    }
-
-    private void resetAnimatingStatusWithDelay(final FloatingActionMenu child) {
-        child.postDelayed(() -> {
-            isAnimating = false;
-            if (isOffScreen && fab != null) {
-                child.hideMenu(false);
-            }
-        }, FAB_ANIMATION_DURATION);
-    }
-
-    private void slideFabOffScreen(FloatingActionMenu view) {
-        Animation slideOff = AnimationUtils.loadAnimation(context, R.anim.fab_slide_out);
-        slideOff.setDuration(FAB_ANIMATION_DURATION);
-        slideOff.setFillAfter(true);
-        view.startAnimation(slideOff);
-    }
-
-    private void slideFabOnScreen(FloatingActionMenu view) {
-        Animation slideIn = AnimationUtils.loadAnimation(context, R.anim.fab_slide_in);
-        slideIn.setDuration(FAB_ANIMATION_DURATION);
-        slideIn.setFillAfter(true);
-        view.startAnimation(slideIn);
-        view.showMenu(false);
-    }
+package com.habitrpg.android.habitica.ui.helpers;
+
+// https://gist.github.com/lodlock/e3cd12130bad70a098db
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.Snackbar;
+import android.support.v4.view.ViewCompat;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+
+import com.github.clans.fab.FloatingActionMenu;
+import com.habitrpg.android.habitica.R;
+
+import java.util.List;
+
+public class FloatingActionMenuBehavior extends CoordinatorLayout.Behavior {
+
+    private final int FAB_ANIMATION_DURATION = 500;
+
+    private float mTranslationY;
+
+    private Context context;
+    private boolean isAnimating;
+    private boolean isOffScreen;
+    @Nullable
+    private FloatingActionMenu fab;
+
+    public FloatingActionMenuBehavior(Context context, AttributeSet attrs) {
+        super();
+        this.context = context;
+        isAnimating = false;
+        isOffScreen = false;
+    }
+
+    @Override
+    public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
+        return dependency instanceof Snackbar.SnackbarLayout;
+    }
+
+    @Override
+    public boolean onDependentViewChanged(CoordinatorLayout parent, View child, View dependency) {
+        if (child instanceof FloatingActionMenu && dependency instanceof Snackbar.SnackbarLayout) {
+            this.updateTranslation(parent, child, dependency);
+        }
+
+        return false;
+    }
+
+    private void updateTranslation(CoordinatorLayout parent, View child, View dependency) {
+        float translationY = this.getTranslationY(parent, child);
+        if (translationY != this.mTranslationY) {
+            ViewCompat.animate(child)
+                    .cancel();
+            if (Math.abs(translationY - this.mTranslationY) == (float) dependency.getHeight()) {
+                ViewCompat.animate(child)
+                        .translationY(translationY)
+                        .setListener(null);
+            } else {
+                ViewCompat.setTranslationY(child, translationY);
+            }
+
+            this.mTranslationY = translationY;
+        }
+
+    }
+
+    private float getTranslationY(CoordinatorLayout parent, View child) {
+        float minOffset = 0.0F;
+        List dependencies = parent.getDependencies(child);
+        int i = 0;
+
+        for (int z = dependencies.size(); i < z; ++i) {
+            View view = (View) dependencies.get(i);
+            if (view instanceof Snackbar.SnackbarLayout && parent.doViewsOverlap(child, view)) {
+                minOffset = Math.min(minOffset, ViewCompat.getTranslationY(view) - (float) view.getHeight());
+            }
+        }
+
+        return minOffset;
+    }
+
+    @Override
+    public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, View child, View directTargetChild, View target, int nestedScrollAxes) {
+        ViewGroup fabContainer = (ViewGroup) child.findViewById(R.id.floating_menu_wrapper);
+        if (fabContainer.getChildCount() > 0) {
+            if (fabContainer.getChildAt(0).getClass().equals(FloatingActionMenu.class)) {
+                fab = (FloatingActionMenu) fabContainer.getChildAt(0);
+            }
+        }
+        return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL ||
+                super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target, nestedScrollAxes);
+    }
+
+    @Override
+    public void onNestedScroll(CoordinatorLayout coordinatorLayout, final View child, View target, int dxConsumed, int dyConsumed, int dxUnconsumed, int dyUnconsumed) {
+        super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
+
+        if (fab == null) {
+            return;
+        }
+
+        /*
+        Logic:
+            - If we're scrolling downwards or we're at the bottom of the screen
+            AND if we're not animating and not on screen > HIDE
+         */
+        if ((dyConsumed > 20 || (dyConsumed == 0 && dyUnconsumed > 0)) && !isAnimating && !isOffScreen) {
+            isAnimating = true;
+            slideFabOffScreen(fab);
+            resetAnimatingStatusWithDelay(fab);
+            isOffScreen = true;
+
+        /*
+         Logic:
+            - If we're not on screen
+            AND we're scrolling upwards and not animating OR we're at the top of the screen > SHOW
+         */
+        } else if (isOffScreen && ((dyConsumed < -10 && !isAnimating) || dyUnconsumed < 0)) {
+            isAnimating = true;
+            slideFabOnScreen(fab);
+            resetAnimatingStatusWithDelay(fab);
+            isOffScreen = false;
+        }
+    }
+
+    private void resetAnimatingStatusWithDelay(final FloatingActionMenu child) {
+        child.postDelayed(() -> {
+            isAnimating = false;
+            if (isOffScreen && fab != null) {
+                child.hideMenu(false);
+            }
+        }, FAB_ANIMATION_DURATION);
+    }
+
+    private void slideFabOffScreen(FloatingActionMenu view) {
+        Animation slideOff = AnimationUtils.loadAnimation(context, R.anim.fab_slide_out);
+        slideOff.setDuration(FAB_ANIMATION_DURATION);
+        slideOff.setFillAfter(true);
+        view.startAnimation(slideOff);
+    }
+
+    private void slideFabOnScreen(FloatingActionMenu view) {
+        Animation slideIn = AnimationUtils.loadAnimation(context, R.anim.fab_slide_in);
+        slideIn.setDuration(FAB_ANIMATION_DURATION);
+        slideIn.setFillAfter(true);
+        view.startAnimation(slideIn);
+        view.showMenu(false);
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.java
index 57f56f28b..56d65953e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarginDecoration.java
@@ -1,12 +1,12 @@
 package com.habitrpg.android.habitica.ui.helpers;
 
-import com.habitrpg.android.habitica.R;
-
 import android.content.Context;
 import android.graphics.Rect;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import com.habitrpg.android.habitica.R;
+
 public class MarginDecoration extends RecyclerView.ItemDecoration {
     private int margin;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java
index bcf970b2a..4c18d6455 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java
@@ -1,50 +1,50 @@
-package com.habitrpg.android.habitica.ui.helpers;
-
-import com.commonsware.cwac.anddown.AndDown;
-
-import net.pherth.android.emoji_library.EmojiParser;
-
-import android.support.annotation.Nullable;
-import android.text.Html;
-
-import static android.text.Html.FROM_HTML_MODE_LEGACY;
-
-/**
- * @author data5tream
- */
-public class MarkdownParser {
-
-    private static AndDown processor = new AndDown();
-
-    /**
-     * Parses formatted markdown and returns it as styled CharSequence
-     *
-     * @param input Markdown formatted String
-     * @return Stylized CharSequence
-     */
-    public static CharSequence parseMarkdown(String input) {
-        if (input == null) {
-            return "";
-        }
-        CharSequence output;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-            output = Html.fromHtml(processor.markdownToHtml(EmojiParser.parseEmojis(input.trim())), FROM_HTML_MODE_LEGACY);
-        } else {
-            output = Html.fromHtml(processor.markdownToHtml(EmojiParser.parseEmojis(input.trim())));
-        }
-        if (output.length() >= 2) output = output.subSequence(0, output.length() - 2);
-        return output;
-    }
-
-    /**
-     * Converts stylized CharSequence into markdown
-     *
-     * @param input Stylized CharSequence
-     * @return Markdown formatted String
-     */
-    @Nullable
-    public static String parseCompiled(CharSequence input) {
-        return EmojiParser.convertToCheatCode(input.toString());
-    }
-
-}
+package com.habitrpg.android.habitica.ui.helpers;
+
+import android.support.annotation.Nullable;
+import android.text.Html;
+
+import com.commonsware.cwac.anddown.AndDown;
+
+import net.pherth.android.emoji_library.EmojiParser;
+
+import static android.text.Html.FROM_HTML_MODE_LEGACY;
+
+/**
+ * @author data5tream
+ */
+public class MarkdownParser {
+
+    private static AndDown processor = new AndDown();
+
+    /**
+     * Parses formatted markdown and returns it as styled CharSequence
+     *
+     * @param input Markdown formatted String
+     * @return Stylized CharSequence
+     */
+    public static CharSequence parseMarkdown(String input) {
+        if (input == null) {
+            return "";
+        }
+        CharSequence output;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+            output = Html.fromHtml(processor.markdownToHtml(EmojiParser.parseEmojis(input.trim())), FROM_HTML_MODE_LEGACY);
+        } else {
+            output = Html.fromHtml(processor.markdownToHtml(EmojiParser.parseEmojis(input.trim())));
+        }
+        if (output.length() >= 2) output = output.subSequence(0, output.length() - 2);
+        return output;
+    }
+
+    /**
+     * Converts stylized CharSequence into markdown
+     *
+     * @param input Stylized CharSequence
+     * @return Markdown formatted String
+     */
+    @Nullable
+    public static String parseCompiled(CharSequence input) {
+        return EmojiParser.convertToCheatCode(input.toString());
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/RecyclerViewEmptySupport.java
index f9b3e5389..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
@@ -5,7 +5,6 @@ import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.WindowInsets;
-import android.view.animation.AlphaAnimation;
 
 //http://stackoverflow.com/a/27801394/1315039
 public class RecyclerViewEmptySupport extends RecyclerView {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java
index 3fa472bbf..5a60c0777 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
@@ -1,78 +1,78 @@
-package com.habitrpg.android.habitica.ui.helpers;
-
-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;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.TextView;
-
-/**
- * Simple utilities class for UI related stuff.
- */
-public class UiUtils {
-
-    /**
-     * Hides soft keyboard if it's opened.
-     *
-     * @param activity Currently visible activity.
-     */
-    public static void dismissKeyboard(Activity activity) {
-        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        View currentFocus = activity.getCurrentFocus();
-        if (currentFocus != null) {
-            imm.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0);
-        }
-    }
-
-    /**
-     * Hides soft keyboard if it's opened.
-     * This eliminates weird behavior when hiding keyboard from within Dialog
-     *
-     * @param view     View that currently has focus
-     * @param activity - Current activity
-     */
-    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);
-        }
-    }
-
-    /**
-     * Shows snackbar in given container.
-     *
-     * @param context   Context.
-     * @param container Parent view where Snackbar will appear.
-     * @param content   message.
-     */
-    public static void showSnackbar(Context context, View container, String content, SnackbarDisplayType displayType) {
-        Snackbar snackbar = Snackbar.make(container, content, Snackbar.LENGTH_LONG);
-        View snackbarView = snackbar.getView();
-
-        switch (displayType) {
-            case FAILURE:
-                snackbarView.setBackgroundColor(ContextCompat.getColor(context, R.color.worse_10));
-                break;
-            case FAILURE_BLUE:
-                snackbarView.setBackgroundColor(ContextCompat.getColor(context, R.color.best_100));
-                break;
-            case DROP:
-                TextView tv = (TextView) snackbarView.findViewById(android.support.design.R.id.snackbar_text);
-                tv.setMaxLines(5);
-                snackbarView.setBackgroundColor(ContextCompat.getColor(context, R.color.best_10));
-                break;
-        }
-
-        snackbar.show();
-    }
-
-    public enum SnackbarDisplayType {
-        NORMAL, FAILURE, FAILURE_BLUE, DROP
-    }
-
-}
+package com.habitrpg.android.habitica.ui.helpers;
+
+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;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+
+/**
+ * Simple utilities class for UI related stuff.
+ */
+public class UiUtils {
+
+    /**
+     * Hides soft keyboard if it's opened.
+     *
+     * @param activity Currently visible activity.
+     */
+    public static void dismissKeyboard(Activity activity) {
+        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+        View currentFocus = activity.getCurrentFocus();
+        if (currentFocus != null) {
+            imm.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0);
+        }
+    }
+
+    /**
+     * Hides soft keyboard if it's opened.
+     * This eliminates weird behavior when hiding keyboard from within Dialog
+     *
+     * @param view     View that currently has focus
+     * @param activity - Current activity
+     */
+    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);
+        }
+    }
+
+    /**
+     * Shows snackbar in given container.
+     *
+     * @param context   Context.
+     * @param container Parent view where Snackbar will appear.
+     * @param content   message.
+     */
+    public static void showSnackbar(Context context, View container, String content, SnackbarDisplayType displayType) {
+        Snackbar snackbar = Snackbar.make(container, content, Snackbar.LENGTH_LONG);
+        View snackbarView = snackbar.getView();
+
+        switch (displayType) {
+            case FAILURE:
+                snackbarView.setBackgroundColor(ContextCompat.getColor(context, R.color.worse_10));
+                break;
+            case FAILURE_BLUE:
+                snackbarView.setBackgroundColor(ContextCompat.getColor(context, R.color.best_100));
+                break;
+            case DROP:
+                TextView tv = (TextView) snackbarView.findViewById(android.support.design.R.id.snackbar_text);
+                tv.setMaxLines(5);
+                snackbarView.setBackgroundColor(ContextCompat.getColor(context, R.color.best_10));
+                break;
+        }
+
+        snackbar.show();
+    }
+
+    public enum SnackbarDisplayType {
+        NORMAL, FAILURE, FAILURE_BLUE, DROP
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ViewHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ViewHelper.java
index 00453a1c1..82492ef19 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ViewHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/ViewHelper.java
@@ -4,7 +4,6 @@ import android.annotation.TargetApi;
 import android.content.res.ColorStateList;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.AppCompatButton;
 import android.view.View;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.java
index 5f1135686..bc53c9a37 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.java
@@ -1,13 +1,13 @@
 package com.habitrpg.android.habitica.ui.menu;
 
-import com.habitrpg.android.habitica.R;
-
 import android.content.Context;
 import android.support.design.widget.BottomSheetDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import com.habitrpg.android.habitica.R;
+
 public class BottomSheetMenu extends BottomSheetDialog implements View.OnClickListener {
 
     private LayoutInflater inflater;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java
index 3eb9ce8df..f4d286a5e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenuItem.java
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.ui.menu;
 
-import com.habitrpg.android.habitica.R;
-
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
@@ -10,6 +8,8 @@ import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+
 public class BottomSheetMenuItem {
 
     private String title;
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 db12d14bc..2ddf036ed 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
@@ -1,5 +1,10 @@
 package com.habitrpg.android.habitica.ui.menu;
 
+import android.app.Activity;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.support.v7.widget.Toolbar;
+
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.activities.AboutActivity;
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
@@ -26,11 +31,6 @@ import com.mikepenz.materialdrawer.DrawerBuilder;
 import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
 import com.mikepenz.materialdrawer.model.ProfileDrawerItem;
 
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.support.v7.widget.Toolbar;
-
 import java.util.Locale;
 
 import static com.habitrpg.android.habitica.ui.activities.MainActivity.GEM_PURCHASE_REQUEST;
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 787797fcd..744db3d6c 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
@@ -1,12 +1,5 @@
 package com.habitrpg.android.habitica.ui.menu;
 
-import com.habitrpg.android.habitica.R;
-import com.mikepenz.fastadapter.utils.ViewHolderFactory;
-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 android.content.Context;
 import android.graphics.Typeface;
 import android.support.annotation.LayoutRes;
@@ -16,6 +9,13 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+import com.mikepenz.fastadapter.utils.ViewHolderFactory;
+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 java.util.List;
 
 /**
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.java
index 83672c1b2..5d09ab54b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/SectionViewHolder.java
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.ui.viewHolders;
 
-import com.habitrpg.android.habitica.R;
-
 import android.content.Context;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
@@ -9,6 +7,8 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
index 8b7995802..fcfad1484 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
@@ -1,213 +1,213 @@
-package com.habitrpg.android.habitica.ui.viewHolders.tasks;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.TaskTappedEvent;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import butterknife.BindColor;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-public abstract class BaseTaskViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
-
-
-    public Task task;
-    protected Context context;
-    @BindView(R.id.checkedTextView)
-    TextView titleTextView;
-
-    @BindView(R.id.notesTextView)
-    TextView notesTextView;
-
-    @Nullable
-    @BindView(R.id.rightBorderView)
-    View rightBorderView;
-
-    @BindColor(R.color.task_gray)
-    int taskGray;
-
-    @Nullable
-    @BindView(R.id.specialTaskText)
-    TextView specialTaskTextView;
-
-    @Nullable
-    @BindView(R.id.iconviewChallenge)
-    ImageView iconViewChallenge;
-
-    @Nullable
-    @BindView(R.id.iconviewReminder)
-    ImageView iconViewReminder;
-
-    @Nullable
-    @BindView(R.id.iconviewTag)
-    ImageView iconViewTag;
-
-    @Nullable
-    @BindView(R.id.taskIconWrapper)
-    LinearLayout taskIconWrapper;
-
-    @BindView(R.id.approvalRequiredTextField)
-    TextView approvalRequiredTextView;
-
-    boolean disabled;
-
-    public BaseTaskViewHolder(View itemView) {
-        this(itemView, true);
-    }
-
-    public BaseTaskViewHolder(View itemView, boolean useButterKnife) {
-        super(itemView);
-
-        itemView.setOnClickListener(this);
-        itemView.setClickable(true);
-
-        if (useButterKnife) {
-            ButterKnife.bind(this, itemView);
-        }
-
-        //Re enable when we find a way to only react when a link is tapped.
-        //this.notesTextView.setMovementMethod(LinkMovementMethod.getInstance());
-        //this.titleTextView.setMovementMethod(LinkMovementMethod.getInstance());
-
-        context = itemView.getContext();
-    }
-
-    public void bindHolder(Task newTask, int position) {
-        this.task = newTask;
-        if (this.canContainMarkdown()) {
-            if (this.task.parsedText != null) {
-                this.titleTextView.setText(this.task.parsedText);
-                this.notesTextView.setText(this.task.parsedNotes);
-            } else {
-                this.titleTextView.setText(this.task.getText());
-                this.notesTextView.setText(this.task.getNotes());
-                Observable.just(this.task)
-                        .map(task1 -> {
-                            task.parsedText = MarkdownParser.parseMarkdown(task.getText());
-                            task.parsedNotes = MarkdownParser.parseMarkdown(task.getNotes());
-                            return task;
-                        })
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(task2 -> {
-                            this.titleTextView.setText(this.task.parsedText);
-                            this.notesTextView.setText(this.task.parsedNotes);
-                        }, Throwable::printStackTrace);
-            }
-        } else {
-            this.titleTextView.setText(this.task.getText());
-            this.notesTextView.setText(this.task.getNotes());
-        }
-        if (this.task.getNotes() != null && this.task.getNotes().length() > 0) {
-            this.notesTextView.setVisibility(View.VISIBLE);
-        } else {
-            this.notesTextView.setVisibility(View.GONE);
-        }
-
-        if (this.rightBorderView != null) {
-            this.rightBorderView.setBackgroundResource(this.task.getLightTaskColor());
-        }
-        if (this.iconViewReminder != null) {
-            this.iconViewReminder.setVisibility(this.task.getReminders().size() > 0 ? View.VISIBLE : View.GONE);
-        }
-        if (this.iconViewTag != null) {
-            this.iconViewTag.setVisibility(this.task.getTags().size() > 0 ? View.VISIBLE : View.GONE);
-        }
-
-        if (this.iconViewChallenge != null) {
-            this.iconViewChallenge.setVisibility(View.GONE);
-        }
-
-        this.configureSpecialTaskTextView(task);
-
-        if (this.taskIconWrapper != null) {
-            this.taskIconWrapper.setVisibility(getTaskIconWrapperIsVisible() ? View.VISIBLE : View.GONE);
-        }
-
-        if (task.isPendingApproval()) {
-            approvalRequiredTextView.setVisibility(View.VISIBLE);
-        } else {
-            approvalRequiredTextView.setVisibility(View.GONE);
-        }
-
-    }
-
-
-
-    protected void configureSpecialTaskTextView(Task task) {
-        if (this.specialTaskTextView != null) {
-            this.specialTaskTextView.setVisibility(View.INVISIBLE);
-        }
-    }
-
-    protected Boolean getTaskIconWrapperIsVisible() {
-        Boolean isVisible = false;
-
-        if (this.iconViewReminder != null) {
-            if (this.iconViewReminder.getVisibility() == View.VISIBLE) {
-                isVisible = true;
-            }
-        }
-        if (this.iconViewTag != null) {
-            if (this.iconViewTag.getVisibility() == View.VISIBLE) {
-                isVisible = true;
-            }
-        }
-        if (this.iconViewChallenge != null) {
-            if (this.iconViewChallenge.getVisibility() == View.VISIBLE) {
-                isVisible = true;
-            }
-        }
-        if (this.iconViewReminder != null) {
-            if (this.iconViewReminder.getVisibility() == View.VISIBLE) {
-                isVisible = true;
-            }
-        }
-        if (this.specialTaskTextView != null) {
-            if (this.specialTaskTextView.getVisibility() == View.VISIBLE) {
-                isVisible = true;
-            }
-        }
-        return isVisible;
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v != itemView || isDisabled()) {
-            return;
-        }
-
-        TaskTappedEvent event = new TaskTappedEvent();
-        event.Task = task;
-
-        EventBus.getDefault().post(event);
-    }
-
-    public boolean canContainMarkdown() {
-        return true;
-    }
-
-    public boolean isDisabled() {
-        return disabled;
-    }
-
-    public void setDisabled(boolean disabled) {
-        this.disabled = disabled;
-
-        itemView.setEnabled(!disabled);
-    }
-}
+package com.habitrpg.android.habitica.ui.viewHolders.tasks;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.TaskTappedEvent;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+
+import org.greenrobot.eventbus.EventBus;
+
+import butterknife.BindColor;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+public abstract class BaseTaskViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+
+
+    public Task task;
+    protected Context context;
+    @BindView(R.id.checkedTextView)
+    TextView titleTextView;
+
+    @BindView(R.id.notesTextView)
+    TextView notesTextView;
+
+    @Nullable
+    @BindView(R.id.rightBorderView)
+    View rightBorderView;
+
+    @BindColor(R.color.task_gray)
+    int taskGray;
+
+    @Nullable
+    @BindView(R.id.specialTaskText)
+    TextView specialTaskTextView;
+
+    @Nullable
+    @BindView(R.id.iconviewChallenge)
+    ImageView iconViewChallenge;
+
+    @Nullable
+    @BindView(R.id.iconviewReminder)
+    ImageView iconViewReminder;
+
+    @Nullable
+    @BindView(R.id.iconviewTag)
+    ImageView iconViewTag;
+
+    @Nullable
+    @BindView(R.id.taskIconWrapper)
+    LinearLayout taskIconWrapper;
+
+    @BindView(R.id.approvalRequiredTextField)
+    TextView approvalRequiredTextView;
+
+    boolean disabled;
+
+    public BaseTaskViewHolder(View itemView) {
+        this(itemView, true);
+    }
+
+    public BaseTaskViewHolder(View itemView, boolean useButterKnife) {
+        super(itemView);
+
+        itemView.setOnClickListener(this);
+        itemView.setClickable(true);
+
+        if (useButterKnife) {
+            ButterKnife.bind(this, itemView);
+        }
+
+        //Re enable when we find a way to only react when a link is tapped.
+        //this.notesTextView.setMovementMethod(LinkMovementMethod.getInstance());
+        //this.titleTextView.setMovementMethod(LinkMovementMethod.getInstance());
+
+        context = itemView.getContext();
+    }
+
+    public void bindHolder(Task newTask, int position) {
+        this.task = newTask;
+        if (this.canContainMarkdown()) {
+            if (this.task.parsedText != null) {
+                this.titleTextView.setText(this.task.parsedText);
+                this.notesTextView.setText(this.task.parsedNotes);
+            } else {
+                this.titleTextView.setText(this.task.getText());
+                this.notesTextView.setText(this.task.getNotes());
+                Observable.just(this.task)
+                        .map(task1 -> {
+                            task.parsedText = MarkdownParser.parseMarkdown(task.getText());
+                            task.parsedNotes = MarkdownParser.parseMarkdown(task.getNotes());
+                            return task;
+                        })
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(task2 -> {
+                            this.titleTextView.setText(this.task.parsedText);
+                            this.notesTextView.setText(this.task.parsedNotes);
+                        }, Throwable::printStackTrace);
+            }
+        } else {
+            this.titleTextView.setText(this.task.getText());
+            this.notesTextView.setText(this.task.getNotes());
+        }
+        if (this.task.getNotes() != null && this.task.getNotes().length() > 0) {
+            this.notesTextView.setVisibility(View.VISIBLE);
+        } else {
+            this.notesTextView.setVisibility(View.GONE);
+        }
+
+        if (this.rightBorderView != null) {
+            this.rightBorderView.setBackgroundResource(this.task.getLightTaskColor());
+        }
+        if (this.iconViewReminder != null) {
+            this.iconViewReminder.setVisibility(this.task.getReminders().size() > 0 ? View.VISIBLE : View.GONE);
+        }
+        if (this.iconViewTag != null) {
+            this.iconViewTag.setVisibility(this.task.getTags().size() > 0 ? View.VISIBLE : View.GONE);
+        }
+
+        if (this.iconViewChallenge != null) {
+            this.iconViewChallenge.setVisibility(View.GONE);
+        }
+
+        this.configureSpecialTaskTextView(task);
+
+        if (this.taskIconWrapper != null) {
+            this.taskIconWrapper.setVisibility(getTaskIconWrapperIsVisible() ? View.VISIBLE : View.GONE);
+        }
+
+        if (task.isPendingApproval()) {
+            approvalRequiredTextView.setVisibility(View.VISIBLE);
+        } else {
+            approvalRequiredTextView.setVisibility(View.GONE);
+        }
+
+    }
+
+
+
+    protected void configureSpecialTaskTextView(Task task) {
+        if (this.specialTaskTextView != null) {
+            this.specialTaskTextView.setVisibility(View.INVISIBLE);
+        }
+    }
+
+    protected Boolean getTaskIconWrapperIsVisible() {
+        Boolean isVisible = false;
+
+        if (this.iconViewReminder != null) {
+            if (this.iconViewReminder.getVisibility() == View.VISIBLE) {
+                isVisible = true;
+            }
+        }
+        if (this.iconViewTag != null) {
+            if (this.iconViewTag.getVisibility() == View.VISIBLE) {
+                isVisible = true;
+            }
+        }
+        if (this.iconViewChallenge != null) {
+            if (this.iconViewChallenge.getVisibility() == View.VISIBLE) {
+                isVisible = true;
+            }
+        }
+        if (this.iconViewReminder != null) {
+            if (this.iconViewReminder.getVisibility() == View.VISIBLE) {
+                isVisible = true;
+            }
+        }
+        if (this.specialTaskTextView != null) {
+            if (this.specialTaskTextView.getVisibility() == View.VISIBLE) {
+                isVisible = true;
+            }
+        }
+        return isVisible;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v != itemView || isDisabled()) {
+            return;
+        }
+
+        TaskTappedEvent event = new TaskTappedEvent();
+        event.Task = task;
+
+        EventBus.getDefault().post(event);
+    }
+
+    public boolean canContainMarkdown() {
+        return true;
+    }
+
+    public boolean isDisabled() {
+        return disabled;
+    }
+
+    public void setDisabled(boolean disabled) {
+        this.disabled = disabled;
+
+        itemView.setEnabled(!disabled);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
index 38877ac49..17a7830aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
@@ -1,175 +1,175 @@
-package com.habitrpg.android.habitica.ui.viewHolders.tasks;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
-import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import net.pherth.android.emoji_library.EmojiTextView;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.content.Context;
-import android.graphics.Rect;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
-import android.view.TouchDelegate;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-public abstract class ChecklistedViewHolder extends BaseTaskViewHolder implements CompoundButton.OnCheckedChangeListener {
-
-    public Boolean displayChecklist;
-    @BindView(R.id.checkBoxHolder)
-    ViewGroup checkboxHolder;
-    @BindView(R.id.checkBox)
-    CheckBox checkbox;
-    @BindView(R.id.checklistView)
-    LinearLayout checklistView;
-    @BindView(R.id.checklistBottomSpace)
-    View checklistBottomSpace;
-    @BindView(R.id.checklistIndicatorWrapper)
-    ViewGroup checklistIndicatorWrapper;
-    @BindView(R.id.checkListCompletedTextView)
-    TextView checklistCompletedTextView;
-    @BindView(R.id.checkListAllTextView)
-    TextView checklistAllTextView;
-
-    public ChecklistedViewHolder(View itemView) {
-        super(itemView);
-        checklistIndicatorWrapper.setClickable(true);
-        checkbox.setOnCheckedChangeListener(this);
-        expandCheckboxTouchArea(checkboxHolder, checkbox);
-        this.displayChecklist = false;
-    }
-
-    @Override
-    public void bindHolder(Task newTask, int position) {
-        super.bindHolder(newTask, position);
-
-        boolean completed = this.task.completed;
-        if (task.isPendingApproval()) {
-            completed = false;
-        }
-        this.checkbox.setChecked(completed);
-        if (this.shouldDisplayAsActive() && !task.isPendingApproval()) {
-            this.checkboxHolder.setBackgroundResource(this.task.getLightTaskColor());
-        } else {
-            this.checkboxHolder.setBackgroundColor(this.taskGray);
-        }
-        this.checklistCompletedTextView.setText(String.valueOf(task.getCompletedChecklistCount()));
-        this.checklistAllTextView.setText(String.valueOf(task.getChecklist().size()));
-
-        this.checklistView.removeAllViews();
-        this.setDisplayChecklist(this.displayChecklist);
-
-        this.checklistIndicatorWrapper.setVisibility(task.checklist.size() == 0 ? View.GONE : View.VISIBLE);
-        if (this.rightBorderView != null) {
-            this.rightBorderView.setVisibility(task.checklist.size() == 0 ? View.VISIBLE : View.GONE);
-            if (this.task.getCompleted()) {
-                this.rightBorderView.setBackgroundResource(this.task.getLightTaskColor());
-            } else {
-                this.rightBorderView.setBackgroundColor(this.taskGray);
-            }
-        }
-
-    }
-
-    abstract public Boolean shouldDisplayAsActive();
-
-    public void setDisplayChecklist(Boolean displayChecklist) {
-        this.displayChecklist = displayChecklist;
-        //This needs to be a LinearLayout, as ListViews can not be inside other ListViews.
-        if (this.checklistView != null) {
-            if (this.displayChecklist && this.task.checklist != null) {
-                LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                for (ChecklistItem item : this.task.checklist) {
-                    LinearLayout itemView = (LinearLayout) layoutInflater.inflate(R.layout.checklist_item_row, this.checklistView, false);
-                    CheckBox checkbox = (CheckBox) itemView.findViewById(R.id.checkBox);
-                    EmojiTextView textView = (EmojiTextView) itemView.findViewById(R.id.checkedTextView);
-                    // Populate the data into the template view using the data object
-                    textView.setText(item.getText());
-                    checkbox.setChecked(item.getCompleted());
-                    checkbox.setOnCheckedChangeListener(this);
-                    RelativeLayout checkboxHolder = (RelativeLayout) itemView.findViewById(R.id.checkBoxHolder);
-                    expandCheckboxTouchArea(checkboxHolder, checkbox);
-                    this.checklistView.addView(itemView);
-                }
-                this.checklistView.setVisibility(View.VISIBLE);
-                this.checklistBottomSpace.setVisibility(View.VISIBLE);
-            } else {
-                this.checklistView.removeAllViewsInLayout();
-                this.checklistView.setVisibility(View.GONE);
-                this.checklistBottomSpace.setVisibility(View.GONE);
-            }
-        }
-    }
-
-    @OnClick(R.id.checklistIndicatorWrapper)
-    public void onChecklistIndicatorClicked() {
-        if (this.displayChecklist != null) {
-            this.setDisplayChecklist(!this.displayChecklist);
-        } else {
-            this.setDisplayChecklist(true);
-        }
-        if (this.displayChecklist) {
-            RecyclerView recyclerView = (RecyclerView) this.checklistView.getParent().getParent();
-            LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
-            layoutManager.scrollToPositionWithOffset(this.getAdapterPosition(), 15);
-        }
-    }
-
-    public void expandCheckboxTouchArea(final View expandedView, final View checkboxView) {
-        expandedView.post(() -> {
-            Rect rect = new Rect();
-            expandedView.getHitRect(rect);
-            expandedView.setTouchDelegate(new TouchDelegate(rect, checkboxView));
-        });
-    }
-
-    @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        if (buttonView == checkbox) {
-            if (isChecked != task.getCompleted()) {
-                TaskCheckedCommand event = new TaskCheckedCommand();
-                event.Task = task;
-                event.completed = !task.getCompleted();
-
-                // it needs to be changed after the event is send -> to the server
-                // maybe a refactor is needed here
-                EventBus.getDefault().post(event);
-                task.completed = event.completed;
-                task.save();
-            }
-        } else {
-            View v = (View) buttonView.getParent();
-            while (v.getParent() != this.checklistView) {
-                v = (View) v.getParent();
-            }
-            Integer position = ((ViewGroup) v.getParent()).indexOfChild(v);
-            if (task.checklist.size() > position && isChecked != task.checklist.get(position).getCompleted()) {
-                ChecklistCheckedCommand event = new ChecklistCheckedCommand();
-                event.task = task;
-                event.item = task.getChecklist().get(position);
-                EventBus.getDefault().post(event);
-            }
-        }
-    }
-
-    @Override
-    public void setDisabled(boolean disabled) {
-        super.setDisabled(disabled);
-
-        this.checkbox.setEnabled(!disabled);
-    }
-}
+package com.habitrpg.android.habitica.ui.viewHolders.tasks;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.TouchDelegate;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
+import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+import net.pherth.android.emoji_library.EmojiTextView;
+
+import org.greenrobot.eventbus.EventBus;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+public abstract class ChecklistedViewHolder extends BaseTaskViewHolder implements CompoundButton.OnCheckedChangeListener {
+
+    public Boolean displayChecklist;
+    @BindView(R.id.checkBoxHolder)
+    ViewGroup checkboxHolder;
+    @BindView(R.id.checkBox)
+    CheckBox checkbox;
+    @BindView(R.id.checklistView)
+    LinearLayout checklistView;
+    @BindView(R.id.checklistBottomSpace)
+    View checklistBottomSpace;
+    @BindView(R.id.checklistIndicatorWrapper)
+    ViewGroup checklistIndicatorWrapper;
+    @BindView(R.id.checkListCompletedTextView)
+    TextView checklistCompletedTextView;
+    @BindView(R.id.checkListAllTextView)
+    TextView checklistAllTextView;
+
+    public ChecklistedViewHolder(View itemView) {
+        super(itemView);
+        checklistIndicatorWrapper.setClickable(true);
+        checkbox.setOnCheckedChangeListener(this);
+        expandCheckboxTouchArea(checkboxHolder, checkbox);
+        this.displayChecklist = false;
+    }
+
+    @Override
+    public void bindHolder(Task newTask, int position) {
+        super.bindHolder(newTask, position);
+
+        boolean completed = this.task.completed;
+        if (task.isPendingApproval()) {
+            completed = false;
+        }
+        this.checkbox.setChecked(completed);
+        if (this.shouldDisplayAsActive() && !task.isPendingApproval()) {
+            this.checkboxHolder.setBackgroundResource(this.task.getLightTaskColor());
+        } else {
+            this.checkboxHolder.setBackgroundColor(this.taskGray);
+        }
+        this.checklistCompletedTextView.setText(String.valueOf(task.getCompletedChecklistCount()));
+        this.checklistAllTextView.setText(String.valueOf(task.getChecklist().size()));
+
+        this.checklistView.removeAllViews();
+        this.setDisplayChecklist(this.displayChecklist);
+
+        this.checklistIndicatorWrapper.setVisibility(task.checklist.size() == 0 ? View.GONE : View.VISIBLE);
+        if (this.rightBorderView != null) {
+            this.rightBorderView.setVisibility(task.checklist.size() == 0 ? View.VISIBLE : View.GONE);
+            if (this.task.getCompleted()) {
+                this.rightBorderView.setBackgroundResource(this.task.getLightTaskColor());
+            } else {
+                this.rightBorderView.setBackgroundColor(this.taskGray);
+            }
+        }
+
+    }
+
+    abstract public Boolean shouldDisplayAsActive();
+
+    public void setDisplayChecklist(Boolean displayChecklist) {
+        this.displayChecklist = displayChecklist;
+        //This needs to be a LinearLayout, as ListViews can not be inside other ListViews.
+        if (this.checklistView != null) {
+            if (this.displayChecklist && this.task.checklist != null) {
+                LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                for (ChecklistItem item : this.task.checklist) {
+                    LinearLayout itemView = (LinearLayout) layoutInflater.inflate(R.layout.checklist_item_row, this.checklistView, false);
+                    CheckBox checkbox = (CheckBox) itemView.findViewById(R.id.checkBox);
+                    EmojiTextView textView = (EmojiTextView) itemView.findViewById(R.id.checkedTextView);
+                    // Populate the data into the template view using the data object
+                    textView.setText(item.getText());
+                    checkbox.setChecked(item.getCompleted());
+                    checkbox.setOnCheckedChangeListener(this);
+                    RelativeLayout checkboxHolder = (RelativeLayout) itemView.findViewById(R.id.checkBoxHolder);
+                    expandCheckboxTouchArea(checkboxHolder, checkbox);
+                    this.checklistView.addView(itemView);
+                }
+                this.checklistView.setVisibility(View.VISIBLE);
+                this.checklistBottomSpace.setVisibility(View.VISIBLE);
+            } else {
+                this.checklistView.removeAllViewsInLayout();
+                this.checklistView.setVisibility(View.GONE);
+                this.checklistBottomSpace.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    @OnClick(R.id.checklistIndicatorWrapper)
+    public void onChecklistIndicatorClicked() {
+        if (this.displayChecklist != null) {
+            this.setDisplayChecklist(!this.displayChecklist);
+        } else {
+            this.setDisplayChecklist(true);
+        }
+        if (this.displayChecklist) {
+            RecyclerView recyclerView = (RecyclerView) this.checklistView.getParent().getParent();
+            LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+            layoutManager.scrollToPositionWithOffset(this.getAdapterPosition(), 15);
+        }
+    }
+
+    public void expandCheckboxTouchArea(final View expandedView, final View checkboxView) {
+        expandedView.post(() -> {
+            Rect rect = new Rect();
+            expandedView.getHitRect(rect);
+            expandedView.setTouchDelegate(new TouchDelegate(rect, checkboxView));
+        });
+    }
+
+    @Override
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        if (buttonView == checkbox) {
+            if (isChecked != task.getCompleted()) {
+                TaskCheckedCommand event = new TaskCheckedCommand();
+                event.Task = task;
+                event.completed = !task.getCompleted();
+
+                // it needs to be changed after the event is send -> to the server
+                // maybe a refactor is needed here
+                EventBus.getDefault().post(event);
+                task.completed = event.completed;
+                task.save();
+            }
+        } else {
+            View v = (View) buttonView.getParent();
+            while (v.getParent() != this.checklistView) {
+                v = (View) v.getParent();
+            }
+            Integer position = ((ViewGroup) v.getParent()).indexOfChild(v);
+            if (task.checklist.size() > position && isChecked != task.checklist.get(position).getCompleted()) {
+                ChecklistCheckedCommand event = new ChecklistCheckedCommand();
+                event.task = task;
+                event.item = task.getChecklist().get(position);
+                EventBus.getDefault().post(event);
+            }
+        }
+    }
+
+    @Override
+    public void setDisabled(boolean disabled) {
+        super.setDisabled(disabled);
+
+        this.checkbox.setEnabled(!disabled);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
index 2053291f7..d430a6bc7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/DailyViewHolder.java
@@ -1,58 +1,58 @@
-package com.habitrpg.android.habitica.ui.viewHolders.tasks;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import android.view.View;
-import android.widget.TextView;
-
-import butterknife.BindView;
-
-public class DailyViewHolder extends ChecklistedViewHolder {
-
-    private final int dailyResetOffset;
-    @BindView(R.id.streakTextView)
-    TextView streakTextView;
-
-    public DailyViewHolder(View itemView, int dailyResetOffset) {
-        super(itemView);
-        this.dailyResetOffset = dailyResetOffset;
-    }
-
-    @Override
-    public void bindHolder(Task newTask, int position) {
-        super.bindHolder(newTask, position);
-        if (this.task.isChecklistDisplayActive(dailyResetOffset)) {
-            this.checklistIndicatorWrapper.setBackgroundResource(this.task.getLightTaskColor());
-        } else {
-            this.checklistIndicatorWrapper.setBackgroundColor(this.taskGray);
-        }
-    }
-
-    @Override
-    public Boolean shouldDisplayAsActive() {
-        return this.task.isDisplayedActive(this.dailyResetOffset);
-    }
-
-    @Override
-    protected void configureSpecialTaskTextView(Task task) {
-        super.configureSpecialTaskTextView(task);
-        if (this.streakTextView != null) {
-            if (task.streak != null && task.streak > 0) {
-                this.streakTextView.setText(String.valueOf(task.streak));
-                this.streakTextView.setVisibility(View.VISIBLE);
-            } else {
-                this.streakTextView.setVisibility(View.GONE);
-            }
-        }
-    }
-
-    @Override
-    protected Boolean getTaskIconWrapperIsVisible() {
-        Boolean isVisible = super.getTaskIconWrapperIsVisible();
-        if (this.streakTextView.getVisibility() == View.VISIBLE) {
-            isVisible = true;
-        }
-        return isVisible;
-    }
-}
+package com.habitrpg.android.habitica.ui.viewHolders.tasks;
+
+import android.view.View;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+import butterknife.BindView;
+
+public class DailyViewHolder extends ChecklistedViewHolder {
+
+    private final int dailyResetOffset;
+    @BindView(R.id.streakTextView)
+    TextView streakTextView;
+
+    public DailyViewHolder(View itemView, int dailyResetOffset) {
+        super(itemView);
+        this.dailyResetOffset = dailyResetOffset;
+    }
+
+    @Override
+    public void bindHolder(Task newTask, int position) {
+        super.bindHolder(newTask, position);
+        if (this.task.isChecklistDisplayActive(dailyResetOffset)) {
+            this.checklistIndicatorWrapper.setBackgroundResource(this.task.getLightTaskColor());
+        } else {
+            this.checklistIndicatorWrapper.setBackgroundColor(this.taskGray);
+        }
+    }
+
+    @Override
+    public Boolean shouldDisplayAsActive() {
+        return this.task.isDisplayedActive(this.dailyResetOffset);
+    }
+
+    @Override
+    protected void configureSpecialTaskTextView(Task task) {
+        super.configureSpecialTaskTextView(task);
+        if (this.streakTextView != null) {
+            if (task.streak != null && task.streak > 0) {
+                this.streakTextView.setText(String.valueOf(task.streak));
+                this.streakTextView.setVisibility(View.VISIBLE);
+            } else {
+                this.streakTextView.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    @Override
+    protected Boolean getTaskIconWrapperIsVisible() {
+        Boolean isVisible = super.getTaskIconWrapperIsVisible();
+        if (this.streakTextView.getVisibility() == View.VISIBLE) {
+            isVisible = true;
+        }
+        return isVisible;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
index c3919cf82..1eba2ad48 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/HabitViewHolder.java
@@ -1,97 +1,97 @@
-package com.habitrpg.android.habitica.ui.viewHolders.tasks;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.HabitScoreEvent;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-public class HabitViewHolder extends BaseTaskViewHolder {
-
-    @BindView(R.id.btnPlusWrapper)
-    FrameLayout btnPlusWrapper;
-    @BindView(R.id.btnPlusIconView)
-    ImageView btnPlusIconView;
-    @BindView(R.id.btnPlus)
-    Button btnPlus;
-
-    @BindView(R.id.btnMinusWrapper)
-    FrameLayout btnMinusWrapper;
-    @BindView(R.id.btnMinusIconView)
-    ImageView btnMinusIconView;
-    @BindView(R.id.btnMinus)
-    Button btnMinus;
-
-    public HabitViewHolder(View itemView) {
-        super(itemView);
-    }
-
-    @Override
-    public void bindHolder(Task newTask, int position) {
-        super.bindHolder(newTask, position);
-
-        if (this.task.up) {
-            this.btnPlusWrapper.setBackgroundResource(this.task.getLightTaskColor());
-            if (this.task.getLightTaskColor() == R.color.neutral_100) {
-                this.btnPlusIconView.setImageResource(R.drawable.habit_plus_yellow);
-            } else {
-                this.btnPlusIconView.setImageResource(R.drawable.habit_plus);
-            }
-            this.btnPlus.setVisibility(View.VISIBLE);
-            this.btnPlus.setClickable(true);
-        } else {
-            this.btnPlusWrapper.setBackgroundResource(R.color.habit_inactive_gray);
-            this.btnPlusIconView.setImageResource(R.drawable.habit_plus_disabled);
-            this.btnPlus.setVisibility(View.GONE);
-            this.btnPlus.setClickable(false);
-        }
-
-        if (this.task.down) {
-            this.btnMinusWrapper.setBackgroundResource(this.task.getLightTaskColor());
-            if (this.task.getLightTaskColor() == R.color.neutral_100) {
-                this.btnMinusIconView.setImageResource(R.drawable.habit_minus_yellow);
-            } else {
-                this.btnMinusIconView.setImageResource(R.drawable.habit_minus);
-            }
-            this.btnMinus.setVisibility(View.VISIBLE);
-            this.btnMinus.setClickable(true);
-        } else {
-            this.btnMinusWrapper.setBackgroundResource(R.color.habit_inactive_gray);
-            this.btnMinusIconView.setImageResource(R.drawable.habit_minus_disabled);
-            this.btnMinus.setVisibility(View.GONE);
-            this.btnMinus.setClickable(false);
-        }
-    }
-
-    @OnClick(R.id.btnPlus)
-    public void onPlusButtonClicked() {
-        HabitScoreEvent event = new HabitScoreEvent();
-        event.Up = true;
-        event.habit = task;
-        EventBus.getDefault().post(event);
-    }
-
-    @OnClick(R.id.btnMinus)
-    public void onMinusButtonClicked() {
-        HabitScoreEvent event = new HabitScoreEvent();
-        event.Up = false;
-        event.habit = task;
-        EventBus.getDefault().post(event);
-    }
-
-    @Override
-    public void setDisabled(boolean disabled) {
-        super.setDisabled(disabled);
-
-        this.btnPlus.setEnabled(!disabled);
-        this.btnMinus.setEnabled(!disabled);
-    }
-}
+package com.habitrpg.android.habitica.ui.viewHolders.tasks;
+
+import android.view.View;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.HabitScoreEvent;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+import org.greenrobot.eventbus.EventBus;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+public class HabitViewHolder extends BaseTaskViewHolder {
+
+    @BindView(R.id.btnPlusWrapper)
+    FrameLayout btnPlusWrapper;
+    @BindView(R.id.btnPlusIconView)
+    ImageView btnPlusIconView;
+    @BindView(R.id.btnPlus)
+    Button btnPlus;
+
+    @BindView(R.id.btnMinusWrapper)
+    FrameLayout btnMinusWrapper;
+    @BindView(R.id.btnMinusIconView)
+    ImageView btnMinusIconView;
+    @BindView(R.id.btnMinus)
+    Button btnMinus;
+
+    public HabitViewHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public void bindHolder(Task newTask, int position) {
+        super.bindHolder(newTask, position);
+
+        if (this.task.up) {
+            this.btnPlusWrapper.setBackgroundResource(this.task.getLightTaskColor());
+            if (this.task.getLightTaskColor() == R.color.neutral_100) {
+                this.btnPlusIconView.setImageResource(R.drawable.habit_plus_yellow);
+            } else {
+                this.btnPlusIconView.setImageResource(R.drawable.habit_plus);
+            }
+            this.btnPlus.setVisibility(View.VISIBLE);
+            this.btnPlus.setClickable(true);
+        } else {
+            this.btnPlusWrapper.setBackgroundResource(R.color.habit_inactive_gray);
+            this.btnPlusIconView.setImageResource(R.drawable.habit_plus_disabled);
+            this.btnPlus.setVisibility(View.GONE);
+            this.btnPlus.setClickable(false);
+        }
+
+        if (this.task.down) {
+            this.btnMinusWrapper.setBackgroundResource(this.task.getLightTaskColor());
+            if (this.task.getLightTaskColor() == R.color.neutral_100) {
+                this.btnMinusIconView.setImageResource(R.drawable.habit_minus_yellow);
+            } else {
+                this.btnMinusIconView.setImageResource(R.drawable.habit_minus);
+            }
+            this.btnMinus.setVisibility(View.VISIBLE);
+            this.btnMinus.setClickable(true);
+        } else {
+            this.btnMinusWrapper.setBackgroundResource(R.color.habit_inactive_gray);
+            this.btnMinusIconView.setImageResource(R.drawable.habit_minus_disabled);
+            this.btnMinus.setVisibility(View.GONE);
+            this.btnMinus.setClickable(false);
+        }
+    }
+
+    @OnClick(R.id.btnPlus)
+    public void onPlusButtonClicked() {
+        HabitScoreEvent event = new HabitScoreEvent();
+        event.Up = true;
+        event.habit = task;
+        EventBus.getDefault().post(event);
+    }
+
+    @OnClick(R.id.btnMinus)
+    public void onMinusButtonClicked() {
+        HabitScoreEvent event = new HabitScoreEvent();
+        event.Up = false;
+        event.habit = task;
+        EventBus.getDefault().post(event);
+    }
+
+    @Override
+    public void setDisabled(boolean disabled) {
+        super.setDisabled(disabled);
+
+        this.btnPlus.setEnabled(!disabled);
+        this.btnMinus.setEnabled(!disabled);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
index c37b2d372..d98179978 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java
@@ -1,98 +1,98 @@
-package com.habitrpg.android.habitica.ui.viewHolders.tasks;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.TaskTappedEvent;
-import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
-import com.habitrpg.android.habitica.ui.ItemDetailDialog;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import org.greenrobot.eventbus.EventBus;
-
-import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.view.View;
-import android.widget.Button;
-
-import java.text.DecimalFormat;
-
-import butterknife.BindView;
-import butterknife.OnClick;
-
-public class RewardViewHolder extends BaseTaskViewHolder {
-
-    private final DecimalFormat priceFormat;
-    @BindView(R.id.rewardImageView)
-    SimpleDraweeView rewardImageView;
-
-    @BindView(R.id.btnReward)
-    Button rewardButton;
-
-    private Drawable customRewardIcon;
-
-    public RewardViewHolder(View itemView) {
-        super(itemView);
-        priceFormat = new DecimalFormat("0.##");
-
-        customRewardIcon = ContextCompat.getDrawable(itemView.getContext(), R.drawable.custom_reward);
-    }
-
-    @Override
-    public void bindHolder(Task newTask, int position) {
-        super.bindHolder(newTask, position);
-
-        this.rewardButton.setText(this.priceFormat.format(this.task.value));
-
-        if (this.isItem()) {
-            DataBindingUtils.loadImage(this.rewardImageView, "shop_" + this.task.getId());
-        } else {
-            this.rewardImageView.setImageDrawable(customRewardIcon);
-        }
-    }
-
-    private boolean isItem() {
-        return this.task.specialTag != null && this.task.specialTag.equals("item");
-    }
-
-    @Override
-    public boolean canContainMarkdown() {
-        return !isItem();
-    }
-
-    @OnClick(R.id.btnReward)
-    void buyReward() {
-        BuyRewardCommand event = new BuyRewardCommand();
-        event.Reward = task;
-        EventBus.getDefault().post(event);
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (task.specialTag != null && task.specialTag.equals("item")) {
-            ItemDetailDialog dialog = new ItemDetailDialog(context);
-            dialog.setTitle(task.getText());
-            dialog.setDescription(task.getNotes());
-            dialog.setImage("shop_" + this.task.getId());
-            dialog.setCurrency("gold");
-            dialog.setValue(task.getValue());
-            dialog.setBuyListener((clickedDialog, which) -> {
-                this.buyReward();
-            });
-            dialog.show();
-        } else {
-            TaskTappedEvent event = new TaskTappedEvent();
-            event.Task = task;
-
-            EventBus.getDefault().post(event);
-        }
-    }
-
-    @Override
-    public void setDisabled(boolean disabled) {
-        super.setDisabled(disabled);
-
-        this.rewardButton.setEnabled(!disabled);
-    }
-
-}
+package com.habitrpg.android.habitica.ui.viewHolders.tasks;
+
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
+import android.view.View;
+import android.widget.Button;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.TaskTappedEvent;
+import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.ui.ItemDetailDialog;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.text.DecimalFormat;
+
+import butterknife.BindView;
+import butterknife.OnClick;
+
+public class RewardViewHolder extends BaseTaskViewHolder {
+
+    private final DecimalFormat priceFormat;
+    @BindView(R.id.rewardImageView)
+    SimpleDraweeView rewardImageView;
+
+    @BindView(R.id.btnReward)
+    Button rewardButton;
+
+    private Drawable customRewardIcon;
+
+    public RewardViewHolder(View itemView) {
+        super(itemView);
+        priceFormat = new DecimalFormat("0.##");
+
+        customRewardIcon = ContextCompat.getDrawable(itemView.getContext(), R.drawable.custom_reward);
+    }
+
+    @Override
+    public void bindHolder(Task newTask, int position) {
+        super.bindHolder(newTask, position);
+
+        this.rewardButton.setText(this.priceFormat.format(this.task.value));
+
+        if (this.isItem()) {
+            DataBindingUtils.loadImage(this.rewardImageView, "shop_" + this.task.getId());
+        } else {
+            this.rewardImageView.setImageDrawable(customRewardIcon);
+        }
+    }
+
+    private boolean isItem() {
+        return this.task.specialTag != null && this.task.specialTag.equals("item");
+    }
+
+    @Override
+    public boolean canContainMarkdown() {
+        return !isItem();
+    }
+
+    @OnClick(R.id.btnReward)
+    void buyReward() {
+        BuyRewardCommand event = new BuyRewardCommand();
+        event.Reward = task;
+        EventBus.getDefault().post(event);
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (task.specialTag != null && task.specialTag.equals("item")) {
+            ItemDetailDialog dialog = new ItemDetailDialog(context);
+            dialog.setTitle(task.getText());
+            dialog.setDescription(task.getNotes());
+            dialog.setImage("shop_" + this.task.getId());
+            dialog.setCurrency("gold");
+            dialog.setValue(task.getValue());
+            dialog.setBuyListener((clickedDialog, which) -> {
+                this.buyReward();
+            });
+            dialog.show();
+        } else {
+            TaskTappedEvent event = new TaskTappedEvent();
+            event.Task = task;
+
+            EventBus.getDefault().post(event);
+        }
+    }
+
+    @Override
+    public void setDisabled(boolean disabled) {
+        super.setDisabled(disabled);
+
+        this.rewardButton.setEnabled(!disabled);
+    }
+
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
index 0bf418d3d..a20910939 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/TodoViewHolder.java
@@ -1,45 +1,45 @@
-package com.habitrpg.android.habitica.ui.viewHolders.tasks;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import android.view.View;
-
-import java.text.DateFormat;
-
-public class TodoViewHolder extends ChecklistedViewHolder {
-
-    private DateFormat dateFormatter;
-
-    public TodoViewHolder(View itemView) {
-        super(itemView);
-        dateFormatter = android.text.format.DateFormat.getDateFormat(context);
-    }
-
-    @Override
-    public void bindHolder(Task newTask, int position) {
-        super.bindHolder(newTask, position);
-        if (this.task.getCompleted()) {
-            this.checklistIndicatorWrapper.setBackgroundColor(this.taskGray);
-        } else {
-            this.checklistIndicatorWrapper.setBackgroundResource(this.task.getLightTaskColor());
-        }
-
-    }
-
-    @Override
-    protected void configureSpecialTaskTextView(Task task) {
-        if (this.specialTaskTextView != null) {
-            if (task.duedate != null) {
-                this.specialTaskTextView.setText(dateFormatter.format(task.duedate));
-                this.specialTaskTextView.setVisibility(View.VISIBLE);
-            } else {
-                this.specialTaskTextView.setVisibility(View.INVISIBLE);
-            }
-        }
-    }
-
-    @Override
-    public Boolean shouldDisplayAsActive() {
-        return !this.task.getCompleted();
-    }
-}
+package com.habitrpg.android.habitica.ui.viewHolders.tasks;
+
+import android.view.View;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+import java.text.DateFormat;
+
+public class TodoViewHolder extends ChecklistedViewHolder {
+
+    private DateFormat dateFormatter;
+
+    public TodoViewHolder(View itemView) {
+        super(itemView);
+        dateFormatter = android.text.format.DateFormat.getDateFormat(context);
+    }
+
+    @Override
+    public void bindHolder(Task newTask, int position) {
+        super.bindHolder(newTask, position);
+        if (this.task.getCompleted()) {
+            this.checklistIndicatorWrapper.setBackgroundColor(this.taskGray);
+        } else {
+            this.checklistIndicatorWrapper.setBackgroundResource(this.task.getLightTaskColor());
+        }
+
+    }
+
+    @Override
+    protected void configureSpecialTaskTextView(Task task) {
+        if (this.specialTaskTextView != null) {
+            if (task.duedate != null) {
+                this.specialTaskTextView.setText(dateFormatter.format(task.duedate));
+                this.specialTaskTextView.setVisibility(View.VISIBLE);
+            } else {
+                this.specialTaskTextView.setVisibility(View.INVISIBLE);
+            }
+        }
+    }
+
+    @Override
+    public Boolean shouldDisplayAsActive() {
+        return !this.task.getCompleted();
+    }
+}
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
index 0cf671aff..95eccc016 100644
--- 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
@@ -3,7 +3,6 @@ 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;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
index f84fdcd9b..64e90cee2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/LoginBackgroundView.java
@@ -1,149 +1,147 @@
-package com.habitrpg.android.habitica.ui.views.login;
-
-
-import com.habitrpg.android.habitica.R;
-
-import android.animation.ObjectAnimator;
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.support.annotation.Nullable;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.animation.AnticipateInterpolator;
-import android.view.animation.OvershootInterpolator;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class LoginBackgroundView extends RelativeLayout {
-
-    private static float SIZE_FACTOR = 1.5f;
-    private static int STAR_SIZE = 30;
-    private static int STAR_OFFSET = 18;
-    private final Random random;
-
-    @BindView(R.id.left_cloud_view)
-    ImageView leftCloudView;
-    @BindView(R.id.right_cloud_view)
-    ImageView rightCloudView;
-
-    private List<StarView> starViews;
-    private int width;
-    private int height;
-    private boolean didLayoutStars = false;
-    private FrameLayout.LayoutParams params;
-
-    public LoginBackgroundView(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        this.random = new Random();
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-        ButterKnife.bind(this, this);
-        starViews = new ArrayList<>();
-        params = new FrameLayout.LayoutParams(0, 0);
-        generateStars();
-        animateClouds();
-    }
-
-    private void animateClouds() {
-        ValueAnimator leftAnimator = ObjectAnimator.ofFloat(leftCloudView, View.TRANSLATION_Y, 10.0f).setDuration(5000);
-        leftAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        leftAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        leftAnimator.start();
-        ValueAnimator rightAnimator = ObjectAnimator.ofFloat(rightCloudView, View.TRANSLATION_Y, -10.0f).setDuration(8000);
-        rightAnimator.setRepeatCount(ValueAnimator.INFINITE);
-        rightAnimator.setRepeatMode(ValueAnimator.REVERSE);
-        rightAnimator.start();
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
-        int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
-        int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
-        this.width = parentWidth;
-        this.height = (int)(parentHeight*SIZE_FACTOR);
-        this.setMeasuredDimension(width, height);
-        params.width = width;
-        params.height = height;
-        this.setLayoutParams(params);
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int l, int t, int r, int b) {
-        super.onLayout(changed, l, t, r, b);
-        updateStarLayoutParams();
-    }
-
-    public void generateStars() {
-        generateStars(1, 12, 25);
-    }
-
-    private void generateStars(int largeCount, int mediumCount, int smallCount) {
-        removeStarViews();
-        for (int x = 0; x < largeCount; x++) {
-            generateStar(2);
-        }
-        for (int x = 0; x < mediumCount; x++) {
-            generateStar(1);
-        }
-        for (int x = 0; x < smallCount; x++) {
-            generateStar(0);
-        }
-        requestLayout();
-    }
-
-    private void removeStarViews() {
-        if (starViews.size() > 0) {
-            starViews.forEach(this::removeView);
-            starViews.clear();
-        }
-    }
-
-    private void generateStar(int size) {
-        StarView starView = new StarView(getContext()
-        );
-        starView.setStarSize(size);
-        if (random.nextInt(10) > 2) {
-            starView.setBlinkDurations(Arrays.asList(getBlinkDuration(), getBlinkDuration(), getBlinkDuration()));
-        }
-        starViews.add(starView);
-        if (width > 0 && height > 0) {
-            this.addView(starView, 0, getStarParams());
-        } else {
-            this.addView(starView, 0);
-        }
-    }
-
-    private int getBlinkDuration() {
-        return random.nextInt(30)*800+4;
-    }
-
-    private void updateStarLayoutParams() {
-        if (width <= 0 || height <= 0 || didLayoutStars || starViews.size() == 0) {
-            return;
-        }
-        for (StarView view : starViews) {
-            view.setLayoutParams(getStarParams());
-        }
-        didLayoutStars = true;
-    }
-
-    private RelativeLayout.LayoutParams getStarParams() {
-        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(STAR_SIZE, STAR_SIZE);
-        params.leftMargin = random.nextInt(width);
-        params.topMargin = random.nextInt(height);
-        return params;
-    }
-}
+package com.habitrpg.android.habitica.ui.views.login;
+
+
+import android.animation.ObjectAnimator;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
+import com.habitrpg.android.habitica.R;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class LoginBackgroundView extends RelativeLayout {
+
+    private static float SIZE_FACTOR = 1.5f;
+    private static int STAR_SIZE = 30;
+    private static int STAR_OFFSET = 18;
+    private final Random random;
+
+    @BindView(R.id.left_cloud_view)
+    ImageView leftCloudView;
+    @BindView(R.id.right_cloud_view)
+    ImageView rightCloudView;
+
+    private List<StarView> starViews;
+    private int width;
+    private int height;
+    private boolean didLayoutStars = false;
+    private FrameLayout.LayoutParams params;
+
+    public LoginBackgroundView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        this.random = new Random();
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        ButterKnife.bind(this, this);
+        starViews = new ArrayList<>();
+        params = new FrameLayout.LayoutParams(0, 0);
+        generateStars();
+        animateClouds();
+    }
+
+    private void animateClouds() {
+        ValueAnimator leftAnimator = ObjectAnimator.ofFloat(leftCloudView, View.TRANSLATION_Y, 10.0f).setDuration(5000);
+        leftAnimator.setRepeatCount(ValueAnimator.INFINITE);
+        leftAnimator.setRepeatMode(ValueAnimator.REVERSE);
+        leftAnimator.start();
+        ValueAnimator rightAnimator = ObjectAnimator.ofFloat(rightCloudView, View.TRANSLATION_Y, -10.0f).setDuration(8000);
+        rightAnimator.setRepeatCount(ValueAnimator.INFINITE);
+        rightAnimator.setRepeatMode(ValueAnimator.REVERSE);
+        rightAnimator.start();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec){
+        int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
+        int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
+        this.width = parentWidth;
+        this.height = (int)(parentHeight*SIZE_FACTOR);
+        this.setMeasuredDimension(width, height);
+        params.width = width;
+        params.height = height;
+        this.setLayoutParams(params);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        updateStarLayoutParams();
+    }
+
+    public void generateStars() {
+        generateStars(1, 12, 25);
+    }
+
+    private void generateStars(int largeCount, int mediumCount, int smallCount) {
+        removeStarViews();
+        for (int x = 0; x < largeCount; x++) {
+            generateStar(2);
+        }
+        for (int x = 0; x < mediumCount; x++) {
+            generateStar(1);
+        }
+        for (int x = 0; x < smallCount; x++) {
+            generateStar(0);
+        }
+        requestLayout();
+    }
+
+    private void removeStarViews() {
+        if (starViews.size() > 0) {
+            starViews.forEach(this::removeView);
+            starViews.clear();
+        }
+    }
+
+    private void generateStar(int size) {
+        StarView starView = new StarView(getContext()
+        );
+        starView.setStarSize(size);
+        if (random.nextInt(10) > 2) {
+            starView.setBlinkDurations(Arrays.asList(getBlinkDuration(), getBlinkDuration(), getBlinkDuration()));
+        }
+        starViews.add(starView);
+        if (width > 0 && height > 0) {
+            this.addView(starView, 0, getStarParams());
+        } else {
+            this.addView(starView, 0);
+        }
+    }
+
+    private int getBlinkDuration() {
+        return random.nextInt(30)*800+4;
+    }
+
+    private void updateStarLayoutParams() {
+        if (width <= 0 || height <= 0 || didLayoutStars || starViews.size() == 0) {
+            return;
+        }
+        for (StarView view : starViews) {
+            view.setLayoutParams(getStarParams());
+        }
+        didLayoutStars = true;
+    }
+
+    private RelativeLayout.LayoutParams getStarParams() {
+        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(STAR_SIZE, STAR_SIZE);
+        params.leftMargin = random.nextInt(width);
+        params.topMargin = random.nextInt(height);
+        return params;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.java
index 2b3f3f753..d00aaaf21 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/login/StarView.java
@@ -1,11 +1,8 @@
 package com.habitrpg.android.habitica.ui.views.login;
 
 
-import com.habitrpg.android.habitica.R;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -14,6 +11,8 @@ import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.habitrpg.android.habitica.R;
+
 import java.util.List;
 
 public class StarView extends AppCompatImageView {
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
index b4578275b..a5bea2770 100644
--- 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
@@ -1,8 +1,6 @@
 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;
@@ -14,6 +12,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
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
index 7d4a5117d..3f67efcf4 100644
--- 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
@@ -1,13 +1,13 @@
 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;
 
+import com.habitrpg.android.habitica.R;
+
 public class AvatarCustomizationDrawer extends LinearLayout {
     public AvatarCustomizationDrawer(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
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 1b422d389..a711a5ce6 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
@@ -1,133 +1,133 @@
-package com.habitrpg.android.habitica.ui.views.subscriptions;
-
-
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
-public class SubscriptionDetailsView extends LinearLayout {
-
-    @BindView(R.id.subscriptionDurationTextView)
-    TextView subscriptionDurationTextView;
-
-    @BindView(R.id.subscriptionStatusActive)
-    TextView subscriptionStatusActive;
-    @BindView(R.id.subscriptionStatusInactive)
-    TextView getSubscriptionStatusInactive;
-
-    @BindView(R.id.paymentProcessorTextView)
-    TextView paymentProcessorTextView;
-
-    @BindView(R.id.monthsSubscribedTextView)
-    TextView monthsSubscribedTextView;
-
-    @BindView(R.id.gemCapTextView)
-    TextView gemCapTextView;
-
-    @BindView(R.id.currentHourglassesTextView)
-    TextView currentHourglassesTextView;
-
-    @BindView(R.id.cancelSubscriptionDescription)
-    TextView cancelSubscripnDescription;
-
-    @BindView(R.id.visitWebsiteButton)
-    Button visitWebsiteButton;
-
-    private SubscriptionPlan plan;
-
-    public SubscriptionDetailsView(Context context, AttributeSet attributeSet) {
-        super(context, attributeSet);
-        setupView();
-    }
-
-    public SubscriptionDetailsView(Context context) {
-        super(context);
-        setupView();
-    }
-
-    private void setupView() {
-        inflate(getContext(), R.layout.subscription_details, this);
-
-        ButterKnife.bind(this);
-    }
-
-    public void setPlan(SubscriptionPlan plan) {
-        this.plan = plan;
-
-        if (plan.isActive()) {
-            subscriptionStatusActive.setVisibility(View.VISIBLE);
-            getSubscriptionStatusInactive.setVisibility(View.GONE);
-        } else {
-            subscriptionStatusActive.setVisibility(View.GONE);
-            getSubscriptionStatusInactive.setVisibility(View.VISIBLE);
-        }
-
-        String duration = null;
-
-        if (plan.planId != null) {
-            if (plan.planId.equals(SubscriptionPlan.PLANID_BASIC) || plan.planId.equals(SubscriptionPlan.PLANID_BASICEARNED)) {
-                duration = getResources().getString(R.string.month);
-            } else if (plan.planId.equals(SubscriptionPlan.PLANID_BASIC3MONTH)) {
-                duration = getResources().getString(R.string.three_months);
-            } else if (plan.planId.equals(SubscriptionPlan.PLANID_BASIC6MONTH) || plan.planId.equals(SubscriptionPlan.PLANID_GOOGLE6MONTH)) {
-                duration = getResources().getString(R.string.six_months);
-            } else if (plan.planId.equals(SubscriptionPlan.PLANID_BASIC12MONTH)) {
-                duration = getResources().getString(R.string.twelve_months);
-            }
-        }
-
-        if (duration != null) {
-            subscriptionDurationTextView.setText(getResources().getString(R.string.subscription_duration, duration));
-        }
-
-        paymentProcessorTextView.setText(plan.paymentMethod);
-
-        if (plan.consecutive.getCount() == 1) {
-            monthsSubscribedTextView.setText(getResources().getString(R.string.one_month));
-        } else {
-            monthsSubscribedTextView.setText(getResources().getString(R.string.months, plan.consecutive.getCount()));
-        }
-        gemCapTextView.setText(String.valueOf(plan.consecutive.getGemCapExtra() + 25));
-        currentHourglassesTextView.setText(String.valueOf(plan.consecutive.getTrinkets()));
-
-        if (plan.paymentMethod != null) {
-            if (plan.paymentMethod.equals("Google")) {
-                cancelSubscripnDescription.setText(R.string.cancel_subscription_google_description);
-                visitWebsiteButton.setText(R.string.open_in_store);
-            } else {
-                cancelSubscripnDescription.setText(R.string.cancel_subscription_notgoogle_description);
-                visitWebsiteButton.setText(R.string.visit_habitica_website);
-            }
-        }
-    }
-
-    @OnClick(R.id.visitWebsiteButton)
-    public void openSubscriptionWebsite() {
-        if (plan.paymentMethod != null) {
-            Intent intent;
-            if (plan.paymentMethod.equals("Google")) {
-                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 + "/"));
-            }
-            getContext().startActivity(intent);
-        }
-    }
-}
+package com.habitrpg.android.habitica.ui.views.subscriptions;
+
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class SubscriptionDetailsView extends LinearLayout {
+
+    @BindView(R.id.subscriptionDurationTextView)
+    TextView subscriptionDurationTextView;
+
+    @BindView(R.id.subscriptionStatusActive)
+    TextView subscriptionStatusActive;
+    @BindView(R.id.subscriptionStatusInactive)
+    TextView getSubscriptionStatusInactive;
+
+    @BindView(R.id.paymentProcessorTextView)
+    TextView paymentProcessorTextView;
+
+    @BindView(R.id.monthsSubscribedTextView)
+    TextView monthsSubscribedTextView;
+
+    @BindView(R.id.gemCapTextView)
+    TextView gemCapTextView;
+
+    @BindView(R.id.currentHourglassesTextView)
+    TextView currentHourglassesTextView;
+
+    @BindView(R.id.cancelSubscriptionDescription)
+    TextView cancelSubscripnDescription;
+
+    @BindView(R.id.visitWebsiteButton)
+    Button visitWebsiteButton;
+
+    private SubscriptionPlan plan;
+
+    public SubscriptionDetailsView(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+        setupView();
+    }
+
+    public SubscriptionDetailsView(Context context) {
+        super(context);
+        setupView();
+    }
+
+    private void setupView() {
+        inflate(getContext(), R.layout.subscription_details, this);
+
+        ButterKnife.bind(this);
+    }
+
+    public void setPlan(SubscriptionPlan plan) {
+        this.plan = plan;
+
+        if (plan.isActive()) {
+            subscriptionStatusActive.setVisibility(View.VISIBLE);
+            getSubscriptionStatusInactive.setVisibility(View.GONE);
+        } else {
+            subscriptionStatusActive.setVisibility(View.GONE);
+            getSubscriptionStatusInactive.setVisibility(View.VISIBLE);
+        }
+
+        String duration = null;
+
+        if (plan.planId != null) {
+            if (plan.planId.equals(SubscriptionPlan.PLANID_BASIC) || plan.planId.equals(SubscriptionPlan.PLANID_BASICEARNED)) {
+                duration = getResources().getString(R.string.month);
+            } else if (plan.planId.equals(SubscriptionPlan.PLANID_BASIC3MONTH)) {
+                duration = getResources().getString(R.string.three_months);
+            } else if (plan.planId.equals(SubscriptionPlan.PLANID_BASIC6MONTH) || plan.planId.equals(SubscriptionPlan.PLANID_GOOGLE6MONTH)) {
+                duration = getResources().getString(R.string.six_months);
+            } else if (plan.planId.equals(SubscriptionPlan.PLANID_BASIC12MONTH)) {
+                duration = getResources().getString(R.string.twelve_months);
+            }
+        }
+
+        if (duration != null) {
+            subscriptionDurationTextView.setText(getResources().getString(R.string.subscription_duration, duration));
+        }
+
+        paymentProcessorTextView.setText(plan.paymentMethod);
+
+        if (plan.consecutive.getCount() == 1) {
+            monthsSubscribedTextView.setText(getResources().getString(R.string.one_month));
+        } else {
+            monthsSubscribedTextView.setText(getResources().getString(R.string.months, plan.consecutive.getCount()));
+        }
+        gemCapTextView.setText(String.valueOf(plan.consecutive.getGemCapExtra() + 25));
+        currentHourglassesTextView.setText(String.valueOf(plan.consecutive.getTrinkets()));
+
+        if (plan.paymentMethod != null) {
+            if (plan.paymentMethod.equals("Google")) {
+                cancelSubscripnDescription.setText(R.string.cancel_subscription_google_description);
+                visitWebsiteButton.setText(R.string.open_in_store);
+            } else {
+                cancelSubscripnDescription.setText(R.string.cancel_subscription_notgoogle_description);
+                visitWebsiteButton.setText(R.string.visit_habitica_website);
+            }
+        }
+    }
+
+    @OnClick(R.id.visitWebsiteButton)
+    public void openSubscriptionWebsite() {
+        if (plan.paymentMethod != null) {
+            Intent intent;
+            if (plan.paymentMethod.equals("Google")) {
+                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 + "/"));
+            }
+            getContext().startActivity(intent);
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.java
index 831d54036..480684123 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionOptionView.java
@@ -1,7 +1,5 @@
 package com.habitrpg.android.habitica.ui.views.subscriptions;
 
-import com.habitrpg.android.habitica.R;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
@@ -10,6 +8,8 @@ import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
+import com.habitrpg.android.habitica.R;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
index ff7f9002e..deac2de4b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
@@ -1,426 +1,426 @@
-package com.habitrpg.android.habitica.ui.views.tasks;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.CompoundButtonCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.AppCompatCheckBox;
-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.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.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 Drawable addIcon;
-    private boolean isEditing;
-
-    public TaskFilterDialog(Context context, AppComponent component) {
-        super(context);
-        component.inject(this);
-        addIcon = ContextCompat.getDrawable(context, R.drawable.ic_add_purple_300_36dp);
-
-        LayoutInflater inflater = LayoutInflater.from(context);
-        View view = inflater.inflate(R.layout.dialog_task_filter, null);
-
-        ButterKnife.bind(this, view);
-
-        taskFilters.setOnCheckedChangeListener(this);
-
-        setTitle(R.string.filters);
-        setView(view);
-        this.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.done), (dialog, which) -> {
-            if (isEditing) {
-                stopEditing();
-            }
-            if (listener != null) {
-                listener.onFilterCompleted(filterType, activeTags);
-            }
-            this.dismiss();
-        });
-
-        setButton(AlertDialog.BUTTON_NEUTRAL, getContext().getString(R.string.clear), (dialog, which) -> {
-        });
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Button clearButton = getButton(AlertDialog.BUTTON_NEUTRAL);
-        if (clearButton != null) {
-            clearButton.setOnClickListener(view1 -> {
-                if (isEditing) {
-                    stopEditing();
-                }
-                setActiveFilter(null);
-                setActiveTags(null);
-            });
-            clearButton.setEnabled(hasActiveFilters());
-        }
-    }
-
-    @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() {
-        ColorStateList colorStateList = new ColorStateList(
-                new int[][]{
-                        new int[]{-android.R.attr.state_checked}, //disabled
-                        new int[]{android.R.attr.state_checked} //enabled
-                },
-                new int[] {
-                        Color.LTGRAY, //disabled
-                        ContextCompat.getColor(getContext(), R.color.brand_400) //enabled
-                }
-        );
-        int leftPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, getContext().getResources().getDisplayMetrics());
-        int verticalPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12, getContext().getResources().getDisplayMetrics());
-        for (Tag tag : tags) {
-            AppCompatCheckBox tagCheckbox = new AppCompatCheckBox(getContext());
-            tagCheckbox.setText(tag.getName());
-            tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP,16);
-            tagCheckbox.setPadding(tagCheckbox.getPaddingLeft()+ leftPadding,
-                    verticalPadding,
-                    tagCheckbox.getPaddingRight(),
-                    verticalPadding);
-            tagCheckbox.setTextColor(ContextCompat.getColor(getContext(), R.color.textColorLight));
-            CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList);
-            tagCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                if (isChecked) {
-                    if (!activeTags.contains(tag.getId())) {
-                        activeTags.add(tag.getId());
-                    }
-                } else {
-                    if (activeTags.contains(tag.getId())) {
-                        activeTags.remove(tag.getId());
-                    }
-                }
-                filtersChanged();
-            });
-            tagsList.addView(tagCheckbox);
-        }
-        createAddTagButton();
-    }
-
-    private void createAddTagButton() {
-        Button button = new Button(getContext());
-        button.setText(R.string.add_tag);
-        button.setOnClickListener(v -> createTag());
-        button.setCompoundDrawablesWithIntrinsicBounds(addIcon, null, null, null);
-        button.setBackgroundResource(R.drawable.layout_rounded_bg_lighter_gray);
-        button.setTextColor(ContextCompat.getColor(getContext(), R.color.text_light));
-        tagsList.addView(button);
-    }
-
-    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) {
-                if (index >= tags.size()) {
-                    return;
-                }
-                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(@Nullable List<String> tagIds) {
-        if (tagIds == null) {
-            this.activeTags.clear();
-        } else {
-            this.activeTags = tagIds;
-        }
-        for (int index = 0; index < tagsList.getChildCount()-1; index++) {
-            ((AppCompatCheckBox)tagsList.getChildAt(index)).setChecked(false);
-        }
-        for (String tagId : this.activeTags) {
-            int index = indexForId(tagId);
-            if (index >= 0) {
-                ((CheckBox)tagsList.getChildAt(index)).setChecked(true);
-            }
-        }
-        filtersChanged();
-    }
-
-    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(@Nullable 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);
-        filtersChanged();
-    }
-
-    @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;
-            }
-        }
-        filtersChanged();
-    }
-
-    @OnClick(R.id.tag_edit_button)
-    void editButtonClicked() {
-        isEditing = !isEditing;
-        if (isEditing) {
-            startEditing();
-        } else {
-            stopEditing();
-        }
-    }
-
-    private void filtersChanged() {
-        Button clearButton = getButton(AlertDialog.BUTTON_NEUTRAL);
-        if (clearButton != null) {
-            clearButton.setEnabled(hasActiveFilters());
-        }
-     }
-
-    private boolean hasActiveFilters() {
-        return taskFilters.getCheckedRadioButtonId() != R.id.all_task_filter || activeTags.size() > 0;
-    }
-
-    public void setListener(OnFilterCompletedListener listener) {
-        this.listener = listener;
-    }
-
-    public interface OnFilterCompletedListener {
-
-        void onFilterCompleted(String activeTaskFilter, List<String> activeTags);
-    }
-}
+package com.habitrpg.android.habitica.ui.views.tasks;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.support.annotation.IdRes;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.support.v4.widget.CompoundButtonCompat;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.widget.AppCompatCheckBox;
+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.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.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 Drawable addIcon;
+    private boolean isEditing;
+
+    public TaskFilterDialog(Context context, AppComponent component) {
+        super(context);
+        component.inject(this);
+        addIcon = ContextCompat.getDrawable(context, R.drawable.ic_add_purple_300_36dp);
+
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View view = inflater.inflate(R.layout.dialog_task_filter, null);
+
+        ButterKnife.bind(this, view);
+
+        taskFilters.setOnCheckedChangeListener(this);
+
+        setTitle(R.string.filters);
+        setView(view);
+        this.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.done), (dialog, which) -> {
+            if (isEditing) {
+                stopEditing();
+            }
+            if (listener != null) {
+                listener.onFilterCompleted(filterType, activeTags);
+            }
+            this.dismiss();
+        });
+
+        setButton(AlertDialog.BUTTON_NEUTRAL, getContext().getString(R.string.clear), (dialog, which) -> {
+        });
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Button clearButton = getButton(AlertDialog.BUTTON_NEUTRAL);
+        if (clearButton != null) {
+            clearButton.setOnClickListener(view1 -> {
+                if (isEditing) {
+                    stopEditing();
+                }
+                setActiveFilter(null);
+                setActiveTags(null);
+            });
+            clearButton.setEnabled(hasActiveFilters());
+        }
+    }
+
+    @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() {
+        ColorStateList colorStateList = new ColorStateList(
+                new int[][]{
+                        new int[]{-android.R.attr.state_checked}, //disabled
+                        new int[]{android.R.attr.state_checked} //enabled
+                },
+                new int[] {
+                        Color.LTGRAY, //disabled
+                        ContextCompat.getColor(getContext(), R.color.brand_400) //enabled
+                }
+        );
+        int leftPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16, getContext().getResources().getDisplayMetrics());
+        int verticalPadding = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12, getContext().getResources().getDisplayMetrics());
+        for (Tag tag : tags) {
+            AppCompatCheckBox tagCheckbox = new AppCompatCheckBox(getContext());
+            tagCheckbox.setText(tag.getName());
+            tagCheckbox.setTextSize(TypedValue.COMPLEX_UNIT_SP,16);
+            tagCheckbox.setPadding(tagCheckbox.getPaddingLeft()+ leftPadding,
+                    verticalPadding,
+                    tagCheckbox.getPaddingRight(),
+                    verticalPadding);
+            tagCheckbox.setTextColor(ContextCompat.getColor(getContext(), R.color.textColorLight));
+            CompoundButtonCompat.setButtonTintList(tagCheckbox, colorStateList);
+            tagCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+                if (isChecked) {
+                    if (!activeTags.contains(tag.getId())) {
+                        activeTags.add(tag.getId());
+                    }
+                } else {
+                    if (activeTags.contains(tag.getId())) {
+                        activeTags.remove(tag.getId());
+                    }
+                }
+                filtersChanged();
+            });
+            tagsList.addView(tagCheckbox);
+        }
+        createAddTagButton();
+    }
+
+    private void createAddTagButton() {
+        Button button = new Button(getContext());
+        button.setText(R.string.add_tag);
+        button.setOnClickListener(v -> createTag());
+        button.setCompoundDrawablesWithIntrinsicBounds(addIcon, null, null, null);
+        button.setBackgroundResource(R.drawable.layout_rounded_bg_lighter_gray);
+        button.setTextColor(ContextCompat.getColor(getContext(), R.color.text_light));
+        tagsList.addView(button);
+    }
+
+    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) {
+                if (index >= tags.size()) {
+                    return;
+                }
+                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(@Nullable List<String> tagIds) {
+        if (tagIds == null) {
+            this.activeTags.clear();
+        } else {
+            this.activeTags = tagIds;
+        }
+        for (int index = 0; index < tagsList.getChildCount()-1; index++) {
+            ((AppCompatCheckBox)tagsList.getChildAt(index)).setChecked(false);
+        }
+        for (String tagId : this.activeTags) {
+            int index = indexForId(tagId);
+            if (index >= 0) {
+                ((CheckBox)tagsList.getChildAt(index)).setChecked(true);
+            }
+        }
+        filtersChanged();
+    }
+
+    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(@Nullable 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);
+        filtersChanged();
+    }
+
+    @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;
+            }
+        }
+        filtersChanged();
+    }
+
+    @OnClick(R.id.tag_edit_button)
+    void editButtonClicked() {
+        isEditing = !isEditing;
+        if (isEditing) {
+            startEditing();
+        } else {
+            stopEditing();
+        }
+    }
+
+    private void filtersChanged() {
+        Button clearButton = getButton(AlertDialog.BUTTON_NEUTRAL);
+        if (clearButton != null) {
+            clearButton.setEnabled(hasActiveFilters());
+        }
+     }
+
+    private boolean hasActiveFilters() {
+        return taskFilters.getCheckedRadioButtonId() != R.id.all_task_filter || activeTags.size() > 0;
+    }
+
+    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/utils/BooleanAsIntAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.java
index c1b2b8149..63c78e8ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/BooleanAsIntAdapter.java
@@ -1,38 +1,38 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-public class BooleanAsIntAdapter extends TypeAdapter<Boolean> {
-
-    @Override
-    public void write(JsonWriter out, Boolean value) throws IOException {
-        if (value == null) {
-            out.nullValue();
-        } else {
-            out.value(value);
-        }
-    }
-
-    @Override
-    public Boolean read(JsonReader in) throws IOException {
-        JsonToken peek = in.peek();
-        switch (peek) {
-            case BOOLEAN:
-                return in.nextBoolean();
-            case NULL:
-                in.nextNull();
-                return null;
-            case NUMBER:
-                return in.nextInt() != 0;
-            case STRING:
-                return Boolean.parseBoolean(in.nextString());
-            default:
-                throw new IllegalStateException("Expected BOOLEAN or NUMBER but was " + peek);
-        }
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+
+public class BooleanAsIntAdapter extends TypeAdapter<Boolean> {
+
+    @Override
+    public void write(JsonWriter out, Boolean value) throws IOException {
+        if (value == null) {
+            out.nullValue();
+        } else {
+            out.value(value);
+        }
+    }
+
+    @Override
+    public Boolean read(JsonReader in) throws IOException {
+        JsonToken peek = in.peek();
+        switch (peek) {
+            case BOOLEAN:
+                return in.nextBoolean();
+            case NULL:
+                in.nextNull();
+                return null;
+            case NUMBER:
+                return in.nextInt() != 0;
+            case STRING:
+                return Boolean.parseBoolean(in.nextString());
+            default:
+                throw new IllegalStateException("Expected BOOLEAN or NUMBER but was " + peek);
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java
index ee5fe6818..53b4acf48 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChallengeDeserializer.java
@@ -1,88 +1,87 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.social.Challenge;
-
-import android.text.TextUtils;
-
-import java.lang.reflect.Type;
-
-public class ChallengeDeserializer implements JsonDeserializer<Challenge> {
-    @Override
-    public Challenge deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-
-        JsonObject jsonObject = json.getAsJsonObject();
-
-        Challenge challenge = new Challenge();
-
-        challenge.id = jsonObject.get("id").getAsString();
-        challenge.name = jsonObject.get("name").getAsString();
-        challenge.shortName = jsonObject.get("shortName").getAsString();
-        challenge.description = jsonObject.get("description").getAsString();
-        challenge.memberCount = jsonObject.get("memberCount").getAsInt();
-
-        JsonElement prizeElement = jsonObject.get("prize");
-        if (!prizeElement.isJsonNull()) {
-            challenge.prize = prizeElement.getAsInt();
-        }
-
-        challenge.official = jsonObject.get("official").getAsBoolean();
-
-        JsonElement leaderElement = jsonObject.get("leader");
-
-        if (leaderElement != null && !leaderElement.isJsonNull()) {
-            JsonObject leaderObj = leaderElement.getAsJsonObject();
-
-            if (leaderObj != null) {
-                JsonObject profile = leaderObj.get("profile").getAsJsonObject();
-
-                if (profile != null) {
-                    challenge.leaderName = profile.get("name").getAsString();
-                    challenge.leaderId = leaderObj.get("id").getAsString();
-                }
-            }
-        }
-
-        JsonElement groupElement = jsonObject.get("group");
-
-        if (groupElement != null && !groupElement.isJsonNull()) {
-            JsonObject groupObj = groupElement.getAsJsonObject();
-
-            if (groupObj != null) {
-                challenge.groupName = groupObj.get("name").getAsString();
-                challenge.groupId = groupObj.get("_id").getAsString();
-            }
-        }
-
-        JsonElement tasksOrderElement = jsonObject.get("tasksOrder");
-
-        if (tasksOrderElement != null && !tasksOrderElement.isJsonNull()) {
-            JsonObject tasksOrderObj = tasksOrderElement.getAsJsonObject();
-
-            challenge.todoList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_TODOS);
-            challenge.dailyList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_DAILYS);
-            challenge.habitList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_HABITS);
-            challenge.rewardList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_REWARDS);
-        }
-
-        return challenge;
-    }
-
-    private String getTaskArrayAsString(JsonDeserializationContext context, JsonObject tasksOrderObj, String taskType) {
-
-        if (tasksOrderObj.has(taskType)) {
-            JsonElement jsonElement = tasksOrderObj.get(taskType);
-
-            String[] taskArray = context.deserialize(jsonElement, String[].class);
-
-            return TextUtils.join(",", taskArray);
-        }
-
-        return "";
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import android.text.TextUtils;
+
+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.habitrpg.android.habitica.models.social.Challenge;
+
+import java.lang.reflect.Type;
+
+public class ChallengeDeserializer implements JsonDeserializer<Challenge> {
+    @Override
+    public Challenge deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+
+        JsonObject jsonObject = json.getAsJsonObject();
+
+        Challenge challenge = new Challenge();
+
+        challenge.id = jsonObject.get("id").getAsString();
+        challenge.name = jsonObject.get("name").getAsString();
+        challenge.shortName = jsonObject.get("shortName").getAsString();
+        challenge.description = jsonObject.get("description").getAsString();
+        challenge.memberCount = jsonObject.get("memberCount").getAsInt();
+
+        JsonElement prizeElement = jsonObject.get("prize");
+        if (!prizeElement.isJsonNull()) {
+            challenge.prize = prizeElement.getAsInt();
+        }
+
+        challenge.official = jsonObject.get("official").getAsBoolean();
+
+        JsonElement leaderElement = jsonObject.get("leader");
+
+        if (leaderElement != null && !leaderElement.isJsonNull()) {
+            JsonObject leaderObj = leaderElement.getAsJsonObject();
+
+            if (leaderObj != null) {
+                JsonObject profile = leaderObj.get("profile").getAsJsonObject();
+
+                if (profile != null) {
+                    challenge.leaderName = profile.get("name").getAsString();
+                    challenge.leaderId = leaderObj.get("id").getAsString();
+                }
+            }
+        }
+
+        JsonElement groupElement = jsonObject.get("group");
+
+        if (groupElement != null && !groupElement.isJsonNull()) {
+            JsonObject groupObj = groupElement.getAsJsonObject();
+
+            if (groupObj != null) {
+                challenge.groupName = groupObj.get("name").getAsString();
+                challenge.groupId = groupObj.get("_id").getAsString();
+            }
+        }
+
+        JsonElement tasksOrderElement = jsonObject.get("tasksOrder");
+
+        if (tasksOrderElement != null && !tasksOrderElement.isJsonNull()) {
+            JsonObject tasksOrderObj = tasksOrderElement.getAsJsonObject();
+
+            challenge.todoList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_TODOS);
+            challenge.dailyList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_DAILYS);
+            challenge.habitList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_HABITS);
+            challenge.rewardList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_REWARDS);
+        }
+
+        return challenge;
+    }
+
+    private String getTaskArrayAsString(JsonDeserializationContext context, JsonObject tasksOrderObj, String taskType) {
+
+        if (tasksOrderObj.has(taskType)) {
+            JsonElement jsonElement = tasksOrderObj.get(taskType);
+
+            String[] taskArray = context.deserialize(jsonElement, String[].class);
+
+            return TextUtils.join(",", taskArray);
+        }
+
+        return "";
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java
index df12a6457..cdac4a682 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java
@@ -1,69 +1,68 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
-
-import com.habitrpg.android.habitica.models.social.Backer;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.social.Contributor;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-
-public class ChatMessageDeserializer implements JsonDeserializer<ChatMessage> {
-    @Override
-    public ChatMessage deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        ChatMessage message = new ChatMessage();
-        JsonObject obj = json.getAsJsonObject();
-        if (obj.has("id")) {
-            message.id = obj.get("id").getAsString();
-        }
-        if (obj.has("text") && !obj.get("text").isJsonNull() && obj.get("text").isJsonPrimitive()) {
-            message.text = obj.get("text").getAsString();
-        }
-        if (obj.has("timestamp")) {
-            message.timestamp = obj.get("timestamp").getAsLong();
-        }
-        if (obj.has("likes")) {
-            message.likes = context.deserialize(obj.get("likes"), new TypeToken<HashMap<String, Boolean>>() {
-            }.getType());
-        }
-        if (obj.has("flagCount")) {
-            message.flagCount = obj.get("flagCount").getAsInt();
-        }
-
-        if (obj.has("uuid")) {
-            message.uuid = obj.get("uuid").getAsString();
-        }
-
-        if (obj.has("contributor")) {
-            if (!obj.get("contributor").isJsonNull()) {
-                if (obj.get("contributor").isJsonObject()) {
-                    message.contributor = context.deserialize(obj.get("contributor"), Contributor.class);
-                } else {
-                    Contributor contributor = new Contributor();
-                    contributor.text = obj.get("contributor").getAsString();
-                    message.contributor = contributor;
-                }
-            }
-        }
-
-        if (obj.has("backer")) {
-            message.backer = context.deserialize(obj.get("backer"), Backer.class);
-        }
-
-        if (obj.has("user")) {
-            message.user = obj.get("user").getAsString();
-        }
-
-        if (obj.has("sent")) {
-            message.sent = obj.get("sent").getAsString();
-        }
-
-        return message;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.reflect.TypeToken;
+import com.habitrpg.android.habitica.models.social.Backer;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Contributor;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+
+public class ChatMessageDeserializer implements JsonDeserializer<ChatMessage> {
+    @Override
+    public ChatMessage deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        ChatMessage message = new ChatMessage();
+        JsonObject obj = json.getAsJsonObject();
+        if (obj.has("id")) {
+            message.id = obj.get("id").getAsString();
+        }
+        if (obj.has("text") && !obj.get("text").isJsonNull() && obj.get("text").isJsonPrimitive()) {
+            message.text = obj.get("text").getAsString();
+        }
+        if (obj.has("timestamp")) {
+            message.timestamp = obj.get("timestamp").getAsLong();
+        }
+        if (obj.has("likes")) {
+            message.likes = context.deserialize(obj.get("likes"), new TypeToken<HashMap<String, Boolean>>() {
+            }.getType());
+        }
+        if (obj.has("flagCount")) {
+            message.flagCount = obj.get("flagCount").getAsInt();
+        }
+
+        if (obj.has("uuid")) {
+            message.uuid = obj.get("uuid").getAsString();
+        }
+
+        if (obj.has("contributor")) {
+            if (!obj.get("contributor").isJsonNull()) {
+                if (obj.get("contributor").isJsonObject()) {
+                    message.contributor = context.deserialize(obj.get("contributor"), Contributor.class);
+                } else {
+                    Contributor contributor = new Contributor();
+                    contributor.text = obj.get("contributor").getAsString();
+                    message.contributor = contributor;
+                }
+            }
+        }
+
+        if (obj.has("backer")) {
+            message.backer = context.deserialize(obj.get("backer"), Backer.class);
+        }
+
+        if (obj.has("user")) {
+            message.user = obj.get("user").getAsString();
+        }
+
+        if (obj.has("sent")) {
+            message.sent = obj.get("sent").getAsString();
+        }
+
+        return message;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChecklistItemSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChecklistItemSerializer.java
index 3834609a9..c22c4ad59 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChecklistItemSerializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChecklistItemSerializer.java
@@ -1,26 +1,25 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-
-import java.lang.reflect.Type;
-
-/**
- * Created by viirus on 25/11/15.
- */
-public class ChecklistItemSerializer
-        implements JsonSerializer<ChecklistItem> {
-
-    @Override
-    public JsonElement serialize(ChecklistItem src, Type typeOfSrc, JsonSerializationContext context) {
-        JsonObject object = new JsonObject();
-        object.addProperty("text", src.getText());
-        object.addProperty("id", src.getId());
-        object.addProperty("completed", src.getCompleted());
-        return object;
-    }
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+
+import java.lang.reflect.Type;
+
+/**
+ * Created by viirus on 25/11/15.
+ */
+public class ChecklistItemSerializer
+        implements JsonSerializer<ChecklistItem> {
+
+    @Override
+    public JsonElement serialize(ChecklistItem src, Type typeOfSrc, JsonSerializationContext context) {
+        JsonObject object = new JsonObject();
+        object.addProperty("text", src.getText());
+        object.addProperty("id", src.getId());
+        object.addProperty("completed", src.getCompleted());
+        return object;
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
index f947421f4..1839a9e15 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
@@ -1,192 +1,198 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.reflect.TypeToken;
-import com.habitrpg.android.habitica.models.ContentGear;
-import com.habitrpg.android.habitica.models.ContentResult;
-import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.habitrpg.android.habitica.models.FAQArticle;
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.inventory.Egg;
-import com.habitrpg.android.habitica.models.inventory.Food;
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.Mount;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-import com.raizlabs.android.dbflow.runtime.TransactionManager;
-import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
-import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-public class ContentDeserializer implements JsonDeserializer<ContentResult> {
-
-    @Override
-    public ContentResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<BaseModel> items = new ArrayList<>();
-
-        ContentResult result = new ContentResult();
-        JsonObject object = json.getAsJsonObject();
-
-        result.potion = context.deserialize(object.get("potion"), ItemData.class);
-        result.armoire = context.deserialize(object.get("armoire"), ItemData.class);
-        result.gear = context.deserialize(object.get("gear"), ContentGear.class);
-
-        items.add(result.potion);
-        items.add(result.armoire);
-        items.addAll(result.gear.flat);
-
-        result.quests = context.deserialize(object.get("quests"), new TypeToken<List<QuestContent>>() {
-        }.getType());
-        result.eggs = context.deserialize(object.get("eggs"), new TypeToken<List<Egg>>() {
-        }.getType());
-        result.food = context.deserialize(object.get("food"), new TypeToken<List<Food>>() {
-        }.getType());
-        result.hatchingPotions = context.deserialize(object.get("hatchingPotions"), new TypeToken<List<HatchingPotion>>() {
-        }.getType());
-
-        items.addAll(result.quests);
-        items.addAll(result.eggs);
-        items.addAll(result.food);
-        items.addAll(result.hatchingPotions);
-
-        result.pets = context.deserialize(object.get("pets"), new TypeToken<Map<String, Pet>>() {
-        }.getType());
-        result.specialPets = context.deserialize(object.get("specialPets"), new TypeToken<Map<String, Pet>>() {
-        }.getType());
-        result.premiumPets = context.deserialize(object.get("premiumPets"), new TypeToken<Map<String, Pet>>() {
-        }.getType());
-        result.questPets = context.deserialize(object.get("questPets"), new TypeToken<Map<String, Pet>>() {
-        }.getType());
-        result.mounts = context.deserialize(object.get("mounts"), new TypeToken<Map<String, Mount>>() {
-        }.getType());
-        result.specialMounts = context.deserialize(object.get("specialMounts"), new TypeToken<Map<String, Mount>>() {
-        }.getType());
-        result.premiumMounts = context.deserialize(object.get("premiumMounts"), new TypeToken<Map<String, Mount>>() {
-        }.getType());
-        result.questMounts = context.deserialize(object.get("questMounts"), new TypeToken<Map<String, Mount>>() {
-        }.getType());
-
-        for (Egg egg : result.eggs) {
-            for (HatchingPotion potion : result.hatchingPotions) {
-                String key = egg.getKey() + "-" + potion.getKey();
-                if (result.pets.containsKey(key)) {
-                    result.pets.put(key, this.populatePet(result.pets.get(key), egg, potion));
-                }
-                if (result.specialPets.containsKey(key)) {
-                    result.specialPets.put(key, this.populatePet(result.specialPets.get(key), egg, potion));
-                }
-                if (result.premiumPets.containsKey(key)) {
-                    result.premiumPets.put(key, this.populatePet(result.premiumPets.get(key), egg, potion));
-                }
-                if (result.questPets.containsKey(key)) {
-                    result.questPets.put(key, this.populatePet(result.questPets.get(key), egg, potion));
-                }
-                if (result.mounts.containsKey(key)) {
-                    result.mounts.put(key, this.popupateMount(result.mounts.get(key), egg, potion));
-                }
-                if (result.specialMounts.containsKey(key)) {
-                    result.specialMounts.put(key, this.popupateMount(result.specialMounts.get(key), egg, potion));
-                }
-                if (result.premiumMounts.containsKey(key)) {
-                    result.premiumMounts.put(key, this.popupateMount(result.premiumMounts.get(key), egg, potion));
-                }
-                if (result.questMounts.containsKey(key)) {
-                    result.questMounts.put(key, this.popupateMount(result.questMounts.get(key), egg, potion));
-                }
-            }
-        }
-
-        for (Pet pet : result.pets.values()) {
-            pet.setAnimalGroup("pets");
-            items.add(pet);
-        }
-        for (Pet pet : result.specialPets.values()) {
-            pet.setAnimalGroup("specialPets");
-            items.add(pet);
-        }
-        for (Pet pet : result.premiumPets.values()) {
-            pet.setAnimalGroup("premiumPets");
-            items.add(pet);
-        }
-        for (Pet pet : result.questPets.values()) {
-            pet.setAnimalGroup("questPets");
-            items.add(pet);
-        }
-
-        for (Mount mount : result.mounts.values()) {
-            mount.setAnimalGroup("mounts");
-            items.add(mount);
-        }
-        for (Mount mount : result.specialMounts.values()) {
-            mount.setAnimalGroup("specialMounts");
-            items.add(mount);
-        }
-        for (Mount mount : result.premiumMounts.values()) {
-            mount.setAnimalGroup("premiumMounts");
-            items.add(mount);
-        }
-        for (Mount mount : result.questMounts.values()) {
-            mount.setAnimalGroup("questMounts");
-            items.add(mount);
-        }
-
-        result.spells = context.deserialize(object.get("spells"), new TypeToken<List<Skill>>() {
-        }.getType());
-
-        List<String> spellKeys = new ArrayList<>();
-        for (Skill skill : result.spells) {
-            spellKeys.add(skill.key);
-        }
-        List<Skill> oldSkills = new Select().from(Skill.class).queryList();
-        for (Skill skill : oldSkills) {
-            if (!spellKeys.contains(skill.key)) {
-                skill.delete();
-            }
-        }
-
-        result.appearances = context.deserialize(object.get("appearances"), new TypeToken<List<Customization>>() {
-        }.getType());
-        result.backgrounds = context.deserialize(object.get("backgrounds"), new TypeToken<List<Customization>>() {
-        }.getType());
-
-        result.faq = context.deserialize(object.get("faq"), new TypeToken<List<FAQArticle>>() {
-        }.getType());
-
-        items.addAll(result.spells);
-
-        items.addAll(result.appearances);
-        items.addAll(result.backgrounds);
-
-        items.addAll(result.faq);
-
-        TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(items)));
-        return result;
-    }
-
-    private Mount popupateMount(Mount mount, Egg egg, HatchingPotion potion) {
-        mount.setAnimalText(egg.getMountText());
-        mount.setColorText(potion.getText());
-        mount.setLimited(potion.getLimited());
-        mount.setPremium(potion.getPremium());
-        return mount;
-    }
-
-    private Pet populatePet(Pet pet, Egg egg, HatchingPotion potion) {
-        pet.setAnimalText(egg.getText());
-        pet.setColorText(potion.getText());
-        pet.setLimited(potion.getLimited());
-        pet.setPremium(potion.getPremium());
-        return pet;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.reflect.TypeToken;
+import com.habitrpg.android.habitica.data.CustomizationRepository;
+import com.habitrpg.android.habitica.models.ContentGear;
+import com.habitrpg.android.habitica.models.ContentResult;
+import com.habitrpg.android.habitica.models.FAQArticle;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.raizlabs.android.dbflow.runtime.TransactionManager;
+import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
+import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
+import com.raizlabs.android.dbflow.sql.language.Select;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.inject.Inject;
+
+public class ContentDeserializer implements JsonDeserializer<ContentResult> {
+
+    @Inject
+    CustomizationRepository customizationRepository;
+
+    @Override
+    public ContentResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<BaseModel> items = new ArrayList<>();
+
+        ContentResult result = new ContentResult();
+        JsonObject object = json.getAsJsonObject();
+
+        result.potion = context.deserialize(object.get("potion"), ItemData.class);
+        result.armoire = context.deserialize(object.get("armoire"), ItemData.class);
+        result.gear = context.deserialize(object.get("gear"), ContentGear.class);
+
+        items.add(result.potion);
+        items.add(result.armoire);
+        items.addAll(result.gear.flat);
+
+        result.quests = context.deserialize(object.get("quests"), new TypeToken<List<QuestContent>>() {
+        }.getType());
+        result.eggs = context.deserialize(object.get("eggs"), new TypeToken<List<Egg>>() {
+        }.getType());
+        result.food = context.deserialize(object.get("food"), new TypeToken<List<Food>>() {
+        }.getType());
+        result.hatchingPotions = context.deserialize(object.get("hatchingPotions"), new TypeToken<List<HatchingPotion>>() {
+        }.getType());
+
+        items.addAll(result.quests);
+        items.addAll(result.eggs);
+        items.addAll(result.food);
+        items.addAll(result.hatchingPotions);
+
+        result.pets = context.deserialize(object.get("pets"), new TypeToken<Map<String, Pet>>() {
+        }.getType());
+        result.specialPets = context.deserialize(object.get("specialPets"), new TypeToken<Map<String, Pet>>() {
+        }.getType());
+        result.premiumPets = context.deserialize(object.get("premiumPets"), new TypeToken<Map<String, Pet>>() {
+        }.getType());
+        result.questPets = context.deserialize(object.get("questPets"), new TypeToken<Map<String, Pet>>() {
+        }.getType());
+        result.mounts = context.deserialize(object.get("mounts"), new TypeToken<Map<String, Mount>>() {
+        }.getType());
+        result.specialMounts = context.deserialize(object.get("specialMounts"), new TypeToken<Map<String, Mount>>() {
+        }.getType());
+        result.premiumMounts = context.deserialize(object.get("premiumMounts"), new TypeToken<Map<String, Mount>>() {
+        }.getType());
+        result.questMounts = context.deserialize(object.get("questMounts"), new TypeToken<Map<String, Mount>>() {
+        }.getType());
+
+        for (Egg egg : result.eggs) {
+            for (HatchingPotion potion : result.hatchingPotions) {
+                String key = egg.getKey() + "-" + potion.getKey();
+                if (result.pets.containsKey(key)) {
+                    result.pets.put(key, this.populatePet(result.pets.get(key), egg, potion));
+                }
+                if (result.specialPets.containsKey(key)) {
+                    result.specialPets.put(key, this.populatePet(result.specialPets.get(key), egg, potion));
+                }
+                if (result.premiumPets.containsKey(key)) {
+                    result.premiumPets.put(key, this.populatePet(result.premiumPets.get(key), egg, potion));
+                }
+                if (result.questPets.containsKey(key)) {
+                    result.questPets.put(key, this.populatePet(result.questPets.get(key), egg, potion));
+                }
+                if (result.mounts.containsKey(key)) {
+                    result.mounts.put(key, this.popupateMount(result.mounts.get(key), egg, potion));
+                }
+                if (result.specialMounts.containsKey(key)) {
+                    result.specialMounts.put(key, this.popupateMount(result.specialMounts.get(key), egg, potion));
+                }
+                if (result.premiumMounts.containsKey(key)) {
+                    result.premiumMounts.put(key, this.popupateMount(result.premiumMounts.get(key), egg, potion));
+                }
+                if (result.questMounts.containsKey(key)) {
+                    result.questMounts.put(key, this.popupateMount(result.questMounts.get(key), egg, potion));
+                }
+            }
+        }
+
+        for (Pet pet : result.pets.values()) {
+            pet.setAnimalGroup("pets");
+            items.add(pet);
+        }
+        for (Pet pet : result.specialPets.values()) {
+            pet.setAnimalGroup("specialPets");
+            items.add(pet);
+        }
+        for (Pet pet : result.premiumPets.values()) {
+            pet.setAnimalGroup("premiumPets");
+            items.add(pet);
+        }
+        for (Pet pet : result.questPets.values()) {
+            pet.setAnimalGroup("questPets");
+            items.add(pet);
+        }
+
+        for (Mount mount : result.mounts.values()) {
+            mount.setAnimalGroup("mounts");
+            items.add(mount);
+        }
+        for (Mount mount : result.specialMounts.values()) {
+            mount.setAnimalGroup("specialMounts");
+            items.add(mount);
+        }
+        for (Mount mount : result.premiumMounts.values()) {
+            mount.setAnimalGroup("premiumMounts");
+            items.add(mount);
+        }
+        for (Mount mount : result.questMounts.values()) {
+            mount.setAnimalGroup("questMounts");
+            items.add(mount);
+        }
+
+        result.spells = context.deserialize(object.get("spells"), new TypeToken<List<Skill>>() {
+        }.getType());
+
+        List<String> spellKeys = new ArrayList<>();
+        for (Skill skill : result.spells) {
+            spellKeys.add(skill.key);
+        }
+        List<Skill> oldSkills = new Select().from(Skill.class).queryList();
+        for (Skill skill : oldSkills) {
+            if (!spellKeys.contains(skill.key)) {
+                skill.delete();
+            }
+        }
+
+        result.appearances = context.deserialize(object.get("appearances"), new TypeToken<List<Customization>>() {
+        }.getType());
+        result.backgrounds = context.deserialize(object.get("backgrounds"), new TypeToken<List<Customization>>() {
+        }.getType());
+
+        result.faq = context.deserialize(object.get("faq"), new TypeToken<List<FAQArticle>>() {
+        }.getType());
+
+        items.addAll(result.spells);
+
+        items.addAll(result.appearances);
+        items.addAll(result.backgrounds);
+
+        items.addAll(result.faq);
+
+        TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(items)));
+        return result;
+    }
+
+    private Mount popupateMount(Mount mount, Egg egg, HatchingPotion potion) {
+        mount.setAnimalText(egg.getMountText());
+        mount.setColorText(potion.getText());
+        mount.setLimited(potion.getLimited());
+        mount.setPremium(potion.getPremium());
+        return mount;
+    }
+
+    private Pet populatePet(Pet pet, Egg egg, HatchingPotion potion) {
+        pet.setAnimalText(egg.getText());
+        pet.setColorText(potion.getText());
+        pet.setLimited(potion.getLimited());
+        pet.setPremium(potion.getPremium());
+        return pet;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
index c12b971b2..08968c9e3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
@@ -1,151 +1,150 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import android.annotation.SuppressLint;
-
-import java.lang.reflect.Type;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-public class CustomizationDeserializer implements JsonDeserializer<List<Customization>> {
-
-    @Override
-    public List<Customization> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        JsonObject object = json.getAsJsonObject();
-        List<Customization> customizations = new ArrayList<Customization>();
-
-
-        if (object.has("shirt")) {
-            List<Customization> existingCustomizations = new Select().from(Customization.class).where(Condition.column("type").isNot("background")).queryList();
-
-            for (Customization customization : existingCustomizations) {
-                if (object.has(customization.getType())) {
-                    JsonObject nestedObject = object.get(customization.getType()).getAsJsonObject();
-                    if (customization.getCategory() != null) {
-                        if (nestedObject.has(customization.getCategory())) {
-                            nestedObject = nestedObject.get(customization.getCategory()).getAsJsonObject();
-                        } else {
-                            continue;
-                        }
-                    }
-                    if (nestedObject.has(customization.getIdentifier())) {
-                        customizations.add(this.parseCustomization(customization, customization.getType(), customization.getCategory(), customization.getIdentifier(), nestedObject.get(customization.getIdentifier()).getAsJsonObject()));
-                        nestedObject.remove(customization.getIdentifier());
-                    }
-                }
-            }
-
-            for (String type : Arrays.asList("shirt", "skin")) {
-                for (Map.Entry<String, JsonElement> entry : object.get(type).getAsJsonObject().entrySet()) {
-                    customizations.add(this.parseCustomization(null, type, null, entry.getKey(), entry.getValue().getAsJsonObject()));
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> categoryEntry : object.get("hair").getAsJsonObject().entrySet()) {
-                for (Map.Entry<String, JsonElement> entry : categoryEntry.getValue().getAsJsonObject().entrySet()) {
-                    customizations.add(this.parseCustomization(null, "hair", categoryEntry.getKey(), entry.getKey(), entry.getValue().getAsJsonObject()));
-                }
-            }
-        } else {
-
-            List<Customization> existingCustomizations = new Select().from(Customization.class).where(Condition.column("type").is("background")).queryList();
-
-            for (Customization customization : existingCustomizations) {
-                if (object.has(customization.getCustomizationSet())) {
-                    JsonObject nestedObject = object.get(customization.getCustomizationSet()).getAsJsonObject();
-                    if (nestedObject.has(customization.getIdentifier())) {
-                        customizations.add(this.parseBackground(customization, customization.getCustomizationSet(), customization.getIdentifier(), nestedObject.get(customization.getIdentifier()).getAsJsonObject()));
-                        nestedObject.remove(customization.getIdentifier());
-                    }
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> setEntry : object.entrySet()) {
-                for (Map.Entry<String, JsonElement> entry : setEntry.getValue().getAsJsonObject().entrySet()) {
-                    customizations.add(this.parseBackground(null, setEntry.getKey(), entry.getKey(), entry.getValue().getAsJsonObject()));
-                }
-            }
-        }
-
-        return customizations;
-    }
-
-    private Customization parseCustomization(Customization existingCustomizaion, String type, String category, String key, JsonObject entry) {
-        JsonObject obj = entry;
-        Customization customization = existingCustomizaion;
-        if (customization == null) {
-            customization = new Customization();
-            customization.setIdentifier(key);
-            customization.setType(type);
-            if (category != null) {
-                customization.setCategory(category);
-            }
-        }
-        if (obj.has("price")) {
-            customization.setPrice(obj.get("price").getAsInt());
-        }
-
-        if (obj.has("set")) {
-            JsonObject setInfo = obj.get("set").getAsJsonObject();
-            customization.setCustomizationSet(setInfo.get("key").getAsString());
-            if (setInfo.has("setPrice")) {
-                customization.setSetPrice(setInfo.get("setPrice").getAsInt());
-            }
-            if (setInfo.has("text")) {
-                customization.setCustomizationSetName(setInfo.get("text").getAsString());
-            }
-            @SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-            try {
-                if (setInfo.has("availableFrom")) {
-                    customization.setAvailableFrom(format.parse(setInfo.get("availableFrom").getAsString()));
-                }
-                if (setInfo.has("availableUntil")) {
-                    customization.setAvailableUntil(format.parse(setInfo.get("availableUntil").getAsString()));
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        return customization;
-    }
-
-    private Customization parseBackground(Customization existingCustomization, String setName, String key, JsonObject entry) {
-        Customization customization = existingCustomization;
-
-        if (customization == null) {
-            customization = new Customization();
-            customization.setCustomizationSet(setName);
-            String readableSetName = setName.substring(13, 17) + "." + setName.substring(11, 13);
-            customization.setCustomizationSetName(readableSetName);
-            customization.setType("background");
-            customization.setIdentifier(key);
-        }
-        if ("incentiveBackgrounds".equals(setName)) {
-            customization.setCustomizationSetName("Login Incentive");
-            customization.setPrice(0);
-            customization.setSetPrice(0);
-            customization.setIsBuyable(false);
-        } else {
-            customization.setPrice(7);
-            customization.setSetPrice(15);
-        }
-
-        customization.setText(entry.get("text").getAsString());
-        customization.setNotes(entry.getAsJsonObject().get("notes").getAsString());
-
-        return customization;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import android.annotation.SuppressLint;
+
+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.habitrpg.android.habitica.models.inventory.Customization;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.lang.reflect.Type;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+public class CustomizationDeserializer implements JsonDeserializer<List<Customization>> {
+
+    @Override
+    public List<Customization> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        JsonObject object = json.getAsJsonObject();
+        List<Customization> customizations = new ArrayList<Customization>();
+
+
+        if (object.has("shirt")) {
+            List<Customization> existingCustomizations = new Select().from(Customization.class).where(Condition.column("type").isNot("background")).queryList();
+
+            for (Customization customization : existingCustomizations) {
+                if (object.has(customization.getType())) {
+                    JsonObject nestedObject = object.get(customization.getType()).getAsJsonObject();
+                    if (customization.getCategory() != null) {
+                        if (nestedObject.has(customization.getCategory())) {
+                            nestedObject = nestedObject.get(customization.getCategory()).getAsJsonObject();
+                        } else {
+                            continue;
+                        }
+                    }
+                    if (nestedObject.has(customization.getIdentifier())) {
+                        customizations.add(this.parseCustomization(customization, customization.getType(), customization.getCategory(), customization.getIdentifier(), nestedObject.get(customization.getIdentifier()).getAsJsonObject()));
+                        nestedObject.remove(customization.getIdentifier());
+                    }
+                }
+            }
+
+            for (String type : Arrays.asList("shirt", "skin")) {
+                for (Map.Entry<String, JsonElement> entry : object.get(type).getAsJsonObject().entrySet()) {
+                    customizations.add(this.parseCustomization(null, type, null, entry.getKey(), entry.getValue().getAsJsonObject()));
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> categoryEntry : object.get("hair").getAsJsonObject().entrySet()) {
+                for (Map.Entry<String, JsonElement> entry : categoryEntry.getValue().getAsJsonObject().entrySet()) {
+                    customizations.add(this.parseCustomization(null, "hair", categoryEntry.getKey(), entry.getKey(), entry.getValue().getAsJsonObject()));
+                }
+            }
+        } else {
+
+            List<Customization> existingCustomizations = new Select().from(Customization.class).where(Condition.column("type").is("background")).queryList();
+
+            for (Customization customization : existingCustomizations) {
+                if (object.has(customization.getCustomizationSet())) {
+                    JsonObject nestedObject = object.get(customization.getCustomizationSet()).getAsJsonObject();
+                    if (nestedObject.has(customization.getIdentifier())) {
+                        customizations.add(this.parseBackground(customization, customization.getCustomizationSet(), customization.getIdentifier(), nestedObject.get(customization.getIdentifier()).getAsJsonObject()));
+                        nestedObject.remove(customization.getIdentifier());
+                    }
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> setEntry : object.entrySet()) {
+                for (Map.Entry<String, JsonElement> entry : setEntry.getValue().getAsJsonObject().entrySet()) {
+                    customizations.add(this.parseBackground(null, setEntry.getKey(), entry.getKey(), entry.getValue().getAsJsonObject()));
+                }
+            }
+        }
+
+        return customizations;
+    }
+
+    private Customization parseCustomization(Customization existingCustomizaion, String type, String category, String key, JsonObject entry) {
+        JsonObject obj = entry;
+        Customization customization = existingCustomizaion;
+        if (customization == null) {
+            customization = new Customization();
+            customization.setIdentifier(key);
+            customization.setType(type);
+            if (category != null) {
+                customization.setCategory(category);
+            }
+        }
+        if (obj.has("price")) {
+            customization.setPrice(obj.get("price").getAsInt());
+        }
+
+        if (obj.has("set")) {
+            JsonObject setInfo = obj.get("set").getAsJsonObject();
+            customization.setCustomizationSet(setInfo.get("key").getAsString());
+            if (setInfo.has("setPrice")) {
+                customization.setSetPrice(setInfo.get("setPrice").getAsInt());
+            }
+            if (setInfo.has("text")) {
+                customization.setCustomizationSetName(setInfo.get("text").getAsString());
+            }
+            @SuppressLint("SimpleDateFormat") SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            try {
+                if (setInfo.has("availableFrom")) {
+                    customization.setAvailableFrom(format.parse(setInfo.get("availableFrom").getAsString()));
+                }
+                if (setInfo.has("availableUntil")) {
+                    customization.setAvailableUntil(format.parse(setInfo.get("availableUntil").getAsString()));
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        return customization;
+    }
+
+    private Customization parseBackground(Customization existingCustomization, String setName, String key, JsonObject entry) {
+        Customization customization = existingCustomization;
+
+        if (customization == null) {
+            customization = new Customization();
+            customization.setCustomizationSet(setName);
+            String readableSetName = setName.substring(13, 17) + "." + setName.substring(11, 13);
+            customization.setCustomizationSetName(readableSetName);
+            customization.setType("background");
+            customization.setIdentifier(key);
+        }
+        if ("incentiveBackgrounds".equals(setName)) {
+            customization.setCustomizationSetName("Login Incentive");
+            customization.setPrice(0);
+            customization.setSetPrice(0);
+            customization.setIsBuyable(false);
+        } else {
+            customization.setPrice(7);
+            customization.setSetPrice(15);
+        }
+
+        customization.setText(entry.get("text").getAsString());
+        customization.setNotes(entry.getAsJsonObject().get("notes").getAsString());
+
+        return customization;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.java
index 30afa7a6b..f684c3155 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateDeserializer.java
@@ -1,65 +1,65 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-import java.lang.reflect.Type;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
-/**
- * Created by viirus on 21/01/16.
- */
-public class DateDeserializer implements JsonDeserializer<Date>, JsonSerializer<Date> {
-
-    private final DateFormat dateFormat;
-    private final DateFormat alternativeFormat;
-
-    public DateDeserializer() {
-        dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
-        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-        alternativeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
-        alternativeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
-    }
-
-    @Override
-    public synchronized Date deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) {
-        if (jsonElement.getAsString().length() == 0) {
-            return null;
-        }
-        try {
-            return dateFormat.parse(jsonElement.getAsString());
-        } catch (ParseException e) {
-            try {
-                return alternativeFormat.parse(jsonElement.getAsString());
-            } catch (ParseException e1) {
-                try {
-                    Long timestamp = jsonElement.getAsLong();
-                    if (timestamp > 0) {
-                        return new Date(timestamp);
-                    } else {
-                        return null;
-                    }
-                } catch (NumberFormatException e2) {
-                    return null;
-                }
-            }
-        }
-    }
-
-    @Override
-    public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
-        if (src == null) {
-            return new JsonPrimitive("");
-        }
-        return new JsonPrimitive(this.dateFormat.format(src));
-    }
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+/**
+ * Created by viirus on 21/01/16.
+ */
+public class DateDeserializer implements JsonDeserializer<Date>, JsonSerializer<Date> {
+
+    private final DateFormat dateFormat;
+    private final DateFormat alternativeFormat;
+
+    public DateDeserializer() {
+        dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
+        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        alternativeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+        alternativeFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
+
+    @Override
+    public synchronized Date deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) {
+        if (jsonElement.getAsString().length() == 0) {
+            return null;
+        }
+        try {
+            return dateFormat.parse(jsonElement.getAsString());
+        } catch (ParseException e) {
+            try {
+                return alternativeFormat.parse(jsonElement.getAsString());
+            } catch (ParseException e1) {
+                try {
+                    Long timestamp = jsonElement.getAsLong();
+                    if (timestamp > 0) {
+                        return new Date(timestamp);
+                    } else {
+                        return null;
+                    }
+                } catch (NumberFormatException e2) {
+                    return null;
+                }
+            }
+        }
+    }
+
+    @Override
+    public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
+        if (src == null) {
+            return new JsonPrimitive("");
+        }
+        return new JsonPrimitive(this.dateFormat.format(src));
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateSerializer.java
index 9caeb4448..960845a47 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateSerializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DateSerializer.java
@@ -1,19 +1,19 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-import java.lang.reflect.Type;
-import java.util.Date;
-
-/**
- * Created by keithholliday on 6/19/16.
- */
-public class DateSerializer implements JsonSerializer<Date> {
-    @Override
-    public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
-        return new JsonPrimitive(src.getTime());
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+
+import java.lang.reflect.Type;
+import java.util.Date;
+
+/**
+ * Created by keithholliday on 6/19/16.
+ */
+public class DateSerializer implements JsonSerializer<Date> {
+    @Override
+    public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
+        return new JsonPrimitive(src.getTime());
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DaysUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DaysUtils.java
index f63498a9e..9e4730c17 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DaysUtils.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/DaysUtils.java
@@ -1,35 +1,35 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.habitrpg.android.habitica.models.tasks.Days;
-
-/**
- * Created by magicmicky on 04/02/15.
- */
-
-
-public class DaysUtils {
-    public static Days getDaysFromBooleans(boolean[] b) {
-        Days d = new Days();
-        d.setM(b[0]);
-        d.setT(b[1]);
-        d.setW(b[2]);
-        d.setTh(b[3]);
-        d.setF(b[4]);
-        d.setS(b[5]);
-        d.setSu(b[6]);
-        return d;
-    }
-
-    public static boolean[] getBooleansFromDays(Days days) {
-        boolean[] b = new boolean[7];
-        b[0] = days.getM();
-        b[1] = days.getT();
-        b[2] = days.getW();
-        b[3] = days.getTh();
-        b[4] = days.getF();
-        b[5] = days.getS();
-        b[6] = days.getSu();
-        return b;
-    }
-}
-
+package com.habitrpg.android.habitica.utils;
+
+import com.habitrpg.android.habitica.models.tasks.Days;
+
+/**
+ * Created by magicmicky on 04/02/15.
+ */
+
+
+public class DaysUtils {
+    public static Days getDaysFromBooleans(boolean[] b) {
+        Days d = new Days();
+        d.setM(b[0]);
+        d.setT(b[1]);
+        d.setW(b[2]);
+        d.setTh(b[3]);
+        d.setF(b[4]);
+        d.setS(b[5]);
+        d.setSu(b[6]);
+        return d;
+    }
+
+    public static boolean[] getBooleansFromDays(Days days) {
+        boolean[] b = new boolean[7];
+        b[0] = days.getM();
+        b[1] = days.getT();
+        b[2] = days.getW();
+        b[3] = days.getTh();
+        b[4] = days.getF();
+        b[5] = days.getS();
+        b[6] = days.getSu();
+        return b;
+    }
+}
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
index 53d26db3a..f275bec8a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
@@ -1,68 +1,67 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.inventory.Egg;
-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 EggListDeserializer implements JsonDeserializer<List<Egg>> {
-    @Override
-    public List<Egg> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<Egg> vals = new ArrayList<>();
-        if (json.isJsonObject()) {
-            JsonObject object = json.getAsJsonObject();
-
-            List<Egg> existingItems = new Select().from(Egg.class).queryList();
-
-            for (Egg item : existingItems) {
-                if (object.has(item.getKey())) {
-                    JsonElement itemObject = object.get(item.getKey());
-
-                    if (itemObject.isJsonObject()) {
-                        Egg parsedItem = context.deserialize(itemObject.getAsJsonObject(), Egg.class);
-                        item.setText(parsedItem.getText());
-                        item.setNotes(parsedItem.getNotes());
-                        item.setValue(parsedItem.getValue());
-                        item.setAdjective(parsedItem.getAdjective());
-                        item.setMountText(parsedItem.getMountText());
-                    } else {
-                        item.setOwned(itemObject.getAsInt());
-                    }
-                    vals.add(item);
-                    object.remove(item.getKey());
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-                Egg item;
-                if (entry.getValue().isJsonObject()) {
-                    item = context.deserialize(entry.getValue(), Egg.class);
-                } else {
-                    item = new Egg();
-                    item.setKey(entry.getKey());
-                    if (entry.getValue().isJsonNull()) {
-                        item.setOwned(0);
-                    } else {
-                        item.setOwned(entry.getValue().getAsInt());
-                    }
-                }
-                vals.add(item);
-            }
-        } else {
-            for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((Egg) context.deserialize(item.getAsJsonObject(), Egg.class));
-            }
-        }
-
-        return vals;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+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 EggListDeserializer implements JsonDeserializer<List<Egg>> {
+    @Override
+    public List<Egg> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<Egg> vals = new ArrayList<>();
+        if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+
+            List<Egg> existingItems = new Select().from(Egg.class).queryList();
+
+            for (Egg item : existingItems) {
+                if (object.has(item.getKey())) {
+                    JsonElement itemObject = object.get(item.getKey());
+
+                    if (itemObject.isJsonObject()) {
+                        Egg parsedItem = context.deserialize(itemObject.getAsJsonObject(), Egg.class);
+                        item.setText(parsedItem.getText());
+                        item.setNotes(parsedItem.getNotes());
+                        item.setValue(parsedItem.getValue());
+                        item.setAdjective(parsedItem.getAdjective());
+                        item.setMountText(parsedItem.getMountText());
+                    } else {
+                        item.setOwned(itemObject.getAsInt());
+                    }
+                    vals.add(item);
+                    object.remove(item.getKey());
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                Egg item;
+                if (entry.getValue().isJsonObject()) {
+                    item = context.deserialize(entry.getValue(), Egg.class);
+                } else {
+                    item = new Egg();
+                    item.setKey(entry.getKey());
+                    if (entry.getValue().isJsonNull()) {
+                        item.setOwned(0);
+                    } else {
+                        item.setOwned(entry.getValue().getAsInt());
+                    }
+                }
+                vals.add(item);
+            }
+        } else {
+            for (JsonElement item : json.getAsJsonArray()) {
+                vals.add((Egg) context.deserialize(item.getAsJsonObject(), Egg.class));
+            }
+        }
+
+        return vals;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
index 87768b6de..c77ec2eb1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
@@ -1,41 +1,40 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.FAQArticle;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by viirus on 22/01/16.
- */
-public class FAQArticleListDeserilializer implements JsonDeserializer<List<FAQArticle>> {
-
-
-    @Override
-    public List<FAQArticle> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<FAQArticle> vals = new ArrayList<>();
-        int position = 0;
-        for (JsonElement e : json.getAsJsonObject().get("questions").getAsJsonArray()) {
-            JsonObject obj = e.getAsJsonObject();
-            FAQArticle article = new FAQArticle();
-            article.setPosition(position);
-            article.setQuestion(obj.get("question").getAsString());
-            if (obj.has("android")) {
-                article.setAnswer(obj.get("android").getAsString());
-            } else {
-                article.setAnswer(obj.get("web").getAsString());
-            }
-            vals.add(article);
-            position++;
-        }
-
-        return vals;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.FAQArticle;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by viirus on 22/01/16.
+ */
+public class FAQArticleListDeserilializer implements JsonDeserializer<List<FAQArticle>> {
+
+
+    @Override
+    public List<FAQArticle> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<FAQArticle> vals = new ArrayList<>();
+        int position = 0;
+        for (JsonElement e : json.getAsJsonObject().get("questions").getAsJsonArray()) {
+            JsonObject obj = e.getAsJsonObject();
+            FAQArticle article = new FAQArticle();
+            article.setPosition(position);
+            article.setQuestion(obj.get("question").getAsString());
+            if (obj.has("android")) {
+                article.setAnswer(obj.get("android").getAsString());
+            } else {
+                article.setAnswer(obj.get("web").getAsString());
+            }
+            vals.add(article);
+            position++;
+        }
+
+        return vals;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.java
index 8b8648bf2..67c3bf47e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FeedResponseDeserializer.java
@@ -1,19 +1,18 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.responses.FeedResponse;
-
-import java.lang.reflect.Type;
-
-public class FeedResponseDeserializer implements JsonDeserializer<FeedResponse> {
-    @Override
-    public FeedResponse deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        FeedResponse response = new FeedResponse();
-        response.value = json.getAsInt();
-        return response;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.responses.FeedResponse;
+
+import java.lang.reflect.Type;
+
+public class FeedResponseDeserializer implements JsonDeserializer<FeedResponse> {
+    @Override
+    public FeedResponse deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        FeedResponse response = new FeedResponse();
+        response.value = json.getAsInt();
+        return response;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
index a7689b7e9..49cc10d8d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
@@ -1,69 +1,68 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.inventory.Food;
-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 FoodListDeserializer implements JsonDeserializer<List<Food>> {
-    @Override
-    public List<Food> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<Food> vals = new ArrayList<>();
-        if (json.isJsonObject()) {
-            JsonObject object = json.getAsJsonObject();
-
-            List<Food> existingItems = new Select().from(Food.class).queryList();
-
-            for (Food item : existingItems) {
-                if (object.has(item.getKey())) {
-                    JsonElement itemObject = object.get(item.getKey());
-
-                    if (itemObject.isJsonObject()) {
-                        Food parsedItem = context.deserialize(itemObject.getAsJsonObject(), Food.class);
-                        item.setText(parsedItem.getText());
-                        item.setNotes(parsedItem.getNotes());
-                        item.setValue(parsedItem.getValue());
-                        item.setArticle(parsedItem.getArticle());
-                        item.setCanDrop(parsedItem.getCanDrop());
-                        item.setTarget(parsedItem.getTarget());
-                    } else {
-                        item.setOwned(itemObject.getAsInt());
-                    }
-                    vals.add(item);
-                    object.remove(item.getKey());
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-                Food item;
-                if (entry.getValue().isJsonObject()) {
-                    item = context.deserialize(entry.getValue(), Food.class);
-                } else {
-                    item = new Food();
-                    item.setKey(entry.getKey());
-                    if (entry.getValue().isJsonNull()) {
-                        item.setOwned(0);
-                    } else {
-                        item.setOwned(entry.getValue().getAsInt());
-                    }
-                }
-                vals.add(item);
-            }
-        } else {
-            for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((Food) context.deserialize(item.getAsJsonObject(), Food.class));
-            }
-        }
-
-        return vals;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Food;
+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 FoodListDeserializer implements JsonDeserializer<List<Food>> {
+    @Override
+    public List<Food> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<Food> vals = new ArrayList<>();
+        if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+
+            List<Food> existingItems = new Select().from(Food.class).queryList();
+
+            for (Food item : existingItems) {
+                if (object.has(item.getKey())) {
+                    JsonElement itemObject = object.get(item.getKey());
+
+                    if (itemObject.isJsonObject()) {
+                        Food parsedItem = context.deserialize(itemObject.getAsJsonObject(), Food.class);
+                        item.setText(parsedItem.getText());
+                        item.setNotes(parsedItem.getNotes());
+                        item.setValue(parsedItem.getValue());
+                        item.setArticle(parsedItem.getArticle());
+                        item.setCanDrop(parsedItem.getCanDrop());
+                        item.setTarget(parsedItem.getTarget());
+                    } else {
+                        item.setOwned(itemObject.getAsInt());
+                    }
+                    vals.add(item);
+                    object.remove(item.getKey());
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                Food item;
+                if (entry.getValue().isJsonObject()) {
+                    item = context.deserialize(entry.getValue(), Food.class);
+                } else {
+                    item = new Food();
+                    item.setKey(entry.getKey());
+                    if (entry.getValue().isJsonNull()) {
+                        item.setOwned(0);
+                    } else {
+                        item.setOwned(entry.getValue().getAsInt());
+                    }
+                }
+                vals.add(item);
+            }
+        } else {
+            for (JsonElement item : json.getAsJsonArray()) {
+                vals.add((Food) context.deserialize(item.getAsJsonObject(), Food.class));
+            }
+        }
+
+        return vals;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java
index bc09eb4c9..71e38be7b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java
@@ -1,91 +1,90 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonArray;
-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.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import com.google.gson.reflect.TypeToken;
-
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.inventory.Quest;
-
-import java.lang.reflect.Type;
-import java.util.List;
-
-public class GroupSerialization implements JsonDeserializer<Group>, JsonSerializer<Group> {
-    @Override
-    public Group deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        Group group = new Group();
-        JsonObject obj = json.getAsJsonObject();
-        group.id = obj.get("_id").getAsString();
-        group.name = obj.get("name").getAsString();
-        if (obj.has("description") && !obj.get("description").isJsonNull()) {
-            group.description = obj.get("description").getAsString();
-        }
-        if (obj.has("leaderMessage") && !obj.get("leaderMessage").isJsonNull()) {
-            group.leaderMessage = obj.get("leaderMessage").getAsString();
-        }
-        if (obj.has("privacy")) {
-            group.privacy = obj.get("privacy").getAsString();
-        }
-        if (obj.has("memberCount")) {
-            group.memberCount = obj.get("memberCount").getAsInt();
-        }
-        if (obj.has("balance")) {
-            group.balance = obj.get("balance").getAsDouble();
-        }
-        if (obj.has("logo") && !obj.get("logo").isJsonNull()) {
-            group.logo = obj.get("logo").getAsString();
-        }
-        if (obj.has("type")) {
-            group.type = obj.get("type").getAsString();
-        }
-        if (obj.has("chat")) {
-            group.chat = context.deserialize(obj.get("chat"), new TypeToken<List<ChatMessage>>() {
-            }.getType());
-        }
-        if (obj.has("members")) {
-            JsonArray memberList = obj.get("members").getAsJsonArray();
-            if (memberList.size() > 0 && memberList.get(0).isJsonObject()) {
-                group.members = context.deserialize(memberList, new TypeToken<List<HabitRPGUser>>() {
-                }.getType());
-            }
-        }
-        if (obj.has("leader")) {
-            if (obj.get("leader").isJsonPrimitive()) {
-                group.leaderID = obj.get("leader").getAsString();
-            } else {
-                JsonObject leader = obj.get("leader").getAsJsonObject();
-                group.leaderID = leader.get("_id").getAsString();
-                if (leader.has("profile") && !leader.get("profile").isJsonNull()) {
-                    if (leader.get("profile").getAsJsonObject().has("name"))
-                        group.leaderName = leader.get("profile").getAsJsonObject().get("name").getAsString();
-                }
-            }
-        }
-        if (obj.has("quest")) {
-            group.quest = context.deserialize(obj.get("quest"), new TypeToken<Quest>() {
-            }.getType());
-        }
-
-        return group;
-    }
-
-    @Override
-    public JsonElement serialize(Group src, Type typeOfSrc, JsonSerializationContext context) {
-        JsonObject obj = new JsonObject();
-        obj.addProperty("name", src.name);
-        obj.addProperty("description", src.description);
-        obj.addProperty("logo", src.logo);
-        obj.addProperty("type", src.type);
-        obj.addProperty("type", src.type);
-        obj.addProperty("leader", src.leaderID);
-        return obj;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonArray;
+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.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.reflect.TypeToken;
+import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+
+import java.lang.reflect.Type;
+import java.util.List;
+
+public class GroupSerialization implements JsonDeserializer<Group>, JsonSerializer<Group> {
+    @Override
+    public Group deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        Group group = new Group();
+        JsonObject obj = json.getAsJsonObject();
+        group.id = obj.get("_id").getAsString();
+        group.name = obj.get("name").getAsString();
+        if (obj.has("description") && !obj.get("description").isJsonNull()) {
+            group.description = obj.get("description").getAsString();
+        }
+        if (obj.has("leaderMessage") && !obj.get("leaderMessage").isJsonNull()) {
+            group.leaderMessage = obj.get("leaderMessage").getAsString();
+        }
+        if (obj.has("privacy")) {
+            group.privacy = obj.get("privacy").getAsString();
+        }
+        if (obj.has("memberCount")) {
+            group.memberCount = obj.get("memberCount").getAsInt();
+        }
+        if (obj.has("balance")) {
+            group.balance = obj.get("balance").getAsDouble();
+        }
+        if (obj.has("logo") && !obj.get("logo").isJsonNull()) {
+            group.logo = obj.get("logo").getAsString();
+        }
+        if (obj.has("type")) {
+            group.type = obj.get("type").getAsString();
+        }
+        if (obj.has("chat")) {
+            group.chat = context.deserialize(obj.get("chat"), new TypeToken<List<ChatMessage>>() {
+            }.getType());
+        }
+        if (obj.has("members")) {
+            JsonArray memberList = obj.get("members").getAsJsonArray();
+            if (memberList.size() > 0 && memberList.get(0).isJsonObject()) {
+                group.members = context.deserialize(memberList, new TypeToken<List<HabitRPGUser>>() {
+                }.getType());
+            }
+        }
+        if (obj.has("leader")) {
+            if (obj.get("leader").isJsonPrimitive()) {
+                group.leaderID = obj.get("leader").getAsString();
+            } else {
+                JsonObject leader = obj.get("leader").getAsJsonObject();
+                group.leaderID = leader.get("_id").getAsString();
+                if (leader.has("profile") && !leader.get("profile").isJsonNull()) {
+                    if (leader.get("profile").getAsJsonObject().has("name"))
+                        group.leaderName = leader.get("profile").getAsJsonObject().get("name").getAsString();
+                }
+            }
+        }
+        if (obj.has("quest")) {
+            group.quest = context.deserialize(obj.get("quest"), new TypeToken<Quest>() {
+            }.getType());
+        }
+
+        return group;
+    }
+
+    @Override
+    public JsonElement serialize(Group src, Type typeOfSrc, JsonSerializationContext context) {
+        JsonObject obj = new JsonObject();
+        obj.addProperty("name", src.name);
+        obj.addProperty("description", src.description);
+        obj.addProperty("logo", src.logo);
+        obj.addProperty("type", src.type);
+        obj.addProperty("type", src.type);
+        obj.addProperty("leader", src.leaderID);
+        return obj;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
index ae52bcb17..e772ac111 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
@@ -1,68 +1,67 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-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 HatchingPotionListDeserializer implements JsonDeserializer<List<HatchingPotion>> {
-    @Override
-    public List<HatchingPotion> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<HatchingPotion> vals = new ArrayList<>();
-        if (json.isJsonObject()) {
-            JsonObject object = json.getAsJsonObject();
-
-            List<HatchingPotion> existingItems = new Select().from(HatchingPotion.class).queryList();
-
-            for (HatchingPotion item : existingItems) {
-                if (object.has(item.getKey())) {
-                    JsonElement itemObject = object.get(item.getKey());
-
-                    if (itemObject.isJsonObject()) {
-                        HatchingPotion parsedItem = context.deserialize(itemObject.getAsJsonObject(), HatchingPotion.class);
-                        item.setText(parsedItem.getText());
-                        item.setNotes(parsedItem.getNotes());
-                        item.setValue(parsedItem.getValue());
-                        item.setLimited(parsedItem.getLimited());
-                        item.setPremium(parsedItem.getPremium());
-                    } else {
-                        item.setOwned(itemObject.getAsInt());
-                    }
-                    vals.add(item);
-                    object.remove(item.getKey());
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-                HatchingPotion item;
-                if (entry.getValue().isJsonObject()) {
-                    item = context.deserialize(entry.getValue(), HatchingPotion.class);
-                } else {
-                    item = new HatchingPotion();
-                    item.setKey(entry.getKey());
-                    if (entry.getValue().isJsonNull()) {
-                        item.setOwned(0);
-                    } else {
-                        item.setOwned(entry.getValue().getAsInt());
-                    }
-                }
-                vals.add(item);
-            }
-        } else {
-            for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((HatchingPotion) context.deserialize(item.getAsJsonObject(), HatchingPotion.class));
-            }
-        }
-
-        return vals;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+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 HatchingPotionListDeserializer implements JsonDeserializer<List<HatchingPotion>> {
+    @Override
+    public List<HatchingPotion> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<HatchingPotion> vals = new ArrayList<>();
+        if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+
+            List<HatchingPotion> existingItems = new Select().from(HatchingPotion.class).queryList();
+
+            for (HatchingPotion item : existingItems) {
+                if (object.has(item.getKey())) {
+                    JsonElement itemObject = object.get(item.getKey());
+
+                    if (itemObject.isJsonObject()) {
+                        HatchingPotion parsedItem = context.deserialize(itemObject.getAsJsonObject(), HatchingPotion.class);
+                        item.setText(parsedItem.getText());
+                        item.setNotes(parsedItem.getNotes());
+                        item.setValue(parsedItem.getValue());
+                        item.setLimited(parsedItem.getLimited());
+                        item.setPremium(parsedItem.getPremium());
+                    } else {
+                        item.setOwned(itemObject.getAsInt());
+                    }
+                    vals.add(item);
+                    object.remove(item.getKey());
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                HatchingPotion item;
+                if (entry.getValue().isJsonObject()) {
+                    item = context.deserialize(entry.getValue(), HatchingPotion.class);
+                } else {
+                    item = new HatchingPotion();
+                    item.setKey(entry.getKey());
+                    if (entry.getValue().isJsonNull()) {
+                        item.setOwned(0);
+                    } else {
+                        item.setOwned(entry.getValue().getAsInt());
+                    }
+                }
+                vals.add(item);
+            }
+        } else {
+            for (JsonElement item : json.getAsJsonArray()) {
+                vals.add((HatchingPotion) context.deserialize(item.getAsJsonObject(), HatchingPotion.class));
+            }
+        }
+
+        return vals;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
index 492f286e5..57e2779ce 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
@@ -5,8 +5,7 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.tasks.ItemData;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.lang.reflect.Type;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
index b8d01c891..bf38073cc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
@@ -1,28 +1,27 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.inventory.Mount;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
-
-public class MountListDeserializer implements JsonDeserializer<HashMap<String, Mount>> {
-    @Override
-    public HashMap<String, Mount> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        HashMap<String, Mount> vals = new HashMap<>();
-        for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-            Mount pet = new Mount();
-            pet.setKey(entry.getKey());
-            pet.setAnimal(entry.getKey().split("-")[0]);
-            pet.setColor(entry.getKey().split("-")[1]);
-            vals.put(entry.getKey(), pet);
-        }
-
-        return vals;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MountListDeserializer implements JsonDeserializer<HashMap<String, Mount>> {
+    @Override
+    public HashMap<String, Mount> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        HashMap<String, Mount> vals = new HashMap<>();
+        for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+            Mount pet = new Mount();
+            pet.setKey(entry.getKey());
+            pet.setAnimal(entry.getKey().split("-")[0]);
+            pet.setColor(entry.getKey().split("-")[1]);
+            vals.put(entry.getKey(), pet);
+        }
+
+        return vals;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
index 7ef1ec2e3..920c86654 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
@@ -1,28 +1,27 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.inventory.Pet;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
-
-public class PetListDeserializer implements JsonDeserializer<HashMap<String, Pet>> {
-    @Override
-    public HashMap<String, Pet> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        HashMap<String, Pet> vals = new HashMap<>();
-        for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-            Pet pet = new Pet();
-            pet.setKey(entry.getKey());
-            pet.setAnimal(entry.getKey().split("-")[0]);
-            pet.setColor(entry.getKey().split("-")[1]);
-            vals.put(entry.getKey(), pet);
-        }
-
-        return vals;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PetListDeserializer implements JsonDeserializer<HashMap<String, Pet>> {
+    @Override
+    public HashMap<String, Pet> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        HashMap<String, Pet> vals = new HashMap<>();
+        for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+            Pet pet = new Pet();
+            pet.setKey(entry.getKey());
+            pet.setAnimal(entry.getKey().split("-")[0]);
+            pet.setColor(entry.getKey().split("-")[1]);
+            vals.put(entry.getKey(), pet);
+        }
+
+        return vals;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
index 8a1051025..4c21202be 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
@@ -1,96 +1,95 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.habitrpg.android.habitica.models.user.Purchases;
-import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
-import com.raizlabs.android.dbflow.runtime.TransactionManager;
-import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
-import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by viirus on 14/01/16.
- */
-public class PurchasedDeserializer implements JsonDeserializer<Purchases> {
-
-    @Override
-    public Purchases deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        JsonObject object = json.getAsJsonObject();
-        List<Customization> customizations = new ArrayList<Customization>();
-        Purchases purchases = new Purchases();
-
-        List<Customization> existingCustomizations;
-        try {
-            existingCustomizations = new Select().from(Customization.class).queryList();
-        } catch (RuntimeException e) {
-            //Tests don't have a database
-            existingCustomizations = new ArrayList<>();
-        }
-        for (Customization customization : existingCustomizations) {
-            if (object.has(customization.getType())) {
-                JsonObject nestedObject = object.get(customization.getType()).getAsJsonObject();
-                if (customization.getCategory() != null) {
-                    if (nestedObject.has(customization.getCategory())) {
-                        nestedObject = nestedObject.get(customization.getCategory()).getAsJsonObject();
-                    } else {
-                        continue;
-                    }
-                }
-                if (nestedObject.has(customization.getIdentifier())) {
-                    customizations.add(this.parseCustomization(customization, customization.getType(), customization.getCategory(), customization.getIdentifier(), nestedObject.get(customization.getIdentifier()).getAsBoolean()));
-                    nestedObject.remove(customization.getIdentifier());
-                }
-            }
-        }
-
-        for (String type : Arrays.asList("background", "shirt", "skin")) {
-            if (!object.has(type)) {
-                continue;
-            }
-            for (Map.Entry<String, JsonElement> entry : object.get(type).getAsJsonObject().entrySet()) {
-                customizations.add(this.parseCustomization(null, type, null, entry.getKey(), entry.getValue().getAsBoolean()));
-            }
-        }
-        if (object.has("hair")) {
-            for (Map.Entry<String, JsonElement> categoryEntry : object.get("hair").getAsJsonObject().entrySet()) {
-                for (Map.Entry<String, JsonElement> entry : categoryEntry.getValue().getAsJsonObject().entrySet()) {
-                    customizations.add(this.parseCustomization(null, "hair", categoryEntry.getKey(), entry.getKey(), entry.getValue().getAsBoolean()));
-                }
-            }
-        }
-
-        TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(customizations)));
-
-        purchases.customizations = customizations;
-        purchases.setPlan(context.deserialize(object.get("plan"), SubscriptionPlan.class));
-
-        return purchases;
-    }
-
-    private Customization parseCustomization(Customization existingCustomizaion, String type, String category, String key, boolean wasPurchased) {
-        Customization customization = existingCustomizaion;
-        if (customization == null) {
-            customization = new Customization();
-            customization.setIdentifier(key);
-            customization.setType(type);
-            if (category != null) {
-                customization.setCategory(category);
-            }
-        }
-        customization.setPurchased(wasPurchased);
-
-        return customization;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.user.Purchases;
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
+import com.raizlabs.android.dbflow.runtime.TransactionManager;
+import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
+import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by viirus on 14/01/16.
+ */
+public class PurchasedDeserializer implements JsonDeserializer<Purchases> {
+
+    @Override
+    public Purchases deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        JsonObject object = json.getAsJsonObject();
+        List<Customization> customizations = new ArrayList<Customization>();
+        Purchases purchases = new Purchases();
+
+        List<Customization> existingCustomizations;
+        try {
+            existingCustomizations = new Select().from(Customization.class).queryList();
+        } catch (RuntimeException e) {
+            //Tests don't have a database
+            existingCustomizations = new ArrayList<>();
+        }
+        for (Customization customization : existingCustomizations) {
+            if (object.has(customization.getType())) {
+                JsonObject nestedObject = object.get(customization.getType()).getAsJsonObject();
+                if (customization.getCategory() != null) {
+                    if (nestedObject.has(customization.getCategory())) {
+                        nestedObject = nestedObject.get(customization.getCategory()).getAsJsonObject();
+                    } else {
+                        continue;
+                    }
+                }
+                if (nestedObject.has(customization.getIdentifier())) {
+                    customizations.add(this.parseCustomization(customization, customization.getType(), customization.getCategory(), customization.getIdentifier(), nestedObject.get(customization.getIdentifier()).getAsBoolean()));
+                    nestedObject.remove(customization.getIdentifier());
+                }
+            }
+        }
+
+        for (String type : Arrays.asList("background", "shirt", "skin")) {
+            if (!object.has(type)) {
+                continue;
+            }
+            for (Map.Entry<String, JsonElement> entry : object.get(type).getAsJsonObject().entrySet()) {
+                customizations.add(this.parseCustomization(null, type, null, entry.getKey(), entry.getValue().getAsBoolean()));
+            }
+        }
+        if (object.has("hair")) {
+            for (Map.Entry<String, JsonElement> categoryEntry : object.get("hair").getAsJsonObject().entrySet()) {
+                for (Map.Entry<String, JsonElement> entry : categoryEntry.getValue().getAsJsonObject().entrySet()) {
+                    customizations.add(this.parseCustomization(null, "hair", categoryEntry.getKey(), entry.getKey(), entry.getValue().getAsBoolean()));
+                }
+            }
+        }
+
+        TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(customizations)));
+
+        purchases.customizations = customizations;
+        purchases.setPlan(context.deserialize(object.get("plan"), SubscriptionPlan.class));
+
+        return purchases;
+    }
+
+    private Customization parseCustomization(Customization existingCustomizaion, String type, String category, String key, boolean wasPurchased) {
+        Customization customization = existingCustomizaion;
+        if (customization == null) {
+            customization = new Customization();
+            customization.setIdentifier(key);
+            customization.setType(type);
+            if (category != null) {
+                customization.setCategory(category);
+            }
+        }
+        customization.setPurchased(wasPurchased);
+
+        return customization;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
index 3fd331377..92616d1ba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
@@ -1,76 +1,75 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.raizlabs.android.dbflow.runtime.TransactionManager;
-import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
-import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
-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 QuestListDeserializer implements JsonDeserializer<List<QuestContent>> {
-    @Override
-    public List<QuestContent> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<QuestContent> vals = new ArrayList<>();
-        if (json.isJsonObject()) {
-            JsonObject object = json.getAsJsonObject();
-
-            List<QuestContent> existingItems = new Select().from(QuestContent.class).queryList();
-
-            for (QuestContent item : existingItems) {
-                if (object.has(item.getKey())) {
-                    JsonElement itemObject = object.get(item.getKey());
-
-                    if (itemObject.isJsonObject()) {
-                        QuestContent parsedItem = context.deserialize(itemObject.getAsJsonObject(), QuestContent.class);
-                        item.setText(parsedItem.getText());
-                        item.setNotes(parsedItem.getNotes());
-                        item.setValue(parsedItem.getValue());
-                        item.setPrevious(parsedItem.getPrevious());
-                        item.setCanBuy(parsedItem.isCanBuy());
-                        item.setBoss(parsedItem.getBoss());
-                        item.setCategory(parsedItem.getCategory());
-                        item.setCollect(parsedItem.getCollect());
-                        item.setLvl(parsedItem.getLvl());
-                    } else {
-                        item.setOwned(itemObject.getAsInt());
-                    }
-                    vals.add(item);
-                    object.remove(item.getKey());
-                }
-            }
-
-            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-                QuestContent item;
-                if (entry.getValue().isJsonObject()) {
-                    item = context.deserialize(entry.getValue(), QuestContent.class);
-                } else {
-                    item = new QuestContent();
-                    item.setKey(entry.getKey());
-                    if (entry.getValue().isJsonNull()) {
-                        item.setOwned(0);
-                    } else {
-                        item.setOwned(entry.getValue().getAsInt());
-                    }
-                }
-                vals.add(item);
-            }
-            TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(vals)));
-        } else {
-            for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((QuestContent) context.deserialize(item.getAsJsonObject(), QuestContent.class));
-            }
-        }
-
-        return vals;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.raizlabs.android.dbflow.runtime.TransactionManager;
+import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
+import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
+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 QuestListDeserializer implements JsonDeserializer<List<QuestContent>> {
+    @Override
+    public List<QuestContent> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<QuestContent> vals = new ArrayList<>();
+        if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+
+            List<QuestContent> existingItems = new Select().from(QuestContent.class).queryList();
+
+            for (QuestContent item : existingItems) {
+                if (object.has(item.getKey())) {
+                    JsonElement itemObject = object.get(item.getKey());
+
+                    if (itemObject.isJsonObject()) {
+                        QuestContent parsedItem = context.deserialize(itemObject.getAsJsonObject(), QuestContent.class);
+                        item.setText(parsedItem.getText());
+                        item.setNotes(parsedItem.getNotes());
+                        item.setValue(parsedItem.getValue());
+                        item.setPrevious(parsedItem.getPrevious());
+                        item.setCanBuy(parsedItem.isCanBuy());
+                        item.setBoss(parsedItem.getBoss());
+                        item.setCategory(parsedItem.getCategory());
+                        item.setCollect(parsedItem.getCollect());
+                        item.setLvl(parsedItem.getLvl());
+                    } else {
+                        item.setOwned(itemObject.getAsInt());
+                    }
+                    vals.add(item);
+                    object.remove(item.getKey());
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                QuestContent item;
+                if (entry.getValue().isJsonObject()) {
+                    item = context.deserialize(entry.getValue(), QuestContent.class);
+                } else {
+                    item = new QuestContent();
+                    item.setKey(entry.getKey());
+                    if (entry.getValue().isJsonNull()) {
+                        item.setOwned(0);
+                    } else {
+                        item.setOwned(entry.getValue().getAsInt());
+                    }
+                }
+                vals.add(item);
+            }
+            TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(vals)));
+        } else {
+            for (JsonElement item : json.getAsJsonArray()) {
+                vals.add((QuestContent) context.deserialize(item.getAsJsonObject(), QuestContent.class));
+            }
+        }
+
+        return vals;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/RemindersItemSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/RemindersItemSerializer.java
index 6940923a0..851e31a0b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/RemindersItemSerializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/RemindersItemSerializer.java
@@ -1,28 +1,27 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-
-import java.lang.reflect.Type;
-
-/**
- * Created by keithholliday on 6/4/16.
- */
-public class RemindersItemSerializer
-        implements JsonSerializer<RemindersItem> {
-
-    @Override
-    public JsonElement serialize(RemindersItem src, Type typeOfSrc, JsonSerializationContext context) {
-        JsonObject object = new JsonObject();
-        object.addProperty("id", src.getId());
-        if (src.getStartDate() != null) {
-            object.addProperty("startDate", src.getStartDate().getTime());
-        }
-        object.addProperty("time", src.getTime().getTime());
-        return object;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+
+import java.lang.reflect.Type;
+
+/**
+ * Created by keithholliday on 6/4/16.
+ */
+public class RemindersItemSerializer
+        implements JsonSerializer<RemindersItem> {
+
+    @Override
+    public JsonElement serialize(RemindersItem src, Type typeOfSrc, JsonSerializationContext context) {
+        JsonObject object = new JsonObject();
+        object.addProperty("id", src.getId());
+        if (src.getStartDate() != null) {
+            object.addProperty("startDate", src.getStartDate().getTime());
+        }
+        object.addProperty("time", src.getTime().getTime());
+        return object;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
index 7ef241eeb..f977565fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
@@ -1,55 +1,54 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.Skill;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by viirus on 25/11/15.
- */
-public class SkillDeserializer
-        implements JsonDeserializer<List<Skill>> {
-
-    @Override
-    public List<Skill> deserialize(JsonElement json, Type type,
-                                   JsonDeserializationContext context) throws JsonParseException {
-
-        JsonObject object = json.getAsJsonObject();
-        List<Skill> skills = new ArrayList<Skill>();
-        for (Map.Entry<String, JsonElement> classEntry : object.entrySet()) {
-            String classname = classEntry.getKey();
-            JsonObject classObject = classEntry.getValue().getAsJsonObject();
-
-            for (Map.Entry<String, JsonElement> skillEntry : classObject.entrySet()) {
-                JsonObject skillObject = skillEntry.getValue().getAsJsonObject();
-                Skill skill = new Skill();
-                skill.key = skillObject.get("key").getAsString();
-                skill.text = skillObject.get("text").getAsString();
-                skill.notes = skillObject.get("notes").getAsString();
-                skill.key = skillObject.get("key").getAsString();
-                skill.target = skillObject.get("target").getAsString();
-                skill.habitClass = classname;
-                skill.mana = skillObject.get("mana").getAsInt();
-
-                JsonElement lvlElement = skillObject.get("lvl");
-
-                if (lvlElement != null) {
-                    skill.lvl = lvlElement.getAsInt();
-                }
-
-                skills.add(skill);
-            }
-        }
-
-        return skills;
-    }
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.Skill;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by viirus on 25/11/15.
+ */
+public class SkillDeserializer
+        implements JsonDeserializer<List<Skill>> {
+
+    @Override
+    public List<Skill> deserialize(JsonElement json, Type type,
+                                   JsonDeserializationContext context) throws JsonParseException {
+
+        JsonObject object = json.getAsJsonObject();
+        List<Skill> skills = new ArrayList<Skill>();
+        for (Map.Entry<String, JsonElement> classEntry : object.entrySet()) {
+            String classname = classEntry.getKey();
+            JsonObject classObject = classEntry.getValue().getAsJsonObject();
+
+            for (Map.Entry<String, JsonElement> skillEntry : classObject.entrySet()) {
+                JsonObject skillObject = skillEntry.getValue().getAsJsonObject();
+                Skill skill = new Skill();
+                skill.key = skillObject.get("key").getAsString();
+                skill.text = skillObject.get("text").getAsString();
+                skill.notes = skillObject.get("notes").getAsString();
+                skill.key = skillObject.get("key").getAsString();
+                skill.target = skillObject.get("target").getAsString();
+                skill.habitClass = classname;
+                skill.mana = skillObject.get("mana").getAsInt();
+
+                JsonElement lvlElement = skillObject.get("lvl");
+
+                if (lvlElement != null) {
+                    skill.lvl = lvlElement.getAsInt();
+                }
+
+                skills.add(skill);
+            }
+        }
+
+        return skills;
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskGroupPlanDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskGroupPlanDeserializer.java
index 97981c324..304309ebb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskGroupPlanDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskGroupPlanDeserializer.java
@@ -1,26 +1,25 @@
-package com.habitrpg.android.habitica.utils;
-
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.tasks.TaskGroupPlan;
-
-import java.lang.reflect.Type;
-
-public class TaskGroupPlanDeserializer implements JsonDeserializer<TaskGroupPlan> {
-    @Override
-    public TaskGroupPlan deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        TaskGroupPlan group = new TaskGroupPlan();
-        JsonObject object = json.getAsJsonObject();
-        JsonObject approvalObject = object.getAsJsonObject("approval");
-        group.approvalRequested = approvalObject.getAsJsonPrimitive("requested").getAsBoolean();
-        group.approvalApproved = approvalObject.getAsJsonPrimitive("approved").getAsBoolean();
-        group.approvalRequired = approvalObject.getAsJsonPrimitive("required").getAsBoolean();
-
-        return null;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.tasks.TaskGroupPlan;
+
+import java.lang.reflect.Type;
+
+public class TaskGroupPlanDeserializer implements JsonDeserializer<TaskGroupPlan> {
+    @Override
+    public TaskGroupPlan deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        TaskGroupPlan group = new TaskGroupPlan();
+        JsonObject object = json.getAsJsonObject();
+        JsonObject approvalObject = object.getAsJsonObject("approval");
+        group.approvalRequested = approvalObject.getAsJsonPrimitive("requested").getAsBoolean();
+        group.approvalApproved = approvalObject.getAsJsonPrimitive("approved").getAsBoolean();
+        group.approvalRequired = approvalObject.getAsJsonPrimitive("required").getAsBoolean();
+
+        return null;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.java
index b969399b6..88a053e42 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskListDeserializer.java
@@ -1,32 +1,31 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by viirus on 09/12/15.
- */
-public class TaskListDeserializer implements JsonDeserializer<TaskList> {
-
-    public TaskList deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext ctx) {
-        TaskList tasks = new TaskList();
-        Map<String, Task> taskMap = new HashMap<>();
-
-        for (JsonElement e : json.getAsJsonArray()) {
-            Task task = ctx.deserialize(e, Task.class);
-            taskMap.put(task.getId(), task);
-        }
-
-        tasks.tasks = taskMap;
-
-        return tasks;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by viirus on 09/12/15.
+ */
+public class TaskListDeserializer implements JsonDeserializer<TaskList> {
+
+    public TaskList deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext ctx) {
+        TaskList tasks = new TaskList();
+        Map<String, Task> taskMap = new HashMap<>();
+
+        for (JsonElement e : json.getAsJsonArray()) {
+            Task task = ctx.deserialize(e, Task.class);
+            taskMap.put(task.getId(), task);
+        }
+
+        tasks.tasks = taskMap;
+
+        return tasks;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
index 2a930abf4..125946ff4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
@@ -1,59 +1,58 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-
-import java.lang.reflect.Type;
-
-public class TaskSerializer implements JsonSerializer<Task> {
-    @Override
-    public JsonElement serialize(Task task, Type typeOfSrc, JsonSerializationContext context) {
-        JsonObject obj = new JsonObject();
-        obj.addProperty("_id", task.getId());
-        obj.addProperty("text", task.getText());
-        obj.addProperty("notes", task.getNotes());
-        obj.addProperty("value", task.getValue());
-        obj.addProperty("priority", task.getPriority());
-        obj.addProperty("attribute", task.getAttribute());
-        obj.addProperty("type", task.getType());
-        JsonArray tagsList = new JsonArray();
-        for (TaskTag tag : task.getTags()) {
-            tagsList.add(tag.getTag().getId());
-        }
-        obj.add("tags", tagsList);
-        switch (task.getType()) {
-            case "habit":
-                obj.addProperty("up", task.getUp());
-                obj.addProperty("down", task.getDown());
-                break;
-            case "daily":
-                obj.addProperty("frequency", task.getFrequency());
-                obj.addProperty("everyX", task.getEveryX());
-                obj.add("repeat", context.serialize(task.getRepeat()));
-                obj.add("startDate", context.serialize(task.getStartDate()));
-                obj.addProperty("streak", task.getStreak());
-                obj.add("checklist", context.serialize(task.getChecklist()));
-                obj.add("reminders", context.serialize(task.getReminders()));
-                obj.addProperty("completed", task.getCompleted());
-                break;
-            case "todo":
-                if (task.getDueDate() == null) {
-                    obj.addProperty("date", "");
-                } else {
-                    obj.add("date", context.serialize(task.getDueDate()));
-                }
-                obj.add("checklist", context.serialize(task.getChecklist()));
-                obj.add("reminders", context.serialize(task.getReminders()));
-                obj.addProperty("completed", task.getCompleted());
-                break;
-        }
-
-        return obj;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+
+import java.lang.reflect.Type;
+
+public class TaskSerializer implements JsonSerializer<Task> {
+    @Override
+    public JsonElement serialize(Task task, Type typeOfSrc, JsonSerializationContext context) {
+        JsonObject obj = new JsonObject();
+        obj.addProperty("_id", task.getId());
+        obj.addProperty("text", task.getText());
+        obj.addProperty("notes", task.getNotes());
+        obj.addProperty("value", task.getValue());
+        obj.addProperty("priority", task.getPriority());
+        obj.addProperty("attribute", task.getAttribute());
+        obj.addProperty("type", task.getType());
+        JsonArray tagsList = new JsonArray();
+        for (TaskTag tag : task.getTags()) {
+            tagsList.add(tag.getTag().getId());
+        }
+        obj.add("tags", tagsList);
+        switch (task.getType()) {
+            case "habit":
+                obj.addProperty("up", task.getUp());
+                obj.addProperty("down", task.getDown());
+                break;
+            case "daily":
+                obj.addProperty("frequency", task.getFrequency());
+                obj.addProperty("everyX", task.getEveryX());
+                obj.add("repeat", context.serialize(task.getRepeat()));
+                obj.add("startDate", context.serialize(task.getStartDate()));
+                obj.addProperty("streak", task.getStreak());
+                obj.add("checklist", context.serialize(task.getChecklist()));
+                obj.add("reminders", context.serialize(task.getReminders()));
+                obj.addProperty("completed", task.getCompleted());
+                break;
+            case "todo":
+                if (task.getDueDate() == null) {
+                    obj.addProperty("date", "");
+                } else {
+                    obj.add("date", context.serialize(task.getDueDate()));
+                }
+                obj.add("checklist", context.serialize(task.getChecklist()));
+                obj.add("reminders", context.serialize(task.getReminders()));
+                obj.addProperty("completed", task.getCompleted());
+                break;
+        }
+
+        return obj;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
index 430cfc660..3279ab390 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
@@ -1,60 +1,59 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TaskTagDeserializer implements JsonDeserializer<List<TaskTag>> {
-    @Override
-    public List<TaskTag> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<TaskTag> taskTags = new ArrayList<>();
-        List<Tag> allTags;
-        try {
-            allTags = new Select()
-                    .from(Tag.class)
-                    .queryList();
-        } catch (RuntimeException e) {
-            //Tests don't have a database
-            allTags = new ArrayList<>();
-        }
-
-        if (json.isJsonArray()) {
-            for (JsonElement tagElement : json.getAsJsonArray()) {
-                String tagId = tagElement.getAsString();
-                TaskTag taskTag = new TaskTag();
-                for (Tag tag : allTags) {
-                    if (tag.getId().equals(tagId)) {
-                        taskTag.setTag(tag);
-
-                        if (!alreadyContainsTag(taskTags, tagId)) {
-                            taskTags.add(taskTag);
-                        }
-
-                        break;
-                    }
-                }
-            }
-        }
-
-        return taskTags;
-    }
-
-    private boolean alreadyContainsTag(List<TaskTag> list, String idToCheck) {
-        for (TaskTag t : list) {
-            if (t.getTag().getId().equals(idToCheck)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TaskTagDeserializer implements JsonDeserializer<List<TaskTag>> {
+    @Override
+    public List<TaskTag> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<TaskTag> taskTags = new ArrayList<>();
+        List<Tag> allTags;
+        try {
+            allTags = new Select()
+                    .from(Tag.class)
+                    .queryList();
+        } catch (RuntimeException e) {
+            //Tests don't have a database
+            allTags = new ArrayList<>();
+        }
+
+        if (json.isJsonArray()) {
+            for (JsonElement tagElement : json.getAsJsonArray()) {
+                String tagId = tagElement.getAsString();
+                TaskTag taskTag = new TaskTag();
+                for (Tag tag : allTags) {
+                    if (tag.getId().equals(tagId)) {
+                        taskTag.setTag(tag);
+
+                        if (!alreadyContainsTag(taskTags, tagId)) {
+                            taskTags.add(taskTag);
+                        }
+
+                        break;
+                    }
+                }
+            }
+        }
+
+        return taskTags;
+    }
+
+    private boolean alreadyContainsTag(List<TaskTag> list, String idToCheck) {
+        for (TaskTag t : list) {
+            if (t.getTag().getId().equals(idToCheck)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
index 1241fec46..c824becf2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
@@ -1,39 +1,38 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-
-import com.habitrpg.android.habitica.models.TutorialStep;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-public class TutorialStepListDeserializer implements JsonDeserializer<List<TutorialStep>> {
-    @Override
-    public List<TutorialStep> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<TutorialStep> vals = new ArrayList<>();
-        for (String group : Arrays.asList("common", "android")) {
-            if (json.getAsJsonObject().has(group)) {
-                for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().get(group).getAsJsonObject().entrySet()) {
-
-                    vals.add(parseStep(group, entry));
-                }
-            }
-        }
-
-        return vals;
-    }
-
-    private TutorialStep parseStep(String group, Map.Entry<String, JsonElement> entry) {
-        TutorialStep article = new TutorialStep();
-        article.setTutorialGroup(group);
-        article.setIdentifier(entry.getKey());
-        article.setWasCompleted(entry.getValue().getAsBoolean());
-        return article;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+public class TutorialStepListDeserializer implements JsonDeserializer<List<TutorialStep>> {
+    @Override
+    public List<TutorialStep> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<TutorialStep> vals = new ArrayList<>();
+        for (String group : Arrays.asList("common", "android")) {
+            if (json.getAsJsonObject().has(group)) {
+                for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().get(group).getAsJsonObject().entrySet()) {
+
+                    vals.add(parseStep(group, entry));
+                }
+            }
+        }
+
+        return vals;
+    }
+
+    private TutorialStep parseStep(String group, Map.Entry<String, JsonElement> entry) {
+        TutorialStep article = new TutorialStep();
+        article.setTutorialGroup(group);
+        article.setIdentifier(entry.getKey());
+        article.setWasCompleted(entry.getValue().getAsBoolean());
+        return article;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.java
index 41a8bda61..6e20527ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.java
@@ -1,71 +1,71 @@
-package com.habitrpg.android.habitica.widget;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.widget.RemoteViews;
-
-public class AddTaskWidgetProvider extends BaseWidgetProvider {
-
-    @Override
-    public int layoutResourceId() {
-        return R.layout.widget_add_task;
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        // Get all ids
-        ComponentName thisWidget = new ComponentName(context,
-                AddTaskWidgetProvider.class);
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-
-        if (Build.VERSION.SDK_INT >= 16) {
-            for (int widgetId : allWidgetIds) {
-                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
-                appWidgetManager.partiallyUpdateAppWidget(widgetId,
-                        sizeRemoteViews(context, options, widgetId));
-            }
-        }
-    }
-
-    @Override
-    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
-
-        String selectedTaskType = getSelectedTaskType(widgetId);
-        String addText = "";
-        int backgroundResource = R.drawable.widget_add_habit_background;
-        switch (selectedTaskType) {
-            case Task.TYPE_HABIT:
-                addText = this.context.getResources().getString(R.string.add_habit);
-                backgroundResource = R.drawable.widget_add_habit_background;
-                break;
-            case Task.TYPE_DAILY:
-                addText = this.context.getResources().getString(R.string.add_daily);
-                backgroundResource = R.drawable.widget_add_daily_background;
-                break;
-            case Task.TYPE_TODO:
-                addText = this.context.getResources().getString(R.string.add_todo);
-                backgroundResource = R.drawable.widget_add_todo_background;
-                break;
-            case Task.TYPE_REWARD:
-                addText = this.context.getResources().getString(R.string.add_reward);
-                backgroundResource = R.drawable.widget_add_reward_background;
-                break;
-        }
-        remoteViews.setTextViewText(R.id.add_task_text, addText);
-        remoteViews.setInt(R.id.add_task_icon, "setBackgroundResource", backgroundResource);
-        return remoteViews;
-    }
-
-    private String getSelectedTaskType(int widgetId) {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this.context);
-        return preferences.getString("add_task_widget_" + widgetId, Task.TYPE_HABIT);
-    }
-}
+package com.habitrpg.android.habitica.widget;
+
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.widget.RemoteViews;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+public class AddTaskWidgetProvider extends BaseWidgetProvider {
+
+    @Override
+    public int layoutResourceId() {
+        return R.layout.widget_add_task;
+    }
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        // Get all ids
+        ComponentName thisWidget = new ComponentName(context,
+                AddTaskWidgetProvider.class);
+        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
+
+        if (Build.VERSION.SDK_INT >= 16) {
+            for (int widgetId : allWidgetIds) {
+                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
+                appWidgetManager.partiallyUpdateAppWidget(widgetId,
+                        sizeRemoteViews(context, options, widgetId));
+            }
+        }
+    }
+
+    @Override
+    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
+
+        String selectedTaskType = getSelectedTaskType(widgetId);
+        String addText = "";
+        int backgroundResource = R.drawable.widget_add_habit_background;
+        switch (selectedTaskType) {
+            case Task.TYPE_HABIT:
+                addText = this.context.getResources().getString(R.string.add_habit);
+                backgroundResource = R.drawable.widget_add_habit_background;
+                break;
+            case Task.TYPE_DAILY:
+                addText = this.context.getResources().getString(R.string.add_daily);
+                backgroundResource = R.drawable.widget_add_daily_background;
+                break;
+            case Task.TYPE_TODO:
+                addText = this.context.getResources().getString(R.string.add_todo);
+                backgroundResource = R.drawable.widget_add_todo_background;
+                break;
+            case Task.TYPE_REWARD:
+                addText = this.context.getResources().getString(R.string.add_reward);
+                backgroundResource = R.drawable.widget_add_reward_background;
+                break;
+        }
+        remoteViews.setTextViewText(R.id.add_task_text, addText);
+        remoteViews.setInt(R.id.add_task_icon, "setBackgroundResource", backgroundResource);
+        return remoteViews;
+    }
+
+    private String getSelectedTaskType(int widgetId) {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this.context);
+        return preferences.getString("add_task_widget_" + widgetId, Task.TYPE_HABIT);
+    }
+}
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 4f9fd3e36..5afb0f7e7 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,127 +1,127 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Stats;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.AvatarView;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
-
-    private AppWidgetManager appWidgetManager;
-
-    @Override
-    public int layoutResourceId() {
-        return R.layout.widget_avatar_stats;
-    }
-
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    String userId;
-    @Inject
-    UserRepository userRepository;
-
-    private void setUp() {
-        if (userRepository == null) {
-            HabiticaBaseApplication.getComponent().inject(this);
-        }
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        this.setUp();
-        this.appWidgetManager = appWidgetManager;
-        this.context = context;
-
-        userRepository.getUser(userId).subscribe(this::updateData, throwable -> {});
-    }
-
-    @Override
-    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
-        if (columns > 3) {
-            remoteViews.setViewVisibility(R.id.avatar_view, View.VISIBLE);
-        } else {
-            remoteViews.setViewVisibility(R.id.avatar_view, View.GONE);
-        }
-
-        if (rows > 1) {
-            remoteViews.setViewVisibility(R.id.mp_wrapper, View.VISIBLE);
-            remoteViews.setViewVisibility(R.id.detail_info_view, View.VISIBLE);
-        } else {
-            remoteViews.setViewVisibility(R.id.mp_wrapper, View.GONE);
-            remoteViews.setViewVisibility(R.id.detail_info_view, View.GONE);
-        }
-
-        return remoteViews;
-    }
-
-    private void updateData(HabitRPGUser user) {
-        if (user == null || user.getStats() == null) {
-            return;
-        }
-        Stats stats = user.getStats();
-        ComponentName thisWidget = new ComponentName(context, AvatarStatsWidgetProvider.class);
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-        String healthValueString = "" + stats.getHp().intValue() + "/" + stats.getMaxHealth();
-        String expValueString = "" + stats.getExp().intValue() + "/" + stats.getToNextLevel();
-        String mpValueString = "" + stats.getMp().intValue() + "/" + stats.getMaxMP();
-
-        for (int widgetId : allWidgetIds) {
-            RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget_avatar_stats);
-
-            remoteViews.setTextViewText(R.id.TV_hp_value, healthValueString);
-            remoteViews.setTextViewText(R.id.exp_TV_value, expValueString);
-            remoteViews.setTextViewText(R.id.mp_TV_value, mpValueString);
-
-            remoteViews.setProgressBar(R.id.hp_bar, stats.getMaxHealth(), stats.getHp().intValue(), false);
-            remoteViews.setProgressBar(R.id.exp_bar, stats.getToNextLevel(), stats.getExp().intValue(), false);
-            remoteViews.setProgressBar(R.id.mp_bar, stats.getMaxMP(), stats.getMp().intValue(), false);
-            remoteViews.setViewVisibility(R.id.mp_wrapper, (stats.get_class() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
-
-            int gp = (stats.getGp().intValue());
-            int sp = (int) ((stats.getGp() - gp) * 100);
-            remoteViews.setTextViewText(R.id.gold_tv, String.valueOf(gp));
-            remoteViews.setTextViewText(R.id.silver_tv, String.valueOf(sp));
-            remoteViews.setTextViewText(R.id.gems_tv, String.valueOf((int) (user.getBalance() * 4)));
-            remoteViews.setTextViewText(R.id.lvl_tv, context.getString(R.string.user_level, user.getStats().getLvl()));
-
-            AvatarView avatarView = new AvatarView(context, true, true, true);
-
-            avatarView.setUser(user);
-            RemoteViews finalRemoteViews = remoteViews;
-            avatarView.onAvatarImageReady(bitmap -> {
-                finalRemoteViews.setImageViewBitmap(R.id.avatar_view, bitmap);
-                appWidgetManager.partiallyUpdateAppWidget(allWidgetIds, finalRemoteViews);
-            });
-
-            //If user click on life and xp: open the app
-            Intent openAppIntent = new Intent(context.getApplicationContext(), MainActivity.class);
-            PendingIntent openApp = PendingIntent.getActivity(context, 0, openAppIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            remoteViews.setOnClickPendingIntent(R.id.widget_main_view, openApp);
-
-
-            if (Build.VERSION.SDK_INT >= 16) {
-                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
-                remoteViews = sizeRemoteViews(context, options, widgetId);
-            }
-
-            appWidgetManager.updateAppWidget(widgetId, remoteViews);
-        }
-    }
-}
+package com.habitrpg.android.habitica.widget;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.RemoteViews;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.ui.AvatarView;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
+
+    private AppWidgetManager appWidgetManager;
+
+    @Override
+    public int layoutResourceId() {
+        return R.layout.widget_avatar_stats;
+    }
+
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
+    @Inject
+    UserRepository userRepository;
+
+    private void setUp() {
+        if (userRepository == null) {
+            HabiticaBaseApplication.getComponent().inject(this);
+        }
+    }
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        this.setUp();
+        this.appWidgetManager = appWidgetManager;
+        this.context = context;
+
+        userRepository.getUser(userId).subscribe(this::updateData, throwable -> {});
+    }
+
+    @Override
+    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
+        if (columns > 3) {
+            remoteViews.setViewVisibility(R.id.avatar_view, View.VISIBLE);
+        } else {
+            remoteViews.setViewVisibility(R.id.avatar_view, View.GONE);
+        }
+
+        if (rows > 1) {
+            remoteViews.setViewVisibility(R.id.mp_wrapper, View.VISIBLE);
+            remoteViews.setViewVisibility(R.id.detail_info_view, View.VISIBLE);
+        } else {
+            remoteViews.setViewVisibility(R.id.mp_wrapper, View.GONE);
+            remoteViews.setViewVisibility(R.id.detail_info_view, View.GONE);
+        }
+
+        return remoteViews;
+    }
+
+    private void updateData(HabitRPGUser user) {
+        if (user == null || user.getStats() == null) {
+            return;
+        }
+        Stats stats = user.getStats();
+        ComponentName thisWidget = new ComponentName(context, AvatarStatsWidgetProvider.class);
+        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
+        String healthValueString = "" + stats.getHp().intValue() + "/" + stats.getMaxHealth();
+        String expValueString = "" + stats.getExp().intValue() + "/" + stats.getToNextLevel();
+        String mpValueString = "" + stats.getMp().intValue() + "/" + stats.getMaxMP();
+
+        for (int widgetId : allWidgetIds) {
+            RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget_avatar_stats);
+
+            remoteViews.setTextViewText(R.id.TV_hp_value, healthValueString);
+            remoteViews.setTextViewText(R.id.exp_TV_value, expValueString);
+            remoteViews.setTextViewText(R.id.mp_TV_value, mpValueString);
+
+            remoteViews.setProgressBar(R.id.hp_bar, stats.getMaxHealth(), stats.getHp().intValue(), false);
+            remoteViews.setProgressBar(R.id.exp_bar, stats.getToNextLevel(), stats.getExp().intValue(), false);
+            remoteViews.setProgressBar(R.id.mp_bar, stats.getMaxMP(), stats.getMp().intValue(), false);
+            remoteViews.setViewVisibility(R.id.mp_wrapper, (stats.get_class() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
+
+            int gp = (stats.getGp().intValue());
+            int sp = (int) ((stats.getGp() - gp) * 100);
+            remoteViews.setTextViewText(R.id.gold_tv, String.valueOf(gp));
+            remoteViews.setTextViewText(R.id.silver_tv, String.valueOf(sp));
+            remoteViews.setTextViewText(R.id.gems_tv, String.valueOf((int) (user.getBalance() * 4)));
+            remoteViews.setTextViewText(R.id.lvl_tv, context.getString(R.string.user_level, user.getStats().getLvl()));
+
+            AvatarView avatarView = new AvatarView(context, true, true, true);
+
+            avatarView.setUser(user);
+            RemoteViews finalRemoteViews = remoteViews;
+            avatarView.onAvatarImageReady(bitmap -> {
+                finalRemoteViews.setImageViewBitmap(R.id.avatar_view, bitmap);
+                appWidgetManager.partiallyUpdateAppWidget(allWidgetIds, finalRemoteViews);
+            });
+
+            //If user click on life and xp: open the app
+            Intent openAppIntent = new Intent(context.getApplicationContext(), MainActivity.class);
+            PendingIntent openApp = PendingIntent.getActivity(context, 0, openAppIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            remoteViews.setOnClickPendingIntent(R.id.widget_main_view, openApp);
+
+
+            if (Build.VERSION.SDK_INT >= 16) {
+                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
+                remoteViews = sizeRemoteViews(context, options, widgetId);
+            }
+
+            appWidgetManager.updateAppWidget(widgetId, remoteViews);
+        }
+    }
+}
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 3b34eb1bc..018652908 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java
@@ -1,88 +1,88 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.annotation.TargetApi;
-import android.appwidget.AppWidgetManager;
-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 com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.interactors.NotifyUserUseCase;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-
-import javax.inject.Inject;
-
-
-public abstract class BaseWidgetProvider extends AppWidgetProvider {
-
-    @Inject
-    UserRepository userRepository;
-
-    protected Context context;
-
-    /**
-     * Returns number of cells needed for given size of the widget.<br/>
-     * see http://stackoverflow.com/questions/14270138/dynamically-adjusting-widgets-content-and-layout-to-the-size-the-user-defined-t
-     *
-     * @param size Widget size in dp.
-     * @return Size in number of cells.
-     */
-    private static int getCellsForSize(int size) {
-        int n = 2;
-        while (70 * n - 30 < size) {
-            ++n;
-        }
-        return n - 1;
-    }
-
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    @Override
-    public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
-        this.context = context;
-        Bundle options = appWidgetManager.getAppWidgetOptions(appWidgetId);
-
-        appWidgetManager.partiallyUpdateAppWidget(appWidgetId,
-                sizeRemoteViews(context, options, appWidgetId));
-
-        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId,
-                newOptions);
-
-    }
-
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-    public RemoteViews sizeRemoteViews(Context context, Bundle options, int widgetId) {
-        this.context = context;
-        int minWidth = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH);
-        int minHeight = options
-                .getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT);
-
-        // First find out rows and columns based on width provided.
-        int rows = getCellsForSize(minHeight);
-        int columns = getCellsForSize(minWidth);
-        RemoteViews remoteViews = new RemoteViews(context.getPackageName(),
-                layoutResourceId());
-
-        return configureRemoteViews(remoteViews, widgetId, columns, rows);
-    }
-
-    protected void showToastForTaskDirection(Context context, TaskDirectionData data, String userID) {
-        if (userRepository == null) {
-            HabiticaApplication.getComponent().inject(this);
-        }
-        userRepository.getUser(userID).subscribe(habitRPGUser -> {
-            Pair<String, UiUtils.SnackbarDisplayType> pair = NotifyUserUseCase.getNotificationAndAddStatsToUser(habitRPGUser, data.exp, data.hp, data.getGp(), data.mp);
-            Toast toast = Toast.makeText(context, pair.first, Toast.LENGTH_LONG);
-            toast.show();
-        }, throwable -> {});
-    }
-
-    abstract public int layoutResourceId();
-
-    abstract public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows);
-}
+package com.habitrpg.android.habitica.widget;
+
+import android.annotation.TargetApi;
+import android.appwidget.AppWidgetManager;
+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 com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.interactors.NotifyUserUseCase;
+import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.ui.helpers.UiUtils;
+
+import javax.inject.Inject;
+
+
+public abstract class BaseWidgetProvider extends AppWidgetProvider {
+
+    @Inject
+    UserRepository userRepository;
+
+    protected Context context;
+
+    /**
+     * Returns number of cells needed for given size of the widget.<br/>
+     * see http://stackoverflow.com/questions/14270138/dynamically-adjusting-widgets-content-and-layout-to-the-size-the-user-defined-t
+     *
+     * @param size Widget size in dp.
+     * @return Size in number of cells.
+     */
+    private static int getCellsForSize(int size) {
+        int n = 2;
+        while (70 * n - 30 < size) {
+            ++n;
+        }
+        return n - 1;
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+    @Override
+    public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {
+        this.context = context;
+        Bundle options = appWidgetManager.getAppWidgetOptions(appWidgetId);
+
+        appWidgetManager.partiallyUpdateAppWidget(appWidgetId,
+                sizeRemoteViews(context, options, appWidgetId));
+
+        super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId,
+                newOptions);
+
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+    public RemoteViews sizeRemoteViews(Context context, Bundle options, int widgetId) {
+        this.context = context;
+        int minWidth = options.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH);
+        int minHeight = options
+                .getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT);
+
+        // First find out rows and columns based on width provided.
+        int rows = getCellsForSize(minHeight);
+        int columns = getCellsForSize(minWidth);
+        RemoteViews remoteViews = new RemoteViews(context.getPackageName(),
+                layoutResourceId());
+
+        return configureRemoteViews(remoteViews, widgetId, columns, rows);
+    }
+
+    protected void showToastForTaskDirection(Context context, TaskDirectionData data, String userID) {
+        if (userRepository == null) {
+            HabiticaApplication.getComponent().inject(this);
+        }
+        userRepository.getUser(userID).subscribe(habitRPGUser -> {
+            Pair<String, UiUtils.SnackbarDisplayType> pair = NotifyUserUseCase.getNotificationAndAddStatsToUser(habitRPGUser, data.exp, data.hp, data.getGp(), data.mp);
+            Toast toast = Toast.makeText(context, pair.first, Toast.LENGTH_LONG);
+            toast.show();
+        }, throwable -> {});
+    }
+
+    abstract public int layoutResourceId();
+
+    abstract public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.java
index 513a635f7..a80251dc3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.java
@@ -1,14 +1,14 @@
-package com.habitrpg.android.habitica.widget;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import android.content.Context;
-import android.content.Intent;
-
-
-public class DailiesListFactory extends TaskListFactory {
-    public DailiesListFactory(Context context, Intent intent) {
-        super(context, intent, Task.TYPE_DAILY, R.layout.widget_dailies_list_row, R.id.dailies_text);
-    }
+package com.habitrpg.android.habitica.widget;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+
+public class DailiesListFactory extends TaskListFactory {
+    public DailiesListFactory(Context context, Intent intent) {
+        super(context, intent, Task.TYPE_DAILY, R.layout.widget_dailies_list_row, R.id.dailies_text);
+    }
 }
\ No newline at end of file
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 76736aecb..d52a5be0f 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,12 +1,12 @@
 package com.habitrpg.android.habitica.widget;
 
-import com.habitrpg.android.habitica.data.ApiClient;
+import android.content.Context;
+
 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 android.content.Context;
+import com.habitrpg.android.habitica.data.ApiClient;
 
 import javax.inject.Inject;
 
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 61328763e..e5b742788 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,95 +1,95 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.widget.RemoteViews;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.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 {
-
-    public static final String HABIT_ACTION = "com.habitrpg.android.habitica.HABIT_ACTION";
-    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 TaskRepository taskRepository;
-    @Inject
-    public String userId;
-
-    private void setUp() {
-        if (taskRepository == null) {
-            HabiticaBaseApplication.getComponent().inject(this);
-        }
-    }
-
-    @Override
-    public int layoutResourceId() {
-        return R.layout.widget_habit_button;
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        setUp();
-        ComponentName thisWidget = new ComponentName(context,
-                HabitButtonWidgetProvider.class);
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            for (int widgetId : allWidgetIds) {
-                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
-                appWidgetManager.partiallyUpdateAppWidget(widgetId,
-                        sizeRemoteViews(context, options, widgetId));
-            }
-        }
-
-        // Build the intent to call the service
-        Intent intent = new Intent(context.getApplicationContext(),
-                HabitButtonWidgetService.class);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, allWidgetIds);
-
-        context.startService(intent);
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        setUp();
-        if (intent.getAction().equals(HABIT_ACTION)) {
-            AppWidgetManager mgr = AppWidgetManager.getInstance(context);
-            int appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
-                    AppWidgetManager.INVALID_APPWIDGET_ID);
-            String taskId = intent.getStringExtra(TASK_ID);
-            String direction = intent.getStringExtra(TASK_DIRECTION);
-
-            int[] ids = {appWidgetId};
-
-            if (taskId != null) {
-                taskRepository.postTaskDirection(taskId, direction)
-                        .subscribe(taskDirectionData -> {
-                            taskRepository.getTask(taskId).subscribe(task -> {
-                                task.value = task.value + taskDirectionData.getDelta();
-                                taskRepository.saveTask(task);
-                            });
-                            showToastForTaskDirection(context, taskDirectionData, userId);
-                            this.onUpdate(context, mgr, ids);
-                        }, throwable -> this.onUpdate(context, mgr, ids));
-            }
-        }
-        super.onReceive(context, intent);
-    }
-
-    @Override
-    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
-        return remoteViews;
-    }
-}
+package com.habitrpg.android.habitica.widget;
+
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.widget.RemoteViews;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.modules.AppModule;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+public class HabitButtonWidgetProvider extends BaseWidgetProvider {
+
+    public static final String HABIT_ACTION = "com.habitrpg.android.habitica.HABIT_ACTION";
+    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 TaskRepository taskRepository;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    public String userId;
+
+    private void setUp() {
+        if (taskRepository == null) {
+            HabiticaBaseApplication.getComponent().inject(this);
+        }
+    }
+
+    @Override
+    public int layoutResourceId() {
+        return R.layout.widget_habit_button;
+    }
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        setUp();
+        ComponentName thisWidget = new ComponentName(context,
+                HabitButtonWidgetProvider.class);
+        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            for (int widgetId : allWidgetIds) {
+                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
+                appWidgetManager.partiallyUpdateAppWidget(widgetId,
+                        sizeRemoteViews(context, options, widgetId));
+            }
+        }
+
+        // Build the intent to call the service
+        Intent intent = new Intent(context.getApplicationContext(),
+                HabitButtonWidgetService.class);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, allWidgetIds);
+
+        context.startService(intent);
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        setUp();
+        if (intent.getAction().equals(HABIT_ACTION)) {
+            AppWidgetManager mgr = AppWidgetManager.getInstance(context);
+            int appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
+                    AppWidgetManager.INVALID_APPWIDGET_ID);
+            String taskId = intent.getStringExtra(TASK_ID);
+            String direction = intent.getStringExtra(TASK_DIRECTION);
+
+            int[] ids = {appWidgetId};
+
+            if (taskId != null) {
+                taskRepository.postTaskDirection(taskId, direction)
+                        .subscribe(taskDirectionData -> {
+                            taskRepository.getTask(taskId).subscribe(task -> {
+                                task.value = task.value + taskDirectionData.getDelta();
+                                taskRepository.saveTask(task);
+                            });
+                            showToastForTaskDirection(context, taskDirectionData, userId);
+                            this.onUpdate(context, mgr, ids);
+                        }, throwable -> this.onUpdate(context, mgr, ids));
+            }
+        }
+        super.onReceive(context, intent);
+    }
+
+    @Override
+    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
+        return remoteViews;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
index 1a1f109dc..6c9ea91a7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
@@ -1,116 +1,116 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.app.PendingIntent;
-import android.app.Service;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.os.IBinder;
-import android.support.v4.content.ContextCompat;
-import android.view.View;
-import android.widget.RemoteViews;
-
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.models.responses.TaskDirection;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.modules.AppModule;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-public class HabitButtonWidgetService extends Service {
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    public String userId;
-    @Inject
-    public SharedPreferences sharedPreferences;
-    @Inject
-    public Resources resources;
-    @Inject
-    public Context context;
-    @Inject
-    TaskRepository taskRepository;
-    private AppWidgetManager appWidgetManager;
-
-    private Map<String, Integer> taskMapping;
-    private int[] allWidgetIds;
-
-    @Override
-    public int onStartCommand(final Intent intent, int flags, int startId) {
-        HabiticaBaseApplication.getComponent().inject(this);
-        this.appWidgetManager = AppWidgetManager.getInstance(this);
-        ComponentName thisWidget = new ComponentName(this, HabitButtonWidgetProvider.class);
-        allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-        makeTaskMapping();
-
-        for (String taskid : this.taskMapping.keySet()) {
-            taskRepository.getTask(taskid).subscribe(this::updateData, throwable -> {});
-        }
-
-        stopSelf();
-
-        return START_STICKY;
-    }
-
-    private void updateData(Task task) {
-        RemoteViews remoteViews = new RemoteViews(this.getPackageName(), R.layout.widget_habit_button);
-        if (task != null) {
-            remoteViews.setTextViewText(R.id.habit_title, task.text);
-
-            if (!task.getUp()) {
-                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.GONE);
-                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, null);
-            } else {
-                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.VISIBLE);
-                remoteViews.setInt(R.id.btnPlus, "setBackgroundColor", ContextCompat.getColor(context, task.getLightTaskColor()));
-                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, getPendingIntent(task.getId(), TaskDirection.up.toString(), taskMapping.get(task.getId())));
-            }
-            if (!task.getDown()) {
-                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.GONE);
-                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, null);
-            } else {
-                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.VISIBLE);
-                remoteViews.setInt(R.id.btnMinus, "setBackgroundColor", ContextCompat.getColor(context, task.getMediumTaskColor()));
-                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, getPendingIntent(task.getId(), TaskDirection.down.toString(), taskMapping.get(task.getId())));
-            }
-            appWidgetManager.updateAppWidget(taskMapping.get(task.getId()), remoteViews);
-        }
-    }
-
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    private void makeTaskMapping() {
-        this.taskMapping = new HashMap<>();
-        for (int widgetId : allWidgetIds) {
-            String taskId = getTaskId(widgetId);
-            if (!taskId.equals("")) {
-                this.taskMapping.put(taskId, widgetId);
-            }
-        }
-    }
-
-    private String getTaskId(int widgetId) {
-        return sharedPreferences.getString("habit_button_widget_" + widgetId, "");
-    }
-
-    private PendingIntent getPendingIntent(String taskId, String direction, int widgetId) {
-        Intent taskIntent = new Intent(context, HabitButtonWidgetProvider.class);
-        taskIntent.setAction(HabitButtonWidgetProvider.HABIT_ACTION);
-        taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
-        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_ID, taskId);
-        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_DIRECTION, direction);
-        return PendingIntent.getBroadcast(context, widgetId + direction.hashCode(), taskIntent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-    }
-}
+package com.habitrpg.android.habitica.widget;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.os.IBinder;
+import android.support.v4.content.ContextCompat;
+import android.view.View;
+import android.widget.RemoteViews;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.models.responses.TaskDirection;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.modules.AppModule;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+public class HabitButtonWidgetService extends Service {
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    public String userId;
+    @Inject
+    public SharedPreferences sharedPreferences;
+    @Inject
+    public Resources resources;
+    @Inject
+    public Context context;
+    @Inject
+    TaskRepository taskRepository;
+    private AppWidgetManager appWidgetManager;
+
+    private Map<String, Integer> taskMapping;
+    private int[] allWidgetIds;
+
+    @Override
+    public int onStartCommand(final Intent intent, int flags, int startId) {
+        HabiticaBaseApplication.getComponent().inject(this);
+        this.appWidgetManager = AppWidgetManager.getInstance(this);
+        ComponentName thisWidget = new ComponentName(this, HabitButtonWidgetProvider.class);
+        allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
+        makeTaskMapping();
+
+        for (String taskid : this.taskMapping.keySet()) {
+            taskRepository.getTask(taskid).subscribe(this::updateData, throwable -> {});
+        }
+
+        stopSelf();
+
+        return START_STICKY;
+    }
+
+    private void updateData(Task task) {
+        RemoteViews remoteViews = new RemoteViews(this.getPackageName(), R.layout.widget_habit_button);
+        if (task != null) {
+            remoteViews.setTextViewText(R.id.habit_title, task.text);
+
+            if (!task.getUp()) {
+                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.GONE);
+                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, null);
+            } else {
+                remoteViews.setViewVisibility(R.id.btnPlusWrapper, View.VISIBLE);
+                remoteViews.setInt(R.id.btnPlus, "setBackgroundColor", ContextCompat.getColor(context, task.getLightTaskColor()));
+                remoteViews.setOnClickPendingIntent(R.id.btnPlusWrapper, getPendingIntent(task.getId(), TaskDirection.up.toString(), taskMapping.get(task.getId())));
+            }
+            if (!task.getDown()) {
+                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.GONE);
+                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, null);
+            } else {
+                remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.VISIBLE);
+                remoteViews.setInt(R.id.btnMinus, "setBackgroundColor", ContextCompat.getColor(context, task.getMediumTaskColor()));
+                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, getPendingIntent(task.getId(), TaskDirection.down.toString(), taskMapping.get(task.getId())));
+            }
+            appWidgetManager.updateAppWidget(taskMapping.get(task.getId()), remoteViews);
+        }
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    private void makeTaskMapping() {
+        this.taskMapping = new HashMap<>();
+        for (int widgetId : allWidgetIds) {
+            String taskId = getTaskId(widgetId);
+            if (!taskId.equals("")) {
+                this.taskMapping.put(taskId, widgetId);
+            }
+        }
+    }
+
+    private String getTaskId(int widgetId) {
+        return sharedPreferences.getString("habit_button_widget_" + widgetId, "");
+    }
+
+    private PendingIntent getPendingIntent(String taskId, String direction, int widgetId) {
+        Intent taskIntent = new Intent(context, HabitButtonWidgetProvider.class);
+        taskIntent.setAction(HabitButtonWidgetProvider.HABIT_ACTION);
+        taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
+        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_ID, taskId);
+        taskIntent.putExtra(HabitButtonWidgetProvider.TASK_DIRECTION, direction);
+        return PendingIntent.getBroadcast(context, widgetId + direction.hashCode(), taskIntent,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
index 648c622fa..10efbfe2f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.java
@@ -1,152 +1,152 @@
-package com.habitrpg.android.habitica.widget;
-
-import android.appwidget.AppWidgetManager;
-import android.content.Context;
-import android.content.Intent;
-import android.text.SpannableStringBuilder;
-import android.text.style.DynamicDrawableSpan;
-import android.widget.RemoteViews;
-import android.widget.RemoteViewsService;
-
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-
-import net.pherth.android.emoji_library.EmojiHandler;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsFactory {
-    private final int widgetId;
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    public String userID;
-    @Inject
-    TaskRepository taskRepository;
-    @Inject
-    UserRepository userRepository;
-    private Integer customDayStart;
-    private int listItemResId;
-    private int listItemTextResId;
-    private String taskType;
-    private List<Task> taskList = new ArrayList<>();
-    private Context context = null;
-    private boolean reloadData;
-
-    TaskListFactory(Context context, Intent intent, String taskType, int listItemResId, int listItemTextResId) {
-        this.context = context;
-        this.widgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0);
-        this.listItemResId = listItemResId;
-        this.listItemTextResId = listItemTextResId;
-        this.reloadData = false;
-        this.taskType = taskType;
-
-        if (userID == null) {
-            HabiticaApplication.getComponent().inject(this);
-        }
-
-        if (customDayStart == null) {
-            userRepository.getUser(userID)
-                    .subscribe(habitRPGUser -> {
-                        customDayStart = habitRPGUser.getPreferences().getDayStart();
-                        this.loadData();
-                    }, throwable -> {
-                    });
-        } else {
-            this.loadData();
-        }
-    }
-
-    private void loadData() {
-        taskRepository.getTasks(taskType, userID)
-                .flatMap(Observable::from)
-                .filter(task -> task.type.equals(Task.TYPE_TODO) || task.isDisplayedActive(customDayStart))
-                .toList()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(tasks -> {
-                    taskList = tasks;
-                    this.reloadData = false;
-                    AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(widgetId, R.id.list_view);
-                }, throwable -> this.reloadData = false);
-    }
-
-
-    @Override
-    public void onCreate() {
-    }
-
-    @Override
-    public void onDataSetChanged() {
-        if (this.reloadData) {
-            this.loadData();
-        }
-        this.reloadData = true;
-    }
-
-    @Override
-    public void onDestroy() {
-    }
-
-    @Override
-    public int getCount() {
-        return taskList.size();
-    }
-
-    @Override
-    public RemoteViews getViewAt(int position) {
-        final RemoteViews remoteView = new RemoteViews(
-                context.getPackageName(), listItemResId);
-        if (taskList.size() > position) {
-            Task task = taskList.get(position);
-
-            CharSequence parsedText = MarkdownParser.parseMarkdown(task.text);
-
-            SpannableStringBuilder builder = new SpannableStringBuilder(parsedText);
-            EmojiHandler.addEmojis(this.context, builder, 16, DynamicDrawableSpan.ALIGN_BASELINE, 16, 0, -1, false);
-
-            remoteView.setTextViewText(listItemTextResId, builder);
-            remoteView.setInt(R.id.checkbox_background, "setBackgroundResource", task.getLightTaskColor());
-            Intent fillInIntent = new Intent();
-            fillInIntent.putExtra(TaskListWidgetProvider.TASK_ID_ITEM, task.getId());
-            remoteView.setOnClickFillInIntent(R.id.widget_list_row, fillInIntent);
-        }
-        return remoteView;
-    }
-
-    @Override
-    public RemoteViews getLoadingView() {
-        return new RemoteViews(context.getPackageName(), listItemResId);
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 1;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        if (taskList.size() > position) {
-            Task task = taskList.get(position);
-            return task.getId().hashCode();
-        }
-        return position;
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-}
+package com.habitrpg.android.habitica.widget;
+
+import android.appwidget.AppWidgetManager;
+import android.content.Context;
+import android.content.Intent;
+import android.text.SpannableStringBuilder;
+import android.text.style.DynamicDrawableSpan;
+import android.widget.RemoteViews;
+import android.widget.RemoteViewsService;
+
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+
+import net.pherth.android.emoji_library.EmojiHandler;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsFactory {
+    private final int widgetId;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    public String userID;
+    @Inject
+    TaskRepository taskRepository;
+    @Inject
+    UserRepository userRepository;
+    private Integer customDayStart;
+    private int listItemResId;
+    private int listItemTextResId;
+    private String taskType;
+    private List<Task> taskList = new ArrayList<>();
+    private Context context = null;
+    private boolean reloadData;
+
+    TaskListFactory(Context context, Intent intent, String taskType, int listItemResId, int listItemTextResId) {
+        this.context = context;
+        this.widgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0);
+        this.listItemResId = listItemResId;
+        this.listItemTextResId = listItemTextResId;
+        this.reloadData = false;
+        this.taskType = taskType;
+
+        if (userID == null) {
+            HabiticaApplication.getComponent().inject(this);
+        }
+
+        if (customDayStart == null) {
+            userRepository.getUser(userID)
+                    .subscribe(habitRPGUser -> {
+                        customDayStart = habitRPGUser.getPreferences().getDayStart();
+                        this.loadData();
+                    }, throwable -> {
+                    });
+        } else {
+            this.loadData();
+        }
+    }
+
+    private void loadData() {
+        taskRepository.getTasks(taskType, userID)
+                .flatMap(Observable::from)
+                .filter(task -> task.type.equals(Task.TYPE_TODO) || task.isDisplayedActive(customDayStart))
+                .toList()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(tasks -> {
+                    taskList = tasks;
+                    this.reloadData = false;
+                    AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(widgetId, R.id.list_view);
+                }, throwable -> this.reloadData = false);
+    }
+
+
+    @Override
+    public void onCreate() {
+    }
+
+    @Override
+    public void onDataSetChanged() {
+        if (this.reloadData) {
+            this.loadData();
+        }
+        this.reloadData = true;
+    }
+
+    @Override
+    public void onDestroy() {
+    }
+
+    @Override
+    public int getCount() {
+        return taskList.size();
+    }
+
+    @Override
+    public RemoteViews getViewAt(int position) {
+        final RemoteViews remoteView = new RemoteViews(
+                context.getPackageName(), listItemResId);
+        if (taskList.size() > position) {
+            Task task = taskList.get(position);
+
+            CharSequence parsedText = MarkdownParser.parseMarkdown(task.text);
+
+            SpannableStringBuilder builder = new SpannableStringBuilder(parsedText);
+            EmojiHandler.addEmojis(this.context, builder, 16, DynamicDrawableSpan.ALIGN_BASELINE, 16, 0, -1, false);
+
+            remoteView.setTextViewText(listItemTextResId, builder);
+            remoteView.setInt(R.id.checkbox_background, "setBackgroundResource", task.getLightTaskColor());
+            Intent fillInIntent = new Intent();
+            fillInIntent.putExtra(TaskListWidgetProvider.TASK_ID_ITEM, task.getId());
+            remoteView.setOnClickFillInIntent(R.id.widget_list_row, fillInIntent);
+        }
+        return remoteView;
+    }
+
+    @Override
+    public RemoteViews getLoadingView() {
+        return new RemoteViews(context.getPackageName(), listItemResId);
+    }
+
+    @Override
+    public int getViewTypeCount() {
+        return 1;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        if (taskList.size() > position) {
+            Task task = taskList.get(position);
+            return task.getId().hashCode();
+        }
+        return position;
+    }
+
+    @Override
+    public boolean hasStableIds() {
+        return true;
+    }
+}
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 8bc39e62a..0bd73a176 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,130 +1,123 @@
-package com.habitrpg.android.habitica.widget;
-
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.modules.AppModule;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.habitrpg.android.habitica.models.responses.TaskDirection;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.widget.RemoteViews;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-
-import static com.habitrpg.android.habitica.BR.task;
-
-public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
-    public static final String DAILY_ACTION = "com.habitrpg.android.habitica.DAILY_ACTION";
-    public static final String TASK_ID_ITEM = "com.habitrpg.android.habitica.TASK_ID_ITEM";
-
-    @Inject
-    ApiClient apiClient;
-    @Inject
-    @Named(AppModule.NAMED_USER_ID)
-    String userId;
-    @Inject
-    TaskRepository taskRepository;
-
-    private void setUp(Context context) {
-        if (apiClient == null) {
-            HabiticaBaseApplication.getComponent().inject(this);
-        }
-    }
-
-    protected abstract Class getServiceClass();
-
-    protected abstract Class getProviderClass();
-
-    protected abstract int getTitleResId();
-
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        setUp(context);
-        if (intent.getAction().equals(DAILY_ACTION)) {
-            AppWidgetManager mgr = AppWidgetManager.getInstance(context);
-            int appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
-                    AppWidgetManager.INVALID_APPWIDGET_ID);
-            String taskId = intent.getStringExtra(TASK_ID_ITEM);
-
-            if (taskId != null) {
-                taskRepository.postTaskDirection(taskId, TaskDirection.up.toString())
-                        .subscribe(taskDirectionData -> {
-                            taskRepository.markTaskCompleted(taskId, true);
-                            showToastForTaskDirection(context, taskDirectionData, userId);
-                            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
-                        }, throwable -> AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view));
-            }
-        }
-        super.onReceive(context, intent);
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        setUp(context);
-        ComponentName thisWidget = new ComponentName(context, getProviderClass());
-        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
-
-        if (Build.VERSION.SDK_INT >= 16) {
-            for (int widgetId : allWidgetIds) {
-                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
-                appWidgetManager.partiallyUpdateAppWidget(widgetId,
-                        sizeRemoteViews(context, options, widgetId));
-            }
-        }
-
-        for (int appWidgetId : appWidgetIds) {
-            Intent intent = new Intent(context, getServiceClass());
-            intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-            intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
-            RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.widget_task_list);
-            rv.setRemoteAdapter(appWidgetId, R.id.list_view, intent);
-            rv.setEmptyView(R.id.list, R.id.empty_view);
-            rv.setTextViewText(R.id.widget_title, context.getString(getTitleResId()));
-
-            // if the user click on the title: open App
-            Intent openAppIntent = new Intent(context.getApplicationContext(), MainActivity.class);
-            PendingIntent openApp = PendingIntent.getActivity(context, 0, openAppIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-            rv.setOnClickPendingIntent(R.id.widget_title, openApp);
-
-            Intent taskIntent = new Intent(context, getProviderClass());
-            taskIntent.setAction(DAILY_ACTION);
-            taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-            intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
-            PendingIntent toastPendingIntent = PendingIntent.getBroadcast(context, 0, taskIntent,
-                    PendingIntent.FLAG_UPDATE_CURRENT);
-            rv.setPendingIntentTemplate(R.id.list_view, toastPendingIntent);
-
-            appWidgetManager.updateAppWidget(appWidgetId, rv);
-
-            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
-        }
-
-        super.onUpdate(context, appWidgetManager, appWidgetIds);
-    }
-
-    @Override
-    public int layoutResourceId() {
-        return R.layout.widget_task_list;
-    }
-
-    @Override
-    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
-        return remoteViews;
-    }
-}
+package com.habitrpg.android.habitica.widget;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.widget.RemoteViews;
+
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.models.responses.TaskDirection;
+import com.habitrpg.android.habitica.modules.AppModule;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
+    public static final String DAILY_ACTION = "com.habitrpg.android.habitica.DAILY_ACTION";
+    public static final String TASK_ID_ITEM = "com.habitrpg.android.habitica.TASK_ID_ITEM";
+
+    @Inject
+    ApiClient apiClient;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
+    @Inject
+    TaskRepository taskRepository;
+
+    private void setUp(Context context) {
+        if (apiClient == null) {
+            HabiticaBaseApplication.getComponent().inject(this);
+        }
+    }
+
+    protected abstract Class getServiceClass();
+
+    protected abstract Class getProviderClass();
+
+    protected abstract int getTitleResId();
+
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        setUp(context);
+        if (intent.getAction().equals(DAILY_ACTION)) {
+            AppWidgetManager mgr = AppWidgetManager.getInstance(context);
+            int appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
+                    AppWidgetManager.INVALID_APPWIDGET_ID);
+            String taskId = intent.getStringExtra(TASK_ID_ITEM);
+
+            if (taskId != null) {
+                taskRepository.postTaskDirection(taskId, TaskDirection.up.toString())
+                        .subscribe(taskDirectionData -> {
+                            taskRepository.markTaskCompleted(taskId, true);
+                            showToastForTaskDirection(context, taskDirectionData, userId);
+                            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
+                        }, throwable -> AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view));
+            }
+        }
+        super.onReceive(context, intent);
+    }
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        setUp(context);
+        ComponentName thisWidget = new ComponentName(context, getProviderClass());
+        int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget);
+
+        if (Build.VERSION.SDK_INT >= 16) {
+            for (int widgetId : allWidgetIds) {
+                Bundle options = appWidgetManager.getAppWidgetOptions(widgetId);
+                appWidgetManager.partiallyUpdateAppWidget(widgetId,
+                        sizeRemoteViews(context, options, widgetId));
+            }
+        }
+
+        for (int appWidgetId : appWidgetIds) {
+            Intent intent = new Intent(context, getServiceClass());
+            intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+            intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
+            RemoteViews rv = new RemoteViews(context.getPackageName(), R.layout.widget_task_list);
+            rv.setRemoteAdapter(appWidgetId, R.id.list_view, intent);
+            rv.setEmptyView(R.id.list, R.id.empty_view);
+            rv.setTextViewText(R.id.widget_title, context.getString(getTitleResId()));
+
+            // if the user click on the title: open App
+            Intent openAppIntent = new Intent(context.getApplicationContext(), MainActivity.class);
+            PendingIntent openApp = PendingIntent.getActivity(context, 0, openAppIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+            rv.setOnClickPendingIntent(R.id.widget_title, openApp);
+
+            Intent taskIntent = new Intent(context, getProviderClass());
+            taskIntent.setAction(DAILY_ACTION);
+            taskIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
+            intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
+            PendingIntent toastPendingIntent = PendingIntent.getBroadcast(context, 0, taskIntent,
+                    PendingIntent.FLAG_UPDATE_CURRENT);
+            rv.setPendingIntentTemplate(R.id.list_view, toastPendingIntent);
+
+            appWidgetManager.updateAppWidget(appWidgetId, rv);
+
+            AppWidgetManager.getInstance(context).notifyAppWidgetViewDataChanged(appWidgetId, R.id.list_view);
+        }
+
+        super.onUpdate(context, appWidgetManager, appWidgetIds);
+    }
+
+    @Override
+    public int layoutResourceId() {
+        return R.layout.widget_task_list;
+    }
+
+    @Override
+    public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
+        return remoteViews;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.java
index 111ba7fa1..7007606ad 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.java
@@ -1,13 +1,13 @@
-package com.habitrpg.android.habitica.widget;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import android.content.Context;
-import android.content.Intent;
-
-public class TodoListFactory extends TaskListFactory {
-    public TodoListFactory(Context context, Intent intent) {
-        super(context, intent, Task.TYPE_TODO, R.layout.widget_todo_list_row, R.id.todo_text);
-    }
-}
+package com.habitrpg.android.habitica.widget;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.tasks.Task;
+
+public class TodoListFactory extends TaskListFactory {
+    public TodoListFactory(Context context, Intent intent) {
+        super(context, intent, Task.TYPE_TODO, R.layout.widget_todo_list_row, R.id.todo_text);
+    }
+}
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 e0334b7a5..8e75c197d 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,75 +1,75 @@
-package com.habitrpg.android.habitica.api;
-
-
-import com.habitrpg.android.habitica.data.implementation.ApiClientImpl;
-import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
-import com.habitrpg.android.habitica.proxy.impl.EmptyCrashlyticsProxy;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
-
-import org.junit.After;
-import org.junit.Before;
-import org.robolectric.shadows.ShadowApplication;
-
-import android.content.Context;
-
-import java.security.InvalidParameterException;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import rx.observers.TestSubscriber;
-
-public class BaseAPITests {
-
-    public ApiClient apiClient;
-    public HostConfig hostConfig;
-
-    public String username;
-    public final String password = "password";
-
-    @Before
-    public void setUp() {
-        if (BuildConfig.BASE_URL.contains("habitica.com")) {
-            throw new InvalidParameterException("Can't test against production server.");
-        }
-        Context context = ShadowApplication.getInstance().getApplicationContext();
-        hostConfig = new HostConfig(BuildConfig.BASE_URL,
-                BuildConfig.PORT,
-                "",
-                "");
-        apiClient = new ApiClientImpl(ApiClientImpl.createGsonFactory(), hostConfig, new EmptyCrashlyticsProxy(), new PopupNotificationsManager(context), context);
-        generateUser();
-    }
-
-    public void generateUser() {
-        TestSubscriber<UserAuthResponse> testSubscriber = new TestSubscriber<>();
-        username = UUID.randomUUID().toString();
-        apiClient.registerUser(username, username+"@example.com", password, password)
-                .subscribe(testSubscriber);
-        testSubscriber.awaitTerminalEvent(5, TimeUnit.SECONDS);
-        testSubscriber.assertCompleted();
-        UserAuthResponse response = testSubscriber.getOnNextEvents().get(0);
-        hostConfig.setUser(response.getId());
-        hostConfig.setApi(response.getApiToken() != null ? response.getApiToken() : response.getToken());
-    }
-
-    public HabitRPGUser getUser() {
-        TestSubscriber<HabitRPGUser> userSubscriber = new TestSubscriber<>();
-
-        apiClient.getUser()
-                .subscribe(userSubscriber);
-        userSubscriber.awaitTerminalEvent();
-        userSubscriber.assertNoErrors();
-        userSubscriber.assertCompleted();
-        HabitRPGUser user = userSubscriber.getOnNextEvents().get(0);
-
-        return user;
-    }
-
-    @After
-    public void tearDown() {
-    }
-}
+package com.habitrpg.android.habitica.api;
+
+
+import com.habitrpg.android.habitica.data.implementation.ApiClientImpl;
+import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
+import com.habitrpg.android.habitica.proxy.impl.EmptyCrashlyticsProxy;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
+
+import org.junit.After;
+import org.junit.Before;
+import org.robolectric.shadows.ShadowApplication;
+
+import android.content.Context;
+
+import java.security.InvalidParameterException;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import rx.observers.TestSubscriber;
+
+public class BaseAPITests {
+
+    public ApiClient apiClient;
+    public HostConfig hostConfig;
+
+    public String username;
+    public final String password = "password";
+
+    @Before
+    public void setUp() {
+        if (BuildConfig.BASE_URL.contains("habitica.com")) {
+            throw new InvalidParameterException("Can't test against production server.");
+        }
+        Context context = ShadowApplication.getInstance().getApplicationContext();
+        hostConfig = new HostConfig(BuildConfig.BASE_URL,
+                BuildConfig.PORT,
+                "",
+                "");
+        apiClient = new ApiClientImpl(ApiClientImpl.createGsonFactory(), hostConfig, new EmptyCrashlyticsProxy(), new PopupNotificationsManager(context), context);
+        generateUser();
+    }
+
+    public void generateUser() {
+        TestSubscriber<UserAuthResponse> testSubscriber = new TestSubscriber<>();
+        username = UUID.randomUUID().toString();
+        apiClient.registerUser(username, username+"@example.com", password, password)
+                .subscribe(testSubscriber);
+        testSubscriber.awaitTerminalEvent(5, TimeUnit.SECONDS);
+        testSubscriber.assertCompleted();
+        UserAuthResponse response = testSubscriber.getOnNextEvents().get(0);
+        hostConfig.setUser(response.getId());
+        hostConfig.setApi(response.getApiToken() != null ? response.getApiToken() : response.getToken());
+    }
+
+    public HabitRPGUser getUser() {
+        TestSubscriber<HabitRPGUser> userSubscriber = new TestSubscriber<>();
+
+        apiClient.getUser()
+                .subscribe(userSubscriber);
+        userSubscriber.awaitTerminalEvent();
+        userSubscriber.assertNoErrors();
+        userSubscriber.assertCompleted();
+        HabitRPGUser user = userSubscriber.getOnNextEvents().get(0);
+
+        return user;
+    }
+
+    @After
+    public void tearDown() {
+    }
+}
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 9dc49c872..378242d03 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/api/SocialAPITests.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/api/SocialAPITests.java
@@ -1,91 +1,91 @@
-package com.habitrpg.android.habitica.api;
-
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import android.os.Build;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import rx.observers.TestSubscriber;
-
-@Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.M)
-@RunWith(RobolectricTestRunner.class)
-public class SocialAPITests extends BaseAPITests {
-
-    List<String> messagesIDs;
-    String groupID;
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        groupID = null;
-        messagesIDs = new ArrayList<>();
-    }
-
-    public void postMessage(String groupID, String messageSuffix) {
-        HashMap<String, String> messageObject = new HashMap<>();
-        messageObject.put("message", "Foo Bar"+messageSuffix);
-        TestSubscriber<PostChatMessageResult> testSubscriber = new TestSubscriber<>();
-        apiClient.postGroupChat(groupID, messageObject)
-                .subscribe(testSubscriber);
-        testSubscriber.awaitTerminalEvent(5, TimeUnit.SECONDS);
-        testSubscriber.assertNoErrors();
-        testSubscriber.assertCompleted();
-        PostChatMessageResult result = testSubscriber.getOnNextEvents().get(0);
-        messagesIDs.add(result.message.id);
-    }
-
-    @Test
-    public void shouldLoadTavernWithMessages() {
-        groupID = "habitrpg";
-        postMessage(groupID, "1");
-
-        TestSubscriber<Group> testSubscriber = new TestSubscriber<>();
-        apiClient.getGroup(groupID)
-                .subscribe(testSubscriber);
-        testSubscriber.awaitTerminalEvent(5, TimeUnit.SECONDS);
-        testSubscriber.assertNoErrors();
-        testSubscriber.assertCompleted();
-        testSubscriber.assertValueCount(1);
-    }
-
-    @Test
-    public void shouldLoadTavernChat() {
-        groupID = "habitrpg";
-        postMessage(groupID, "1");
-        postMessage(groupID, "2");
-
-        TestSubscriber<List<ChatMessage>> testSubscriber = new TestSubscriber<>();
-        apiClient.listGroupChat(groupID)
-                .subscribe(testSubscriber);
-        testSubscriber.awaitTerminalEvent(5, TimeUnit.SECONDS);
-        testSubscriber.assertNoErrors();
-        testSubscriber.assertCompleted();
-        testSubscriber.assertValueCount(1);
-    }
-
-    @After
-    public void tearDown() {
-        TestSubscriber<Void> testSubscriber = new TestSubscriber<>();
-        for (String messageID : this.messagesIDs) {
-            apiClient.deleteMessage("habitrpg", messageID)
-                    .subscribe(testSubscriber);
-            testSubscriber.awaitTerminalEvent();
-            testSubscriber.assertNoErrors();
-            testSubscriber.assertCompleted();
-        }
-        super.tearDown();
-    }
-}
+package com.habitrpg.android.habitica.api;
+
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+import com.habitrpg.android.habitica.models.social.Group;
+import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import android.os.Build;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import rx.observers.TestSubscriber;
+
+@Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.M)
+@RunWith(RobolectricTestRunner.class)
+public class SocialAPITests extends BaseAPITests {
+
+    List<String> messagesIDs;
+    String groupID;
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        groupID = null;
+        messagesIDs = new ArrayList<>();
+    }
+
+    public void postMessage(String groupID, String messageSuffix) {
+        HashMap<String, String> messageObject = new HashMap<>();
+        messageObject.put("message", "Foo Bar"+messageSuffix);
+        TestSubscriber<PostChatMessageResult> testSubscriber = new TestSubscriber<>();
+        apiClient.postGroupChat(groupID, messageObject)
+                .subscribe(testSubscriber);
+        testSubscriber.awaitTerminalEvent(5, TimeUnit.SECONDS);
+        testSubscriber.assertNoErrors();
+        testSubscriber.assertCompleted();
+        PostChatMessageResult result = testSubscriber.getOnNextEvents().get(0);
+        messagesIDs.add(result.message.id);
+    }
+
+    @Test
+    public void shouldLoadTavernWithMessages() {
+        groupID = "habitrpg";
+        postMessage(groupID, "1");
+
+        TestSubscriber<Group> testSubscriber = new TestSubscriber<>();
+        apiClient.getGroup(groupID)
+                .subscribe(testSubscriber);
+        testSubscriber.awaitTerminalEvent(5, TimeUnit.SECONDS);
+        testSubscriber.assertNoErrors();
+        testSubscriber.assertCompleted();
+        testSubscriber.assertValueCount(1);
+    }
+
+    @Test
+    public void shouldLoadTavernChat() {
+        groupID = "habitrpg";
+        postMessage(groupID, "1");
+        postMessage(groupID, "2");
+
+        TestSubscriber<List<ChatMessage>> testSubscriber = new TestSubscriber<>();
+        apiClient.listGroupChat(groupID)
+                .subscribe(testSubscriber);
+        testSubscriber.awaitTerminalEvent(5, TimeUnit.SECONDS);
+        testSubscriber.assertNoErrors();
+        testSubscriber.assertCompleted();
+        testSubscriber.assertValueCount(1);
+    }
+
+    @After
+    public void tearDown() {
+        TestSubscriber<Void> testSubscriber = new TestSubscriber<>();
+        for (String messageID : this.messagesIDs) {
+            apiClient.deleteMessage("habitrpg", messageID)
+                    .subscribe(testSubscriber);
+            testSubscriber.awaitTerminalEvent();
+            testSubscriber.assertNoErrors();
+            testSubscriber.assertCompleted();
+        }
+        super.tearDown();
+    }
+}
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 edcea3079..a3b598fbc 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,151 +1,151 @@
-package com.habitrpg.android.habitica.helpers;
-
-import com.habitrpg.android.habitica.data.implementation.ApiClientImpl;
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.proxy.impl.EmptyCrashlyticsProxy;
-import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.Notification;
-import com.habitrpg.android.habitica.models.notifications.NotificationData;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-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.assertNull;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-/**
- * Created by krh12 on 12/9/2016.
- */
-
-@Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.M)
-@RunWith(RobolectricTestRunner.class)
-public class PopupNotificationsManagerTest {
-
-    public ApiClient apiClient;
-    public HostConfig hostConfig;
-
-    public String username;
-    public final String password = "password";
-    private Context context;
-    private PopupNotificationsManager popupNotificationsManager;
-
-    @Before
-    public void setUp() {
-        context = ShadowApplication.getInstance().getApplicationContext();
-        hostConfig = new HostConfig(BuildConfig.BASE_URL,
-                BuildConfig.PORT,
-                "",
-                "");
-        popupNotificationsManager =new PopupNotificationsManager(context);
-
-        apiClient = new ApiClientImpl(ApiClientImpl.createGsonFactory(), hostConfig, new EmptyCrashlyticsProxy(), popupNotificationsManager, context);
-    }
-
-    @Test
-    public void itDoesNothingWhenNotificationsListIsEmpty() {
-        List<Notification> notifications = new ArrayList<>();
-        popupNotificationsManager.showNotificationDialog(notifications);
-
-        AlertDialog alert =
-                ShadowAlertDialog.getLatestAlertDialog();
-        assertNull(alert);
-    }
-
-    @Test
-    // @TODO: Eventually, we should have a list of implemented notifications and only use those
-    public void itShouldNotDisplayNotificationsThatAreNotLoginIncentives() {
-        Activity activity;
-        activity = Robolectric.buildActivity(Activity.class).create().get();
-        HabiticaApplication.currentActivity = activity;
-
-        List<Notification> notifications = new ArrayList<>();
-
-        Notification notification = new Notification();
-        notification.setType("NOT_LOGIN_INCENTIVE");
-
-        notifications.add(notification);
-
-        final PopupNotificationsManager testClass = Mockito.mock(PopupNotificationsManager.class);
-        Mockito.when(testClass.displayNotification(notification)).thenReturn(true);
-        Mockito.when(testClass.showNotificationDialog(notifications)).thenCallRealMethod();
-
-        testClass.showNotificationDialog(notifications);
-
-        verify(testClass, times(0)).displayNotification(notification);
-    }
-
-    @Test
-    public void itShouldDisplayADialogueForANotification() {
-        Activity activity;
-        activity = Robolectric.buildActivity(Activity.class).create().get();
-        HabiticaApplication.currentActivity = activity;
-
-        String testTitle = "Test Title";
-
-        List<Notification> notifications = new ArrayList<>();
-
-        NotificationData notificationData = new NotificationData();
-        notificationData.message = testTitle;
-
-        Notification notification = new Notification();
-        notification.setType("LOGIN_INCENTIVE");
-        notification.data = notificationData;
-
-        notifications.add(notification);
-
-        final PopupNotificationsManager testClass = Mockito.mock(PopupNotificationsManager.class);
-        Mockito.when(testClass.displayNotification(notification)).thenReturn(true);
-        Mockito.when(testClass.showNotificationDialog(notifications)).thenCallRealMethod();
-
-        testClass.showNotificationDialog(notifications);
-
-        verify(testClass, times(1)).displayNotification(notification);
-    }
-
-    @Test
-    public void itShouldNotDisplayANotificationTwice() {
-        Activity activity;
-        activity = Robolectric.buildActivity(Activity.class).create().get();
-        HabiticaApplication.currentActivity = activity;
-
-        String testTitle = "Test Title";
-
-        List<Notification> notifications = new ArrayList<>();
-
-        NotificationData notificationData = new NotificationData();
-        notificationData.message = testTitle;
-
-        Notification notification = new Notification();
-        notification.setType("LOGIN_INCENTIVE");
-        notification.data = notificationData;
-
-        notifications.add(notification);
-        notifications.add(notification);
-
-        final PopupNotificationsManager testClass = Mockito.mock(PopupNotificationsManager.class);
-        Mockito.when(testClass.displayNotification(notification)).thenReturn(true);
-        Mockito.when(testClass.showNotificationDialog(notifications)).thenCallRealMethod();
-
-        testClass.showNotificationDialog(notifications);
-
-        verify(testClass, times(1)).displayNotification(notification);
-    }
-}
+package com.habitrpg.android.habitica.helpers;
+
+import com.habitrpg.android.habitica.data.implementation.ApiClientImpl;
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.proxy.impl.EmptyCrashlyticsProxy;
+import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.models.Notification;
+import com.habitrpg.android.habitica.models.notifications.NotificationData;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+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.assertNull;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * Created by krh12 on 12/9/2016.
+ */
+
+@Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.M)
+@RunWith(RobolectricTestRunner.class)
+public class PopupNotificationsManagerTest {
+
+    public ApiClient apiClient;
+    public HostConfig hostConfig;
+
+    public String username;
+    public final String password = "password";
+    private Context context;
+    private PopupNotificationsManager popupNotificationsManager;
+
+    @Before
+    public void setUp() {
+        context = ShadowApplication.getInstance().getApplicationContext();
+        hostConfig = new HostConfig(BuildConfig.BASE_URL,
+                BuildConfig.PORT,
+                "",
+                "");
+        popupNotificationsManager =new PopupNotificationsManager(context);
+
+        apiClient = new ApiClientImpl(ApiClientImpl.createGsonFactory(), hostConfig, new EmptyCrashlyticsProxy(), popupNotificationsManager, context);
+    }
+
+    @Test
+    public void itDoesNothingWhenNotificationsListIsEmpty() {
+        List<Notification> notifications = new ArrayList<>();
+        popupNotificationsManager.showNotificationDialog(notifications);
+
+        AlertDialog alert =
+                ShadowAlertDialog.getLatestAlertDialog();
+        assertNull(alert);
+    }
+
+    @Test
+    // @TODO: Eventually, we should have a list of implemented notifications and only use those
+    public void itShouldNotDisplayNotificationsThatAreNotLoginIncentives() {
+        Activity activity;
+        activity = Robolectric.buildActivity(Activity.class).create().get();
+        HabiticaApplication.currentActivity = activity;
+
+        List<Notification> notifications = new ArrayList<>();
+
+        Notification notification = new Notification();
+        notification.setType("NOT_LOGIN_INCENTIVE");
+
+        notifications.add(notification);
+
+        final PopupNotificationsManager testClass = Mockito.mock(PopupNotificationsManager.class);
+        Mockito.when(testClass.displayNotification(notification)).thenReturn(true);
+        Mockito.when(testClass.showNotificationDialog(notifications)).thenCallRealMethod();
+
+        testClass.showNotificationDialog(notifications);
+
+        verify(testClass, times(0)).displayNotification(notification);
+    }
+
+    @Test
+    public void itShouldDisplayADialogueForANotification() {
+        Activity activity;
+        activity = Robolectric.buildActivity(Activity.class).create().get();
+        HabiticaApplication.currentActivity = activity;
+
+        String testTitle = "Test Title";
+
+        List<Notification> notifications = new ArrayList<>();
+
+        NotificationData notificationData = new NotificationData();
+        notificationData.message = testTitle;
+
+        Notification notification = new Notification();
+        notification.setType("LOGIN_INCENTIVE");
+        notification.data = notificationData;
+
+        notifications.add(notification);
+
+        final PopupNotificationsManager testClass = Mockito.mock(PopupNotificationsManager.class);
+        Mockito.when(testClass.displayNotification(notification)).thenReturn(true);
+        Mockito.when(testClass.showNotificationDialog(notifications)).thenCallRealMethod();
+
+        testClass.showNotificationDialog(notifications);
+
+        verify(testClass, times(1)).displayNotification(notification);
+    }
+
+    @Test
+    public void itShouldNotDisplayANotificationTwice() {
+        Activity activity;
+        activity = Robolectric.buildActivity(Activity.class).create().get();
+        HabiticaApplication.currentActivity = activity;
+
+        String testTitle = "Test Title";
+
+        List<Notification> notifications = new ArrayList<>();
+
+        NotificationData notificationData = new NotificationData();
+        notificationData.message = testTitle;
+
+        Notification notification = new Notification();
+        notification.setType("LOGIN_INCENTIVE");
+        notification.data = notificationData;
+
+        notifications.add(notification);
+        notifications.add(notification);
+
+        final PopupNotificationsManager testClass = Mockito.mock(PopupNotificationsManager.class);
+        Mockito.when(testClass.displayNotification(notification)).thenReturn(true);
+        Mockito.when(testClass.showNotificationDialog(notifications)).thenCallRealMethod();
+
+        testClass.showNotificationDialog(notifications);
+
+        verify(testClass, times(1)).displayNotification(notification);
+    }
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java
index 81c0bc5d3..4599087ec 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/TaskAlarmManagerTest.java
@@ -1,360 +1,360 @@
-package com.habitrpg.android.habitica.helpers;
-
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.receivers.TaskReceiver;
-import com.habitrpg.android.habitica.models.tasks.Days;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.raizlabs.android.dbflow.config.FlowManager;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.UUID;
-/**
- * Created by keithholliday on 7/16/16.
- */
-
-@Config(manifest = "AndroidManifestTesting.xml")
-@RunWith(value = RobolectricTestRunner.class)
-public class TaskAlarmManagerTest {
-    private TaskAlarmManager taskAlarmManager;
-
-    private Context context;
-
-    @Before
-    public void setUp() {
-        context = ShadowApplication.getInstance().getApplicationContext();
-        taskAlarmManager = new TaskAlarmManager(context);
-    }
-
-    @After
-    public void tearDown() {
-        FlowManager.getDatabase(HabitDatabase.NAME).reset(context);
-    }
-
-    @Test
-    public void testItSchedulesAlarmsForTodosWithMultipleReminders() {
-        Task task = new Task();
-        task.setType(Task.TYPE_TODO);
-
-        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
-        RemindersItem remindersItem1 = new RemindersItem();
-        UUID randomUUID = UUID.randomUUID();
-        remindersItem1.setId(randomUUID.toString());
-
-        Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE) + 1);
-
-        remindersItem1.setTime(cal.getTime());
-        reminders.add(remindersItem1);
-
-        task.setReminders(reminders);
-        task.save();
-
-        taskAlarmManager.setAlarmsForTask(task);
-
-        int intentId = remindersItem1.getId().hashCode() & 0xfffffff;
-        Intent intent = new Intent(context, TaskReceiver.class);
-        intent.setAction(remindersItem1.getId());
-        PendingIntent sender = PendingIntent.getBroadcast(context, intentId, intent, PendingIntent.FLAG_NO_CREATE);
-        boolean alarmUp = sender != null;
-
-        Assert.assertNotNull(intentId);
-        Assert.assertEquals(true, alarmUp);
-    }
-
-    @Test
-    public void itUpdatesScheduledAlarmsForTodosWithMultipleReminders() {
-        Task task = new Task();
-        task.setType(Task.TYPE_TODO);
-
-        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
-        RemindersItem remindersItem1 = new RemindersItem();
-        UUID randomUUID = UUID.randomUUID();
-        remindersItem1.setId(randomUUID.toString());
-
-        Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE) + 1);
-
-        remindersItem1.setTime(cal.getTime());
-        reminders.add(remindersItem1);
-
-        task.setReminders(reminders);
-        task.save();
-
-        taskAlarmManager.setAlarmsForTask(task);
-
-        int alarmId = remindersItem1.getId().hashCode() & 0xfffffff;
-        Intent intent = new Intent(context, TaskReceiver.class);
-        intent.setAction(remindersItem1.getId());
-        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
-        boolean alarmUp = sender != null;
-
-        Assert.assertNotNull(alarmId);
-        Assert.assertEquals(true, alarmUp);
-
-
-        reminders = new ArrayList<RemindersItem>();
-        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE) + 1);
-        remindersItem1.setTime(cal.getTime());
-        remindersItem1.save();
-        reminders.add(remindersItem1);
-        task.setReminders(reminders);
-        task.save();
-
-        taskAlarmManager.setAlarmsForTask(task);
-        int newAlarmId = reminders.get(0).getId().hashCode() & 0xfffffff;
-        PendingIntent senderNew = PendingIntent.getBroadcast(context, newAlarmId, intent, PendingIntent.FLAG_NO_CREATE);
-        boolean alarmUpNew = senderNew != null;
-
-        Assert.assertNotNull(newAlarmId);
-        Assert.assertEquals(alarmId, newAlarmId);
-        Assert.assertEquals(true, alarmUpNew);
-    }
-
-    @Test
-    //@TODO: Pending
-    public void itRemovesAlarmsWhenRemindersAreRemovedFromTodo() {
-        Task task = new Task();
-        task.setType(Task.TYPE_TODO);
-
-        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
-        RemindersItem remindersItem1 = new RemindersItem();
-        Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE) + 1);
-        remindersItem1.setTime(cal.getTime());
-        reminders.add(remindersItem1);
-        task.setReminders(reminders);
-        task.save();
-
-//        taskAlarmManager.setAlarmsForTask(task);
-//
-//        Integer alarmId = reminders.get(0).getAlarmId();
-//        Intent intent = new Intent(context, TaskReceiver.class);
-//        intent.setAction(remindersItem1.getAlarmId().toString());
-//        PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
-//        try{ Thread.sleep(5000); }catch(InterruptedException e){ }
-//        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
-//        boolean alarmUp = sender != null;
-//        System.out.println(sender);
-//        Assert.assertNotNull(alarmId);
-//        Assert.assertEquals(true, alarmUp);
-
-//        remindersItem1.delete();
-//
-//        PendingIntent senderUpdated = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
-//        boolean alarmDown = senderUpdated == null;
-//
-//        Assert.assertEquals(true, alarmDown);
-    }
-
-    @Test
-    //@TODO: Pending
-    public void itRemovesAlarmsWhenTodoIsDeleted() {
-
-    }
-
-    @Test
-    public void itScheduledAlarmForTheNextAvailableDayForRegularDaily() {
-        Task task = new Task();
-        task.setType(Task.TYPE_DAILY);
-        task.setFrequency(Task.FREQUENCY_WEEKLY);
-
-        Days taskRepeatDays = new Days();
-        taskRepeatDays.setM(true);
-        taskRepeatDays.setS(false);
-        taskRepeatDays.setSu(false);
-        task.setRepeat(taskRepeatDays);
-
-        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
-        RemindersItem remindersItem1 = new RemindersItem();
-        UUID randomUUID = UUID.randomUUID();
-        remindersItem1.setId(randomUUID.toString());
-
-        //We try to set a reminder on Tuesday, but the manager will correct this to Monday
-        Calendar cal = Calendar.getInstance();
-        cal.set(Calendar.DAY_OF_WEEK, 3);
-        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE) + 1);
-
-        remindersItem1.setTime(cal.getTime());
-        reminders.add(remindersItem1);
-
-        task.setReminders(reminders);
-        task.save();
-
-        taskAlarmManager.setAlarmsForTask(task);
-
-        int alarmId = reminders.get(0).getId().hashCode() & 0xfffffff;
-
-        Calendar newReminderTime = Calendar.getInstance();
-        newReminderTime.setTime(reminders.get(0).getTime());
-
-        Intent intent = new Intent(context, TaskReceiver.class);
-        intent.setAction(remindersItem1.getId());
-        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
-        boolean alarmUp = sender != null;
-
-        Assert.assertNotNull(alarmId);
-        Assert.assertEquals(true, alarmUp);
-        Assert.assertEquals(1, newReminderTime.get(Calendar.DAY_OF_WEEK));
-    }
-
-    @Test
-    //This also tests for when the receiver tries to schedule the next daily available
-    public void itScheduledAlarmForTheNextAvailableDayForRegularDailyWhenUserTriesToSetAlarmForNow() {
-        Task task = new Task();
-        task.setType(Task.TYPE_DAILY);
-        task.setFrequency(Task.FREQUENCY_WEEKLY);
-
-        Days taskRepeatDays = new Days();
-        taskRepeatDays.setM(true);
-        taskRepeatDays.setT(true);
-        taskRepeatDays.setW(true);
-        taskRepeatDays.setTh(true);
-        taskRepeatDays.setF(true);
-        taskRepeatDays.setS(false);
-        taskRepeatDays.setSu(false);
-        task.setRepeat(taskRepeatDays);
-
-        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
-        RemindersItem remindersItem1 = new RemindersItem();
-        UUID randomUUID = UUID.randomUUID();
-        remindersItem1.setId(randomUUID.toString());
-
-        //We try to set a reminder for now, but by the manager will correct (because the seconds will be different)
-        Calendar cal = Calendar.getInstance();
-
-        remindersItem1.setTime(cal.getTime());
-        reminders.add(remindersItem1);
-
-        task.setReminders(reminders);
-        task.save();
-
-        taskAlarmManager.setAlarmsForTask(task);
-
-        int alarmId = reminders.get(0).getId().hashCode() & 0xfffffff;
-
-        Calendar newReminderTime = Calendar.getInstance();
-        newReminderTime.setTime(reminders.get(0).getTime());
-
-        Intent intent = new Intent(context, TaskReceiver.class);
-        intent.setAction(remindersItem1.getId());
-        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
-        boolean alarmUp = sender != null;
-
-        Assert.assertNotNull(alarmId);
-        Assert.assertEquals(true, alarmUp);
-        Assert.assertNotSame(cal.getTime(), newReminderTime);
-    }
-
-    @Test
-    public void itScheduledAlarmForTheNextAvailableDayForEveryXDayDaily() {
-        Task task = new Task();
-        task.setType(Task.TYPE_DAILY);
-        task.setFrequency(Task.FREQUENCY_DAILY);
-
-        int everyXDay = 2;
-        task.setEveryX(everyXDay);
-
-        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
-        RemindersItem remindersItem1 = new RemindersItem();
-        UUID randomUUID = UUID.randomUUID();
-        remindersItem1.setId(randomUUID.toString());
-
-        //We try to set a reminder one day after the start date, but the manager will correct since the
-        // daily is every 2 days from above
-        Calendar cal = Calendar.getInstance();
-        int currentDayOfTheWeek = cal.get(Calendar.DAY_OF_WEEK);
-
-        task.setStartDate(cal.getTime());
-
-        cal.set(Calendar.DAY_OF_WEEK, currentDayOfTheWeek + 1);
-        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE));
-
-        remindersItem1.setTime(cal.getTime());
-        reminders.add(remindersItem1);
-
-        task.setReminders(reminders);
-        task.save();
-
-        taskAlarmManager.setAlarmsForTask(task);
-
-        int alarmId = reminders.get(0).getId().hashCode() & 0xfffffff;
-
-        Calendar newReminderTime = Calendar.getInstance();
-        newReminderTime.setTime(reminders.get(0).getTime());
-
-        Intent intent = new Intent(context, TaskReceiver.class);
-        intent.setAction(remindersItem1.getId());
-        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
-        boolean alarmUp = sender != null;
-
-        Assert.assertNotNull(alarmId);
-        Assert.assertEquals(true, alarmUp);
-
-        int expectedDay = (currentDayOfTheWeek + everyXDay) % 7;
-        if (expectedDay == 0) { expectedDay = 7;};
-
-        Assert.assertEquals(expectedDay, newReminderTime.get(Calendar.DAY_OF_WEEK));
-    }
-
-    @Test
-    //This also tests for when the receiver tries to schedule the next daily available
-    public void itScheduledAlarmForTheNextAvailableDayForEveryXDayDailyWhenUserTriesToSetAlarmForNow() {
-        Task task = new Task();
-        task.setType(Task.TYPE_DAILY);
-        task.setFrequency(Task.FREQUENCY_DAILY);
-
-        int everyXDay = 2;
-        task.setEveryX(everyXDay);
-
-        List<RemindersItem> reminders = new ArrayList<>();
-        RemindersItem remindersItem1 = new RemindersItem();
-        UUID randomUUID = UUID.randomUUID();
-        remindersItem1.setId(randomUUID.toString());
-
-        //We try to set a reminder for now, but the manager will correct since the seconds will be off
-        Calendar cal = Calendar.getInstance();
-        int currentDayOfTheWeek = cal.get(Calendar.DAY_OF_WEEK);
-
-        remindersItem1.setTime(cal.getTime());
-        reminders.add(remindersItem1);
-
-        task.setReminders(reminders);
-        task.save();
-
-        taskAlarmManager.setAlarmsForTask(task);
-
-        int alarmId = reminders.get(0).getId().hashCode() & 0xfffffff;
-
-        Calendar newReminderTime = Calendar.getInstance();
-        newReminderTime.setTime(reminders.get(0).getTime());
-
-        Intent intent = new Intent(context, TaskReceiver.class);
-        intent.setAction(remindersItem1.getId());
-        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
-        boolean alarmUp = sender != null;
-
-        Assert.assertNotNull(alarmId);
-        Assert.assertEquals(true, alarmUp);
-
-        int expectedDay = (currentDayOfTheWeek + everyXDay) % 7;
-        if (expectedDay == 0) { expectedDay = 7;};
-
-        Assert.assertEquals(expectedDay, newReminderTime.get(Calendar.DAY_OF_WEEK));
-    }
-}
+package com.habitrpg.android.habitica.helpers;
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.receivers.TaskReceiver;
+import com.habitrpg.android.habitica.models.tasks.Days;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.raizlabs.android.dbflow.config.FlowManager;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.UUID;
+/**
+ * Created by keithholliday on 7/16/16.
+ */
+
+@Config(manifest = "AndroidManifestTesting.xml")
+@RunWith(value = RobolectricTestRunner.class)
+public class TaskAlarmManagerTest {
+    private TaskAlarmManager taskAlarmManager;
+
+    private Context context;
+
+    @Before
+    public void setUp() {
+        context = ShadowApplication.getInstance().getApplicationContext();
+        taskAlarmManager = new TaskAlarmManager(context);
+    }
+
+    @After
+    public void tearDown() {
+        FlowManager.getDatabase(HabitDatabase.NAME).reset(context);
+    }
+
+    @Test
+    public void testItSchedulesAlarmsForTodosWithMultipleReminders() {
+        Task task = new Task();
+        task.setType(Task.TYPE_TODO);
+
+        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
+        RemindersItem remindersItem1 = new RemindersItem();
+        UUID randomUUID = UUID.randomUUID();
+        remindersItem1.setId(randomUUID.toString());
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE) + 1);
+
+        remindersItem1.setTime(cal.getTime());
+        reminders.add(remindersItem1);
+
+        task.setReminders(reminders);
+        task.save();
+
+        taskAlarmManager.setAlarmsForTask(task);
+
+        int intentId = remindersItem1.getId().hashCode() & 0xfffffff;
+        Intent intent = new Intent(context, TaskReceiver.class);
+        intent.setAction(remindersItem1.getId());
+        PendingIntent sender = PendingIntent.getBroadcast(context, intentId, intent, PendingIntent.FLAG_NO_CREATE);
+        boolean alarmUp = sender != null;
+
+        Assert.assertNotNull(intentId);
+        Assert.assertEquals(true, alarmUp);
+    }
+
+    @Test
+    public void itUpdatesScheduledAlarmsForTodosWithMultipleReminders() {
+        Task task = new Task();
+        task.setType(Task.TYPE_TODO);
+
+        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
+        RemindersItem remindersItem1 = new RemindersItem();
+        UUID randomUUID = UUID.randomUUID();
+        remindersItem1.setId(randomUUID.toString());
+
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE) + 1);
+
+        remindersItem1.setTime(cal.getTime());
+        reminders.add(remindersItem1);
+
+        task.setReminders(reminders);
+        task.save();
+
+        taskAlarmManager.setAlarmsForTask(task);
+
+        int alarmId = remindersItem1.getId().hashCode() & 0xfffffff;
+        Intent intent = new Intent(context, TaskReceiver.class);
+        intent.setAction(remindersItem1.getId());
+        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
+        boolean alarmUp = sender != null;
+
+        Assert.assertNotNull(alarmId);
+        Assert.assertEquals(true, alarmUp);
+
+
+        reminders = new ArrayList<RemindersItem>();
+        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE) + 1);
+        remindersItem1.setTime(cal.getTime());
+        remindersItem1.save();
+        reminders.add(remindersItem1);
+        task.setReminders(reminders);
+        task.save();
+
+        taskAlarmManager.setAlarmsForTask(task);
+        int newAlarmId = reminders.get(0).getId().hashCode() & 0xfffffff;
+        PendingIntent senderNew = PendingIntent.getBroadcast(context, newAlarmId, intent, PendingIntent.FLAG_NO_CREATE);
+        boolean alarmUpNew = senderNew != null;
+
+        Assert.assertNotNull(newAlarmId);
+        Assert.assertEquals(alarmId, newAlarmId);
+        Assert.assertEquals(true, alarmUpNew);
+    }
+
+    @Test
+    //@TODO: Pending
+    public void itRemovesAlarmsWhenRemindersAreRemovedFromTodo() {
+        Task task = new Task();
+        task.setType(Task.TYPE_TODO);
+
+        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
+        RemindersItem remindersItem1 = new RemindersItem();
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE) + 1);
+        remindersItem1.setTime(cal.getTime());
+        reminders.add(remindersItem1);
+        task.setReminders(reminders);
+        task.save();
+
+//        taskAlarmManager.setAlarmsForTask(task);
+//
+//        Integer alarmId = reminders.get(0).getAlarmId();
+//        Intent intent = new Intent(context, TaskReceiver.class);
+//        intent.setAction(remindersItem1.getAlarmId().toString());
+//        PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+//        try{ Thread.sleep(5000); }catch(InterruptedException e){ }
+//        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
+//        boolean alarmUp = sender != null;
+//        System.out.println(sender);
+//        Assert.assertNotNull(alarmId);
+//        Assert.assertEquals(true, alarmUp);
+
+//        remindersItem1.delete();
+//
+//        PendingIntent senderUpdated = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
+//        boolean alarmDown = senderUpdated == null;
+//
+//        Assert.assertEquals(true, alarmDown);
+    }
+
+    @Test
+    //@TODO: Pending
+    public void itRemovesAlarmsWhenTodoIsDeleted() {
+
+    }
+
+    @Test
+    public void itScheduledAlarmForTheNextAvailableDayForRegularDaily() {
+        Task task = new Task();
+        task.setType(Task.TYPE_DAILY);
+        task.setFrequency(Task.FREQUENCY_WEEKLY);
+
+        Days taskRepeatDays = new Days();
+        taskRepeatDays.setM(true);
+        taskRepeatDays.setS(false);
+        taskRepeatDays.setSu(false);
+        task.setRepeat(taskRepeatDays);
+
+        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
+        RemindersItem remindersItem1 = new RemindersItem();
+        UUID randomUUID = UUID.randomUUID();
+        remindersItem1.setId(randomUUID.toString());
+
+        //We try to set a reminder on Tuesday, but the manager will correct this to Monday
+        Calendar cal = Calendar.getInstance();
+        cal.set(Calendar.DAY_OF_WEEK, 3);
+        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE) + 1);
+
+        remindersItem1.setTime(cal.getTime());
+        reminders.add(remindersItem1);
+
+        task.setReminders(reminders);
+        task.save();
+
+        taskAlarmManager.setAlarmsForTask(task);
+
+        int alarmId = reminders.get(0).getId().hashCode() & 0xfffffff;
+
+        Calendar newReminderTime = Calendar.getInstance();
+        newReminderTime.setTime(reminders.get(0).getTime());
+
+        Intent intent = new Intent(context, TaskReceiver.class);
+        intent.setAction(remindersItem1.getId());
+        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
+        boolean alarmUp = sender != null;
+
+        Assert.assertNotNull(alarmId);
+        Assert.assertEquals(true, alarmUp);
+        Assert.assertEquals(1, newReminderTime.get(Calendar.DAY_OF_WEEK));
+    }
+
+    @Test
+    //This also tests for when the receiver tries to schedule the next daily available
+    public void itScheduledAlarmForTheNextAvailableDayForRegularDailyWhenUserTriesToSetAlarmForNow() {
+        Task task = new Task();
+        task.setType(Task.TYPE_DAILY);
+        task.setFrequency(Task.FREQUENCY_WEEKLY);
+
+        Days taskRepeatDays = new Days();
+        taskRepeatDays.setM(true);
+        taskRepeatDays.setT(true);
+        taskRepeatDays.setW(true);
+        taskRepeatDays.setTh(true);
+        taskRepeatDays.setF(true);
+        taskRepeatDays.setS(false);
+        taskRepeatDays.setSu(false);
+        task.setRepeat(taskRepeatDays);
+
+        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
+        RemindersItem remindersItem1 = new RemindersItem();
+        UUID randomUUID = UUID.randomUUID();
+        remindersItem1.setId(randomUUID.toString());
+
+        //We try to set a reminder for now, but by the manager will correct (because the seconds will be different)
+        Calendar cal = Calendar.getInstance();
+
+        remindersItem1.setTime(cal.getTime());
+        reminders.add(remindersItem1);
+
+        task.setReminders(reminders);
+        task.save();
+
+        taskAlarmManager.setAlarmsForTask(task);
+
+        int alarmId = reminders.get(0).getId().hashCode() & 0xfffffff;
+
+        Calendar newReminderTime = Calendar.getInstance();
+        newReminderTime.setTime(reminders.get(0).getTime());
+
+        Intent intent = new Intent(context, TaskReceiver.class);
+        intent.setAction(remindersItem1.getId());
+        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
+        boolean alarmUp = sender != null;
+
+        Assert.assertNotNull(alarmId);
+        Assert.assertEquals(true, alarmUp);
+        Assert.assertNotSame(cal.getTime(), newReminderTime);
+    }
+
+    @Test
+    public void itScheduledAlarmForTheNextAvailableDayForEveryXDayDaily() {
+        Task task = new Task();
+        task.setType(Task.TYPE_DAILY);
+        task.setFrequency(Task.FREQUENCY_DAILY);
+
+        int everyXDay = 2;
+        task.setEveryX(everyXDay);
+
+        List<RemindersItem> reminders = new ArrayList<RemindersItem>();
+        RemindersItem remindersItem1 = new RemindersItem();
+        UUID randomUUID = UUID.randomUUID();
+        remindersItem1.setId(randomUUID.toString());
+
+        //We try to set a reminder one day after the start date, but the manager will correct since the
+        // daily is every 2 days from above
+        Calendar cal = Calendar.getInstance();
+        int currentDayOfTheWeek = cal.get(Calendar.DAY_OF_WEEK);
+
+        task.setStartDate(cal.getTime());
+
+        cal.set(Calendar.DAY_OF_WEEK, currentDayOfTheWeek + 1);
+        cal.set(Calendar.MINUTE, cal.get(Calendar.MINUTE));
+
+        remindersItem1.setTime(cal.getTime());
+        reminders.add(remindersItem1);
+
+        task.setReminders(reminders);
+        task.save();
+
+        taskAlarmManager.setAlarmsForTask(task);
+
+        int alarmId = reminders.get(0).getId().hashCode() & 0xfffffff;
+
+        Calendar newReminderTime = Calendar.getInstance();
+        newReminderTime.setTime(reminders.get(0).getTime());
+
+        Intent intent = new Intent(context, TaskReceiver.class);
+        intent.setAction(remindersItem1.getId());
+        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
+        boolean alarmUp = sender != null;
+
+        Assert.assertNotNull(alarmId);
+        Assert.assertEquals(true, alarmUp);
+
+        int expectedDay = (currentDayOfTheWeek + everyXDay) % 7;
+        if (expectedDay == 0) { expectedDay = 7;};
+
+        Assert.assertEquals(expectedDay, newReminderTime.get(Calendar.DAY_OF_WEEK));
+    }
+
+    @Test
+    //This also tests for when the receiver tries to schedule the next daily available
+    public void itScheduledAlarmForTheNextAvailableDayForEveryXDayDailyWhenUserTriesToSetAlarmForNow() {
+        Task task = new Task();
+        task.setType(Task.TYPE_DAILY);
+        task.setFrequency(Task.FREQUENCY_DAILY);
+
+        int everyXDay = 2;
+        task.setEveryX(everyXDay);
+
+        List<RemindersItem> reminders = new ArrayList<>();
+        RemindersItem remindersItem1 = new RemindersItem();
+        UUID randomUUID = UUID.randomUUID();
+        remindersItem1.setId(randomUUID.toString());
+
+        //We try to set a reminder for now, but the manager will correct since the seconds will be off
+        Calendar cal = Calendar.getInstance();
+        int currentDayOfTheWeek = cal.get(Calendar.DAY_OF_WEEK);
+
+        remindersItem1.setTime(cal.getTime());
+        reminders.add(remindersItem1);
+
+        task.setReminders(reminders);
+        task.save();
+
+        taskAlarmManager.setAlarmsForTask(task);
+
+        int alarmId = reminders.get(0).getId().hashCode() & 0xfffffff;
+
+        Calendar newReminderTime = Calendar.getInstance();
+        newReminderTime.setTime(reminders.get(0).getTime());
+
+        Intent intent = new Intent(context, TaskReceiver.class);
+        intent.setAction(remindersItem1.getId());
+        PendingIntent sender = PendingIntent.getBroadcast(context, alarmId, intent, PendingIntent.FLAG_NO_CREATE);
+        boolean alarmUp = sender != null;
+
+        Assert.assertNotNull(alarmId);
+        Assert.assertEquals(true, alarmUp);
+
+        int expectedDay = (currentDayOfTheWeek + everyXDay) % 7;
+        if (expectedDay == 0) { expectedDay = 7;};
+
+        Assert.assertEquals(expectedDay, newReminderTime.get(Calendar.DAY_OF_WEEK));
+    }
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
index 4c6dc34dd..7a585dcb5 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
@@ -1,117 +1,117 @@
-package com.habitrpg.android.habitica.helpers;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.HabitRpgClass;
-import com.habitrpg.android.habitica.models.user.Stats;
-import com.habitrpg.android.habitica.models.tasks.ItemData;
-
-import junit.framework.Assert;
-
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 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;
-
-    private int str = 1;
-    private int intStat = 2;
-    private int per = 3;
-    private 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);
-    }
-}
+package com.habitrpg.android.habitica.helpers;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.HabitRpgClass;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.models.inventory.ItemData;
+
+import junit.framework.Assert;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 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;
+
+    private int str = 1;
+    private int intStat = 2;
+    private int per = 3;
+    private 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/Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.java
index a2c15c490..48f886530 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/SubscriptionPlanTest.java
@@ -1,50 +1,50 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Calendar;
-import java.util.Date;
-
-import static org.junit.Assert.*;
-
-public class SubscriptionPlanTest {
-    private SubscriptionPlan plan;
-
-    @Before
-    public void setUp() throws Exception {
-        this.plan = new SubscriptionPlan();
-        this.plan.planId = "test";
-    }
-
-    @Test
-    public void isInactiveForNoPlanId() throws Exception {
-        this.plan.planId = null;
-        assertFalse(this.plan.isActive());
-    }
-
-    @Test
-    public void isActiveForNoTerminationDate() throws Exception {
-        assertTrue(this.plan.isActive());
-    }
-
-    @Test
-    public void isActiveForLaterTerminationDate() throws Exception {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date());
-        calendar.add(Calendar.DATE, 1);
-        this.plan.dateTerminated = calendar.getTime();
-        assertTrue(this.plan.isActive());
-    }
-
-    @Test
-    public void isInactiveForEarlierTerminationDate() throws Exception {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(new Date());
-        calendar.add(Calendar.DATE, -1);
-        this.plan.dateTerminated = calendar.getTime();
-        assertFalse(this.plan.isActive());
-    }
+package com.habitrpg.android.habitica.models;
+
+import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import static org.junit.Assert.*;
+
+public class SubscriptionPlanTest {
+    private SubscriptionPlan plan;
+
+    @Before
+    public void setUp() throws Exception {
+        this.plan = new SubscriptionPlan();
+        this.plan.planId = "test";
+    }
+
+    @Test
+    public void isInactiveForNoPlanId() throws Exception {
+        this.plan.planId = null;
+        assertFalse(this.plan.isActive());
+    }
+
+    @Test
+    public void isActiveForNoTerminationDate() throws Exception {
+        assertTrue(this.plan.isActive());
+    }
+
+    @Test
+    public void isActiveForLaterTerminationDate() throws Exception {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.add(Calendar.DATE, 1);
+        this.plan.dateTerminated = calendar.getTime();
+        assertTrue(this.plan.isActive());
+    }
+
+    @Test
+    public void isInactiveForEarlierTerminationDate() throws Exception {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.add(Calendar.DATE, -1);
+        this.plan.dateTerminated = calendar.getTime();
+        assertFalse(this.plan.isActive());
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
index e18901c5d..976c0ad1c 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
@@ -1,65 +1,65 @@
-package com.habitrpg.android.habitica.models;
-
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Items;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.util.HashMap;
-
-import static org.junit.Assert.assertEquals;
-
-@Config(constants = BuildConfig.class)
-@RunWith(RobolectricTestRunner.class)
-public class UserTest {
-
-    private HabitRPGUser user;
-
-    @Before
-    public void setup() {
-        user = new HabitRPGUser();
-        Items items = new Items();
-        user.setItems(items);
-    }
-
-    @Test
-    public void getPetsFoundCount_shouldReturnSumOfAllPetEntries() {
-        HashMap<String, Integer> pets = new HashMap<>();
-        pets.put("BearCub-Base", 0);
-        pets.put("Sheep-Base", 5);
-        pets.put("Cheetah-Shade", 35);
-        pets.put("Slime-Base", -1);
-        pets.put("Axolotl-Red", 5);
-
-        user.getItems().setPets(pets);
-        assertEquals(5, user.getPetsFoundCount());
-    }
-
-    @Test
-    public void getPetsFoundCount_onNoPetCollectionAvailable_shouldReturnZero() {
-        assertEquals(0, user.getPetsFoundCount());
-    }
-
-    @Test
-    public void getMountsTamedCount_shouldReturnSumOfAllMountEntries() {
-        HashMap<String, Boolean> mounts = new HashMap<>();
-        mounts.put("BearCub-White", null);
-        mounts.put("BearCub-CottonCandyPink", true);
-        mounts.put("Seahorse-Base", true);
-        mounts.put("Owl-Zombie", true);
-        mounts.put("Cactus-White", null);
-
-        user.getItems().setMounts(mounts);
-        assertEquals(5, user.getMountsTamedCount());
-    }
-
-    @Test
-    public void getMountsTamedCount_onNoMountCollectionAvailable_shouldReturnZero() {
-        assertEquals(0, user.getMountsTamedCount());
-    }
+package com.habitrpg.android.habitica.models;
+
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.util.HashMap;
+
+import static org.junit.Assert.assertEquals;
+
+@Config(constants = BuildConfig.class)
+@RunWith(RobolectricTestRunner.class)
+public class UserTest {
+
+    private HabitRPGUser user;
+
+    @Before
+    public void setup() {
+        user = new HabitRPGUser();
+        Items items = new Items();
+        user.setItems(items);
+    }
+
+    @Test
+    public void getPetsFoundCount_shouldReturnSumOfAllPetEntries() {
+        HashMap<String, Integer> pets = new HashMap<>();
+        pets.put("BearCub-Base", 0);
+        pets.put("Sheep-Base", 5);
+        pets.put("Cheetah-Shade", 35);
+        pets.put("Slime-Base", -1);
+        pets.put("Axolotl-Red", 5);
+
+        user.getItems().setPets(pets);
+        assertEquals(5, user.getPetsFoundCount());
+    }
+
+    @Test
+    public void getPetsFoundCount_onNoPetCollectionAvailable_shouldReturnZero() {
+        assertEquals(0, user.getPetsFoundCount());
+    }
+
+    @Test
+    public void getMountsTamedCount_shouldReturnSumOfAllMountEntries() {
+        HashMap<String, Boolean> mounts = new HashMap<>();
+        mounts.put("BearCub-White", null);
+        mounts.put("BearCub-CottonCandyPink", true);
+        mounts.put("Seahorse-Base", true);
+        mounts.put("Owl-Zombie", true);
+        mounts.put("Cactus-White", null);
+
+        user.getItems().setMounts(mounts);
+        assertEquals(5, user.getMountsTamedCount());
+    }
+
+    @Test
+    public void getMountsTamedCount_onNoMountCollectionAvailable_shouldReturnZero() {
+        assertEquals(0, user.getMountsTamedCount());
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java
index c1261f046..720051200 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java
@@ -1,22 +1,22 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.customization;
-
-import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Hair;
-import com.habitrpg.android.habitica.models.user.Preferences;
-
-public class AvatarCustomizationFragmentTest extends BaseFragmentTests<AvatarCustomizationFragment> {
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        this.fragment = new AvatarCustomizationFragment();
-        HabitRPGUser user = new HabitRPGUser();
-        user.setPreferences(new Preferences());
-        user.getPreferences().setSkin("");
-        user.getPreferences().setHair(new Hair());
-        user.getPreferences().getHair().setColor("");
-        this.fragment.setUser(user);
-        fragment.type = "skin";
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.customization;
+
+import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Hair;
+import com.habitrpg.android.habitica.models.user.Preferences;
+
+public class AvatarCustomizationFragmentTest extends BaseFragmentTests<AvatarCustomizationFragment> {
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        this.fragment = new AvatarCustomizationFragment();
+        HabitRPGUser user = new HabitRPGUser();
+        user.setPreferences(new Preferences());
+        user.getPreferences().setSkin("");
+        user.getPreferences().setHair(new Hair());
+        user.getPreferences().getHair().setColor("");
+        this.fragment.setUser(user);
+        fragment.type = "skin";
+    }
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java
index 7a29404b6..438956b68 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java
@@ -1,25 +1,25 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.equipment;
-
-import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.habitrpg.android.habitica.models.user.Gear;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Items;
-import com.habitrpg.android.habitica.models.user.Outfit;
-import com.habitrpg.android.habitica.models.user.Preferences;
-
-public class EquipmentOverviewFragmentTest extends BaseFragmentTests<EquipmentOverviewFragment> {
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        this.fragment = new EquipmentOverviewFragment();
-        HabitRPGUser user = new HabitRPGUser();
-        user.setItems(new Items());
-        user.getItems().setGear(new Gear());
-        user.getItems().getGear().setCostume(new Outfit());
-        user.getItems().getGear().setEquipped(new Outfit());
-        user.setPreferences(new Preferences());
-        user.getPreferences().setCostume(true);
-        this.fragment.setUser(user);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.equipment;
+
+import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
+import com.habitrpg.android.habitica.models.user.Gear;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.user.Outfit;
+import com.habitrpg.android.habitica.models.user.Preferences;
+
+public class EquipmentOverviewFragmentTest extends BaseFragmentTests<EquipmentOverviewFragment> {
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        this.fragment = new EquipmentOverviewFragment();
+        HabitRPGUser user = new HabitRPGUser();
+        user.setItems(new Items());
+        user.getItems().setGear(new Gear());
+        user.getItems().getGear().setCostume(new Outfit());
+        user.getItems().getGear().setEquipped(new Outfit());
+        user.setPreferences(new Preferences());
+        user.getPreferences().setCostume(true);
+        this.fragment.setUser(user);
+    }
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java
index cf86332b9..c4c971a73 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java
@@ -1,20 +1,20 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
-
-import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Items;
-
-import java.util.HashMap;
-
-public class MountDetailRecyclerFragmentTest extends BaseFragmentTests<MountDetailRecyclerFragment> {
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        this.fragment = new MountDetailRecyclerFragment();
-        HabitRPGUser user = new HabitRPGUser();
-        user.setItems(new Items());
-        user.getItems().setMounts(new HashMap<>());
-        this.fragment.setUser(user);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
+
+import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+
+import java.util.HashMap;
+
+public class MountDetailRecyclerFragmentTest extends BaseFragmentTests<MountDetailRecyclerFragment> {
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        this.fragment = new MountDetailRecyclerFragment();
+        HabitRPGUser user = new HabitRPGUser();
+        user.setItems(new Items());
+        user.getItems().setMounts(new HashMap<>());
+        this.fragment.setUser(user);
+    }
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java
index 4e6e639c1..86c45c4ad 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java
@@ -1,20 +1,20 @@
-package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
-
-import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.Items;
-
-import java.util.HashMap;
-
-public class PetDetailRecyclerFragmentTest extends BaseFragmentTests<PetDetailRecyclerFragment> {
-
-    @Override
-    public void setUp() {
-        super.setUp();
-        this.fragment = new PetDetailRecyclerFragment();
-        HabitRPGUser user = new HabitRPGUser();
-        user.setItems(new Items());
-        user.getItems().setPets(new HashMap<>());
-        this.fragment.setUser(user);
-    }
-}
+package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
+
+import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
+import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.Items;
+
+import java.util.HashMap;
+
+public class PetDetailRecyclerFragmentTest extends BaseFragmentTests<PetDetailRecyclerFragment> {
+
+    @Override
+    public void setUp() {
+        super.setUp();
+        this.fragment = new PetDetailRecyclerFragment();
+        HabitRPGUser user = new HabitRPGUser();
+        user.setItems(new Items());
+        user.getItems().setPets(new HashMap<>());
+        this.fragment.setUser(user);
+    }
+}
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java
index 5e2a25944..ba025d98c 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/utils/DateDeserializerTest.java
@@ -1,87 +1,87 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-
-import com.habitrpg.android.habitica.BuildConfig;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-import java.lang.reflect.Type;
-import java.util.Date;
-
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
-
-@Config(constants = BuildConfig.class)
-@RunWith(RobolectricTestRunner.class)
-public class DateDeserializerTest {
-    DateDeserializer deserializer;
-    JsonDeserializationContext deserializationContext;
-    JsonSerializationContext serializationContext;
-
-    Long referenceTimestamp;
-
-    @Before
-    public void setup() {
-        this.deserializer = new DateDeserializer();
-        this.deserializationContext = new JsonDeserializationContext() {
-            @Override
-            public <T> T deserialize(JsonElement json, Type typeOfT) throws JsonParseException {
-                return null;
-            }
-        };
-        this.serializationContext = new JsonSerializationContext() {
-            @Override
-            public JsonElement serialize(Object src) {
-                return null;
-            }
-
-            @Override
-            public JsonElement serialize(Object src, Type typeOfSrc) {
-                return null;
-            }
-        };
-
-        this.referenceTimestamp = Long.valueOf("1443445200000");
-    }
-
-    @Test
-    public void validateNormalDateDeserialize() {
-        Date date = this.deserializer.deserialize(new JsonPrimitive("2015-09-28T13:00:00.000Z"), Date.class, this.deserializationContext);
-
-        assertThat(date, is(new Date(referenceTimestamp)));
-    }
-
-    @Test
-    public void validateTimestampDeserialize() {
-        Date date = this.deserializer.deserialize(new JsonPrimitive(referenceTimestamp), Date.class, this.deserializationContext);
-        assertThat(date, is(new Date(referenceTimestamp)));
-    }
-
-    @Test
-    public void validateEmptyDeserialize() {
-        Date date = this.deserializer.deserialize(new JsonPrimitive(""), Date.class, this.deserializationContext);
-        assertNull(date);
-    }
-
-    @Test
-    public void validateNormalDateSerialize() {
-        JsonElement dateElement = this.deserializer.serialize(new Date(referenceTimestamp), Date.class, this.serializationContext);
-        assertThat(dateElement.getAsString(), is("2015-09-28T13:00:00.000Z"));
-    }
-
-    @Test
-    public void validateEmptySerialize() {
-        JsonElement dateElement = this.deserializer.serialize(null, Date.class, this.serializationContext);
-        assertThat(dateElement.getAsString(), is(""));
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+
+import com.habitrpg.android.habitica.BuildConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+import java.lang.reflect.Type;
+import java.util.Date;
+
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
+@Config(constants = BuildConfig.class)
+@RunWith(RobolectricTestRunner.class)
+public class DateDeserializerTest {
+    DateDeserializer deserializer;
+    JsonDeserializationContext deserializationContext;
+    JsonSerializationContext serializationContext;
+
+    Long referenceTimestamp;
+
+    @Before
+    public void setup() {
+        this.deserializer = new DateDeserializer();
+        this.deserializationContext = new JsonDeserializationContext() {
+            @Override
+            public <T> T deserialize(JsonElement json, Type typeOfT) throws JsonParseException {
+                return null;
+            }
+        };
+        this.serializationContext = new JsonSerializationContext() {
+            @Override
+            public JsonElement serialize(Object src) {
+                return null;
+            }
+
+            @Override
+            public JsonElement serialize(Object src, Type typeOfSrc) {
+                return null;
+            }
+        };
+
+        this.referenceTimestamp = Long.valueOf("1443445200000");
+    }
+
+    @Test
+    public void validateNormalDateDeserialize() {
+        Date date = this.deserializer.deserialize(new JsonPrimitive("2015-09-28T13:00:00.000Z"), Date.class, this.deserializationContext);
+
+        assertThat(date, is(new Date(referenceTimestamp)));
+    }
+
+    @Test
+    public void validateTimestampDeserialize() {
+        Date date = this.deserializer.deserialize(new JsonPrimitive(referenceTimestamp), Date.class, this.deserializationContext);
+        assertThat(date, is(new Date(referenceTimestamp)));
+    }
+
+    @Test
+    public void validateEmptyDeserialize() {
+        Date date = this.deserializer.deserialize(new JsonPrimitive(""), Date.class, this.deserializationContext);
+        assertNull(date);
+    }
+
+    @Test
+    public void validateNormalDateSerialize() {
+        JsonElement dateElement = this.deserializer.serialize(new Date(referenceTimestamp), Date.class, this.serializationContext);
+        assertThat(dateElement.getAsString(), is("2015-09-28T13:00:00.000Z"));
+    }
+
+    @Test
+    public void validateEmptySerialize() {
+        JsonElement dateElement = this.deserializer.serialize(null, Date.class, this.serializationContext);
+        assertThat(dateElement.getAsString(), is(""));
+    }
+}
diff --git a/store_strings.xml b/store_strings.xml
index 56dab0578..f7ed05bcf 100644
--- a/store_strings.xml
+++ b/store_strings.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="store_title">Gamify Your Tasks</string>
-    <string name="store_short_description">Treat your life like a game to stay motivated and organized!</string>
-    <string name="store_description">Treat your life like a game to stay motivated and organized! Habitica makes it simple to have fun while accomplishing goals.
-Input your Habits, your Daily goals, and your To-Do list, and then create a custom avatar. Check off tasks to level up your avatar and unlock features such as armor, pets, skills, and even quests! Fight monsters with friends to keep each other accountable, and use your gold on in-game rewards, like equipment, or custom awards, like watching an episode of your favorite TV show. Flexible, social, and fun, Habitica is the perfect way to motivate yourself to accomplish anything.
-If you have any questions, feel free to send feedback to mobile@habitica.com! And if you enjoy our app, we would really appreciate it if you would leave us a review.
-</string>
-</resources>
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="store_title">Gamify Your Tasks</string>
+    <string name="store_short_description">Treat your life like a game to stay motivated and organized!</string>
+    <string name="store_description">Treat your life like a game to stay motivated and organized! Habitica makes it simple to have fun while accomplishing goals.
+Input your Habits, your Daily goals, and your To-Do list, and then create a custom avatar. Check off tasks to level up your avatar and unlock features such as armor, pets, skills, and even quests! Fight monsters with friends to keep each other accountable, and use your gold on in-game rewards, like equipment, or custom awards, like watching an episode of your favorite TV show. Flexible, social, and fun, Habitica is the perfect way to motivate yourself to accomplish anything.
+If you have any questions, feel free to send feedback to mobile@habitica.com! And if you enjoy our app, we would really appreciate it if you would leave us a review.
+</string>
+</resources>
+
diff --git a/translations/store_strings-bg.xml b/translations/store_strings-bg.xml
index 68ae499f9..74610881c 100644
--- a/translations/store_strings-bg.xml
+++ b/translations/store_strings-bg.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_title">Превърнете задачите си в игра</string>
-  <string name="store_short_description">Превърнете живота си в игра за повече мотивация и по-добра организация!</string>
-  <string name="store_description">Превърнете живота си в игра за повече мотивация и по-добра организация! С Хабитика се забавлявате, докато постигате целите си.
-Въведете навиците си, ежедневните си цели и задачите, които имате да свършите, и си създайте герой. Отмятайте задачите си, за да качвате нивото на героя си и да отключвате различни функционалности като екипировка, любимци, умения и дори мисии! Бийте се с чудовища заедно с приятели, за да се подкрепяте взаимно и да се държите отговорни, и използвайте златото си за награди в играта, например екипировка; или създайте свои собствени награди, като например разрешение да гледате епизод от любимия си сериал. Хабитика е приспособим и забавен начин да мотивирате себе си, за да постигнете всичко, което искате.
-Ако имате въпроси, пишете на mobile@habitica.com! А ако приложението Ви харесва, ще се радваме да оставите коментар или рецензия.
-</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_title">Превърнете задачите си в игра</string>
+  <string name="store_short_description">Превърнете живота си в игра за повече мотивация и по-добра организация!</string>
+  <string name="store_description">Превърнете живота си в игра за повече мотивация и по-добра организация! С Хабитика се забавлявате, докато постигате целите си.
+Въведете навиците си, ежедневните си цели и задачите, които имате да свършите, и си създайте герой. Отмятайте задачите си, за да качвате нивото на героя си и да отключвате различни функционалности като екипировка, любимци, умения и дори мисии! Бийте се с чудовища заедно с приятели, за да се подкрепяте взаимно и да се държите отговорни, и използвайте златото си за награди в играта, например екипировка; или създайте свои собствени награди, като например разрешение да гледате епизод от любимия си сериал. Хабитика е приспособим и забавен начин да мотивирате себе си, за да постигнете всичко, което искате.
+Ако имате въпроси, пишете на mobile@habitica.com! А ако приложението Ви харесва, ще се радваме да оставите коментар или рецензия.
+</string>
+</resources>
diff --git a/translations/store_strings-ca.xml b/translations/store_strings-ca.xml
index 885ca53c1..24aeb596e 100644
--- a/translations/store_strings-ca.xml
+++ b/translations/store_strings-ca.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Viu la teva vida com un joc per mantenir-te motivat i organitzat!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Viu la teva vida com un joc per mantenir-te motivat i organitzat!</string>
+</resources>
diff --git a/translations/store_strings-cmn.xml b/translations/store_strings-cmn.xml
index a8204f443..a7492ee7a 100644
--- a/translations/store_strings-cmn.xml
+++ b/translations/store_strings-cmn.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">让你的生活如同游戏，动力十足，井井有条！</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">让你的生活如同游戏，动力十足，井井有条！</string>
+</resources>
diff --git a/translations/store_strings-cs.xml b/translations/store_strings-cs.xml
index cbcd4dfaf..ff213dd1e 100644
--- a/translations/store_strings-cs.xml
+++ b/translations/store_strings-cs.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Berte život jako hru, načerpejte motivaci a mějte vše pod kontrolou!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Berte život jako hru, načerpejte motivaci a mějte vše pod kontrolou!</string>
+</resources>
diff --git a/translations/store_strings-de.xml b/translations/store_strings-de.xml
index d132d5134..e5df7390b 100644
--- a/translations/store_strings-de.xml
+++ b/translations/store_strings-de.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Betrachte Dein Leben als ein Spiel, um motiviert und organisiert zu bleiben!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Betrachte Dein Leben als ein Spiel, um motiviert und organisiert zu bleiben!</string>
+</resources>
diff --git a/translations/store_strings-en-rGB.xml b/translations/store_strings-en-rGB.xml
index 4e0303736..890fd059e 100644
--- a/translations/store_strings-en-rGB.xml
+++ b/translations/store_strings-en-rGB.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Treat your life like a game to stay motivated and organised!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Treat your life like a game to stay motivated and organised!</string>
+</resources>
diff --git a/translations/store_strings-es.xml b/translations/store_strings-es.xml
index 69ced6da6..564842ce1 100644
--- a/translations/store_strings-es.xml
+++ b/translations/store_strings-es.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">¡Vive tu vida como si fuese un juego para motivarte y organizarte!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">¡Vive tu vida como si fuese un juego para motivarte y organizarte!</string>
+</resources>
diff --git a/translations/store_strings-es_419.xml b/translations/store_strings-es_419.xml
index 157bf3690..5a927a8f3 100644
--- a/translations/store_strings-es_419.xml
+++ b/translations/store_strings-es_419.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">¡Trata tu vida como un juego para mantenerte motivado y organizado!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">¡Trata tu vida como un juego para mantenerte motivado y organizado!</string>
+</resources>
diff --git a/translations/store_strings-fi.xml b/translations/store_strings-fi.xml
index d1e96a342..6e369fc90 100644
--- a/translations/store_strings-fi.xml
+++ b/translations/store_strings-fi.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Tee elämästäsi peli. Se auttaa sinua motivoitumaan ja organisoitumaan.</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Tee elämästäsi peli. Se auttaa sinua motivoitumaan ja organisoitumaan.</string>
+</resources>
diff --git a/translations/store_strings-fil.xml b/translations/store_strings-fil.xml
index 5665fb6c1..575a89cef 100644
--- a/translations/store_strings-fil.xml
+++ b/translations/store_strings-fil.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Isipin mo na ang buhay mo ay isang laro para lalo kang nagaganyak at mas oranisado!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Isipin mo na ang buhay mo ay isang laro para lalo kang nagaganyak at mas oranisado!</string>
+</resources>
diff --git a/translations/store_strings-fr.xml b/translations/store_strings-fr.xml
index 39a26f0d6..7584b5198 100644
--- a/translations/store_strings-fr.xml
+++ b/translations/store_strings-fr.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Traitez votre vie comme un jeu afin de rester motivé·e et organisé·e !</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Traitez votre vie comme un jeu afin de rester motivé·e et organisé·e !</string>
+</resources>
diff --git a/translations/store_strings-he.xml b/translations/store_strings-he.xml
index 0846093d7..3cb32459a 100644
--- a/translations/store_strings-he.xml
+++ b/translations/store_strings-he.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">התייחסו אל חייכם כאל משחק כדי להשאר מאורגנים עם מוטיבציה!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">התייחסו אל חייכם כאל משחק כדי להשאר מאורגנים עם מוטיבציה!</string>
+</resources>
diff --git a/translations/store_strings-hr_HR.xml b/translations/store_strings-hr_HR.xml
index f91e4dda2..3f68e73c4 100644
--- a/translations/store_strings-hr_HR.xml
+++ b/translations/store_strings-hr_HR.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Pretvorite život u igru da ostanete motivirani i organizirani!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Pretvorite život u igru da ostanete motivirani i organizirani!</string>
+</resources>
diff --git a/translations/store_strings-id.xml b/translations/store_strings-id.xml
index 5ab730e4e..2a2ee9123 100644
--- a/translations/store_strings-id.xml
+++ b/translations/store_strings-id.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Perlakukan hidupmu seperti permainan untuk tetap termotivasi dan terorganisir!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Perlakukan hidupmu seperti permainan untuk tetap termotivasi dan terorganisir!</string>
+</resources>
diff --git a/translations/store_strings-it.xml b/translations/store_strings-it.xml
index c3da95a67..7e7924278 100644
--- a/translations/store_strings-it.xml
+++ b/translations/store_strings-it.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_title">Trasforma le tue attività in un gioco</string>
-  <string name="store_short_description">Trasforma la tua vita in un gioco di ruolo per affrontarla motivato ed organizzato.</string>
-  <string name="store_description">Trasforma la tua vita in un gioco di ruolo per essere organizzato e motivato! Con Habitica raggiungere i propri obiettivi non è mai stato così divertente.
-
-Imposta le tue abitudini (Habit), i tuoi obiettivi giornalieri (Daily) e la tua lista di cose da fare (To-Do), poi crea il tuo avatar personalizzato. Completa le attività per far salire di livello il tuo avatar e sbloccare funzionalità come armature, animali, abilità e persino missioni! Combatti i mostri con i tuoi amici per aiutarvi a vicenda ad essere responsabili, e usa il tuo oro per ricompense in-game come pezzi di equipaggiamento, o ricompense personalizzate, ad esempio guardare un episodio della tua serie TV preferita. Flessibile, sociale e soprattutto divertente, Habitica è il modo perfetto per motivarti a fare qualsiasi cosa.
-
-Se avete una qualsiasi domanda o dei suggerimenti, sentitevi liberi di scrivere a mobile@habitica.com! E se vi piace la nostra app, saremmo davvero felici se ci lasciaste una recensione.
-</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_title">Trasforma le tue attività in un gioco</string>
+  <string name="store_short_description">Trasforma la tua vita in un gioco di ruolo per affrontarla motivato ed organizzato.</string>
+  <string name="store_description">Trasforma la tua vita in un gioco di ruolo per essere organizzato e motivato! Con Habitica raggiungere i propri obiettivi non è mai stato così divertente.
+
+Imposta le tue abitudini (Habit), i tuoi obiettivi giornalieri (Daily) e la tua lista di cose da fare (To-Do), poi crea il tuo avatar personalizzato. Completa le attività per far salire di livello il tuo avatar e sbloccare funzionalità come armature, animali, abilità e persino missioni! Combatti i mostri con i tuoi amici per aiutarvi a vicenda ad essere responsabili, e usa il tuo oro per ricompense in-game come pezzi di equipaggiamento, o ricompense personalizzate, ad esempio guardare un episodio della tua serie TV preferita. Flessibile, sociale e soprattutto divertente, Habitica è il modo perfetto per motivarti a fare qualsiasi cosa.
+
+Se avete una qualsiasi domanda o dei suggerimenti, sentitevi liberi di scrivere a mobile@habitica.com! E se vi piace la nostra app, saremmo davvero felici se ci lasciaste una recensione.
+</string>
+</resources>
diff --git a/translations/store_strings-ja.xml b/translations/store_strings-ja.xml
index 9c000d819..65c6528c8 100644
--- a/translations/store_strings-ja.xml
+++ b/translations/store_strings-ja.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">自分の人生をゲーム化して、やる気の維持とやるべきことの整理をしよう!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">自分の人生をゲーム化して、やる気の維持とやるべきことの整理をしよう!</string>
+</resources>
diff --git a/translations/store_strings-ko.xml b/translations/store_strings-ko.xml
index 62daface6..57ad9d598 100644
--- a/translations/store_strings-ko.xml
+++ b/translations/store_strings-ko.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">인생을 게임처럼 즐기면서 동기를 부여하고 계획적인 삶을 사세요!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">인생을 게임처럼 즐기면서 동기를 부여하고 계획적인 삶을 사세요!</string>
+</resources>
diff --git a/translations/store_strings-lt.xml b/translations/store_strings-lt.xml
index cf51ca7ac..505259bf2 100644
--- a/translations/store_strings-lt.xml
+++ b/translations/store_strings-lt.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Žiūrėk į savo gyvenimą kaip į žaidimą ir išlaikyk motyvaciją ir organizuotumą!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Žiūrėk į savo gyvenimą kaip į žaidimą ir išlaikyk motyvaciją ir organizuotumą!</string>
+</resources>
diff --git a/translations/store_strings-nl.xml b/translations/store_strings-nl.xml
index 519c008ba..3b835dfbd 100644
--- a/translations/store_strings-nl.xml
+++ b/translations/store_strings-nl.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_title">Maak van je taken een spel</string>
-  <string name="store_short_description">Behandel je leven alsof het een spel is en blijf gemotiveerd en georganiseerd!</string>
-  <string name="store_description">Behandel je leven als een spel om gemotiveerd en georganiseerd te blijven! Habitica houdt het simpel om plezier te maken terwijl je doelen bereikt.
-Voer je gewoontes, dagelijkse taken en to-do\'s toe en maak dan een eigen avatar. Vink taken af om je avatar sterker te maken en functies vrij te spelen zoals uitrusting, huisdieren, vaardigheden en zelfs queesten! Vecht tegen monsters met vrienden om samen verantwoordelijk te blijven en gebruik je goud voor beloningen, zoals uitrusting of kies je eigen beloning, zoals een aflevering van je favoriete serie bekijken. Flexibel, sociaal en plezant, Habitica is de perfecte manier om jezelf te motiveren om alles te bereiken.
-Als je vragen hebt kan je ze stellen bij mobile@habitica.com! En als je de app leuk vindt, waarderen we het als je ons een recensie nalaat.
-</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_title">Maak van je taken een spel</string>
+  <string name="store_short_description">Behandel je leven alsof het een spel is en blijf gemotiveerd en georganiseerd!</string>
+  <string name="store_description">Behandel je leven als een spel om gemotiveerd en georganiseerd te blijven! Habitica houdt het simpel om plezier te maken terwijl je doelen bereikt.
+Voer je gewoontes, dagelijkse taken en to-do\'s toe en maak dan een eigen avatar. Vink taken af om je avatar sterker te maken en functies vrij te spelen zoals uitrusting, huisdieren, vaardigheden en zelfs queesten! Vecht tegen monsters met vrienden om samen verantwoordelijk te blijven en gebruik je goud voor beloningen, zoals uitrusting of kies je eigen beloning, zoals een aflevering van je favoriete serie bekijken. Flexibel, sociaal en plezant, Habitica is de perfecte manier om jezelf te motiveren om alles te bereiken.
+Als je vragen hebt kan je ze stellen bij mobile@habitica.com! En als je de app leuk vindt, waarderen we het als je ons een recensie nalaat.
+</string>
+</resources>
diff --git a/translations/store_strings-no.xml b/translations/store_strings-no.xml
index 3f0ac02fe..06892bf05 100644
--- a/translations/store_strings-no.xml
+++ b/translations/store_strings-no.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Se på livet ditt som et spill for å holde deg motivert og organisert!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Se på livet ditt som et spill for å holde deg motivert og organisert!</string>
+</resources>
diff --git a/translations/store_strings-pl.xml b/translations/store_strings-pl.xml
index 6ae5bdd36..5d812e29a 100644
--- a/translations/store_strings-pl.xml
+++ b/translations/store_strings-pl.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Traktuj życie jak grę, będziesz zmotywowany i zorganizowany!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Traktuj życie jak grę, będziesz zmotywowany i zorganizowany!</string>
+</resources>
diff --git a/translations/store_strings-pt-rBR.xml b/translations/store_strings-pt-rBR.xml
index a257a6980..4352181ea 100644
--- a/translations/store_strings-pt-rBR.xml
+++ b/translations/store_strings-pt-rBR.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Trate sua vida como um jogo para se manter motivado e organizado!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Trate sua vida como um jogo para se manter motivado e organizado!</string>
+</resources>
diff --git a/translations/store_strings-pt_PT.xml b/translations/store_strings-pt_PT.xml
index 9e3bff208..113f98db8 100644
--- a/translations/store_strings-pt_PT.xml
+++ b/translations/store_strings-pt_PT.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Trate a sua vida como um jogo para manter-se motivado e organizado!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Trate a sua vida como um jogo para manter-se motivado e organizado!</string>
+</resources>
diff --git a/translations/store_strings-ru.xml b/translations/store_strings-ru.xml
index 4c20edafa..38cff8fe5 100644
--- a/translations/store_strings-ru.xml
+++ b/translations/store_strings-ru.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Живите играючи и развивайте мотивацию и организованность!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Живите играючи и развивайте мотивацию и организованность!</string>
+</resources>
diff --git a/translations/store_strings-tr.xml b/translations/store_strings-tr.xml
index 9cecce597..478326749 100644
--- a/translations/store_strings-tr.xml
+++ b/translations/store_strings-tr.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">Hayatını motive ve düzenli kalmak için oyun gibi düzenle!</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">Hayatını motive ve düzenli kalmak için oyun gibi düzenle!</string>
+</resources>
diff --git a/translations/store_strings-zh-Hans.xml b/translations/store_strings-zh-Hans.xml
index a30094a87..711935149 100644
--- a/translations/store_strings-zh-Hans.xml
+++ b/translations/store_strings-zh-Hans.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">把生活当游戏玩，保持积极与条理性！</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">把生活当游戏玩，保持积极与条理性！</string>
+</resources>
diff --git a/translations/store_strings-zh-rTW.xml b/translations/store_strings-zh-rTW.xml
index f8c383932..5893603ed 100644
--- a/translations/store_strings-zh-rTW.xml
+++ b/translations/store_strings-zh-rTW.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="store_short_description">生活即遊戲，保持動力，讓生活井井有條！</string>
-</resources>
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="store_short_description">生活即遊戲，保持動力，讓生活井井有條！</string>
+</resources>

From d80359dbdbbb26b10b0cae987c428122b62f01ba Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 20 Apr 2017 21:10:05 +0200
Subject: [PATCH 04/17] Start refactoring Tasks to realm

---
 Habitica/build.gradle                         |   3 +
 .../habitica/HabiticaBaseApplication.java     |  13 +
 .../callbacks/HabitRPGUserCallback.java       |   1 -
 .../callbacks/TaskScoringCallback.java        |  10 +-
 .../callbacks/TaskUpdateCallback.java         |   2 -
 .../android/habitica/data/TagRepository.java  |   3 +-
 .../android/habitica/data/TaskRepository.java |  14 +-
 .../data/implementation/ApiClientImpl.java    |  32 +-
 .../implementation/TagRepositoryImpl.java     |   3 +-
 .../implementation/TaskRepositoryImpl.java    |  53 ++-
 .../data/local/BaseLocalRepository.java       |   4 +
 .../data/local/TagLocalRepository.java        |   3 +-
 .../data/local/TaskLocalRepository.java       |   8 +-
 .../DbFlowCustomizationLocalRepository.java   |   6 +
 .../DbFlowFAQLocalRepository.java             |   6 +
 .../DbFlowInventoryLocalRepository.java       |   6 +
 .../DbFlowSocialLocalRepository.java          |   8 +-
 .../DbFlowTagLocalRepository.java             |  79 -----
 .../DbFlowTaskLocalRepository.java            | 313 ------------------
 .../DbFlowTutorialLocalRepository.java        |   6 +
 .../DbFlowUserLocalRepository.java            |   6 +
 .../RealmBaseLocalRepository.java             |  24 ++
 .../RealmTagLocalRepository.java              |  27 ++
 .../RealmTaskLocalRepository.java             |  92 +++++
 .../habitica/helpers/TaskAlarmManager.java    |   2 +-
 .../habitrpg/android/habitica/models/Tag.java |  60 +---
 .../habitica/models/tasks/ChecklistItem.java  |  45 +--
 .../android/habitica/models/tasks/Days.java   |  16 +-
 .../habitica/models/tasks/RemindersItem.java  |  73 +---
 .../android/habitica/models/tasks/Task.java   | 183 +---------
 .../habitica/models/tasks/TaskGroupPlan.java  |  16 +-
 .../habitica/models/tasks/TaskTag.java        |  44 +--
 .../habitica/models/user/HabitRPGUser.java    | 111 +------
 .../habitica/modules/RepositoryModule.java    |  20 +-
 .../habitica/ui/activities/MainActivity.java  |  51 ++-
 .../ui/activities/TaskFormActivity.java       | 231 +++++++------
 .../ui/adapter/tasks/CheckListAdapter.java    |  14 +-
 .../tasks/DailiesRecyclerViewHolder.java      |  17 +-
 .../tasks/HabitsRecyclerViewAdapter.java      |  14 +-
 .../RealmBaseTasksRecyclerViewAdapter.java    |  43 +++
 .../ui/adapter/tasks/RemindersAdapter.java    |   1 -
 .../tasks/RewardsRecyclerViewAdapter.java     |  28 +-
 .../tasks/TodosRecyclerViewAdapter.java       |  15 +-
 .../tasks/TaskRecyclerViewFragment.java       |  88 ++---
 .../ui/fragments/tasks/TasksFragment.java     |  11 +-
 .../viewHolders/tasks/BaseTaskViewHolder.java |  18 +-
 .../tasks/ChecklistedViewHolder.java          |   2 -
 .../habitica/utils/TaskTagDeserializer.java   |   9 +-
 .../widget/HabitButtonWidgetProvider.java     |   3 +-
 .../widget/TaskListWidgetProvider.java        |   3 +-
 build.gradle                                  |   2 +
 51 files changed, 619 insertions(+), 1223 deletions(-)
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index f17f14154..1820ccf5b 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'com.android.databinding'
 apply plugin: 'io.fabric'
 apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'com.noveogroup.android.check'
+apply plugin: 'realm-android'
 
 buildscript {
     repositories {
@@ -149,6 +150,8 @@ dependencies {
 
     compile 'com.roughike:bottom-bar:2.2.0'
 
+    compile 'io.realm:android-adapters:2.0.0'
+
     compile(project(':seeds-sdk')) {
         exclude group: 'com.google.android.gms'
         exclude group: 'com.android.support', module: 'multidex'
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 55f1555f0..11fd68e76 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -41,6 +41,8 @@ import java.lang.reflect.Field;
 import javax.inject.Inject;
 
 import dagger.Lazy;
+import io.realm.Realm;
+import io.realm.RealmConfiguration;
 
 //contains all HabiticaApplicationLogic except dagger componentInitialisation
 public abstract class HabiticaBaseApplication extends MultiDexApplication {
@@ -129,6 +131,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
             // You should not init your app in this process.
             return;
         }
+        setupRealm();
         setupDagger();
         crashlyticsProxy.init(this);
         setupLeakCanary();
@@ -149,6 +152,16 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
         checkIfNewVersion();
     }
 
+    protected void setupRealm() {
+        Realm.init(this);
+        RealmConfiguration.Builder builder = new RealmConfiguration.Builder()
+                .schemaVersion(1);
+        if (BuildConfig.DEBUG) {
+            builder = builder.deleteRealmIfMigrationNeeded();
+        }
+        Realm.setDefaultConfiguration(builder.build());
+    }
+
     private void checkIfNewVersion() {
         PackageInfo info = null;
         try {
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 f176b30ef..20ce54ce1 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
@@ -21,7 +21,6 @@ public class HabitRPGUserCallback implements Action1<HabitRPGUser> {
 
     @Override
     public void call(HabitRPGUser user) {
-        // Negue: once everything is refactored to DbFlowTaskLocalRepository, this will be removed
         user.async().save();
         if (callBack != null) {
             callBack.onUserReceived(user);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
index c052a6204..7298186d5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
@@ -27,15 +27,7 @@ public class TaskScoringCallback implements Action1<TaskDirectionData> {
 
     @Override
     public void call(TaskDirectionData taskDirectionData) {
-        taskRepository.getTask(taskId).subscribe(task -> {
-            if (task != null && task.type != null && !task.type.equals("reward")) {
-                task.value = task.value + taskDirectionData.getDelta();
-
-                taskRepository.saveTask(task);
-            }
-
-            mCallback.onTaskDataReceived(taskDirectionData, task);
-        });
+        taskRepository.getTask(taskId).first().subscribe(task -> mCallback.onTaskDataReceived(taskDirectionData, task));
         if (taskDirectionData.get_tmp() != null) {
             if (taskDirectionData.get_tmp().getDrop() != null) {
                 String type = taskDirectionData.get_tmp().getDrop().getType();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
index 67dfcd0c8..53f8277df 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
@@ -14,8 +14,6 @@ public class TaskUpdateCallback implements Action1<Task> {
 
     @Override
     public void call(Task task) {
-        task.save();
-
         EventBus.getDefault().post(new TaskUpdatedEvent(task));
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
index 29312b5e2..d5ea7e28a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TagRepository.java
@@ -5,11 +5,12 @@ import com.habitrpg.android.habitica.models.Tag;
 import java.util.Collection;
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface TagRepository extends BaseRepository {
 
-    Observable<List<Tag>> getTags(String userId);
+    Observable<RealmResults<Tag>> getTags(String userId);
 
     Observable<Tag> createTag(Tag tag);
     Observable<Tag> updateTag(Tag tag);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
index b30cfc53b..fe731089e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
@@ -10,18 +10,22 @@ import com.habitrpg.android.habitica.models.tasks.TasksOrder;
 
 import java.util.List;
 
+import io.realm.Realm;
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface TaskRepository extends BaseRepository  {
-    Observable<List<Task>> getTasks(String taskType, String userID);
-    Observable<List<Task>> getTasks(String userId);
+    Observable<RealmResults<Task>> getTasks(String taskType, String userID);
+    Observable<RealmResults<Task>> getTasks(String userId);
 
     Observable<TaskList> refreshTasks(TasksOrder tasksOrder);
 
     Observable<TaskDirectionData> taskChecked(Task task, boolean up);
+    Observable<TaskDirectionData> taskChecked(String taskId, boolean up);
     Observable<Task> scoreChecklistItem(String taskId, String itemId);
 
     Observable<Task> getTask(String taskId);
+    Observable<Task> getTaskCopy(String taskId);
     Observable<Task> createTask(Task task);
     Observable<Task> updateTask(Task task);
     Observable<Void> deleteTask(String taskId);
@@ -34,7 +38,9 @@ public interface TaskRepository extends BaseRepository  {
     void removeOldTaskTags(List<TaskTag> onlineTaskTags);
     void removeOldReminders(List<RemindersItem> onlineReminders);
 
-    Observable<TaskDirectionData> postTaskDirection(String taskId, String direction);
-
     void markTaskCompleted(String taskId, boolean isCompleted);
+
+    void saveReminder(RemindersItem remindersItem);
+
+    void executeTransaction(Realm.Transaction transaction);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index 38ac206aa..cc6c7a657 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -103,6 +103,8 @@ import java.util.Map;
 
 import javax.net.ssl.SSLException;
 
+import io.realm.Realm;
+import io.realm.RealmList;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.ResponseBody;
@@ -204,7 +206,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     public static GsonConverterFactory createGsonFactory() {
-        Type taskTagClassListType = new TypeToken<List<TaskTag>>() {
+        Type taskTagClassListType = new TypeToken<RealmList<TaskTag>>() {
         }.getType();
         Type skillListType = new TypeToken<List<Skill>>() {
         }.getType();
@@ -354,29 +356,13 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
 
             userObservable = Observable.zip(userObservable, tasksObservable,
                     (habitRPGUser, tasks) -> {
+                        List<Task> sortedTasks = new ArrayList<>();
+                        sortedTasks.addAll(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getHabits()));
+                        sortedTasks.addAll(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getDailys()));
+                        sortedTasks.addAll(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getTodos()));
+                        sortedTasks.addAll(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getRewards()));
 
-                        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 Task.TYPE_HABIT:
-                                    habitRPGUser.getHabits().add(task);
-                                    break;
-                                case Task.TYPE_DAILY:
-                                    habitRPGUser.getDailys().add(task);
-                                    break;
-                                case Task.TYPE_TODO:
-                                    habitRPGUser.getTodos().add(task);
-                                    break;
-                                case Task.TYPE_REWARD:
-                                    habitRPGUser.getRewards().add(task);
-                                    break;
-                                default:
-                                    break;
-                            }
-                        }
+                        Realm.getDefaultInstance().executeTransactionAsync(realm -> realm.copyToRealmOrUpdate(sortedTasks));
 
                         return habitRPGUser;
                     });
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
index cecae96e5..8071a5610 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
@@ -8,6 +8,7 @@ import com.habitrpg.android.habitica.models.Tag;
 import java.util.Collection;
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 
@@ -18,7 +19,7 @@ public class TagRepositoryImpl extends BaseRepositoryImpl<TagLocalRepository> im
     }
 
     @Override
-    public Observable<List<Tag>> getTags(String userId) {
+    public Observable<RealmResults<Tag>> getTags(String userId) {
         return localRepository.getTags(userId);
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
index 135407c2a..79f7979db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -19,6 +19,8 @@ import org.greenrobot.eventbus.EventBus;
 import java.util.Date;
 import java.util.List;
 
+import io.realm.Realm;
+import io.realm.RealmResults;
 import rx.Observable;
 
 
@@ -31,12 +33,12 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
     }
 
     @Override
-    public Observable<List<Task>> getTasks(String taskType, String userID) {
+    public Observable<RealmResults<Task>> getTasks(String taskType, String userID) {
         return this.localRepository.getTasks(taskType, userID);
     }
 
     @Override
-    public Observable<List<Task>> getTasks(String userId) {
+    public Observable<RealmResults<Task>> getTasks(String userId) {
         return this.localRepository.getTasks(userId);
     }
 
@@ -57,15 +59,26 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
                 .doOnNext(res -> {
                     // save local task changes
                     if (task.type != null && !task.type.equals("reward")) {
-                        task.value = task.value + res.getDelta();
 
-                        this.localRepository.saveTask(task);
+                        this.localRepository.executeTransaction(realm -> {
+                            task.value = task.value + res.getDelta();
+                            if (Task.TYPE_DAILY.equals(task.type) || Task.TYPE_TODO.equals(task.type)) {
+                                task.completed = up;
+                            }
+                        });
                     }
                 });
     }
 
+    @Override
+    public Observable<TaskDirectionData> taskChecked(String taskId, boolean up) {
+        return localRepository.getTask(taskId)
+                .flatMap(task -> taskChecked(task, up));
+    }
+
     public Observable<Task> scoreChecklistItem(String taskId, String itemId){
-        return apiClient.scoreChecklistItem(taskId, itemId).doOnNext(this.localRepository::saveTask);
+        return apiClient.scoreChecklistItem(taskId, itemId)
+                .doOnNext(this.localRepository::saveTask);
     }
 
     @Override
@@ -73,6 +86,11 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         return localRepository.getTask(taskId);
     }
 
+    @Override
+    public Observable<Task> getTaskCopy(String taskId) {
+        return localRepository.getTaskCopy(taskId);
+    }
+
     @Override
     public Observable<Task> createTask(Task task) {
         long now = new Date().getTime();
@@ -81,10 +99,7 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         }
         lastTaskAction = now;
         return apiClient.createItem(task)
-                .doOnNext(task1 -> {
-                    localRepository.saveTask(task1);
-                    EventBus.getDefault().post(new TaskCreatedEvent(task1));
-                });
+                .doOnNext(localRepository::saveTask);
     }
 
     @Override
@@ -95,10 +110,7 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         }
         lastTaskAction = now;
         return apiClient.updateTask(task.getId(), task)
-                .doOnNext(task1 -> {
-                    localRepository.saveTask(task1);
-                    EventBus.getDefault().post(new TaskUpdatedEvent(task1));
-                });
+                .doOnNext(localRepository::saveTask);
     }
 
     @Override
@@ -137,13 +149,18 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         localRepository.removeOldReminders(onlineReminders);
     }
 
-    @Override
-    public Observable<TaskDirectionData> postTaskDirection(String taskId, String direction) {
-        return apiClient.postTaskDirection(taskId, direction);
-    }
-
     @Override
     public void markTaskCompleted(String taskId, boolean isCompleted) {
         localRepository.markTaskCompleted(taskId, isCompleted);
     }
+
+    @Override
+    public void saveReminder(RemindersItem remindersItem) {
+        localRepository.saveReminder(remindersItem);
+    }
+
+    @Override
+    public void executeTransaction(Realm.Transaction transaction) {
+        localRepository.executeTransaction(transaction);
+    }
 }
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
index 4dae26d2e..696b942d1 100644
--- 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
@@ -1,6 +1,10 @@
 package com.habitrpg.android.habitica.data.local;
 
+import io.realm.Realm;
+
 public interface BaseLocalRepository {
 
     void close();
+
+    void executeTransaction(Realm.Transaction transaction);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
index 8e79d43d7..bf7c90a4e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TagLocalRepository.java
@@ -4,10 +4,11 @@ import com.habitrpg.android.habitica.models.Tag;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface TagLocalRepository extends BaseLocalRepository {
-    Observable<List<Tag>> getTags(String userId);
+    Observable<RealmResults<Tag>> getTags(String userId);
 
     void removeOldTags(List<Tag> onlineTags);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
index a0bf5d613..77c419680 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
@@ -9,12 +9,13 @@ import com.habitrpg.android.habitica.models.tasks.TasksOrder;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface TaskLocalRepository extends BaseLocalRepository {
 
-    Observable<List<Task>> getTasks(String taskType, String userID);
-    Observable<List<Task>> getTasks(String userId);
+    Observable<RealmResults<Task>> getTasks(String taskType, String userID);
+    Observable<RealmResults<Task>> getTasks(String userId);
 
     void saveTasks(TasksOrder tasksOrder, TaskList tasks);
 
@@ -28,6 +29,9 @@ public interface TaskLocalRepository extends BaseLocalRepository {
     void deleteTask(String taskID);
 
     Observable<Task> getTask(String taskId);
+    Observable<Task> getTaskCopy(String taskId);
 
     void markTaskCompleted(String taskId, boolean isCompleted);
+
+    void saveReminder(RemindersItem remindersItem);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java
index d053b64fa..59bad7da3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java
@@ -10,6 +10,7 @@ import com.raizlabs.android.dbflow.sql.language.Where;
 import java.util.Date;
 import java.util.List;
 
+import io.realm.Realm;
 import rx.Observable;
 
 public class DbFlowCustomizationLocalRepository implements CustomizationLocalRepository {
@@ -18,6 +19,11 @@ public class DbFlowCustomizationLocalRepository implements CustomizationLocalRep
 
     }
 
+    @Override
+    public void executeTransaction(Realm.Transaction transaction) {
+
+    }
+
     @Override
     public Observable<List<Customization>> getCustomizations(String type, String category) {
         return Observable.defer(() -> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java
index 07f08ecb0..c36eced12 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java
@@ -6,6 +6,7 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.util.List;
 
+import io.realm.Realm;
 import rx.Observable;
 
 public class DbFlowFAQLocalRepository implements FAQLocalRepository {
@@ -14,6 +15,11 @@ public class DbFlowFAQLocalRepository implements FAQLocalRepository {
 
     }
 
+    @Override
+    public void executeTransaction(Realm.Transaction transaction) {
+
+    }
+
     @Override
     public Observable<List<FAQArticle>> getArticles() {
         return Observable.defer(() -> Observable.just(new Select().from(FAQArticle.class).queryList()));
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java
index 370cf5ca4..e002b7deb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import io.realm.Realm;
 import rx.Observable;
 
 public class DbFlowInventoryLocalRepository implements InventoryLocalRepository {
@@ -34,6 +35,11 @@ public class DbFlowInventoryLocalRepository implements InventoryLocalRepository
 
     }
 
+    @Override
+    public void executeTransaction(Realm.Transaction transaction) {
+
+    }
+
     @Override
     public Observable<QuestContent> getQuestContent(String key) {
         return Observable.defer(() -> Observable.just(new Select().from(QuestContent.class).querySingle()))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
index 114c14671..e8c4cb404 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
@@ -7,6 +7,7 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.util.List;
 
+import io.realm.Realm;
 import rx.Observable;
 
 
@@ -16,6 +17,11 @@ public class DbFlowSocialLocalRepository implements SocialLocalRepository {
 
     }
 
+    @Override
+    public void executeTransaction(Realm.Transaction transaction) {
+
+    }
+
     @Override
     public Observable<Challenge> getChallenge(String challengeId) {
         return Observable.defer(() -> Observable.just(new Select().from(Challenge.class).where(Condition.column("id").eq(challengeId)).querySingle()));
@@ -31,7 +37,7 @@ public class DbFlowSocialLocalRepository implements SocialLocalRepository {
         return Observable.defer(() -> Observable.just(new Select()
                 .from(Challenge.class)
                 .where(Condition.column("name").isNotNull())
-                .and(Condition.column("user_id").is(userId))
+                .and(Condition.column("userId").is(userId))
                 .queryList()));
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
deleted file mode 100644
index ef1b75403..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTagLocalRepository.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-
-import android.database.sqlite.SQLiteDoneException;
-
-import com.habitrpg.android.habitica.data.local.TagLocalRepository;
-import com.habitrpg.android.habitica.models.Tag;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.From;
-import com.raizlabs.android.dbflow.sql.language.OrderBy;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import rx.Observable;
-
-public class DbFlowTagLocalRepository implements TagLocalRepository {
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public Observable<List<Tag>> getTags(String userId) {
-        return Observable.defer(() -> Observable.just(new Select().from(Tag.class)
-                .where(Condition.column("user_id").eq(userId))
-                .orderBy(OrderBy.columns("position", "dateCreated").descending())
-                .queryList()));
-    }
-
-    @Override
-    public void removeOldTags(List<Tag> onlineTags) {
-        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
-
-        for (Tag item : onlineTags) {
-            onlineTaskTagItemIdList.add(item.getId());
-        }
-
-        From<Tag> query = new Select().from(Tag.class);
-        try {
-            if (query.count() != onlineTags.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<Tag>>() {
-                    @Override
-                    public void onResultReceived(List<Tag> items) {
-
-                        ArrayList<Tag> tagsToDelete = new ArrayList<>();
-
-                        for (Tag tag : items) {
-                            if (!onlineTaskTagItemIdList.contains(tag.getId())) {
-                                tagsToDelete.add(tag);
-                            }
-                        }
-
-                        for (Tag tag : tagsToDelete) {
-                            tag.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<Tag>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<Tag>> transaction, List<Tag> result) {
-                        return result != null && result.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
deleted file mode 100644
index 82b733b45..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTaskLocalRepository.java
+++ /dev/null
@@ -1,313 +0,0 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import android.database.sqlite.SQLiteDoneException;
-
-import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
-import com.habitrpg.android.habitica.events.TaskRemovedEvent;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.Days;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.habitrpg.android.habitica.models.tasks.TasksOrder;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Delete;
-import com.raizlabs.android.dbflow.sql.language.From;
-import com.raizlabs.android.dbflow.sql.language.OrderBy;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.sql.language.Where;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import rx.Observable;
-
-public class DbFlowTaskLocalRepository implements TaskLocalRepository {
-
-    @Override
-    public Observable<List<Task>> getTasks(String taskType, String userID) {
-        return Observable.defer(() -> Observable.just(new Select().from(Task.class)
-                .where(Condition.column("type").eq(taskType))
-                .and(Condition.CombinedCondition
-                        .begin(Condition.column("completed").eq(false))
-                        .or(Condition.column("type").eq("daily"))
-                )
-                .and(Condition.column("user_id").eq(userID))
-                .orderBy(OrderBy.columns("position", "dateCreated").descending())
-                .queryList()));
-    }
-
-    @Override
-    public Observable<List<Task>> getTasks(String userId) {
-        return Observable.defer(() -> Observable.just(new Select().from(Task.class)
-                .where(Condition.column("user_id").eq(userId))
-                .and(Condition.CombinedCondition
-                        .begin(Condition.column("completed").eq(false))
-                        .or(Condition.column("type").eq("daily"))
-                )
-                .orderBy(OrderBy.columns("position", "dateCreated").descending())
-                .queryList()));    }
-
-    public Observable<Task> getTask(String taskID) {
-        return Observable.defer(() -> Observable.just(new Select().from(Task.class)
-                .where(Condition.column("id").eq(taskID))
-                .querySingle()));
-    }
-
-    @Override
-    public void markTaskCompleted(String taskId, boolean isCompleted) {
-        getTask(taskId).subscribe(task -> {
-            task.completed = isCompleted;
-            saveTask(task);
-        }, throwable -> {});
-    }
-
-    @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();
-    }
-
-    @Override
-    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
-        final ArrayList<String> onlineTaskIdList = new ArrayList<>();
-
-        for (Task oTask : onlineTaskList) {
-            onlineTaskIdList.add(oTask.getId());
-        }
-
-        Where<Task> query = new Select().from(Task.class).where(Condition.column("user_id").eq(userID));
-        try {
-            if (query.count() != onlineTaskList.size()) {
-
-                // Load Database Tasks
-                query.async().queryList(new TransactionListener<List<Task>>() {
-                    @Override
-                    public void onResultReceived(List<Task> tasks) {
-
-                        ArrayList<Task> tasksToDelete = new ArrayList<>();
-
-                        for (Task dbTask : tasks) {
-                            if (!onlineTaskIdList.contains(dbTask.getId())) {
-                                tasksToDelete.add(dbTask);
-                            }
-                        }
-
-                        for (Task delTask : tasksToDelete) {
-                            // TaskTag
-                            new Delete().from(TaskTag.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
-
-                            // ChecklistItem
-                            new Delete().from(ChecklistItem.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
-
-                            // Days
-                            new Delete().from(Days.class).where(Condition.column("task_id").eq(delTask.getId())).async().execute();
-
-                            // TASK
-                            delTask.async().delete();
-
-                            EventBus.getDefault().post(new TaskRemovedEvent(delTask.getId()));
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<Task>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<Task>> baseTransaction, List<Task> tasks) {
-                        return tasks != null && tasks.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-
-    @Override
-    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
-        final ArrayList<String> onlineChecklistItemIdList = new ArrayList<>();
-
-        for (ChecklistItem item : onlineChecklistItems) {
-            onlineChecklistItemIdList.add(item.getId());
-        }
-
-        From<ChecklistItem> query = new Select().from(ChecklistItem.class);
-        try {
-            if (query.count() != onlineChecklistItems.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<ChecklistItem>>() {
-                    @Override
-                    public void onResultReceived(List<ChecklistItem> items) {
-
-                        ArrayList<ChecklistItem> checkListItemsToDelete = new ArrayList<>();
-
-                        for (ChecklistItem chItem : items) {
-                            if (!onlineChecklistItemIdList.contains(chItem.getId())) {
-                                checkListItemsToDelete.add(chItem);
-                            }
-                        }
-
-                        for (ChecklistItem chItem : checkListItemsToDelete) {
-                            chItem.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<ChecklistItem>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<ChecklistItem>> baseTransaction, List<ChecklistItem> items) {
-                        return items != null && items.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-
-    @Override
-    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
-        final ArrayList<String> onlineTaskTagItemIdList = new ArrayList<>();
-
-        for (TaskTag item : onlineTaskTags) {
-            onlineTaskTagItemIdList.add(item.getId());
-        }
-
-        From<TaskTag> query = new Select().from(TaskTag.class);
-        try {
-            if (query.count() != onlineTaskTags.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<TaskTag>>() {
-                    @Override
-                    public void onResultReceived(List<TaskTag> items) {
-
-                        ArrayList<TaskTag> checkListItemsToDelete = new ArrayList<>();
-
-                        for (TaskTag ttag : items) {
-                            if (!onlineTaskTagItemIdList.contains(ttag.getId())) {
-                                checkListItemsToDelete.add(ttag);
-                            }
-                        }
-
-                        for (TaskTag ttag : checkListItemsToDelete) {
-                            ttag.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<TaskTag>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<TaskTag>> baseTransaction, List<TaskTag> items) {
-                        return items != null && items.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-
-    @Override
-    public void removeOldReminders(List<RemindersItem> onlineReminders) {
-        final ArrayList<String> onlineReminderIds = new ArrayList<>();
-
-        for (RemindersItem item : onlineReminders) {
-            onlineReminderIds.add(item.getId());
-        }
-
-        From<RemindersItem> query = new Select().from(RemindersItem.class);
-        try {
-            if (query.count() != onlineReminders.size()) {
-
-                // Load Database Checklist items
-                query.async().queryList(new TransactionListener<List<RemindersItem>>() {
-                    @Override
-                    public void onResultReceived(List<RemindersItem> items) {
-
-                        ArrayList<RemindersItem> remindersToDelete = new ArrayList<>();
-
-                        for (RemindersItem reminder : items) {
-                            if (!onlineReminderIds.contains(reminder.getId())) {
-                                remindersToDelete.add(reminder);
-                            }
-                        }
-
-                        for (RemindersItem reminder : remindersToDelete) {
-                            reminder.async().delete();
-                        }
-                    }
-
-                    @Override
-                    public boolean onReady(BaseTransaction<List<RemindersItem>> baseTransaction) {
-                        return false;
-                    }
-
-                    @Override
-                    public boolean hasResult(BaseTransaction<List<RemindersItem>> baseTransaction, List<RemindersItem> items) {
-                        return items != null && items.size() > 0;
-                    }
-                });
-            }
-        } catch (SQLiteDoneException ignored) {
-            //Ignored
-        }
-    }
-
-    @Override
-    public void deleteTask(String taskID) {
-        getTask(taskID).subscribe(Task::delete, throwable -> {});
-    }
-
-    private List<Task> sortTasks(TaskList taskList, List<String> taskOrder) {
-        List<Task> taskResult = new ArrayList<>();
-        int position = 0;
-
-        for (String taskId : taskOrder) {
-            Task task = taskList.tasks.get(taskId);
-            if (task != null) {
-                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/DbFlowTutorialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTutorialLocalRepository.java
index b45508286..1c7077539 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTutorialLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTutorialLocalRepository.java
@@ -7,6 +7,7 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.util.List;
 
+import io.realm.Realm;
 import rx.Observable;
 
 public class DbFlowTutorialLocalRepository implements TutorialLocalRepository {
@@ -15,6 +16,11 @@ public class DbFlowTutorialLocalRepository implements TutorialLocalRepository {
 
     }
 
+    @Override
+    public void executeTransaction(Realm.Transaction transaction) {
+
+    }
+
     @Override
     public Observable<TutorialStep> getTutorialStep(String key) {
         return Observable.defer(() -> Observable.just(new Select().from(TutorialStep.class).where(Condition.column("key").eq(key)).querySingle()));
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
index deee4f042..bb3ffb55b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
@@ -11,6 +11,7 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.realm.Realm;
 import rx.Observable;
 
 public class DbFlowUserLocalRepository implements UserLocalRepository {
@@ -19,6 +20,11 @@ public class DbFlowUserLocalRepository implements UserLocalRepository {
 
     }
 
+    @Override
+    public void executeTransaction(Realm.Transaction transaction) {
+
+    }
+
     @Override
     public Observable<HabitRPGUser> getUser(String userID) {
         return Observable.defer(() -> Observable.just(new Select()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
new file mode 100644
index 000000000..e3a908a62
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
@@ -0,0 +1,24 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.BaseLocalRepository;
+
+import io.realm.Realm;
+
+abstract class RealmBaseLocalRepository implements BaseLocalRepository {
+
+    Realm realm;
+
+    RealmBaseLocalRepository(Realm realm) {
+        this.realm = realm;
+    }
+
+    @Override
+    public void close() {
+        realm.close();
+    }
+
+    @Override
+    public void executeTransaction(Realm.Transaction transaction) {
+        realm.executeTransaction(transaction);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java
new file mode 100644
index 000000000..b5c7ed2b6
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java
@@ -0,0 +1,27 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.TagLocalRepository;
+import com.habitrpg.android.habitica.models.Tag;
+
+import java.util.List;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import rx.Observable;
+
+
+public class RealmTagLocalRepository extends RealmBaseLocalRepository implements TagLocalRepository {
+    public RealmTagLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public Observable<RealmResults<Tag>> getTags(String userId) {
+        return realm.where(Tag.class).equalTo("userId", userId).findAll().asObservable();
+    }
+
+    @Override
+    public void removeOldTags(List<Tag> onlineTags) {
+
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
new file mode 100644
index 000000000..da2dc33c3
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
@@ -0,0 +1,92 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+
+import java.util.List;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import rx.Observable;
+
+public class RealmTaskLocalRepository extends RealmBaseLocalRepository implements TaskLocalRepository {
+
+    public RealmTaskLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public Observable<RealmResults<Task>> getTasks(String taskType, String userID) {
+        return realm.where(Task.class).equalTo("type", taskType).equalTo("userId", userID).findAllSorted("position").asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Task>> getTasks(String userId) {
+        return realm.where(Task.class).equalTo("userId", userId).findAll().asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public void saveTasks(TasksOrder tasksOrder, TaskList tasks) {
+        realm.executeTransaction(realm1 -> realm1.copyToRealm(tasks.tasks.values()));
+    }
+
+    @Override
+    public void saveTask(Task task) {
+        realm.executeTransaction(realm1 -> realm1.copyToRealm(task));
+    }
+
+    @Override
+    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
+
+    }
+
+    @Override
+    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
+
+    }
+
+    @Override
+    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
+
+    }
+
+    @Override
+    public void removeOldReminders(List<RemindersItem> onlineReminders) {
+
+    }
+
+    @Override
+    public void deleteTask(String taskID) {
+        Task task = realm.where(Task.class).equalTo("id", taskID).findFirst();
+        realm.executeTransaction(realm1 -> task.deleteFromRealm());
+    }
+
+    @Override
+    public Observable<Task> getTask(String taskId) {
+        return realm.where(Task.class).equalTo("id", taskId).findFirst().asObservable();
+    }
+
+    @Override
+    public Observable<Task> getTaskCopy(String taskId) {
+        return getTask(taskId)
+                .map(realm::copyFromRealm);
+    }
+
+    @Override
+    public void markTaskCompleted(String taskId, boolean isCompleted) {
+        Task task = realm.where(Task.class).equalTo("id", taskId).findFirst();
+        realm.executeTransaction(realm1 -> task.completed = true);
+    }
+
+    @Override
+    public void saveReminder(RemindersItem remindersItem) {
+        realm.executeTransaction(realm1 -> realm1.copyToRealm(remindersItem));
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
index 629363d42..519b3469e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
@@ -212,7 +212,7 @@ public class TaskAlarmManager {
 
         setAlarm(context, cal.getTimeInMillis(), sender);
 
-        remindersItem.save();
+        taskRepository.saveReminder(remindersItem);
     }
 
     private void removeAlarmForRemindersItem(RemindersItem remindersItem) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
index c8498046c..b9d9d6409 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
@@ -1,57 +1,28 @@
 package com.habitrpg.android.habitica.models;
 
-import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ModelContainer;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.util.List;
 
+import io.realm.RealmList;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
 /**
  * Description of a Tag in HabitRPG
  * Created by MagicMicky on 16/03/14.
  */
 
-@ModelContainer
-@Table(databaseName = HabitDatabase.NAME)
-public class Tag extends BaseModel {
+public class Tag extends RealmObject {
 
-    @Column
     @PrimaryKey
-    @NotNull
     public String id;
 
-    @Column
-    @NotNull
-    public String user_id;
-    public List<TaskTag> tasks;
-    @Column
+    public String userId;
+    public RealmList<TaskTag> tasks;
     String name;
 
-    public Tag() {
-        this(null, null);
-    }
-
-    public Tag(String id, String name) {
-        this.setId(id);
-        this.setName(name);
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tasks")
     public List<TaskTag> getTasks() {
-        if (tasks == null) {
-            tasks = new Select()
-                    .from(TaskTag.class)
-                    .where(Condition.column("tag_id").eq(this.id)).and(Condition.column("task_id").isNotNull())
-                    .queryList();
-        }
         return tasks;
     }
 
@@ -71,15 +42,6 @@ public class Tag extends BaseModel {
         this.id = id;
     }
 
-    @Override
-    public void delete() {
-        if (getTasks() != null) {
-            for (TaskTag tt : getTasks()) {
-                tt.delete();
-            }
-        }
-        super.delete();
-    }
 
     @Override
     public boolean equals(Object o) {
@@ -89,12 +51,4 @@ public class Tag extends BaseModel {
         }
         return super.equals(o);
     }
-
-    @Override
-    public void save() {
-        if (user_id == null) {
-            return;
-        }
-        super.save();
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java
index c3ff5255c..c2593ea3f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/ChecklistItem.java
@@ -1,37 +1,18 @@
 package com.habitrpg.android.habitica.models.tasks;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.database.ExcludeCheckListItem;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-import com.raizlabs.android.dbflow.structure.container.ForeignKeyContainer;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * Created by viirus on 06/07/15.
  */
-@Table(databaseName = HabitDatabase.NAME)
-public class ChecklistItem extends BaseModel {
+public class ChecklistItem extends RealmObject {
 
-    @Column
-    @ForeignKey(
-            references = {@ForeignKeyReference(columnName = "task_id",
-                    columnType = String.class,
-                    foreignColumnName = "id")},
-            saveForeignKeyModel = false)
-    @ExcludeCheckListItem
-    ForeignKeyContainer<Task> task;
-    @Column
+    Task task;
     @PrimaryKey
     private String id;
-    @Column
     private String text;
-    @Column
     private boolean completed;
-    @Column
     private int position;
 
     public ChecklistItem() {
@@ -91,24 +72,10 @@ public class ChecklistItem extends BaseModel {
     }
 
     public Task getTask() {
-        if (task != null) {
-            return task.toModel();
-        } else {
-            return null;
-        }
+        return task;
     }
 
     public void setTask(Task task) {
-        this.task = new ForeignKeyContainer<>(Task.class);
-        this.task.setModel(task);
-        this.task.put("id", task.id);
-    }
-
-    @Override
-    public void save() {
-        if (this.getId() == null || this.getId().isEmpty()) {
-            return;
-        }
-        super.save();
+        this.task = task;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
index 81334fd5e..9fe5dc905 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
@@ -1,26 +1,18 @@
 package com.habitrpg.android.habitica.models.tasks;
 
 import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ModelContainer;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * Created by viirus on 06/07/15.
  */
-@ModelContainer
-@Table(databaseName = HabitDatabase.NAME)
-public class Days extends BaseModel {
+public class Days extends RealmObject {
 
-    @Column
     @PrimaryKey
-    @NotNull
     String task_id;
 
-    @Column
     private boolean m, t, w, th, f, s, su;
 
     public Days() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java
index ae849056c..1e960a0e8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/RemindersItem.java
@@ -1,44 +1,19 @@
 package com.habitrpg.android.habitica.models.tasks;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.database.ExcludeCheckListItem;
-import com.habitrpg.android.habitica.events.ReminderDeleteEvent;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-import com.raizlabs.android.dbflow.structure.container.ForeignKeyContainer;
-
-import org.greenrobot.eventbus.EventBus;
-
 import java.util.Date;
-import java.util.List;
+
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * Created by keithholliday on 5/31/16.
  */
-@Table(databaseName = HabitDatabase.NAME)
-public class RemindersItem extends BaseModel {
-    @Column
-    @ForeignKey(
-            references = {@ForeignKeyReference(columnName = "task_id",
-                    columnType = String.class,
-                    foreignColumnName = "id")},
-            saveForeignKeyModel = false)
-    @ExcludeCheckListItem
-    ForeignKeyContainer<Task> task;
-    @Column
+public class RemindersItem extends RealmObject {
+    Task task;
     @PrimaryKey
     private String id;
-    @Column
     private Date startDate;
-    @Column
     private Date time;
-    @Column
     private Integer alarmId;
 
     //Use to store task type before a task is created
@@ -77,29 +52,11 @@ public class RemindersItem extends BaseModel {
     }
 
     public Task getTask() {
-        if (task != null) {
-            //This will get all the task info
-            Task taskModel = task.toModel();
-
-            if (taskModel.getId() == null) {
-                return taskModel;
-            }
-
-            List<Task> task = new Select()
-                    .from(Task.class)
-                    .where(Condition.column("id").eq(taskModel.getId()))
-                    .queryList();
-
-            return task.get(0);
-        } else {
-            return null;
-        }
+        return task;
     }
 
     public void setTask(Task task) {
-        this.task = new ForeignKeyContainer<>(Task.class);
-        this.task.setModel(task);
-        this.task.put("id", task.getId());
+        this.task = task;
     }
 
     public String getType() {
@@ -109,20 +66,4 @@ public class RemindersItem extends BaseModel {
     public void setType(String type) {
         this.type = type;
     }
-
-    @Override
-    public void save() {
-        if (this.getId() == null) {
-            return;
-        }
-        super.save();
-    }
-
-    @Override
-    public void delete() {
-        ReminderDeleteEvent event = new ReminderDeleteEvent();
-        event.reminder = this;
-        EventBus.getDefault().post(event);
-        super.delete();
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
index 4bd93b30d..c2dcbeb5f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
@@ -3,21 +3,9 @@ package com.habitrpg.android.habitica.models.tasks;
 import android.support.annotation.Nullable;
 
 import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.TaskDeleteEvent;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.ModelContainer;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -28,12 +16,12 @@ import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-/**
- * Created by viirus on 10/08/15.
- */
-@ModelContainer
-@Table(databaseName = HabitDatabase.NAME)
-public class Task extends BaseModel {
+import io.realm.RealmList;
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
+
+public class Task extends RealmObject {
     public static final String TYPE_HABIT = "habit";
     public static final String TYPE_TODO = "todo";
     public static final String TYPE_DAILY = "daily";
@@ -51,58 +39,36 @@ public class Task extends BaseModel {
     public static final String ATTRIBUTE_CONSTITUTION = "con";
     public static final String ATTRIBUTE_INTELLIGENCE = "int";
     public static final String ATTRIBUTE_PERCEPTION = "per";
-    @Column
-    @SerializedName("userId")
-    public String user_id;
-    @Column
+    public String userId;
     public Float priority;
-    @Column
     public String text, notes, attribute, type;
-    @Column
     public double value;
-    public List<TaskTag> tags;
-    @Column
+    public RealmList<TaskTag> tags;
     public Date dateCreated;
-    @Column
     public int position;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "group_id",
-            columnType = String.class,
-            foreignColumnName = "task_id")})
     public TaskGroupPlan group;
     //Habits
-    @Column
     public Boolean up, down;
     //todos/dailies
-    @Column
     public boolean completed;
-    public List<ChecklistItem> checklist;
-    public List<RemindersItem> reminders;
+    public RealmList<ChecklistItem> checklist;
+    public RealmList<RemindersItem> reminders;
     //dailies
-    @Column
     public String frequency;
-    @Column
     public Integer everyX, streak;
-    @Column
-    public
-    Date startDate;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "days_id",
-            columnType = String.class,
-            foreignColumnName = "task_id")})
+    public Date startDate;
     public Days repeat;
     //todos
-    @Column
     @SerializedName("date")
     public Date duedate;
     //TODO: private String lastCompleted;
     // used for buyable items
     public String specialTag;
+    @Ignore
     public CharSequence parsedText;
+    @Ignore
     public CharSequence parsedNotes;
-    @Column
     @PrimaryKey
-    @NotNull
     @SerializedName("_id")
     String id;
 
@@ -198,25 +164,15 @@ public class Task extends BaseModel {
         this.type = type;
     }
 
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tags")
     public List<TaskTag> getTags() {
-        if (tags == null) {
-            tags = new Select()
-                    .from(TaskTag.class)
-                    .where(Condition.column("task_id").eq(this.id))
-                    .queryList();
-        }
         return tags;
     }
 
-    public void setTags(List<TaskTag> tags) {
-        for (TaskTag tag : tags) {
-            tag.setTask(this);
-        }
+    public void setTags(RealmList<TaskTag> tags) {
         this.tags = tags;
     }
 
-    public boolean containsAnyTagId(ArrayList<String> tagIdList) {
+    public boolean containsAnyTagId(List<String> tagIdList) {
         getTags();
 
         for (TaskTag t : tags) {
@@ -231,7 +187,7 @@ public class Task extends BaseModel {
     public boolean containsAllTagIds(List<String> tagIdList) {
         getTags();
 
-        ArrayList<String> allTagIds = new ArrayList<String>();
+        List<String> allTagIds = new ArrayList<String>();
 
         for (TaskTag t : tags) {
             allTagIds.add(t.getTag().getId());
@@ -287,41 +243,19 @@ public class Task extends BaseModel {
     }
 
 
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "checklist")
     public List<ChecklistItem> getChecklist() {
-        if (this.checklist == null) {
-            this.checklist = new Select()
-                    .from(ChecklistItem.class)
-                    .where(Condition.column("task_id").eq(this.id))
-                    .orderBy(true, "position")
-                    .queryList();
-        }
         return this.checklist;
     }
 
-    public void setChecklist(List<ChecklistItem> checklist) {
-        for (ChecklistItem checklistItem : checklist) {
-            checklistItem.setTask(this);
-        }
+    public void setChecklist(RealmList<ChecklistItem> checklist) {
         this.checklist = checklist;
     }
 
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "reminders")
     public List<RemindersItem> getReminders() {
-        if (this.reminders == null) {
-            this.reminders = new Select()
-                    .from(RemindersItem.class)
-                    .where(Condition.column("task_id").eq(this.id))
-                    .orderBy(true, "time")
-                    .queryList();
-        }
         return this.reminders;
     }
 
-    public void setReminders(List<RemindersItem> reminders) {
-        for (RemindersItem remindersItem : reminders) {
-            remindersItem.setTask(this);
-        }
+    public void setReminders(RealmList<RemindersItem> reminders) {
         this.reminders = reminders;
     }
 
@@ -434,79 +368,6 @@ public class Task extends BaseModel {
         this.attribute = attribute;
     }
 
-
-    @Override
-    public void save() {
-        if (this.getId() == null || this.getId().length() == 0) {
-            return;
-        }
-
-        List<TaskTag> tmpTags = tags;
-        List<ChecklistItem> tmpChecklist = checklist;
-        List<RemindersItem> tmpReminders = reminders;
-
-        // remove them, so that the database don't add empty entries
-
-        tags = null;
-        checklist = null;
-        reminders = null;
-
-        if (repeat != null) {
-            repeat.task_id = this.id;
-        }
-
-        if (group != null) {
-            group.task_id = this.id;
-        }
-
-        super.save();
-
-        tags = tmpTags;
-        checklist = tmpChecklist;
-        reminders = tmpReminders;
-
-        if (this.tags != null) {
-            for (TaskTag tag : this.tags) {
-                tag.setTask(this);
-                tag.async().save();
-            }
-        }
-
-        int position = 0;
-        if (this.checklist != null) {
-            for (ChecklistItem item : this.checklist) {
-                if (item.getTask() == null) {
-                    item.setTask(this);
-                }
-                item.setPosition(position);
-                item.async().save();
-                position++;
-            }
-        }
-
-        int index = 0;
-        if (this.reminders != null) {
-            for (RemindersItem item : this.reminders) {
-                if (item.getTask() == null) {
-                    item.setTask(this);
-                }
-                if (item.getId() == null) {
-                    item.setId(this.id + "task-reminder" + index);
-                }
-                item.async().save();
-                index++;
-            }
-        }
-    }
-
-    @Override
-    public void update() {
-        if (this.getId() == null || this.getId().length() == 0) {
-            return;
-        }
-        super.update();
-    }
-
     public int getLightTaskColor() {
         if (this.value < -20)
             return R.color.worst_100;
@@ -647,14 +508,6 @@ public class Task extends BaseModel {
         return newTime.getTime();
     }
 
-    @Override
-    public void delete() {
-        TaskDeleteEvent event = new TaskDeleteEvent();
-        event.task = this;
-        EventBus.getDefault().post(event);
-        super.delete();
-    }
-
     public boolean isGroupTask() {
         if (group != null) {
             if (group.approvalRequired) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java
index ccd58bbee..f03dddbbb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskGroupPlan.java
@@ -1,23 +1,13 @@
 package com.habitrpg.android.habitica.models.tasks;
 
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ModelContainer;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
-@ModelContainer
-@Table(databaseName = HabitDatabase.NAME)
-public class TaskGroupPlan extends BaseModel {
+public class TaskGroupPlan extends RealmObject {
 
-    @Column
     @PrimaryKey
-    @NotNull
     String task_id;
 
-    @Column
     public boolean approvalRequested, approvalApproved, approvalRequired;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
index 736c8ac84..231261fa9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/TaskTag.java
@@ -1,36 +1,19 @@
 package com.habitrpg.android.habitica.models.tasks;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.Tag;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-import com.raizlabs.android.dbflow.structure.container.ForeignKeyContainer;
 
+import com.habitrpg.android.habitica.models.Tag;
+
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * Created by viirus on 08/08/15.
  */
 
-@Table(databaseName = HabitDatabase.NAME)
-public class TaskTag extends BaseModel {
+public class TaskTag extends RealmObject {
 
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "tag_id",
-            columnType = String.class,
-            foreignColumnName = "id")},
-            saveForeignKeyModel = false)
-    public ForeignKeyContainer<Tag> tag;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "task_id",
-            columnType = String.class,
-            foreignColumnName = "id")},
-            saveForeignKeyModel = false)
-    public ForeignKeyContainer<Task> task;
-    @Column
+    public Tag tag;
+    public Task task;
     @PrimaryKey
     String id;
     private String tagId = "";
@@ -45,26 +28,21 @@ public class TaskTag extends BaseModel {
     }
 
     public Tag getTag() {
-        return tag.toModel();
+        return tag;
     }
 
     public void setTag(Tag tag) {
-        this.tag = new ForeignKeyContainer<>(Tag.class);
-        this.tag.setModel(tag);
-        this.tag.put("id", tag.id);
-
+        this.tag = tag;
         tagId = tag.id;
         updatePrimaryKey();
     }
 
     public Task getTask() {
-        return task.toModel();
+        return task;
     }
 
     public void setTask(Task task) {
-        this.task = new ForeignKeyContainer<>(Task.class);
-        this.task.setModel(task);
-        this.task.put("id", task.id);
+        this.task = task;
 
         taskId = task.id;
         updatePrimaryKey();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
index 37f8fc547..dff20ff7e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
@@ -31,13 +31,8 @@ import java.util.Map;
 @Table(databaseName = HabitDatabase.NAME)
 public class HabitRPGUser extends BaseModel {
 
-    List<Task> dailys;
-    List<Task> todos;
-    List<Task> rewards;
-    List<Task> habits;
     List<Challenge> challengeList;
 
-    List<Tag> tags;
     @Column
     @PrimaryKey
     @SerializedName("_id")
@@ -239,85 +234,6 @@ public class HabitRPGUser extends BaseModel {
         this.purchased = purchased;
     }
 
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "habits")
-    public List<Task> getHabits() {
-        if (habits == null) {
-            habits = new Select()
-                    .from(Task.class)
-                    .where(Condition.column("type").eq("habit"))
-                    .and(Condition.column("user_id").eq(this.id))
-                    .queryList();
-        }
-        return habits;
-    }
-
-    public void setHabits(List<Task> habits) {
-        this.habits = habits;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "dailys")
-    public List<Task> getDailys() {
-        if (dailys == null) {
-            dailys = new Select()
-                    .from(Task.class)
-                    .where(Condition.column("type").eq("daily"))
-                    .and(Condition.column("user_id").eq(this.id))
-                    .queryList();
-        }
-        return dailys;
-    }
-
-    public void setDailys(List<Task> dailys) {
-        this.dailys = dailys;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "todos")
-    public List<Task> getTodos() {
-        if (todos == null) {
-            todos = new Select()
-                    .from(Task.class)
-                    .where(Condition.column("type").eq("todo"))
-                    .and(Condition.column("user_id").eq(this.id))
-                    .queryList();
-        }
-        return todos;
-    }
-
-    public void setTodos(List<Task> todos) {
-        this.todos = todos;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "rewards")
-    public List<Task> getRewards() {
-        if (rewards == null) {
-            rewards = new Select()
-                    .from(Task.class)
-                    .where(Condition.column("type").eq("reward"))
-                    .and(Condition.column("user_id").eq(this.id))
-                    .queryList();
-        }
-        return rewards;
-    }
-
-    public void setRewards(List<Task> rewards) {
-        this.rewards = rewards;
-    }
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tags")
-    public List<Tag> getTags() {
-        if (tags == null) {
-            tags = new Select()
-                    .from(Tag.class)
-                    .where(Condition.column("user_id").eq(this.id))
-                    .queryList();
-        }
-        return tags;
-    }
-
-    public void setTags(List<Tag> tags) {
-        this.tags = tags;
-    }
-
     public Flags getFlags() {
         return flags;
     }
@@ -353,7 +269,7 @@ public class HabitRPGUser extends BaseModel {
 
     @Override
     public void save() {
-        // We need to set the user_id to all other objects
+        // We need to set the userId to all other objects
         if (id == null) {
             return;
         }
@@ -376,31 +292,6 @@ public class HabitRPGUser extends BaseModel {
             invitations.user_id = id;
         }
 
-
-        ArrayList<Task> allTasks = new ArrayList<Task>();
-        if (dailys != null) {
-            allTasks.addAll(dailys);
-        }
-        if (todos != null) {
-            allTasks.addAll(todos);
-        }
-        if (habits != null) {
-            allTasks.addAll(habits);
-        }
-        if (rewards != null) {
-            allTasks.addAll(rewards);
-        }
-
-        for (Task t : allTasks) {
-            t.user_id = id;
-        }
-
-        if (tags != null) {
-            for (Tag t : tags) {
-                t.user_id = id;
-            }
-        }
-
         List<Challenge> challenges = getChallengeList();
         List<Challenge> newChallenges = new ArrayList<>();
         if (getChallenges() != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
index 47227826b..c0b4e8c9d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
@@ -34,15 +34,17 @@ import com.habitrpg.android.habitica.data.local.implementation.DbFlowCustomizati
 import com.habitrpg.android.habitica.data.local.implementation.DbFlowFAQLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.DbFlowInventoryLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.DbFlowSocialLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowTagLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowTaskLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.DbFlowTutorialLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.DbFlowUserLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.RealmTagLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.RealmTaskLocalRepository;
 
 import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
+import io.realm.Realm;
+import io.realm.RealmConfiguration;
 
 @Module
 public class RepositoryModule {
@@ -50,12 +52,16 @@ public class RepositoryModule {
     @Provides
     SetupCustomizationRepository providesSetupCustomizationRepository(Context context) {
         return new SetupCustomizationRepositoryImpl(context);
-
     }
 
     @Provides
-    TaskLocalRepository providesTaskLocalRepository() {
-        return new DbFlowTaskLocalRepository();
+    Realm providesRealm(Context context) {
+        return Realm.getDefaultInstance();
+    }
+
+    @Provides
+    TaskLocalRepository providesTaskLocalRepository(Realm realm) {
+        return new RealmTaskLocalRepository(realm);
     }
 
     @Provides
@@ -65,8 +71,8 @@ public class RepositoryModule {
     }
 
     @Provides
-    TagLocalRepository providesTagLocalRepository() {
-        return new DbFlowTagLocalRepository();
+    TagLocalRepository providesTagLocalRepository(Realm realm) {
+        return new RealmTagLocalRepository(realm);
     }
 
     @Provides
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 b87d04239..e1d4f2c7d 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
@@ -96,10 +96,7 @@ import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.habitrpg.android.habitica.models.shops.Shop;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
 import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.habitrpg.android.habitica.models.user.Preferences;
 import com.habitrpg.android.habitica.models.user.SpecialItems;
@@ -129,7 +126,6 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -229,8 +225,11 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     // endregion
 
+    @Nullable
     private Drawer drawer;
+    @Nullable
     private AccountHeader accountHeader;
+    @Nullable
     private BaseMainFragment activeFragment;
     private AvatarWithBarsViewModel avatarInHeader;
     private AlertDialog faintDialog;
@@ -266,12 +265,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             return;
         }
 
-        userRepository.getUser(hostConfig.getUser())
-                .subscribe(newUser -> {
-                    MainActivity.this.user = newUser;
-                    MainActivity.this.setUserData(true);
-                }, throwable -> {});
-
         setupToolbar(toolbar);
 
         avatarInHeader = new AvatarWithBarsViewModel(this, avatar_with_bars);
@@ -292,6 +285,12 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             avatar_with_bars.setPadding((int)px, getStatusBarHeight(), (int)px, 0);
         }
 
+        userRepository.getUser(hostConfig.getUser())
+                .subscribe(newUser -> {
+                    MainActivity.this.user = newUser;
+                    MainActivity.this.setUserData(true);
+                }, throwable -> {});
+
         EventBus.getDefault().register(this);
     }
 
@@ -455,13 +454,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
                     // multiple crashes because user is null
                     if (user != null) {
-                        ArrayList<Task> allTasks = new ArrayList<>();
-                        allTasks.addAll(user.getDailys());
-                        allTasks.addAll(user.getTodos());
-                        allTasks.addAll(user.getHabits());
-                        allTasks.addAll(user.getRewards());
 
-                        taskRepository.removeOldTasks(user.getId(), allTasks);
+                        /*taskRepository.removeOldTasks(user.getId(), allTasks);
 
                         ArrayList<ChecklistItem> allChecklistItems = new ArrayList<>();
                         for (Task t : allTasks) {
@@ -487,7 +481,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                         }
                         taskRepository.removeOldReminders(allReminders);
 
-                        tagRepository.removeOldTags(user.getTags());
+                        tagRepository.removeOldTags(user.getTags());*/
 
                         inventoryRepository.updateOwnedEquipment(user);
                     }
@@ -521,17 +515,20 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     }
 
     private void updateUserAvatars() {
-        avatarInHeader.updateData(user);
+        if (avatarInHeader != null) {
+            avatarInHeader.updateData(user);
+        }
     }
 
     private void updateHeader() {
         updateUserAvatars();
         setTranslatedFragmentTitle(activeFragment);
 
-        android.support.v7.app.ActionBarDrawerToggle actionBarDrawerToggle = drawer.getActionBarDrawerToggle();
-
-        if (actionBarDrawerToggle != null) {
-            actionBarDrawerToggle.setDrawerIndicatorEnabled(true);
+        if (drawer != null) {
+            android.support.v7.app.ActionBarDrawerToggle actionBarDrawerToggle = drawer.getActionBarDrawerToggle();
+            if (actionBarDrawerToggle != null) {
+                actionBarDrawerToggle.setDrawerIndicatorEnabled(true);
+            }
         }
     }
 
@@ -1148,16 +1145,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                 });
     }
 
-    @Subscribe
-    public void onEvent(final TaskSaveEvent event) {
-        Task task = event.task;
-        if (event.created) {
-            this.taskRepository.createTask(task).subscribe(task1 -> {}, throwable -> {});
-        } else {
-            this.taskRepository.updateTask(task).subscribe(task1 -> {}, throwable -> {});
-        }
-    }
-
     private void checkMaintenance() {
         this.maintenanceService.getMaintenanceStatus()
                 .compose(apiClient.configureApiCallObserver())
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 20bfbd0b8..c4b5f428e 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
@@ -78,6 +78,10 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import io.realm.Realm;
+import io.realm.RealmList;
+import io.realm.RealmObject;
+import rx.Observable;
 
 public class TaskFormActivity extends BaseActivity implements AdapterView.OnItemSelectedListener {
     public static final String TASK_ID_KEY = "taskId";
@@ -246,7 +250,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
                 .setTitle(getString(R.string.taskform_delete_title))
                 .setMessage(getString(R.string.taskform_delete_message)).setPositiveButton(getString(R.string.yes), (dialog, which) -> {
                     if (task != null) {
-                        task.delete();
+                        taskRepository.deleteTask(task.getId());
                     }
 
                     finish();
@@ -322,7 +326,9 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
         }
 
         if (taskId != null) {
-            taskRepository.getTask(taskId).subscribe(task -> {
+            taskRepository.getTask(taskId)
+                    .first()
+                    .subscribe(task -> {
                 this.task = task;
                 if (task != null) {
                     populate(task);
@@ -732,113 +738,128 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
     }
 
     private boolean saveTask(Task task) {
-        task.text = MarkdownParser.parseCompiled(taskText.getText());
 
-        if (checklistAdapter != null) {
-            if (checklistAdapter.getCheckListItems() != null) {
-                task.setChecklist(checklistAdapter.getCheckListItems());
-            }
-        }
-
-        if (remindersAdapter != null) {
-            if (remindersAdapter.getRemindersItems() != null) {
-                task.setReminders(remindersAdapter.getRemindersItems());
-            }
-        }
-
-        if (task.text.isEmpty()) {
+        String text = MarkdownParser.parseCompiled(taskText.getText());
+        if (text == null || text.isEmpty()) {
             return false;
         }
 
-        task.notes = MarkdownParser.parseCompiled(taskNotes.getText());
+        taskRepository.executeTransaction(realm -> {
+            task.text = text;
 
-        if (this.taskDifficultySpinner.getSelectedItemPosition() == 0) {
-            task.setPriority((float) 0.1);
-        } else if (this.taskDifficultySpinner.getSelectedItemPosition() == 1) {
-            task.setPriority((float) 1.0);
-        } else if (this.taskDifficultySpinner.getSelectedItemPosition() == 2) {
-            task.setPriority((float) 1.5);
-        } else if (this.taskDifficultySpinner.getSelectedItemPosition() == 3) {
-            task.setPriority((float) 2.0);
-        }
-
-        if (TextUtils.isEmpty(allocationMode) || !allocationMode.equals("taskbased")) {
-            task.setAttribute(Task.ATTRIBUTE_STRENGTH);
-        } else {
-            switch (this.taskAttributeSpinner.getSelectedItemPosition()) {
-                case 0:
-                    task.setAttribute(Task.ATTRIBUTE_STRENGTH);
-                    break;
-                case 1:
-                    task.setAttribute(Task.ATTRIBUTE_INTELLIGENCE);
-                    break;
-                case 2:
-                    task.setAttribute(Task.ATTRIBUTE_CONSTITUTION);
-                    break;
-                case 3:
-                    task.setAttribute(Task.ATTRIBUTE_PERCEPTION);
-                    break;
+            if (checklistAdapter != null) {
+                if (checklistAdapter.getCheckListItems() != null) {
+                    for (ChecklistItem item : task.getChecklist()) {
+                        item.setText(checklistAdapter.checklistTexts.get(item.getId()));
+                    }
+                }
             }
-        }
 
-        switch (task.type) {
-            case "habit": {
-                task.setUp(positiveCheckBox.isChecked());
-                task.setDown(negativeCheckBox.isChecked());
+            if (remindersAdapter != null) {
+                if (remindersAdapter.getRemindersItems() != null) {
+                    task.getReminders().addAll(remindersAdapter.getRemindersItems());
+                }
             }
-            break;
 
-            case "daily": {
-                task.setStartDate(new Date(startDateListener.getCalendar().getTimeInMillis()));
 
-                if (this.dailyFrequencySpinner.getSelectedItemPosition() == 0) {
-                    task.setFrequency("weekly");
-                    Days repeat = task.getRepeat();
-                    if (repeat == null) {
-                        repeat = new Days();
-                        task.setRepeat(repeat);
+            RealmList<TaskTag> taskTags = new RealmList<>();
+            for (Tag tag : selectedTags) {
+                TaskTag tt = new TaskTag();
+                tt.setTag(tag);
+                tt.setTask(task);
+                taskTags.add(tt);
+            }
+            task.setTags(taskTags);
+
+            task.notes = MarkdownParser.parseCompiled(taskNotes.getText());
+
+            if (taskDifficultySpinner.getSelectedItemPosition() == 0) {
+                task.setPriority((float) 0.1);
+            } else if (taskDifficultySpinner.getSelectedItemPosition() == 1) {
+                task.setPriority((float) 1.0);
+            } else if (taskDifficultySpinner.getSelectedItemPosition() == 2) {
+                task.setPriority((float) 1.5);
+            } else if (taskDifficultySpinner.getSelectedItemPosition() == 3) {
+                task.setPriority((float) 2.0);
+            }
+
+            if (TextUtils.isEmpty(allocationMode) || !allocationMode.equals("taskbased")) {
+                task.setAttribute(Task.ATTRIBUTE_STRENGTH);
+            } else {
+                switch (taskAttributeSpinner.getSelectedItemPosition()) {
+                    case 0:
+                        task.setAttribute(Task.ATTRIBUTE_STRENGTH);
+                        break;
+                    case 1:
+                        task.setAttribute(Task.ATTRIBUTE_INTELLIGENCE);
+                        break;
+                    case 2:
+                        task.setAttribute(Task.ATTRIBUTE_CONSTITUTION);
+                        break;
+                    case 3:
+                        task.setAttribute(Task.ATTRIBUTE_PERCEPTION);
+                        break;
+                }
+            }
+
+            switch (task.type) {
+                case "habit": {
+                    task.setUp(positiveCheckBox.isChecked());
+                    task.setDown(negativeCheckBox.isChecked());
+                }
+                break;
+
+                case "daily": {
+                    task.setStartDate(new Date(startDateListener.getCalendar().getTimeInMillis()));
+
+                    if (dailyFrequencySpinner.getSelectedItemPosition() == 0) {
+                        task.setFrequency("weekly");
+                        Days repeat = task.getRepeat();
+                        if (repeat == null) {
+                            repeat = new Days();
+                            task.setRepeat(repeat);
+                        }
+
+                        int offset = firstDayOfTheWeekHelper.getDailyTaskFormOffset();
+                        repeat.setM(weekdayCheckboxes.get(offset).isChecked());
+                        repeat.setT(weekdayCheckboxes.get((offset + 1) % 7).isChecked());
+                        repeat.setW(weekdayCheckboxes.get((offset + 2) % 7).isChecked());
+                        repeat.setTh(weekdayCheckboxes.get((offset + 3) % 7).isChecked());
+                        repeat.setF(weekdayCheckboxes.get((offset + 4) % 7).isChecked());
+                        repeat.setS(weekdayCheckboxes.get((offset + 5) % 7).isChecked());
+                        repeat.setSu(weekdayCheckboxes.get((offset + 6) % 7).isChecked());
+                    } else {
+                        task.setFrequency("daily");
+                        task.setEveryX(frequencyPicker.getValue());
+                    }
+                }
+                break;
+
+                case "todo": {
+                    if (dueDateCheckBox.isChecked()) {
+                        task.setDueDate(new Date(dueDateListener.getCalendar().getTimeInMillis()));
+                    } else {
+                        task.setDueDate(null);
+                    }
+                }
+                break;
+
+                case "reward": {
+                    String value = taskValue.getText().toString();
+                    if (!value.isEmpty()) {
+                        NumberFormat localFormat = DecimalFormat.getInstance(Locale.getDefault());
+                        try {
+                            task.setValue(localFormat.parse(value).doubleValue());
+                        } catch (ParseException e) {
+                        }
+                    } else {
+                        task.setValue(0.0d);
                     }
 
-                    int offset = firstDayOfTheWeekHelper.getDailyTaskFormOffset();
-                    repeat.setM(this.weekdayCheckboxes.get(offset).isChecked());
-                    repeat.setT(this.weekdayCheckboxes.get((offset + 1) % 7).isChecked());
-                    repeat.setW(this.weekdayCheckboxes.get((offset + 2) % 7).isChecked());
-                    repeat.setTh(this.weekdayCheckboxes.get((offset + 3) % 7).isChecked());
-                    repeat.setF(this.weekdayCheckboxes.get((offset + 4) % 7).isChecked());
-                    repeat.setS(this.weekdayCheckboxes.get((offset + 5) % 7).isChecked());
-                    repeat.setSu(this.weekdayCheckboxes.get((offset + 6) % 7).isChecked());
-                } else {
-                    task.setFrequency("daily");
-                    task.setEveryX(this.frequencyPicker.getValue());
                 }
+                break;
             }
-            break;
-
-            case "todo": {
-                if (dueDateCheckBox.isChecked()) {
-                    task.setDueDate(new Date(dueDateListener.getCalendar().getTimeInMillis()));
-                } else {
-                    task.setDueDate(null);
-                }
-            }
-            break;
-
-            case "reward": {
-                String value = taskValue.getText().toString();
-                if (!value.isEmpty()) {
-                    NumberFormat localFormat = DecimalFormat.getInstance(Locale.getDefault());
-                    try {
-                        task.setValue(localFormat.parse(value).doubleValue());
-                    } catch (ParseException e) {
-                    }
-                } else {
-                    task.setValue(0.0d);
-                }
-
-            }
-            break;
-        }
-
+        });
         return true;
     }
 
@@ -858,24 +879,14 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
         }
 
         if (this.saveTask(this.task)) {
-            List<TaskTag> taskTags = new ArrayList<>();
-            for (Tag tag : selectedTags) {
-                TaskTag tt = new TaskTag();
-                tt.setTag(tag);
-                tt.setTask(task);
-                taskTags.add(tt);
-            }
-            //save
-            this.task.setTags(taskTags);
-            this.task.save();
             //send back to other elements.
-            TaskSaveEvent event = new TaskSaveEvent();
+            Observable<Task> observable;
             if (TaskFormActivity.this.task.getId() == null) {
-                event.created = true;
+                observable = taskRepository.createTask(task);
+            } else {
+                observable = taskRepository.updateTask(task);
             }
-
-            event.task = TaskFormActivity.this.task;
-            EventBus.getDefault().post(event);
+            observable.subscribe(task1 -> {}, throwable -> {});
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
index c4c46ffc1..70f99cbfe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
@@ -17,7 +17,9 @@ import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
 import net.pherth.android.emoji_library.EmojiEditText;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -29,21 +31,23 @@ public class CheckListAdapter extends RecyclerView.Adapter<CheckListAdapter.Item
         implements ItemTouchHelperAdapter {
 
     private final List<ChecklistItem> items = new ArrayList<>();
+    public final Map<String, String> checklistTexts = new HashMap<>();
 
     public CheckListAdapter(List<ChecklistItem> checklistItems) {
         items.addAll(checklistItems);
+        for (ChecklistItem item : checklistItems) {
+            checklistTexts.put(item.getId(), item.getText());
+        }
     }
 
     @Override
     public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.checklist_item, parent, false);
-        ItemViewHolder itemViewHolder = new ItemViewHolder(view);
-        return itemViewHolder;
+        return new ItemViewHolder(view);
     }
 
     @Override
     public void onBindViewHolder(final ItemViewHolder holder, int position) {
-        holder.textWatcher.position = position;
         holder.checkListTextView.setText(items.get(position).getText());
     }
 
@@ -116,7 +120,7 @@ public class CheckListAdapter extends RecyclerView.Adapter<CheckListAdapter.Item
 
         private class ChecklistTextWatcher implements TextWatcher {
 
-            public int position;
+            public String id;
 
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -125,7 +129,7 @@ public class CheckListAdapter extends RecyclerView.Adapter<CheckListAdapter.Item
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                items.get(position).setText(checkListTextView.getText().toString());
+                checklistTexts.put(id, checkListTextView.getText().toString());
             }
 
             @Override
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 2c7dc1243..b26088921 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
@@ -7,16 +7,17 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder;
 
-public class DailiesRecyclerViewHolder extends SortableTasksRecyclerViewAdapter<DailyViewHolder> {
+import io.realm.OrderedRealmCollection;
+
+public class DailiesRecyclerViewHolder extends RealmBaseTasksRecyclerViewAdapter<DailyViewHolder> {
 
     public int dailyResetOffset;
 
-    public DailiesRecyclerViewHolder(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
-                                     Context newContext, String userID, int dailyResetOffset,
-                                     @Nullable SortTasksCallback sortTasksCallback) {
-        super(taskType, taskFilterHelper, layoutResource, newContext, userID, sortTasksCallback);
+    public DailiesRecyclerViewHolder(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource, int dailyResetOffset) {
+        super(data, autoUpdate, layoutResource);
         this.dailyResetOffset = dailyResetOffset;
     }
 
@@ -24,10 +25,4 @@ public class DailiesRecyclerViewHolder extends SortableTasksRecyclerViewAdapter<
     public DailyViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         return new DailyViewHolder(getContentView(parent), dailyResetOffset);
     }
-
-
-    @Override
-    protected void injectThis(AppComponent component) {
-        HabiticaBaseApplication.getComponent().inject(this);
-    }
 }
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 2a304cebb..32d5de1fd 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
@@ -7,22 +7,20 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder;
 
-public class HabitsRecyclerViewAdapter extends SortableTasksRecyclerViewAdapter<HabitViewHolder> {
+import io.realm.OrderedRealmCollection;
+
+public class HabitsRecyclerViewAdapter extends RealmBaseTasksRecyclerViewAdapter<HabitViewHolder> {
 
 
-    public HabitsRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource, Context newContext, String userID, @Nullable SortTasksCallback sortCallback) {
-        super(taskType, taskFilterHelper, layoutResource, newContext, userID, sortCallback);
+    public HabitsRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource) {
+        super(data, autoUpdate, layoutResource);
     }
 
     @Override
     public HabitViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         return new HabitViewHolder(getContentView(parent));
     }
-
-    @Override
-    protected void injectThis(AppComponent component) {
-        HabiticaBaseApplication.getComponent().inject(this);
-    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java
new file mode 100644
index 000000000..cf7d50c5e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java
@@ -0,0 +1,43 @@
+package com.habitrpg.android.habitica.ui.adapter.tasks;
+
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
+
+import io.realm.OrderedRealmCollection;
+import io.realm.RealmRecyclerViewAdapter;
+
+public abstract class RealmBaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder> extends RealmRecyclerViewAdapter<Task, VH> {
+
+    private final int layoutResource;
+
+    public RealmBaseTasksRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource) {
+        super(data, autoUpdate);
+        this.layoutResource = layoutResource;
+    }
+
+    @Override
+    public VH onCreateViewHolder(ViewGroup parent, int viewType) {
+        return null;
+    }
+
+    @Override
+    public void onBindViewHolder(VH holder, int position) {
+        Task item = getItem(position);
+        if (item != null) {
+            holder.bindHolder(item, position);
+        }
+    }
+
+    View getContentView(ViewGroup parent) {
+        return getContentView(parent, layoutResource);
+    }
+
+    protected View getContentView(ViewGroup parent, int layoutResource) {
+        return LayoutInflater.from(parent.getContext()).inflate(layoutResource, parent, false);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
index a4195f791..577189063 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
@@ -71,7 +71,6 @@ public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.Item
     @Override
     public void onItemDismiss(int position) {
         if (position >= 0 && position < reminders.size()) {
-            reminders.get(position).async().delete();
             reminders.remove(position);
             notifyItemRemoved(position);
         }
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 594d7372e..740e27340 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
@@ -18,20 +18,22 @@ import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.realm.OrderedRealmCollection;
 import rx.Observable;
 
-public class RewardsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter<RewardViewHolder> {
+public class RewardsRecyclerViewAdapter extends RealmBaseTasksRecyclerViewAdapter<RewardViewHolder> {
 
-    private final InventoryRepository inventoryRepository;
+    private final Context context;
+    private InventoryRepository inventoryRepository;
     @Nullable
-    private final HabitRPGUser user;
+    private HabitRPGUser user;
 
-    public RewardsRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource, Context newContext, @Nullable HabitRPGUser user, InventoryRepository inventoryRepository) {
-        super(taskType, taskFilterHelper, layoutResource, newContext, user != null ? user.getId() : null);
-        this.user = user;
-        this.inventoryRepository = inventoryRepository;
+    public RewardsRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource, Context context) {
+        super(data, autoUpdate, layoutResource);
+        this.context = context;
     }
 
+
     @Override
     public RewardViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         return new RewardViewHolder(getContentView(parent));
@@ -79,21 +81,9 @@ public class RewardsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter<Rew
                         }, throwable -> {}));
                     })
                     .subscribe(items -> {
-                        this.filteredContent.addAll(items);
                         notifyDataSetChanged();
                     }, throwable -> {
                     });
         }
     }
-
-    @Override
-    protected void injectThis(AppComponent component) {
-        HabiticaBaseApplication.getComponent().inject(this);
-    }
-
-    @Override
-    public void setTasks(List<Task> tasks) {
-        super.setTasks(tasks);
-        this.loadEquipmentRewards();
-    }
 }
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 0516b8846..9cbe3acee 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
@@ -7,13 +7,16 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder;
 
-public class TodosRecyclerViewAdapter extends SortableTasksRecyclerViewAdapter<TodoViewHolder> {
+import io.realm.OrderedRealmCollection;
 
-    public TodosRecyclerViewAdapter(String taskType, TaskFilterHelper taskFilterHelper, int layoutResource,
-                                    Context newContext, String userID, @Nullable SortTasksCallback sortCallback) {
-        super(taskType, taskFilterHelper, layoutResource, newContext, userID, sortCallback);
+public class TodosRecyclerViewAdapter extends RealmBaseTasksRecyclerViewAdapter<TodoViewHolder> {
+
+
+    public TodosRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource) {
+        super(data, autoUpdate, layoutResource);
     }
 
     @Override
@@ -21,8 +24,4 @@ public class TodosRecyclerViewAdapter extends SortableTasksRecyclerViewAdapter<T
         return new TodoViewHolder(getContentView(parent));
     }
 
-    @Override
-    protected void injectThis(AppComponent component) {
-        HabiticaBaseApplication.getComponent().inject(this);
-    }
 }
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 040d23323..c172e7d07 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
@@ -19,6 +19,7 @@ import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.events.TaskCreatedEvent;
 import com.habitrpg.android.habitica.events.TaskRemovedEvent;
@@ -34,6 +35,7 @@ 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;
+import com.habitrpg.android.habitica.ui.adapter.tasks.RealmBaseTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter;
@@ -54,6 +56,7 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.realm.RealmList;
 
 /**
  * TaskRecyclerViewFragment
@@ -63,7 +66,7 @@ import butterknife.ButterKnife;
  */
 public class TaskRecyclerViewFragment extends BaseFragment implements View.OnClickListener, SwipeRefreshLayout.OnRefreshListener {
     private static final String CLASS_TYPE_KEY = "CLASS_TYPE_KEY";
-    public BaseTasksRecyclerViewAdapter recyclerAdapter;
+    public RealmBaseTasksRecyclerViewAdapter recyclerAdapter;
     @Inject
     @Named(AppModule.NAMED_USER_ID)
     String userID;
@@ -75,6 +78,8 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     UserRepository userRepository;
     @Inject
     InventoryRepository inventoryRepository;
+    @Inject
+    TaskRepository taskRepository;
 
     LinearLayoutManager layoutManager = null;
 
@@ -147,33 +152,35 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
 
     // TODO needs a bit of cleanup
     public void setInnerAdapter() {
-        int layoutOfType;
         if (this.classType != null) {
-            switch (this.classType) {
-                case Task.TYPE_HABIT:
-                    layoutOfType = R.layout.habit_item_card;
-                    this.recyclerAdapter = new HabitsRecyclerViewAdapter(Task.TYPE_HABIT, taskFilterHelper, layoutOfType, getContext(), userID, sortCallback);
-                    allowReordering();
-                    break;
-                case Task.TYPE_DAILY:
-                    layoutOfType = R.layout.daily_item_card;
-                    int dailyResetOffset = 0;
-                    if (user != null) {
-                        dailyResetOffset = user.getPreferences().getDayStart();
-                    }
-                    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, taskFilterHelper, layoutOfType, getContext(), userID, sortCallback);
-                    allowReordering();
-                    return;
-                case Task.TYPE_REWARD:
-                    layoutOfType = R.layout.reward_item_card;
-                    this.recyclerAdapter = new RewardsRecyclerViewAdapter(Task.TYPE_REWARD, taskFilterHelper, layoutOfType, getContext(), user, inventoryRepository);
-                    break;
-            }
+            taskRepository.getTasks(this.classType, userID).first().subscribe(tasks -> {
+                int layoutOfType;
+                switch (this.classType) {
+                    case Task.TYPE_HABIT:
+                        layoutOfType = R.layout.habit_item_card;
+                        this.recyclerAdapter = new HabitsRecyclerViewAdapter(tasks, true, layoutOfType);
+                        allowReordering();
+                        break;
+                    case Task.TYPE_DAILY:
+                        layoutOfType = R.layout.daily_item_card;
+                        int dailyResetOffset = 0;
+                        if (user != null) {
+                            dailyResetOffset = user.getPreferences().getDayStart();
+                        }
+                        this.recyclerAdapter = new DailiesRecyclerViewHolder(tasks, true, layoutOfType, dailyResetOffset);
+                        allowReordering();
+                        break;
+                    case Task.TYPE_TODO:
+                        layoutOfType = R.layout.todo_item_card;
+                        this.recyclerAdapter = new TodosRecyclerViewAdapter(tasks, true, layoutOfType);
+                        allowReordering();
+                        return;
+                    case Task.TYPE_REWARD:
+                        layoutOfType = R.layout.reward_item_card;
+                        this.recyclerAdapter = new RewardsRecyclerViewAdapter(tasks, true, layoutOfType, getContext());
+                        break;
+                }
+            });
         }
     }
 
@@ -336,31 +343,6 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
         return this.classType != null ? this.classType : "";
     }
 
-    @Subscribe
-    public void onEvent(FilterTasksByTagsCommand cmd) {
-        recyclerAdapter.filter();
-    }
-
-    @Subscribe
-    public void onEvent(TaskCheckedCommand event) {
-        recyclerAdapter.checkTask(event.Task, event.completed);
-    }
-
-    @Subscribe
-    public void onEvent(TaskUpdatedEvent event) {
-        recyclerAdapter.updateTask(event.task);
-    }
-
-    @Subscribe
-    public void onEvent(TaskCreatedEvent event) {
-        recyclerAdapter.addTask(event.task);
-    }
-
-    @Subscribe
-    public void onEvent(TaskRemovedEvent event) {
-        recyclerAdapter.removeTask(event.deletedTaskId);
-    }
-
     @Override
     public void onRefresh() {
         swipeRefreshLayout.setRefreshing(true);
@@ -376,6 +358,6 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
         if (classType != null) {
             taskFilterHelper.setActiveFilter(classType, activeFilter);
         }
-        recyclerAdapter.filter();
+        //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 54929a3de..aa0b8206b 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
@@ -37,6 +37,7 @@ 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.RealmBaseTasksRecyclerViewAdapter;
 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;
@@ -164,7 +165,7 @@ public class TasksFragment extends BaseMainFragment {
     private void showFilterDialog() {
         TaskFilterDialog dialog = new TaskFilterDialog(getContext(), HabiticaBaseApplication.getComponent());
         if (user != null) {
-            dialog.setTags(user.getTags());
+            //dialog.setTags();
         }
         dialog.setActiveTags(taskFilterHelper.getTags());
         if (getActiveFragment() != null) {
@@ -176,10 +177,10 @@ public class TasksFragment extends BaseMainFragment {
         dialog.setListener((activeTaskFilter, activeTags) -> {
             int activePos = viewPager.getCurrentItem();
             if (activePos >= 1 && viewFragmentsDictionary.get(activePos-1).recyclerAdapter != null) {
-                viewFragmentsDictionary.get(activePos-1).recyclerAdapter.filter();
+                //viewFragmentsDictionary.get(activePos-1).recyclerAdapter.filter();
             }
             if (activePos < viewPager.getAdapter().getCount()-1 && viewFragmentsDictionary.get(activePos+1).recyclerAdapter != null) {
-                viewFragmentsDictionary.get(activePos+1).recyclerAdapter.filter();
+                //viewFragmentsDictionary.get(activePos+1).recyclerAdapter.filter();
             }
             if (getActiveFragment() != null) {
                 getActiveFragment().setActiveFilter(activeTaskFilter);
@@ -351,12 +352,12 @@ public class TasksFragment extends BaseMainFragment {
             for (int index = 0; index < viewFragmentsDictionary.size(); index++) {
                 TaskRecyclerViewFragment fragment = viewFragmentsDictionary.get(index);
                 if (fragment != null) {
-                    BaseTasksRecyclerViewAdapter adapter = fragment.recyclerAdapter;
+                    RealmBaseTasksRecyclerViewAdapter adapter = fragment.recyclerAdapter;
                     if (adapter.getClass().equals(DailiesRecyclerViewHolder.class)) {
                         final DailiesRecyclerViewHolder dailyAdapter = (DailiesRecyclerViewHolder) fragment.recyclerAdapter;
                         dailyAdapter.dailyResetOffset = this.user.getPreferences().getDayStart();
                     }
-                    AsyncTask.execute(() -> adapter.loadContent(true));
+                    //AsyncTask.execute(() -> adapter.loadContent(true));
                 }
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
index fcfad1484..567caa08e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
@@ -95,16 +95,20 @@ public abstract class BaseTaskViewHolder extends RecyclerView.ViewHolder impleme
             } else {
                 this.titleTextView.setText(this.task.getText());
                 this.notesTextView.setText(this.task.getNotes());
-                Observable.just(this.task)
-                        .map(task1 -> {
-                            task.parsedText = MarkdownParser.parseMarkdown(task.getText());
-                            task.parsedNotes = MarkdownParser.parseMarkdown(task.getNotes());
-                            return task;
-                        })
+                Observable.just(this.task.getText())
+                        .map(MarkdownParser::parseMarkdown)
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(task2 -> {
+                        .subscribe(parsedText -> {
+                            this.task.parsedText = parsedText;
                             this.titleTextView.setText(this.task.parsedText);
+                        }, Throwable::printStackTrace);
+                Observable.just(this.task.getNotes())
+                        .map(MarkdownParser::parseMarkdown)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(parsedNotes -> {
+                            this.task.parsedNotes = parsedNotes;
                             this.notesTextView.setText(this.task.parsedNotes);
                         }, Throwable::printStackTrace);
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
index 17a7830aa..060e04f38 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java
@@ -148,8 +148,6 @@ public abstract class ChecklistedViewHolder extends BaseTaskViewHolder implement
                 // it needs to be changed after the event is send -> to the server
                 // maybe a refactor is needed here
                 EventBus.getDefault().post(event);
-                task.completed = event.completed;
-                task.save();
             }
         } else {
             View v = (View) buttonView.getParent();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
index 3279ab390..6e94a1cdf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
@@ -12,15 +12,14 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.realm.RealmList;
+
 public class TaskTagDeserializer implements JsonDeserializer<List<TaskTag>> {
     @Override
     public List<TaskTag> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<TaskTag> taskTags = new ArrayList<>();
-        List<Tag> allTags;
+        List<TaskTag> taskTags = new RealmList<>();
+        List<Tag> allTags = new ArrayList<>();
         try {
-            allTags = new Select()
-                    .from(Tag.class)
-                    .queryList();
         } catch (RuntimeException e) {
             //Tests don't have a database
             allTags = new ArrayList<>();
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 e5b742788..349dc5747 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
@@ -11,6 +11,7 @@ import android.widget.RemoteViews;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.models.responses.TaskDirection;
 import com.habitrpg.android.habitica.modules.AppModule;
 
 import javax.inject.Inject;
@@ -74,7 +75,7 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider {
             int[] ids = {appWidgetId};
 
             if (taskId != null) {
-                taskRepository.postTaskDirection(taskId, direction)
+                taskRepository.taskChecked(taskId, TaskDirection.up.toString().equals(direction))
                         .subscribe(taskDirectionData -> {
                             taskRepository.getTask(taskId).subscribe(task -> {
                                 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 0bd73a176..2a268e3de 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
@@ -50,13 +50,12 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
     public void onReceive(Context context, Intent intent) {
         setUp(context);
         if (intent.getAction().equals(DAILY_ACTION)) {
-            AppWidgetManager mgr = AppWidgetManager.getInstance(context);
             int appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
                     AppWidgetManager.INVALID_APPWIDGET_ID);
             String taskId = intent.getStringExtra(TASK_ID_ITEM);
 
             if (taskId != null) {
-                taskRepository.postTaskDirection(taskId, TaskDirection.up.toString())
+                taskRepository.taskChecked(taskId, true)
                         .subscribe(taskDirectionData -> {
                             taskRepository.markTaskCompleted(taskId, true);
                             showToastForTaskDirection(context, taskDirectionData, userId);
diff --git a/build.gradle b/build.gradle
index fe1fbd914..d6dc07752 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,8 @@ buildscript {
         classpath 'com.android.databinding:dataBinder:1.0-rc4'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:3.0.0'
+
+        classpath "io.realm:realm-gradle-plugin:3.1.3"
     }
 }
 

From 8aa32d04e97dd039b783c036185f864dd14c451d Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 20 Apr 2017 21:13:10 +0200
Subject: [PATCH 05/17] reformatting

---
 .../RealmBaseLocalRepository.java             |  48 ++---
 .../RealmTagLocalRepository.java              |  54 ++---
 .../RealmTaskLocalRepository.java             | 184 +++++++++---------
 .../RealmBaseTasksRecyclerViewAdapter.java    |  86 ++++----
 4 files changed, 186 insertions(+), 186 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
index e3a908a62..888a1eb43 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
@@ -1,24 +1,24 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.BaseLocalRepository;
-
-import io.realm.Realm;
-
-abstract class RealmBaseLocalRepository implements BaseLocalRepository {
-
-    Realm realm;
-
-    RealmBaseLocalRepository(Realm realm) {
-        this.realm = realm;
-    }
-
-    @Override
-    public void close() {
-        realm.close();
-    }
-
-    @Override
-    public void executeTransaction(Realm.Transaction transaction) {
-        realm.executeTransaction(transaction);
-    }
-}
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.BaseLocalRepository;
+
+import io.realm.Realm;
+
+abstract class RealmBaseLocalRepository implements BaseLocalRepository {
+
+    Realm realm;
+
+    RealmBaseLocalRepository(Realm realm) {
+        this.realm = realm;
+    }
+
+    @Override
+    public void close() {
+        realm.close();
+    }
+
+    @Override
+    public void executeTransaction(Realm.Transaction transaction) {
+        realm.executeTransaction(transaction);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java
index b5c7ed2b6..0b9d14de4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java
@@ -1,27 +1,27 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.TagLocalRepository;
-import com.habitrpg.android.habitica.models.Tag;
-
-import java.util.List;
-
-import io.realm.Realm;
-import io.realm.RealmResults;
-import rx.Observable;
-
-
-public class RealmTagLocalRepository extends RealmBaseLocalRepository implements TagLocalRepository {
-    public RealmTagLocalRepository(Realm realm) {
-        super(realm);
-    }
-
-    @Override
-    public Observable<RealmResults<Tag>> getTags(String userId) {
-        return realm.where(Tag.class).equalTo("userId", userId).findAll().asObservable();
-    }
-
-    @Override
-    public void removeOldTags(List<Tag> onlineTags) {
-
-    }
-}
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.TagLocalRepository;
+import com.habitrpg.android.habitica.models.Tag;
+
+import java.util.List;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import rx.Observable;
+
+
+public class RealmTagLocalRepository extends RealmBaseLocalRepository implements TagLocalRepository {
+    public RealmTagLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public Observable<RealmResults<Tag>> getTags(String userId) {
+        return realm.where(Tag.class).equalTo("userId", userId).findAll().asObservable();
+    }
+
+    @Override
+    public void removeOldTags(List<Tag> onlineTags) {
+
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
index da2dc33c3..4005b8f13 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
@@ -1,92 +1,92 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
-import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.habitrpg.android.habitica.models.tasks.TasksOrder;
-
-import java.util.List;
-
-import io.realm.Realm;
-import io.realm.RealmResults;
-import rx.Observable;
-
-public class RealmTaskLocalRepository extends RealmBaseLocalRepository implements TaskLocalRepository {
-
-    public RealmTaskLocalRepository(Realm realm) {
-        super(realm);
-    }
-
-    @Override
-    public Observable<RealmResults<Task>> getTasks(String taskType, String userID) {
-        return realm.where(Task.class).equalTo("type", taskType).equalTo("userId", userID).findAllSorted("position").asObservable()
-                .filter(RealmResults::isLoaded);
-    }
-
-    @Override
-    public Observable<RealmResults<Task>> getTasks(String userId) {
-        return realm.where(Task.class).equalTo("userId", userId).findAll().asObservable()
-                .filter(RealmResults::isLoaded);
-    }
-
-    @Override
-    public void saveTasks(TasksOrder tasksOrder, TaskList tasks) {
-        realm.executeTransaction(realm1 -> realm1.copyToRealm(tasks.tasks.values()));
-    }
-
-    @Override
-    public void saveTask(Task task) {
-        realm.executeTransaction(realm1 -> realm1.copyToRealm(task));
-    }
-
-    @Override
-    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
-
-    }
-
-    @Override
-    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
-
-    }
-
-    @Override
-    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
-
-    }
-
-    @Override
-    public void removeOldReminders(List<RemindersItem> onlineReminders) {
-
-    }
-
-    @Override
-    public void deleteTask(String taskID) {
-        Task task = realm.where(Task.class).equalTo("id", taskID).findFirst();
-        realm.executeTransaction(realm1 -> task.deleteFromRealm());
-    }
-
-    @Override
-    public Observable<Task> getTask(String taskId) {
-        return realm.where(Task.class).equalTo("id", taskId).findFirst().asObservable();
-    }
-
-    @Override
-    public Observable<Task> getTaskCopy(String taskId) {
-        return getTask(taskId)
-                .map(realm::copyFromRealm);
-    }
-
-    @Override
-    public void markTaskCompleted(String taskId, boolean isCompleted) {
-        Task task = realm.where(Task.class).equalTo("id", taskId).findFirst();
-        realm.executeTransaction(realm1 -> task.completed = true);
-    }
-
-    @Override
-    public void saveReminder(RemindersItem remindersItem) {
-        realm.executeTransaction(realm1 -> realm1.copyToRealm(remindersItem));
-    }
-}
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
+import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
+import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+
+import java.util.List;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import rx.Observable;
+
+public class RealmTaskLocalRepository extends RealmBaseLocalRepository implements TaskLocalRepository {
+
+    public RealmTaskLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public Observable<RealmResults<Task>> getTasks(String taskType, String userID) {
+        return realm.where(Task.class).equalTo("type", taskType).equalTo("userId", userID).findAllSorted("position").asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Task>> getTasks(String userId) {
+        return realm.where(Task.class).equalTo("userId", userId).findAll().asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public void saveTasks(TasksOrder tasksOrder, TaskList tasks) {
+        realm.executeTransaction(realm1 -> realm1.copyToRealm(tasks.tasks.values()));
+    }
+
+    @Override
+    public void saveTask(Task task) {
+        realm.executeTransaction(realm1 -> realm1.copyToRealm(task));
+    }
+
+    @Override
+    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
+
+    }
+
+    @Override
+    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
+
+    }
+
+    @Override
+    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
+
+    }
+
+    @Override
+    public void removeOldReminders(List<RemindersItem> onlineReminders) {
+
+    }
+
+    @Override
+    public void deleteTask(String taskID) {
+        Task task = realm.where(Task.class).equalTo("id", taskID).findFirst();
+        realm.executeTransaction(realm1 -> task.deleteFromRealm());
+    }
+
+    @Override
+    public Observable<Task> getTask(String taskId) {
+        return realm.where(Task.class).equalTo("id", taskId).findFirst().asObservable();
+    }
+
+    @Override
+    public Observable<Task> getTaskCopy(String taskId) {
+        return getTask(taskId)
+                .map(realm::copyFromRealm);
+    }
+
+    @Override
+    public void markTaskCompleted(String taskId, boolean isCompleted) {
+        Task task = realm.where(Task.class).equalTo("id", taskId).findFirst();
+        realm.executeTransaction(realm1 -> task.completed = true);
+    }
+
+    @Override
+    public void saveReminder(RemindersItem remindersItem) {
+        realm.executeTransaction(realm1 -> realm1.copyToRealm(remindersItem));
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java
index cf7d50c5e..5046a8de1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java
@@ -1,43 +1,43 @@
-package com.habitrpg.android.habitica.ui.adapter.tasks;
-
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
-
-import io.realm.OrderedRealmCollection;
-import io.realm.RealmRecyclerViewAdapter;
-
-public abstract class RealmBaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder> extends RealmRecyclerViewAdapter<Task, VH> {
-
-    private final int layoutResource;
-
-    public RealmBaseTasksRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource) {
-        super(data, autoUpdate);
-        this.layoutResource = layoutResource;
-    }
-
-    @Override
-    public VH onCreateViewHolder(ViewGroup parent, int viewType) {
-        return null;
-    }
-
-    @Override
-    public void onBindViewHolder(VH holder, int position) {
-        Task item = getItem(position);
-        if (item != null) {
-            holder.bindHolder(item, position);
-        }
-    }
-
-    View getContentView(ViewGroup parent) {
-        return getContentView(parent, layoutResource);
-    }
-
-    protected View getContentView(ViewGroup parent, int layoutResource) {
-        return LayoutInflater.from(parent.getContext()).inflate(layoutResource, parent, false);
-    }
-}
+package com.habitrpg.android.habitica.ui.adapter.tasks;
+
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
+
+import io.realm.OrderedRealmCollection;
+import io.realm.RealmRecyclerViewAdapter;
+
+public abstract class RealmBaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder> extends RealmRecyclerViewAdapter<Task, VH> {
+
+    private final int layoutResource;
+
+    public RealmBaseTasksRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource) {
+        super(data, autoUpdate);
+        this.layoutResource = layoutResource;
+    }
+
+    @Override
+    public VH onCreateViewHolder(ViewGroup parent, int viewType) {
+        return null;
+    }
+
+    @Override
+    public void onBindViewHolder(VH holder, int position) {
+        Task item = getItem(position);
+        if (item != null) {
+            holder.bindHolder(item, position);
+        }
+    }
+
+    View getContentView(ViewGroup parent) {
+        return getContentView(parent, layoutResource);
+    }
+
+    protected View getContentView(ViewGroup parent, int layoutResource) {
+        return LayoutInflater.from(parent.getContext()).inflate(layoutResource, parent, false);
+    }
+}

From 025ca6a64e54da2db70e714682dbf34c766d7e76 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 21 Apr 2017 00:49:26 +0200
Subject: [PATCH 06/17] Refactor User data to realm

---
 Habitica/res/layout/fragment_group_info.xml   |   5 +-
 .../habitica/HabiticaBaseApplication.java     |   4 +-
 .../habitica/NotificationPublisher.java       |   1 +
 .../android/habitica/api/ApiService.java      |  32 +-
 .../callbacks/HabitRPGUserCallback.java       |   9 +-
 .../habitica/callbacks/ItemsCallback.java     |   7 +-
 .../habitica/callbacks/MergeUserCallback.java |   8 +-
 .../habitica/callbacks/SkillCallback.java     |   6 +-
 .../habitica/callbacks/UnlockCallback.java    |   7 +-
 .../android/habitica/data/ApiClient.java      |  34 +-
 .../data/CustomizationRepository.java         |   3 +-
 .../android/habitica/data/FAQRepository.java  |   3 +-
 .../habitica/data/InventoryRepository.java    |  29 +-
 .../data/SetupCustomizationRepository.java    |   6 +-
 .../habitica/data/SocialRepository.java       |   6 +-
 .../habitica/data/TutorialRepository.java     |   3 +-
 .../android/habitica/data/UserRepository.java |  25 +-
 .../data/implementation/ApiClientImpl.java    |  40 +-
 .../CustomizationRepositoryImpl.java          |   5 +-
 .../implementation/FAQRepositoryImpl.java     |   5 +-
 .../InventoryRepositoryImpl.java              |  31 +-
 .../SetupCustomizationRepositoryImpl.java     |   6 +-
 .../implementation/SocialRepositoryImpl.java  |   7 +-
 .../TutorialRepositoryImpl.java               |   3 +-
 .../implementation/UserRepositoryImpl.java    |  32 +-
 .../local/CustomizationLocalRepository.java   |   3 +-
 .../data/local/FAQLocalRepository.java        |   3 +-
 .../data/local/InventoryLocalRepository.java  |  25 +-
 .../data/local/TutorialLocalRepository.java   |   3 +-
 .../data/local/UserLocalRepository.java       |  13 +-
 .../DbFlowCustomizationLocalRepository.java   |  59 --
 .../DbFlowFAQLocalRepository.java             |  27 -
 .../DbFlowInventoryLocalRepository.java       | 244 -----
 .../DbFlowTutorialLocalRepository.java        |  35 -
 .../DbFlowUserLocalRepository.java            |  90 --
 .../RealmCustomizationLocalRepository.java    |  25 +
 .../RealmFAQLocalRepository.java              |  23 +
 .../RealmInventoryLocalRepository.java        | 126 +++
 .../RealmTaskLocalRepository.java             |  12 +-
 .../RealmTutorialLocalRepository.java         |  35 +
 .../RealmUserLocalRepository.java             |  77 ++
 .../events/OpenedMysteryItemEvent.java        |   4 +-
 .../helpers/ReactiveErrorHandler.java         |  17 +
 .../habitica/helpers/UserStatComputer.java    |  12 +-
 .../PushNotificationManager.java              |   7 +-
 .../CheckClassSelectionUseCase.java           |  12 +-
 .../habitica/interactors/LevelUpUseCase.java  |   6 +-
 .../interactors/NotifyUserUseCase.java        |  10 +-
 .../android/habitica/models/ContentGear.java  |   4 +-
 .../habitica/models/ContentResult.java        |   6 +-
 .../android/habitica/models/FAQArticle.java   |  15 +-
 .../android/habitica/models/Skill.java        |  19 +-
 .../android/habitica/models/TutorialStep.java |  23 +-
 .../models/auth/LocalAuthentication.java      |  21 +-
 .../habitica/models/inventory/Animal.java     |  95 +-
 .../models/inventory/Customization.java       |  21 +-
 .../habitica/models/inventory/Egg.java        |  58 +-
 .../{ItemData.java => Equipment.java}         | 284 +++---
 .../habitica/models/inventory/Food.java       |  59 +-
 .../models/inventory/HatchingPotion.java      |  58 +-
 .../habitica/models/inventory/Item.java       |  57 +-
 .../habitica/models/inventory/Mount.java      |  95 +-
 .../habitica/models/inventory/Pet.java        |  95 +-
 .../habitica/models/inventory/Quest.java      |  30 +-
 .../habitica/models/inventory/QuestBoss.java  |  49 +-
 .../models/inventory/QuestContent.java        | 106 +-
 .../models/inventory/QuestProgress.java       |  24 +-
 .../models/inventory/SpecialItem.java         |  36 +-
 .../models/invitations/GuildInvite.java       |  18 +-
 .../models/invitations/Invitations.java       |  32 +-
 .../models/invitations/PartyInvite.java       |  16 +-
 .../models/responses/SkillResponse.java       |   6 +-
 .../models/responses/TaskDirectionData.java   |  29 +-
 .../habitica/models/shops/ShopItem.java       |   4 +-
 .../habitica/models/social/Challenge.java     |   4 +-
 .../android/habitica/models/social/Group.java |   4 +-
 .../habitica/models/social/UserParty.java     |  26 +-
 .../habitica/models/user/Authentication.java  |  34 +-
 .../android/habitica/models/user/Buffs.java   |  44 +-
 .../habitica/models/user/ContributorInfo.java |  32 +-
 .../android/habitica/models/user/Flags.java   |  57 +-
 .../android/habitica/models/user/Gear.java    |  39 +-
 .../android/habitica/models/user/Hair.java    |  19 +-
 .../android/habitica/models/user/Inbox.java   |  33 +-
 .../android/habitica/models/user/Items.java   |  56 +-
 .../android/habitica/models/user/Outfit.java  |  23 +-
 .../habitica/models/user/PlayerMinStats.java  | 151 ---
 .../habitica/models/user/Preferences.java     |  44 +-
 .../android/habitica/models/user/Profile.java |  23 +-
 .../habitica/models/user/Purchases.java       |  26 +-
 .../habitica/models/user/SpecialItems.java    |  25 +-
 .../android/habitica/models/user/Stats.java   | 130 ++-
 .../models/user/SubscriptionPlan.java         |  38 +-
 .../user/SubscriptionPlanConsecutive.java     |  25 +-
 .../models/user/SuppressedModals.java         |  13 +-
 .../user/{BasicStats.java => Training.java}   | 127 ++-
 .../user/{HabitRPGUser.java => User.java}     | 933 ++++++++----------
 .../habitica/modules/RepositoryModule.java    |  31 +-
 .../LocalNotificationActionReceiver.java      |   6 +-
 .../android/habitica/ui/AvatarView.java       |  10 +-
 .../habitica/ui/AvatarWithBarsViewModel.java  |  23 +-
 .../activities/ChallengeDetailActivity.java   |   1 +
 .../ui/activities/ClassSelectionActivity.java |  18 +-
 .../ui/activities/FullProfileActivity.java    |  20 +-
 .../habitica/ui/activities/IntroActivity.java |   1 +
 .../habitica/ui/activities/LoginActivity.java |   4 +-
 .../habitica/ui/activities/MainActivity.java  |  17 +-
 .../ui/activities/PartyInviteActivity.java    |   5 +-
 .../habitica/ui/activities/SetupActivity.java |   6 +-
 .../ui/activities/TaskFormActivity.java       |   1 +
 .../SkillTasksRecyclerViewAdapter.java        |   1 +
 .../EquipmentRecyclerViewAdapter.java         |  10 +-
 .../setup/CustomizationSetupAdapter.java      |   4 +-
 .../social/ChallengesListViewAdapter.java     |   6 +-
 .../social/ChatRecyclerViewAdapter.java       |  10 +-
 .../PartyMemberRecyclerViewAdapter.java       |  18 +-
 .../tasks/RewardsRecyclerViewAdapter.java     |  14 +-
 .../habitica/ui/fragments/BaseFragment.java   |   1 +
 .../ui/fragments/BaseMainFragment.java        |   9 +-
 .../ui/fragments/SubscriptionFragment.java    |   6 +-
 .../ui/fragments/faq/FAQOverviewFragment.java |   1 +
 .../AvatarCustomizationFragment.java          |   5 +-
 .../customization/AvatarOverviewFragment.java |   5 +-
 .../equipment/EquipmentDetailFragment.java    |   1 +
 .../equipment/EquipmentOverviewFragment.java  |   5 +-
 .../inventory/items/ItemRecyclerFragment.java |   5 +-
 .../inventory/shops/ShopFragment.java         |   4 +-
 .../stable/PetDetailRecyclerFragment.java     |   5 +-
 .../stable/StableRecyclerFragment.java        |   5 +-
 .../preferences/AccountDetailsFragment.java   |   7 +-
 .../preferences/PreferencesFragment.java      |   7 +-
 .../fragments/setup/AvatarSetupFragment.java  |   6 +-
 .../ui/fragments/setup/TaskSetupFragment.java |   6 +-
 .../ui/fragments/skills/SkillsFragment.java   |   5 +-
 .../ui/fragments/social/ChatListFragment.java |   7 +-
 .../social/GroupInformationFragment.java      |   9 +-
 .../ui/fragments/social/InboxFragment.java    |   4 +-
 .../social/InboxMessageListFragment.java      |   5 +-
 .../ui/fragments/social/TavernFragment.java   |   1 +
 .../ChallengeDetailDialogHolder.java          |   8 +-
 .../challenges/ChallengeListFragment.java     |   1 +
 .../ChallengeTasksRecyclerViewFragment.java   |   6 +-
 .../ChallengesOverviewFragment.java           |   1 +
 .../fragments/social/party/PartyFragment.java |   1 +
 .../social/party/PartyMemberListFragment.java |   8 +-
 .../tasks/TaskRecyclerViewFragment.java       |  15 +-
 .../ui/fragments/tasks/TasksFragment.java     |   7 +-
 .../ui/views/tasks/TaskFilterDialog.java      |   1 +
 .../habitica/utils/ContentDeserializer.java   |  15 +-
 .../utils/CustomizationDeserializer.java      |   6 +-
 .../habitica/utils/EggListDeserializer.java   |   3 +-
 .../habitica/utils/FoodListDeserializer.java  |   3 +-
 .../habitica/utils/GroupSerialization.java    |   4 +-
 .../utils/HatchingPotionListDeserializer.java |   3 +-
 .../utils/ItemDataListDeserializer.java       |  23 +-
 .../habitica/utils/PurchasedDeserializer.java |   7 +-
 .../habitica/utils/QuestListDeserializer.java |   7 +-
 .../utils/TutorialStepListDeserializer.java   |   4 +-
 .../widget/AvatarStatsWidgetProvider.java     |   7 +-
 .../habitica/widget/BaseWidgetProvider.java   |   1 +
 .../widget/HabitButtonWidgetService.java      |   1 +
 .../android/habitica/api/BaseAPITests.java    |   8 +-
 .../android/habitica/api/UserAPITests.java    |   6 +-
 .../helpers/UserStatComputerTest.java         |  54 +-
 .../android/habitica/models/UserTest.java     |   6 +-
 .../AvatarCustomizationFragmentTest.java      |   4 +-
 .../EquipmentOverviewFragmentTest.java        |   4 +-
 .../MountDetailRecyclerFragmentTest.java      |   4 +-
 .../stable/PetDetailRecyclerFragmentTest.java |   4 +-
 169 files changed, 2161 insertions(+), 2727 deletions(-)
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTutorialLocalRepository.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReactiveErrorHandler.java
 rename Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/{ItemData.java => Equipment.java} (75%)
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java
 rename Habitica/src/main/java/com/habitrpg/android/habitica/models/user/{BasicStats.java => Training.java} (62%)
 rename Habitica/src/main/java/com/habitrpg/android/habitica/models/user/{HabitRPGUser.java => User.java} (69%)

diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index 9eada270f..c144d565b 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -7,7 +7,7 @@
         <import type="com.habitrpg.android.habitica.models.social.Group" />
         <import type="com.habitrpg.android.habitica.models.inventory.QuestContent" />
         <import type="com.habitrpg.android.habitica.models.invitations.PartyInvite" />
-        <import type="com.habitrpg.android.habitica.models.user.HabitRPGUser" />
+        <import type="com.habitrpg.android.habitica.models.user.User" />
         <import type="android.view.View" />
         <import type="android.text.Html"/>
 
@@ -21,7 +21,7 @@
 
         <variable
             name="user"
-            type="HabitRPGUser" />
+            type="User" />
 
         <variable
             name="hideParticipantCard"
@@ -314,7 +314,6 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@{quest.notes != null ? Html.fromHtml(quest.notes) : null}"
                         style="@style/CardText"
                         />
 
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 11fd68e76..f37332117 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -22,7 +22,7 @@ import com.facebook.FacebookSdk;
 import com.facebook.drawee.backends.pipeline.Fresco;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.activities.IntroActivity;
 import com.habitrpg.android.habitica.ui.activities.LoginActivity;
@@ -47,7 +47,7 @@ import io.realm.RealmConfiguration;
 //contains all HabiticaApplicationLogic except dagger componentInitialisation
 public abstract class HabiticaBaseApplication extends MultiDexApplication {
 
-    public static HabitRPGUser User;
+    public static com.habitrpg.android.habitica.models.user.User User;
     public static Activity currentActivity = null;
     private static AppComponent component;
     public RefWatcher refWatcher;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java b/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
index a0c04ff09..ba2fa6eb5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
@@ -11,6 +11,7 @@ import android.os.Build;
 import android.support.v4.content.ContextCompat;
 
 import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.modules.AppModule;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
index 55fa84517..09df63d2b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.models.Tag;
 import com.habitrpg.android.habitica.models.auth.UserAuth;
 import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
 import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.responses.BuyResponse;
 import com.habitrpg.android.habitica.models.responses.FeedResponse;
@@ -26,7 +26,7 @@ import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.social.Group;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Items;
 
 import java.util.List;
@@ -56,16 +56,16 @@ public interface ApiService {
     /* user API */
 
     @GET("user/")
-    Observable<HabitResponse<HabitRPGUser>> getUser();
+    Observable<HabitResponse<User>> getUser();
 
     @PUT("user/")
-    Observable<HabitResponse<HabitRPGUser>> updateUser(@Body Map<String, Object> updateDictionary);
+    Observable<HabitResponse<User>> updateUser(@Body Map<String, Object> updateDictionary);
 
     @PUT("user/")
-    Observable<HabitResponse<HabitRPGUser>> registrationLanguage(@Header("Accept-Language") String registrationLanguage);
+    Observable<HabitResponse<User>> registrationLanguage(@Header("Accept-Language") String registrationLanguage);
 
     @GET("user/inventory/buy")
-    Observable<HabitResponse<List<ItemData>>> getInventoryBuyableGear();
+    Observable<HabitResponse<List<Equipment>>> getInventoryBuyableGear();
 
     @POST("user/equip/{type}/{key}")
     Observable<HabitResponse<Items>> equipItem(@Path("type") String type, @Path("key") String itemKey);
@@ -86,7 +86,7 @@ public interface ApiService {
     Observable<HabitResponse<Void>> purchaseQuest(@Path("key") String key);
 
     @POST("user/sell/{type}/{key}")
-    Observable<HabitResponse<HabitRPGUser>> sellItem(@Path("type") String itemType, @Path("key") String itemKey);
+    Observable<HabitResponse<User>> sellItem(@Path("type") String itemType, @Path("key") String itemKey);
 
     @POST("user/feed/{pet}/{food}")
     Observable<HabitResponse<FeedResponse>> feedPet(@Path("pet") String petKey, @Path("food") String foodKey);
@@ -149,7 +149,7 @@ public interface ApiService {
     Observable<HabitResponse<Boolean>> sleep();
 
     @POST("user/revive")
-    Observable<HabitResponse<HabitRPGUser>> revive();
+    Observable<HabitResponse<User>> revive();
 
     @POST("user/class/cast/{skill}")
     Observable<HabitResponse<SkillResponse>> useSkill(@Path("skill") String skillName, @Query("targetType") String targetType, @Query("targetId") String targetId);
@@ -158,13 +158,13 @@ public interface ApiService {
     Observable<HabitResponse<SkillResponse>> useSkill(@Path("skill") String skillName, @Query("targetType") String targetType);
 
     @POST("user/change-class")
-    Observable<HabitResponse<HabitRPGUser>> changeClass();
+    Observable<HabitResponse<User>> changeClass();
 
     @POST("user/change-class")
-    Observable<HabitResponse<HabitRPGUser>> changeClass(@Query("class") String className);
+    Observable<HabitResponse<User>> changeClass(@Query("class") String className);
 
     @POST("user/disable-classes")
-    Observable<HabitResponse<HabitRPGUser>> disableClasses();
+    Observable<HabitResponse<User>> disableClasses();
 
     @POST("user/mark-pms-read")
     Observable<HabitResponse<Void>> markPrivateMessagesRead();
@@ -198,10 +198,10 @@ public interface ApiService {
     Observable<HabitResponse<Void>> deleteMessage(@Path("gid") String groupId, @Path("messageId") String messageId);
 
     @GET("groups/{gid}/members")
-    Observable<HabitResponse<List<HabitRPGUser>>> getGroupMembers(@Path("gid") String groupId, @Query("includeAllPublicFields") Boolean includeAllPublicFields);
+    Observable<HabitResponse<List<User>>> getGroupMembers(@Path("gid") String groupId, @Query("includeAllPublicFields") Boolean includeAllPublicFields);
 
     @GET("groups/{gid}/members")
-    Observable<HabitResponse<List<HabitRPGUser>>> getGroupMembers(@Path("gid") String groupId, @Query("includeAllPublicFields") Boolean includeAllPublicFields, @Query("lastId") String lastId);
+    Observable<HabitResponse<List<User>>> getGroupMembers(@Path("gid") String groupId, @Query("includeAllPublicFields") Boolean includeAllPublicFields, @Query("lastId") String lastId);
 
     // Like returns the full chat list
     @POST("groups/{gid}/chat/{mid}/like")
@@ -247,11 +247,11 @@ public interface ApiService {
     Observable<HabitResponse<Void>> validateSubscription(@Body SubscriptionValidationRequest request);
 
     @POST("user/custom-day-start")
-    Observable<HabitResponse<HabitRPGUser>> changeCustomDayStart(@Body Map<String, Object> updateObject);
+    Observable<HabitResponse<User>> changeCustomDayStart(@Body Map<String, Object> updateObject);
 
     //Members URL
     @GET("members/{mid}")
-    Observable<HabitResponse<HabitRPGUser>> getMember(@Path("mid") String memberId);
+    Observable<HabitResponse<User>> getMember(@Path("mid") String memberId);
 
     @GET("members/{mid}/achievements")
     Observable<HabitResponse<AchievementResult>> getMemberAchievements(@Path("mid") String memberId);
@@ -296,5 +296,5 @@ public interface ApiService {
     Observable<HabitResponse<Void>> readNotification(@Path("notificationId") String notificationId);
 
     @POST("user/open-mystery-item")
-    Observable<HabitResponse<ItemData>> openMysteryItem();
+    Observable<HabitResponse<Equipment>> openMysteryItem();
 }
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 20ce54ce1..da14cb931 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
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.callbacks;
 
 import android.support.annotation.Nullable;
 
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import rx.functions.Action1;
 
@@ -10,7 +10,7 @@ import rx.functions.Action1;
  * r
  * Created by magicmicky on 18/02/15.
  */
-public class HabitRPGUserCallback implements Action1<HabitRPGUser> {
+public class HabitRPGUserCallback implements Action1<User> {
 
     @Nullable
     public final OnUserReceived callBack;
@@ -20,14 +20,13 @@ public class HabitRPGUserCallback implements Action1<HabitRPGUser> {
     }
 
     @Override
-    public void call(HabitRPGUser user) {
-        user.async().save();
+    public void call(User user) {
         if (callBack != null) {
             callBack.onUserReceived(user);
         }
     }
 
     public interface OnUserReceived {
-        void onUserReceived(HabitRPGUser user);
+        void onUserReceived(User user);
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
index ac42796dd..1ceb57432 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
@@ -1,6 +1,6 @@
 package com.habitrpg.android.habitica.callbacks;
 
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Items;
 
 import rx.functions.Action1;
@@ -9,9 +9,9 @@ public class ItemsCallback implements Action1<Items> {
 
     private final HabitRPGUserCallback.OnUserReceived mCallback;
 
-    private HabitRPGUser user;
+    private User user;
 
-    public ItemsCallback(HabitRPGUserCallback.OnUserReceived callback, HabitRPGUser user) {
+    public ItemsCallback(HabitRPGUserCallback.OnUserReceived callback, User user) {
         this.mCallback = callback;
         this.user = user;
     }
@@ -19,7 +19,6 @@ public class ItemsCallback implements Action1<Items> {
     @Override
     public void call(Items items) {
         this.user.setItems(items);
-        this.user.async().save();
         mCallback.onUserReceived(this.user);
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
index 82b296828..5c08bb976 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
@@ -2,20 +2,20 @@ package com.habitrpg.android.habitica.callbacks;
 
 import android.support.annotation.Nullable;
 
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 
 public class MergeUserCallback extends HabitRPGUserCallback {
 
-    private HabitRPGUser user;
+    private User user;
 
-    public MergeUserCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, HabitRPGUser user) {
+    public MergeUserCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, User user) {
         super(callback);
         this.user = user;
     }
 
     @Override
-    public void call(HabitRPGUser user) {
+    public void call(User user) {
 
         if (callBack != null) {
             callBack.onUserReceived(this.user);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
index 9b9e36b18..17e183172 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
@@ -5,7 +5,7 @@ import android.support.annotation.Nullable;
 import com.habitrpg.android.habitica.events.SkillUsedEvent;
 import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Stats;
 
 import org.greenrobot.eventbus.EventBus;
@@ -18,11 +18,11 @@ import rx.functions.Action1;
 public class SkillCallback implements Action1<SkillResponse> {
 
     private Skill usedSkill;
-    private HabitRPGUser user;
+    private User user;
     @Nullable
     private HabitRPGUserCallback.OnUserReceived callBack;
 
-    public SkillCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, @Nullable HabitRPGUser user, Skill usedSkill) {
+    public SkillCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, @Nullable User user, Skill usedSkill) {
         this.usedSkill = usedSkill;
         this.user = user;
         this.callBack = callback;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
index 1e5be9548..acfa4d1b3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.callbacks;
 
 import com.habitrpg.android.habitica.models.responses.UnlockResponse;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import rx.functions.Action1;
 
@@ -12,9 +12,9 @@ public class UnlockCallback implements Action1<UnlockResponse> {
 
     private final HabitRPGUserCallback.OnUserReceived callback;
 
-    private HabitRPGUser user;
+    private User user;
 
-    public UnlockCallback(HabitRPGUserCallback.OnUserReceived callback, HabitRPGUser user) {
+    public UnlockCallback(HabitRPGUserCallback.OnUserReceived callback, User user) {
         this.callback = callback;
         this.user = user;
     }
@@ -24,7 +24,6 @@ public class UnlockCallback implements Action1<UnlockResponse> {
         this.user.setPurchased(unlockResponse.purchased);
         this.user.setItems(unlockResponse.items);
         this.user.setPreferences(unlockResponse.preferences);
-        this.user.async().save();
 
         callback.onUserReceived(this.user);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
index 812b4e8b9..8ff26a2f1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.models.PurchaseValidationResult;
 import com.habitrpg.android.habitica.models.SubscriptionValidationRequest;
 import com.habitrpg.android.habitica.models.Tag;
 import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.responses.BuyResponse;
 import com.habitrpg.android.habitica.models.responses.FeedResponse;
@@ -27,7 +27,7 @@ import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.social.Group;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Items;
 
 import java.util.List;
@@ -46,13 +46,13 @@ public interface ApiClient {
 
     /* user API */
 
-    Observable<HabitRPGUser> getUser();
+    Observable<User> getUser();
 
-    Observable<HabitRPGUser> updateUser(Map<String, Object> updateDictionary);
+    Observable<User> updateUser(Map<String, Object> updateDictionary);
 
-    Observable<HabitRPGUser> registrationLanguage(String registrationLanguage);
+    Observable<User> registrationLanguage(String registrationLanguage);
 
-    Observable<List<ItemData>> getInventoryBuyableGear();
+    Observable<List<Equipment>> getInventoryBuyableGear();
 
     Observable<Items> equipItem(String type, String itemKey);
 
@@ -67,7 +67,7 @@ public interface ApiClient {
     Observable<Void> purchaseQuest(String key);
     Observable<Void> validateSubscription(SubscriptionValidationRequest request);
 
-    Observable<HabitRPGUser> sellItem(String itemType, String itemKey);
+    Observable<User> sellItem(String itemType, String itemKey);
 
     Observable<FeedResponse> feedPet(String petKey, String foodKey);
 
@@ -108,17 +108,17 @@ public interface ApiClient {
     Observable<UserAuthResponse> connectSocial(String network, String userId, String accessToken);
     Observable<Boolean> sleep();
 
-    Observable<HabitRPGUser> revive();
+    Observable<User> revive();
 
     Observable<SkillResponse> useSkill(String skillName, String targetType, String targetId);
 
     Observable<SkillResponse> useSkill(String skillName, String targetType);
 
-    Observable<HabitRPGUser> changeClass();
+    Observable<User> changeClass();
 
-    Observable<HabitRPGUser> changeClass(String className);
+    Observable<User> changeClass(String className);
 
-    Observable<HabitRPGUser> disableClasses();
+    Observable<User> disableClasses();
 
     Observable<Void> markPrivateMessagesRead();
 
@@ -140,9 +140,9 @@ public interface ApiClient {
 
     Observable<Void> deleteMessage(String groupId, String messageId);
 
-    Observable<List<HabitRPGUser>> getGroupMembers(String groupId, Boolean includeAllPublicFields);
+    Observable<List<User>> getGroupMembers(String groupId, Boolean includeAllPublicFields);
 
-    Observable<List<HabitRPGUser>> getGroupMembers(String groupId, Boolean includeAllPublicFields, String lastId);
+    Observable<List<User>> getGroupMembers(String groupId, Boolean includeAllPublicFields, String lastId);
 
     // Like returns the full chat list
     Observable<ChatMessage> likeMessage(String groupId, String mid);
@@ -171,10 +171,10 @@ public interface ApiClient {
 
     Observable<PurchaseValidationResult> validatePurchase(PurchaseValidationRequest request);
 
-    Observable<HabitRPGUser> changeCustomDayStart(Map<String, Object> updateObject);
+    Observable<User> changeCustomDayStart(Map<String, Object> updateObject);
 
     //Members URL
-    Observable<HabitRPGUser> getMember(String memberId);
+    Observable<User> getMember(String memberId);
 
     Observable<AchievementResult> getMemberAchievements(String memberId);
 
@@ -212,9 +212,9 @@ public interface ApiClient {
 
     boolean hasAuthenticationKeys();
 
-    Observable<HabitRPGUser> retrieveUser(boolean withTasks);
+    Observable<User> retrieveUser(boolean withTasks);
 
     <T> Observable.Transformer<HabitResponse<T>, T> configureApiCallObserver();
 
-    Observable<ItemData> openMysteryItem();
+    Observable<Equipment> openMysteryItem();
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.java
index 5391c6089..67d122738 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/CustomizationRepository.java
@@ -4,8 +4,9 @@ import com.habitrpg.android.habitica.models.inventory.Customization;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface CustomizationRepository extends ContentRepository {
-    Observable<List<Customization>> getCustomizations(String type, String category);
+    Observable<RealmResults<Customization>> getCustomizations(String type, String category);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.java
index 007e46085..50f5439bb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/FAQRepository.java
@@ -4,9 +4,10 @@ import com.habitrpg.android.habitica.models.FAQArticle;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface FAQRepository extends BaseRepository {
-    Observable<List<FAQArticle>> getArticles();
+    Observable<RealmResults<FAQArticle>> getArticles();
 
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
index 89a46c37a..f03f48c7c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
@@ -1,44 +1,45 @@
 package com.habitrpg.android.habitica.data;
 
 import com.habitrpg.android.habitica.models.inventory.Item;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 
 public interface InventoryRepository extends ContentRepository {
     Observable<QuestContent> getQuestContent(String key);
 
-    Observable<List<ItemData>> getItems(List<String> searchedKeys);
+    Observable<RealmResults<Equipment>> getItems(List<String> searchedKeys);
 
     long getArmoireRemainingCount();
 
-    Observable<List<ItemData>> getInventoryBuyableGear();
+    Observable<List<Equipment>> getInventoryBuyableGear();
 
-    Observable<List<ItemData>> getOwnedEquipment(String type);
-    Observable<List<ItemData>> getOwnedEquipment();
+    Observable<RealmResults<Equipment>> getOwnedEquipment(String type);
+    Observable<RealmResults<Equipment>> getOwnedEquipment();
 
     Observable<List<Item>> getOwnedItems(String itemType);
 
-    Observable<ItemData> getEquipment(String key);
+    Observable<Equipment> getEquipment(String key);
 
-    Observable<ItemData> openMysteryItem(String key);
+    Observable<Equipment> openMysteryItem(String key);
 
-    void saveEquipment(ItemData itemData);
+    void saveEquipment(Equipment equipment);
 
-    Observable<List<Mount>> getMounts();
-    Observable<List<Mount>> getMounts(String type, String group);
+    Observable<RealmResults<Mount>> getMounts();
+    Observable<RealmResults<Mount>> getMounts(String type, String group);
 
-    Observable<List<Pet>> getPets();
-    Observable<List<Pet>> getPets(String type, String group);
+    Observable<RealmResults<Pet>> getPets();
+    Observable<RealmResults<Pet>> getPets(String type, String group);
 
-    void updateOwnedEquipment(HabitRPGUser user);
+    void updateOwnedEquipment(User user);
 
     void changeOwnedCount(String type, String key, int amountToAdd);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java
index df1d06e81..01e9a75b1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SetupCustomizationRepository.java
@@ -2,12 +2,12 @@ package com.habitrpg.android.habitica.data;
 
 
 import com.habitrpg.android.habitica.models.SetupCustomization;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 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);
+    public List<SetupCustomization> getCustomizations(String type, User user);
+    public List<SetupCustomization> getCustomizations(String type, String subtype, User user);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
index 4a3d6ed6c..7b72da3a9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
@@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
 import com.habitrpg.android.habitica.models.social.Challenge;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.HashMap;
 import java.util.List;
@@ -43,13 +43,13 @@ public interface SocialRepository extends BaseRepository {
     Observable<PostChatMessageResult> postPrivateMessage(String recipientId, String message);
 
 
-    Observable<List<HabitRPGUser>> getGroupMembers(String id, boolean includeAllPublicFields);
+    Observable<List<User>> getGroupMembers(String id, boolean includeAllPublicFields);
 
     Observable<Void> inviteToGroup(String id, Map<String, Object> inviteData);
 
     Observable<List<Challenge>> getUserChallenges();
 
-    Observable<HabitRPGUser> getMember(String userId);
+    Observable<User> getMember(String userId);
 
     Observable<Challenge> getChallenge(String challengeId);
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.java
index 7c2f6f2cf..d79e92b0b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TutorialRepository.java
@@ -4,11 +4,12 @@ import com.habitrpg.android.habitica.models.TutorialStep;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface TutorialRepository extends BaseRepository {
 
     Observable<TutorialStep> getTutorialStep(String key);
-    Observable<List<TutorialStep>> getTutorialSteps(List<String> keys);
+    Observable<RealmResults<TutorialStep>> getTutorialSteps(List<String> keys);
 
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
index 4ad3e53cf..ff33e4a73 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
@@ -4,32 +4,33 @@ import android.support.annotation.Nullable;
 
 import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
 import java.util.Map;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface UserRepository extends BaseRepository {
 
-    Observable<HabitRPGUser> getUser(String userID);
-    Observable<HabitRPGUser> updateUser(HabitRPGUser user, Map<String, Object> updateData);
-    Observable<HabitRPGUser> updateUser(HabitRPGUser user, String key, Object value);
+    Observable<User> getUser(String userID);
+    Observable<User> updateUser(User user, Map<String, Object> updateData);
+    Observable<User> updateUser(User user, String key, Object value);
 
-    Observable<HabitRPGUser> retrieveUser(Boolean withTasks);
+    Observable<User> retrieveUser(Boolean withTasks);
 
-    Observable<HabitRPGUser> revive(HabitRPGUser user);
+    Observable<User> revive(User user);
 
-    void resetTutorial(@Nullable HabitRPGUser user);
+    void resetTutorial(@Nullable User user);
 
-    Observable<HabitRPGUser> sleep(HabitRPGUser user);
+    Observable<User> sleep(User user);
 
-    Observable<List<Skill>> getSkills(HabitRPGUser user);
+    Observable<RealmResults<Skill>> getSkills(User user);
 
-    Observable<List<Skill>> getSpecialItems(HabitRPGUser user);
+    Observable<RealmResults<Skill>> getSpecialItems(User user);
 
-    Observable<SkillResponse> useSkill(@Nullable HabitRPGUser user, String key, String target, String taskId);
+    Observable<SkillResponse> useSkill(@Nullable User user, String key, String target, String taskId);
 
-    Observable<SkillResponse> useSkill(@Nullable HabitRPGUser user, String key, String target);
+    Observable<SkillResponse> useSkill(@Nullable User user, String key, String target);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index cc6c7a657..a95bb36bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -36,9 +36,9 @@ import com.habitrpg.android.habitica.models.auth.UserAuthSocial;
 import com.habitrpg.android.habitica.models.auth.UserAuthSocialTokens;
 import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Food;
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.Quest;
@@ -60,7 +60,7 @@ import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
 import com.habitrpg.android.habitica.models.tasks.TaskTag;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.Purchases;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
@@ -212,11 +212,11 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
         }.getType();
         Type customizationListType = new TypeToken<List<Customization>>() {
         }.getType();
-        Type tutorialStepListType = new TypeToken<List<TutorialStep>>() {
+        Type tutorialStepListType = new TypeToken<RealmList<TutorialStep>>() {
         }.getType();
         Type faqArticleListType = new TypeToken<List<FAQArticle>>() {
         }.getType();
-        Type itemDataListType = new TypeToken<List<ItemData>>() {
+        Type itemDataListType = new TypeToken<List<Equipment>>() {
         }.getType();
         Type eggListType = new TypeToken<List<Egg>>() {
         }.getType();
@@ -347,9 +347,9 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
         }
     }
 
-    public Observable<HabitRPGUser> retrieveUser(boolean withTasks) {
+    public Observable<User> retrieveUser(boolean withTasks) {
 
-        Observable<HabitRPGUser> userObservable = this.getUser();
+        Observable<User> userObservable = this.getUser();
 
         if (withTasks) {
             Observable<TaskList> tasksObservable = this.getTasks();
@@ -450,22 +450,22 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     @Override
-    public Observable<HabitRPGUser> getUser() {
+    public Observable<User> getUser() {
         return apiService.getUser().compose(configureApiCallObserver());
     }
 
     @Override
-    public Observable<HabitRPGUser> updateUser(Map<String, Object> updateDictionary) {
+    public Observable<User> updateUser(Map<String, Object> updateDictionary) {
         return apiService.updateUser(updateDictionary).compose(configureApiCallObserver());
     }
 
     @Override
-    public Observable<HabitRPGUser> registrationLanguage(String registrationLanguage) {
+    public Observable<User> registrationLanguage(String registrationLanguage) {
         return apiService.registrationLanguage(registrationLanguage).compose(configureApiCallObserver());
     }
 
     @Override
-    public Observable<List<ItemData>> getInventoryBuyableGear() {
+    public Observable<List<Equipment>> getInventoryBuyableGear() {
         return apiService.getInventoryBuyableGear().compose(configureApiCallObserver());
     }
 
@@ -513,7 +513,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     @Override
-    public Observable<HabitRPGUser> sellItem(String itemType, String itemKey) {
+    public Observable<User> sellItem(String itemType, String itemKey) {
         return apiService.sellItem(itemType, itemKey).compose(configureApiCallObserver());
     }
 
@@ -598,7 +598,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     @Override
-    public Observable<HabitRPGUser> revive() {
+    public Observable<User> revive() {
         return apiService.revive().compose(configureApiCallObserver());
     }
 
@@ -613,17 +613,17 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     @Override
-    public Observable<HabitRPGUser> changeClass() {
+    public Observable<User> changeClass() {
         return apiService.changeClass().compose(configureApiCallObserver());
     }
 
     @Override
-    public Observable<HabitRPGUser> changeClass(String className) {
+    public Observable<User> changeClass(String className) {
         return apiService.changeClass(className).compose(configureApiCallObserver());
     }
 
     @Override
-    public Observable<HabitRPGUser> disableClasses() {
+    public Observable<User> disableClasses() {
         return apiService.disableClasses().compose(configureApiCallObserver());
     }
 
@@ -673,12 +673,12 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     @Override
-    public Observable<List<HabitRPGUser>> getGroupMembers(String groupId, Boolean includeAllPublicFields) {
+    public Observable<List<User>> getGroupMembers(String groupId, Boolean includeAllPublicFields) {
         return apiService.getGroupMembers(groupId, includeAllPublicFields).compose(configureApiCallObserver());
     }
 
     @Override
-    public Observable<List<HabitRPGUser>> getGroupMembers(String groupId, Boolean includeAllPublicFields, String lastId) {
+    public Observable<List<User>> getGroupMembers(String groupId, Boolean includeAllPublicFields, String lastId) {
         return apiService.getGroupMembers(groupId, includeAllPublicFields, lastId).compose(configureApiCallObserver());
     }
 
@@ -753,12 +753,12 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     @Override
-    public Observable<HabitRPGUser> changeCustomDayStart(Map<String, Object> updateObject) {
+    public Observable<User> changeCustomDayStart(Map<String, Object> updateObject) {
         return apiService.changeCustomDayStart(updateObject).compose(configureApiCallObserver());
     }
 
     @Override
-    public Observable<HabitRPGUser> getMember(String memberId) {
+    public Observable<User> getMember(String memberId) {
         return apiService.getMember(memberId).compose(configureApiCallObserver());
     }
 
@@ -828,7 +828,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
 
 
     @Override
-    public Observable<ItemData> openMysteryItem() {
+    public Observable<Equipment> openMysteryItem() {
         return apiService.openMysteryItem().compose(configureApiCallObserver());
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.java
index 248b18c26..3399bb711 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/CustomizationRepositoryImpl.java
@@ -5,8 +5,7 @@ import com.habitrpg.android.habitica.data.CustomizationRepository;
 import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository;
 import com.habitrpg.android.habitica.models.inventory.Customization;
 
-import java.util.List;
-
+import io.realm.RealmResults;
 import rx.Observable;
 
 public class CustomizationRepositoryImpl extends ContentRepositoryImpl<CustomizationLocalRepository> implements CustomizationRepository {
@@ -16,7 +15,7 @@ public class CustomizationRepositoryImpl extends ContentRepositoryImpl<Customiza
     }
 
     @Override
-    public Observable<List<Customization>> getCustomizations(String type, String category) {
+    public Observable<RealmResults<Customization>> getCustomizations(String type, String category) {
         return localRepository.getCustomizations(type, category);
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.java
index 5e75a651c..2f0a0f6d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/FAQRepositoryImpl.java
@@ -5,8 +5,7 @@ import com.habitrpg.android.habitica.data.FAQRepository;
 import com.habitrpg.android.habitica.data.local.FAQLocalRepository;
 import com.habitrpg.android.habitica.models.FAQArticle;
 
-import java.util.List;
-
+import io.realm.RealmResults;
 import rx.Observable;
 
 
@@ -16,7 +15,7 @@ public class FAQRepositoryImpl extends ContentRepositoryImpl<FAQLocalRepository>
     }
 
     @Override
-    public Observable<List<FAQArticle>> getArticles() {
+    public Observable<RealmResults<FAQArticle>> getArticles() {
         return localRepository.getArticles();
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
index 4525ef1b2..deaeec1af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
@@ -4,14 +4,15 @@ import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.data.local.InventoryLocalRepository;
 import com.habitrpg.android.habitica.models.inventory.Item;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLocalRepository> implements InventoryRepository {
@@ -26,7 +27,7 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
     }
 
     @Override
-    public Observable<List<ItemData>> getItems(List<String> searchedKeys) {
+    public Observable<RealmResults<Equipment>> getItems(List<String> searchedKeys) {
         return localRepository.getItems(searchedKeys);
     }
 
@@ -36,17 +37,17 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
     }
 
     @Override
-    public Observable<List<ItemData>> getInventoryBuyableGear() {
+    public Observable<List<Equipment>> getInventoryBuyableGear() {
         return apiClient.getInventoryBuyableGear();
     }
 
     @Override
-    public Observable<List<ItemData>> getOwnedEquipment(String type) {
+    public Observable<RealmResults<Equipment>> getOwnedEquipment(String type) {
         return localRepository.getOwnedEquipment(type);
     }
 
     @Override
-    public Observable<List<ItemData>> getOwnedEquipment() {
+    public Observable<RealmResults<Equipment>> getOwnedEquipment() {
         return localRepository.getOwnedEquipment();
     }
 
@@ -56,12 +57,12 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
     }
 
     @Override
-    public Observable<ItemData> getEquipment(String key) {
+    public Observable<Equipment> getEquipment(String key) {
         return localRepository.getEquipment(key);
     }
 
     @Override
-    public Observable<ItemData> openMysteryItem(String key) {
+    public Observable<Equipment> openMysteryItem(String key) {
         return apiClient.openMysteryItem().doOnNext(itemData -> {
             itemData.setOwned(true);
             localRepository.saveEquipment(itemData);
@@ -69,32 +70,32 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
     }
 
     @Override
-    public void saveEquipment(ItemData itemData) {
-        localRepository.saveEquipment(itemData);
+    public void saveEquipment(Equipment equipment) {
+        localRepository.saveEquipment(equipment);
     }
 
     @Override
-    public Observable<List<Mount>> getMounts() {
+    public Observable<RealmResults<Mount>> getMounts() {
         return localRepository.getMounts();
     }
 
     @Override
-    public Observable<List<Mount>> getMounts(String type, String group) {
+    public Observable<RealmResults<Mount>> getMounts(String type, String group) {
         return localRepository.getMounts(type, group);
     }
 
     @Override
-    public Observable<List<Pet>> getPets() {
+    public Observable<RealmResults<Pet>> getPets() {
         return localRepository.getPets();
     }
 
     @Override
-    public Observable<List<Pet>> getPets(String type, String group) {
+    public Observable<RealmResults<Pet>> getPets(String type, String group) {
         return localRepository.getPets(type, group);
     }
 
     @Override
-    public void updateOwnedEquipment(HabitRPGUser user) {
+    public void updateOwnedEquipment(User user) {
         localRepository.updateOwnedEquipment(user);
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
index 705874458..c5bbfa319 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SetupCustomizationRepositoryImpl.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
 import com.habitrpg.android.habitica.models.SetupCustomization;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,12 +24,12 @@ public class SetupCustomizationRepositoryImpl implements SetupCustomizationRepos
     }
 
     @Override
-    public List<SetupCustomization> getCustomizations(String category, HabitRPGUser user) {
+    public List<SetupCustomization> getCustomizations(String category, User user) {
         return getCustomizations(category, null, user);
     }
 
     @Override
-    public List<SetupCustomization> getCustomizations(String category, String subcategory, HabitRPGUser user) {
+    public List<SetupCustomization> getCustomizations(String category, String subcategory, User user) {
         switch (category) {
             case "body": {
                 switch (subcategory) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
index 446eabf24..2e43b9321 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
@@ -3,11 +3,12 @@ package com.habitrpg.android.habitica.data.implementation;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.responses.PostChatMessageResult;
 import com.habitrpg.android.habitica.models.social.Challenge;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 
 import java.util.HashMap;
@@ -122,7 +123,7 @@ public class SocialRepositoryImpl extends BaseRepositoryImpl<SocialLocalReposito
     }
 
     @Override
-    public Observable<List<HabitRPGUser>> getGroupMembers(String id, boolean includeAllPublicFields) {
+    public Observable<List<User>> getGroupMembers(String id, boolean includeAllPublicFields) {
         return apiClient.getGroupMembers(id, includeAllPublicFields);
     }
 
@@ -137,7 +138,7 @@ public class SocialRepositoryImpl extends BaseRepositoryImpl<SocialLocalReposito
     }
 
     @Override
-    public Observable<HabitRPGUser> getMember(String userId) {
+    public Observable<User> getMember(String userId) {
         return apiClient.getMember(userId);
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.java
index 816136ee7..48fd4f634 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TutorialRepositoryImpl.java
@@ -7,6 +7,7 @@ import com.habitrpg.android.habitica.models.TutorialStep;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 
@@ -21,7 +22,7 @@ public class TutorialRepositoryImpl extends BaseRepositoryImpl<TutorialLocalRepo
     }
 
     @Override
-    public Observable<List<TutorialStep>> getTutorialSteps(List<String> keys) {
+    public Observable<RealmResults<TutorialStep>> getTutorialSteps(List<String> keys) {
         return localRepository.getTutorialSteps(keys);
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index e6f1ca3f9..4d75bfd22 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -3,15 +3,16 @@ package com.habitrpg.android.habitica.data.implementation;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.data.local.UserLocalRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.TutorialStep;
 import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 
@@ -22,10 +23,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
     }
 
     @Override
-    public Observable<HabitRPGUser> getUser(String userID) {
+    public Observable<User> getUser(String userID) {
         return localRepository.getUser(userID)
+                .first()
                 .flatMap(habitRPGUser -> {
-                    if (habitRPGUser == null) {
+                    if (habitRPGUser == null || !habitRPGUser.isValid()) {
                         return retrieveUser(true);
                     } else {
                         return Observable.just(habitRPGUser);
@@ -34,31 +36,31 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
     }
 
     @Override
-    public Observable<HabitRPGUser> updateUser(HabitRPGUser user, Map<String, Object> updateData) {
+    public Observable<User> updateUser(User user, Map<String, Object> updateData) {
         return apiClient.updateUser(updateData)
                 .map(newUser -> mergeUser(user, newUser));
     }
 
     @Override
-    public Observable<HabitRPGUser> updateUser(HabitRPGUser user, String key, Object value) {
+    public Observable<User> updateUser(User user, String key, Object value) {
         Map<String, Object> updateData = new HashMap<>();
         updateData.put(key, value);
         return updateUser(user, updateData);
     }
 
     @Override
-    public Observable<HabitRPGUser> retrieveUser(Boolean withTasks) {
+    public Observable<User> retrieveUser(Boolean withTasks) {
         return apiClient.retrieveUser(withTasks)
                 .doOnNext(localRepository::saveUser);
     }
 
     @Override
-    public Observable<HabitRPGUser> revive(HabitRPGUser user) {
+    public Observable<User> revive(User user) {
         return apiClient.revive().map(newUser -> mergeUser(user, newUser));
     }
 
     @Override
-    public void resetTutorial(HabitRPGUser user) {
+    public void resetTutorial(User user) {
         localRepository.getTutorialSteps()
                 .map(tutorialSteps -> {
                     Map<String, Object> updateData = new HashMap<>();
@@ -72,7 +74,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
     }
 
     @Override
-    public Observable<HabitRPGUser> sleep(HabitRPGUser user) {
+    public Observable<User> sleep(User user) {
         return apiClient.sleep()
                 .map(isSleeping -> {
                     user.getPreferences().setSleep(isSleeping);
@@ -82,17 +84,17 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
     }
 
     @Override
-    public Observable<List<Skill>> getSkills(HabitRPGUser user) {
+    public Observable<RealmResults<Skill>> getSkills(User user) {
         return localRepository.getSkills(user);
     }
 
     @Override
-    public Observable<List<Skill>> getSpecialItems(HabitRPGUser user) {
+    public Observable<RealmResults<Skill>> getSpecialItems(User user) {
         return localRepository.getSpecialItems(user);
     }
 
     @Override
-    public Observable<SkillResponse> useSkill(HabitRPGUser user, String key, String target, String taskId) {
+    public Observable<SkillResponse> useSkill(User user, String key, String target, String taskId) {
         return apiClient.useSkill(key, target, taskId).doOnNext(skillResponse -> {
             if (user != null) {
                 mergeUser(user, skillResponse.user);
@@ -101,7 +103,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
     }
 
     @Override
-    public Observable<SkillResponse> useSkill(HabitRPGUser user, String key, String target) {
+    public Observable<SkillResponse> useSkill(User user, String key, String target) {
         return apiClient.useSkill(key, target).doOnNext(skillResponse -> {
             if (user != null) {
                 mergeUser(user, skillResponse.user);
@@ -109,7 +111,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
         });
     }
 
-    private HabitRPGUser mergeUser(HabitRPGUser oldUser, HabitRPGUser newUser) {
+    private User mergeUser(User oldUser, User newUser) {
         if (newUser.getItems() != null) {
             oldUser.setItems(newUser.getItems());
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java
index 056041328..9bf9e7835 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java
@@ -4,8 +4,9 @@ import com.habitrpg.android.habitica.models.inventory.Customization;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface CustomizationLocalRepository extends BaseLocalRepository {
-    Observable<List<Customization>> getCustomizations(String type, String category);
+    Observable<RealmResults<Customization>> getCustomizations(String type, String category);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java
index 7a22ed29e..0d332fd67 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java
@@ -4,9 +4,10 @@ import com.habitrpg.android.habitica.models.FAQArticle;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface FAQLocalRepository extends BaseLocalRepository {
 
-    Observable<List<FAQArticle>> getArticles();
+    Observable<RealmResults<FAQArticle>> getArticles();
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
index 50e8f7a5d..ccd001864 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
@@ -1,39 +1,40 @@
 package com.habitrpg.android.habitica.data.local;
 
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Item;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface InventoryLocalRepository extends BaseLocalRepository {
     Observable<QuestContent> getQuestContent(String key);
 
-    Observable<List<ItemData>> getItems(List<String> searchedKeys);
+    Observable<RealmResults<Equipment>> getItems(List<String> searchedKeys);
 
     long getArmoireRemainingCount();
 
-    Observable<List<ItemData>> getOwnedEquipment(String type);
-    Observable<List<ItemData>> getOwnedEquipment();
+    Observable<RealmResults<Equipment>> getOwnedEquipment(String type);
+    Observable<RealmResults<Equipment>> getOwnedEquipment();
 
     Observable<List<Item>> getOwnedItems(String itemType);
 
-    Observable<ItemData> getEquipment(String key);
+    Observable<Equipment> getEquipment(String key);
 
-    void saveEquipment(ItemData itemData);
+    void saveEquipment(Equipment equipment);
 
-    Observable<List<Mount>> getMounts();
-    Observable<List<Mount>> getMounts(String type, String group);
+    Observable<RealmResults<Mount>> getMounts();
+    Observable<RealmResults<Mount>> getMounts(String type, String group);
 
-    Observable<List<Pet>> getPets();
-    Observable<List<Pet>> getPets(String type, String group);
+    Observable<RealmResults<Pet>> getPets();
+    Observable<RealmResults<Pet>> getPets(String type, String group);
 
-    void updateOwnedEquipment(HabitRPGUser user);
+    void updateOwnedEquipment(User user);
 
     void changeOwnedCount(String type, String key, int amountToAdd);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.java
index 92b61e537..8042005f6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TutorialLocalRepository.java
@@ -4,10 +4,11 @@ import com.habitrpg.android.habitica.models.TutorialStep;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface TutorialLocalRepository extends BaseLocalRepository {
 
     Observable<TutorialStep> getTutorialStep(String key);
-    Observable<List<TutorialStep>> getTutorialSteps(List<String> keys);
+    Observable<RealmResults<TutorialStep>> getTutorialSteps(List<String> keys);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
index 42548c396..ba78224ee 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/UserLocalRepository.java
@@ -2,21 +2,22 @@ package com.habitrpg.android.habitica.data.local;
 
 import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.TutorialStep;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface UserLocalRepository extends BaseLocalRepository {
 
-    Observable<HabitRPGUser> getUser(String userID);
+    Observable<User> getUser(String userID);
 
-    void saveUser(HabitRPGUser user);
+    void saveUser(User user);
 
-    Observable<List<TutorialStep>> getTutorialSteps();
+    Observable<RealmResults<TutorialStep>> getTutorialSteps();
 
-    Observable<List<Skill>> getSkills(HabitRPGUser user);
+    Observable<RealmResults<Skill>> getSkills(User user);
 
-    Observable<List<Skill>> getSpecialItems(HabitRPGUser user);
+    Observable<RealmResults<Skill>> getSpecialItems(User user);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java
deleted file mode 100644
index 59bad7da3..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowCustomizationLocalRepository.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository;
-import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.OrderBy;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.sql.language.Where;
-
-import java.util.Date;
-import java.util.List;
-
-import io.realm.Realm;
-import rx.Observable;
-
-public class DbFlowCustomizationLocalRepository implements CustomizationLocalRepository {
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public void executeTransaction(Realm.Transaction transaction) {
-
-    }
-
-    @Override
-    public Observable<List<Customization>> getCustomizations(String type, String category) {
-        return Observable.defer(() -> {
-
-            Where<Customization> select = new Select()
-                    .from(Customization.class)
-                    .where(Condition.column("type").eq(type))
-                    .and(Condition.CombinedCondition.begin(Condition.column("purchased").eq(true))
-                            .or(Condition.column("price").eq(0))
-                            .or(Condition.column("price").isNull())
-                            .or(Condition.column("isBuyable").eq(true))
-                            .or(Condition.column("isBuyable").isNull())
-                            .or(Condition.CombinedCondition.begin(
-                                    Condition.CombinedCondition.begin(Condition.column("availableUntil").isNull())
-                                            .or(Condition.column("availableUntil").greaterThanOrEq(new Date().getTime())))
-                                    .and(Condition.CombinedCondition.begin(Condition.column("availableFrom").isNull())
-                                            .or(Condition.column("availableFrom").lessThanOrEq(new Date().getTime()))
-                                    )
-                            )
-                    );
-            if (category != null) {
-                select = select.and(Condition.column("category").eq(category));
-            }
-            if (type != null && type.equals("background")) {
-                select.orderBy(OrderBy.columns("customizationSetName").descending());
-            } else {
-                select.orderBy(true, "customizationSet");
-            }
-
-            return Observable.just(select.queryList());
-        });
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java
deleted file mode 100644
index c36eced12..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowFAQLocalRepository.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.FAQLocalRepository;
-import com.habitrpg.android.habitica.models.FAQArticle;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.util.List;
-
-import io.realm.Realm;
-import rx.Observable;
-
-public class DbFlowFAQLocalRepository implements FAQLocalRepository {
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public void executeTransaction(Realm.Transaction transaction) {
-
-    }
-
-    @Override
-    public Observable<List<FAQArticle>> getArticles() {
-        return Observable.defer(() -> Observable.just(new Select().from(FAQArticle.class).queryList()));
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java
deleted file mode 100644
index e002b7deb..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowInventoryLocalRepository.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.InventoryLocalRepository;
-import com.habitrpg.android.habitica.models.inventory.Egg;
-import com.habitrpg.android.habitica.models.inventory.Food;
-import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.Item;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
-import com.habitrpg.android.habitica.models.inventory.Mount;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.habitrpg.android.habitica.models.inventory.QuestBoss;
-import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.raizlabs.android.dbflow.runtime.TransactionManager;
-import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
-import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
-import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
-import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.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 java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import io.realm.Realm;
-import rx.Observable;
-
-public class DbFlowInventoryLocalRepository implements InventoryLocalRepository {
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public void executeTransaction(Realm.Transaction transaction) {
-
-    }
-
-    @Override
-    public Observable<QuestContent> getQuestContent(String key) {
-        return Observable.defer(() -> Observable.just(new Select().from(QuestContent.class).querySingle()))
-                .map(questContent -> {
-                    questContent.boss = new Select().from(QuestBoss.class).where(Condition.column(ItemData.UNIQUE_IDENTIFIER).eq(key)).querySingle();
-                    return questContent;
-                });
-    }
-
-    @Override
-    public Observable<List<ItemData>> getItems(List<String> searchedKeys) {
-        Condition.In keyCondition = Condition.column(ItemData.UNIQUE_IDENTIFIER).in("");
-        for (String item : searchedKeys) {
-            keyCondition = keyCondition.and(item);
-        }
-        Where<ItemData> query = new Select().from(ItemData.class).where(keyCondition);
-        return Observable.defer(() -> Observable.just(query.queryList()));
-    }
-
-    @Override
-    public long getArmoireRemainingCount() {
-        return new Select().count()
-                .from(ItemData.class)
-                .where(Condition.CombinedCondition.begin(Condition.column("klass").eq("armoire"))
-                        .and(Condition.column("owned").isNull())
-                ).count();
-    }
-
-    @Override
-    public Observable<List<ItemData>> getOwnedEquipment(String type) {
-        return Observable.defer(() -> Observable.just(new Select()
-                .from(ItemData.class)
-                .where(Condition.CombinedCondition.begin(Condition.column("type").eq(type))
-                        .and(Condition.column("owned").eq(true))
-                ).queryList()));
-    }
-
-    @Override
-    public Observable<List<ItemData>> getOwnedEquipment() {
-        return Observable.defer(() -> Observable.just(new Select().from(ItemData.class).where(Condition.column("owned").eq(true)).queryList()));
-    }
-
-    @Override
-    public Observable<List<Item>> getOwnedItems(String itemType) {
-        return Observable.defer(() -> {
-                From from = null;
-                switch (itemType) {
-                    case "eggs":
-                        from = new Select().from(Egg.class);
-                        break;
-                    case "hatchingPotions":
-                        from = new Select().from(HatchingPotion.class);
-                        break;
-                    case "food":
-                        from = new Select().from(Food.class);
-                        break;
-                    case "quests":
-                        from = new Select().from(QuestContent.class);
-                }
-            if (from != null) {
-                return Observable.just(((From<Item>)from).where(Condition.column("owned").greaterThan(0)).queryList());
-            } else {
-                return Observable.just(new ArrayList<Item>());
-            }
-        });
-    }
-
-    @Override
-    public Observable<ItemData> getEquipment(String key) {
-        return Observable.defer(() -> Observable.just(new Select().from(ItemData.class).where(Condition.column("key").eq(key)).querySingle()));
-    }
-
-    @Override
-    public void saveEquipment(ItemData itemData) {
-        itemData.async().save();
-    }
-
-    @Override
-    public Observable<List<Mount>> getMounts() {
-        return Observable.defer(() -> Observable.just(new Select().from(Mount.class).orderBy(true, "color").queryList()));
-    }
-
-    @Override
-    public Observable<List<Mount>> getMounts(String type, String group) {
-        return Observable.defer(() -> Observable.just(new Select()
-                .from(Mount.class)
-                .where(Condition.CombinedCondition
-                        .begin(Condition.column("animal").eq(type))
-                        .and(Condition.column("animalGroup").eq(group)))
-                .orderBy(true, "color").queryList()));
-    }
-
-    @Override
-    public Observable<List<Pet>> getPets() {
-        return Observable.defer(() -> Observable.just(new Select().from(Pet.class).orderBy(true, "color").queryList()));
-    }
-
-    @Override
-    public Observable<List<Pet>> getPets(String type, String group) {
-        return Observable.defer(() -> Observable.just(new Select()
-                .from(Pet.class)
-                .where(Condition.CombinedCondition
-                        .begin(Condition.column("animal").eq(type))
-                        .and(Condition.column("animalGroup").eq(group)))
-                .orderBy(true, "color").queryList()));
-    }
-
-    @Override
-    public void updateOwnedEquipment(HabitRPGUser user) {
-        if (user == null || user.getItems() == null) {
-            return;
-        }
-        List<BaseModel> updates = new ArrayList<>();
-        updates.addAll(this.updateOwnedData(Egg.class, user.getItems().getEggs()));
-        updates.addAll(this.updateOwnedData(Food.class, user.getItems().getFood()));
-        updates.addAll(this.updateOwnedData(HatchingPotion.class, user.getItems().getHatchingPotions()));
-        updates.addAll(this.updateOwnedData(QuestContent.class, user.getItems().getQuests()));
-
-        updates.addAll(this.updateOwnedData(user.getItems().getGear().owned));
-        if (!updates.isEmpty()) {
-            TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(updates)));
-        }
-    }
-
-    @Override
-    public void changeOwnedCount(String type, String key, int amountToAdd) {
-        From from = null;
-
-        switch (type) {
-            case "hatchingpotion":
-                from = new Select().from(HatchingPotion.class);
-                break;
-            case "food":
-                from = new Select().from(Food.class);
-                break;
-            case "egg":
-                from = new Select().from(Egg.class);
-                break;
-        }
-
-        if (from != null) {
-            from.where(Condition.column("key").eq(key))
-                    .async()
-                    .querySingle(new TransactionListener() {
-                        @Override
-                        public void onResultReceived(Object result) {
-                            if (result != null) {
-                                Item item = (Item) result;
-                                item.setOwned(item.getOwned() + 1);
-                                item.save();
-                            }
-                        }
-
-                        @Override
-                        public boolean onReady(BaseTransaction transaction) {
-                            return true;
-                        }
-
-                        @Override
-                        public boolean hasResult(BaseTransaction transaction, Object result) {
-                            return true;
-                        }
-                    });
-        }
-    }
-
-    private <T extends Item> List<T> updateOwnedData(Class<T> itemClass, HashMap<String, Integer> ownedMapping) {
-        List<T> updates = new ArrayList<>();
-        if (ownedMapping == null) {
-            return updates;
-        }
-        List<T> items = new Select().from(itemClass).queryList();
-        for (T item : items) {
-            if (ownedMapping.containsKey(item.getKey()) && !item.getOwned().equals(ownedMapping.get(item.getKey()))) {
-                item.setOwned(ownedMapping.get(item.getKey()));
-                updates.add(item);
-            } else if (!ownedMapping.containsKey(item.getKey()) && item.getOwned() > 0) {
-                item.setOwned(0);
-                updates.add(item);
-            }
-        }
-        return updates;
-    }
-
-    private List<ItemData> updateOwnedData(HashMap<String, Boolean> ownedMapping) {
-        List<ItemData> updates = new ArrayList<>();
-        if (ownedMapping == null) {
-            return updates;
-        }
-        List<ItemData> items = new Select().from(ItemData.class).queryList();
-        for (ItemData item : items) {
-            if (ownedMapping.containsKey(item.key) && item.owned != ownedMapping.get(item.key)) {
-                item.owned = ownedMapping.get(item.key);
-                updates.add(item);
-            } else if (!ownedMapping.containsKey(item.key) && item.owned != null) {
-                item.owned = null;
-                updates.add(item);
-            }
-        }
-        return updates;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTutorialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTutorialLocalRepository.java
deleted file mode 100644
index 1c7077539..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowTutorialLocalRepository.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.TutorialLocalRepository;
-import com.habitrpg.android.habitica.models.TutorialStep;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.util.List;
-
-import io.realm.Realm;
-import rx.Observable;
-
-public class DbFlowTutorialLocalRepository implements TutorialLocalRepository {
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public void executeTransaction(Realm.Transaction transaction) {
-
-    }
-
-    @Override
-    public Observable<TutorialStep> getTutorialStep(String key) {
-        return Observable.defer(() -> Observable.just(new Select().from(TutorialStep.class).where(Condition.column("key").eq(key)).querySingle()));
-    }
-
-    @Override
-    public Observable<List<TutorialStep>> getTutorialSteps(List<String> keys) {
-        return Observable.defer(() -> Observable.just(new Select().from(TutorialStep.class)
-                .where(Condition.column("key").in(keys))
-                .queryList()));
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
deleted file mode 100644
index bb3ffb55b..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowUserLocalRepository.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.UserLocalRepository;
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.TutorialStep;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
-import com.habitrpg.android.habitica.models.user.SpecialItems;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.realm.Realm;
-import rx.Observable;
-
-public class DbFlowUserLocalRepository implements UserLocalRepository {
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public void executeTransaction(Realm.Transaction transaction) {
-
-    }
-
-    @Override
-    public Observable<HabitRPGUser> getUser(String userID) {
-        return Observable.defer(() -> Observable.just(new Select()
-                .from(HabitRPGUser.class).where(Condition.column("id").eq(userID)).querySingle()));
-    }
-
-    @Override
-    public void saveUser(HabitRPGUser user) {
-        user.async().save();
-    }
-
-    @Override
-    public Observable<List<TutorialStep>> getTutorialSteps() {
-        return Observable.defer(() -> Observable.just(new Select()
-                .from(TutorialStep.class).queryList()));
-    }
-
-    @Override
-    public Observable<List<Skill>> getSkills(HabitRPGUser user) {
-        return Observable.defer(() -> Observable.just(new Select()
-                .from(Skill.class)
-                .where(Condition.column("habitClass").eq(user.getStats().get_class()))
-                .and(Condition.column("lvl").lessThanOrEq(user.getStats().getLvl()))
-                .queryList()));
-    }
-
-    @Override
-    public Observable<List<Skill>> getSpecialItems(HabitRPGUser user) {
-        SpecialItems specialItems = user.getItems().getSpecial();
-        if (specialItems != null) {
-
-            Condition.In specialsWhere = Condition.column("key").in("");
-
-            if (specialItems.getSnowball() > 0) {
-                specialsWhere.and("snowball");
-            }
-
-            if (specialItems.getShinySeed() > 0) {
-                specialsWhere.and("shinySeed");
-            }
-
-            if (specialItems.getSeafoam() > 0) {
-                specialsWhere.and("seafoam");
-            }
-
-            if (specialItems.getSpookySparkles() > 0) {
-                specialsWhere.and("spookySparkles");
-            }
-            return Observable.defer(() -> Observable.from(new Select()
-                    .from(Skill.class)
-                    .where(specialsWhere)
-                    .queryList()))
-                    .map(skill -> {
-                        skill.isSpecialItem = true;
-                        skill.target = "party";
-                        return skill;
-                    })
-                    .toList();
-        } else {
-            return Observable.just(new ArrayList<>());
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.java
new file mode 100644
index 000000000..8086d537b
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.java
@@ -0,0 +1,25 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.CustomizationLocalRepository;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import rx.Observable;
+
+
+public class RealmCustomizationLocalRepository extends RealmBaseLocalRepository implements CustomizationLocalRepository {
+
+    public RealmCustomizationLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public Observable<RealmResults<Customization>> getCustomizations(String type, String category) {
+        return realm.where(Customization.class)
+                .equalTo("type", type)
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.java
new file mode 100644
index 000000000..4e2106065
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.java
@@ -0,0 +1,23 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.FAQLocalRepository;
+import com.habitrpg.android.habitica.models.FAQArticle;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import rx.Observable;
+
+public class RealmFAQLocalRepository extends RealmBaseLocalRepository implements FAQLocalRepository {
+
+    public RealmFAQLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public Observable<RealmResults<FAQArticle>> getArticles() {
+        return realm.where(FAQArticle.class)
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
new file mode 100644
index 000000000..424da2e5d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
@@ -0,0 +1,126 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.InventoryLocalRepository;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
+import com.habitrpg.android.habitica.models.inventory.Item;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.user.User;
+
+import java.util.List;
+
+import io.realm.Realm;
+import io.realm.RealmQuery;
+import io.realm.RealmResults;
+import rx.Observable;
+
+
+public class RealmInventoryLocalRepository extends RealmBaseLocalRepository implements InventoryLocalRepository {
+    public RealmInventoryLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public Observable<QuestContent> getQuestContent(String key) {
+        return realm.where(QuestContent.class).equalTo("key", key).findFirstAsync()
+                .asObservable()
+                .filter(realmObject -> realmObject.isLoaded())
+                .cast(QuestContent.class);
+    }
+
+    @Override
+    public Observable<RealmResults<Equipment>> getItems(List<String> searchedKeys) {
+        return realm.where(Equipment.class)
+                .in("key", (String[]) searchedKeys.toArray())
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public long getArmoireRemainingCount() {
+        return 0;
+    }
+
+    @Override
+    public Observable<RealmResults<Equipment>> getOwnedEquipment(String type) {
+        return realm.where(Equipment.class)
+                .equalTo("type", type)
+                .equalTo("owned", true)
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Equipment>> getOwnedEquipment() {
+        return realm.where(Equipment.class)
+                .equalTo("owned", true)
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<List<Item>> getOwnedItems(String itemType) {
+        return null;
+    }
+
+    @Override
+    public Observable<Equipment> getEquipment(String key) {
+        return realm.where(Equipment.class)
+                .equalTo("key", key)
+                .findFirstAsync()
+                .asObservable()
+                .filter(realmObject -> realmObject.isLoaded())
+                .cast(Equipment.class);    }
+
+    @Override
+    public void saveEquipment(Equipment equipment) {
+        realm.executeTransaction(realm1 -> realm1.copyToRealm(equipment));
+    }
+
+    @Override
+    public Observable<RealmResults<Mount>> getMounts() {
+        return realm.where(Mount.class).findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Mount>> getMounts(String type, String group) {
+        return realm.where(Mount.class)
+                .equalTo("group", group)
+                .equalTo("type", type)
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Pet>> getPets() {
+        return realm.where(Pet.class).findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Pet>> getPets(String type, String group) {
+        return realm.where(Pet.class)
+                .equalTo("group", group)
+                .equalTo("type", type)
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public void updateOwnedEquipment(User user) {
+
+    }
+
+    @Override
+    public void changeOwnedCount(String type, String key, int amountToAdd) {
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
index 4005b8f13..13ad0857c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
@@ -34,12 +34,12 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
 
     @Override
     public void saveTasks(TasksOrder tasksOrder, TaskList tasks) {
-        realm.executeTransaction(realm1 -> realm1.copyToRealm(tasks.tasks.values()));
+        realm.executeTransaction(realm1 -> realm1.copyToRealmOrUpdate(tasks.tasks.values()));
     }
 
     @Override
     public void saveTask(Task task) {
-        realm.executeTransaction(realm1 -> realm1.copyToRealm(task));
+        realm.executeTransaction(realm1 -> realm1.copyToRealmOrUpdate(task));
     }
 
     @Override
@@ -64,13 +64,15 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
 
     @Override
     public void deleteTask(String taskID) {
-        Task task = realm.where(Task.class).equalTo("id", taskID).findFirst();
+        Task task = realm.where(Task.class).equalTo("id", taskID).findFirstAsync();
         realm.executeTransaction(realm1 -> task.deleteFromRealm());
     }
 
     @Override
     public Observable<Task> getTask(String taskId) {
-        return realm.where(Task.class).equalTo("id", taskId).findFirst().asObservable();
+        return realm.where(Task.class).equalTo("id", taskId).findFirstAsync().asObservable()
+                .filter(realmObject -> realmObject.isLoaded())
+                .cast(Task.class);
     }
 
     @Override
@@ -81,7 +83,7 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
 
     @Override
     public void markTaskCompleted(String taskId, boolean isCompleted) {
-        Task task = realm.where(Task.class).equalTo("id", taskId).findFirst();
+        Task task = realm.where(Task.class).equalTo("id", taskId).findFirstAsync();
         realm.executeTransaction(realm1 -> task.completed = true);
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.java
new file mode 100644
index 000000000..75063c4a6
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTutorialLocalRepository.java
@@ -0,0 +1,35 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.TutorialLocalRepository;
+import com.habitrpg.android.habitica.models.TutorialStep;
+
+import java.util.List;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import rx.Observable;
+
+
+public class RealmTutorialLocalRepository extends RealmBaseLocalRepository implements TutorialLocalRepository {
+
+    public RealmTutorialLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public Observable<TutorialStep> getTutorialStep(String key) {
+        return realm.where(TutorialStep.class).equalTo("key", key).findFirstAsync()
+                .asObservable()
+                .filter(realmObject -> realmObject.isLoaded())
+                .cast(TutorialStep.class);
+    }
+
+    @Override
+    public Observable<RealmResults<TutorialStep>> getTutorialSteps(List<String> keys) {
+        return realm.where(TutorialStep.class)
+                .in("key", (String[]) keys.toArray())
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
new file mode 100644
index 000000000..2007a5e26
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
@@ -0,0 +1,77 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.UserLocalRepository;
+import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.user.SpecialItems;
+import com.habitrpg.android.habitica.models.user.User;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import rx.Observable;
+
+
+public class RealmUserLocalRepository extends RealmBaseLocalRepository implements UserLocalRepository {
+
+    public RealmUserLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public Observable<User> getUser(String userID) {
+        return realm.where(User.class).equalTo("id", userID).findFirstAsync().asObservable()
+                .filter(realmObject -> realmObject.isLoaded())
+                .cast(User.class);
+    }
+
+    @Override
+    public void saveUser(User user) {
+        realm.executeTransaction(realm1 -> realm1.copyToRealmOrUpdate(user));
+    }
+
+    @Override
+    public Observable<RealmResults<TutorialStep>> getTutorialSteps() {
+        return realm.where(TutorialStep.class).findAll().asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Skill>> getSkills(User user) {
+        return realm.where(Skill.class)
+                .equalTo("habitClass", user.getStats().getHabitClass())
+                .equalTo("lvl", user.getStats().lvl)
+                .findAll().asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Skill>> getSpecialItems(User user) {
+        SpecialItems specialItems = user.getItems().getSpecial();
+        List<String> ownedItems = new ArrayList<>();
+        if (specialItems != null) {
+            if (specialItems.getSnowball() > 0) {
+                ownedItems.add("snowball");
+            }
+
+            if (specialItems.getShinySeed() > 0) {
+                ownedItems.add("shinySeed");
+            }
+
+            if (specialItems.getSeafoam() > 0) {
+                ownedItems.add("seafoam");
+            }
+
+            if (specialItems.getSpookySparkles() > 0) {
+                ownedItems.add("spookySparkles");
+            }
+        }
+        return realm.where(Skill.class)
+                .in("key", (String[]) ownedItems.toArray())
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
index ffe0c840f..39284e8ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.events;
 
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 
 public class OpenedMysteryItemEvent {
 
     public int numberLeft;
 
-    public ItemData mysteryItem;
+    public Equipment mysteryItem;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReactiveErrorHandler.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReactiveErrorHandler.java
new file mode 100644
index 000000000..b3173f375
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReactiveErrorHandler.java
@@ -0,0 +1,17 @@
+package com.habitrpg.android.habitica.helpers;
+
+import android.util.Log;
+
+import rx.android.BuildConfig;
+import rx.functions.Action1;
+
+public class ReactiveErrorHandler {
+
+    public static Action1<Throwable> handleEmptyError() {
+        return throwable -> {
+            if (BuildConfig.DEBUG) {
+                Log.e("ObservableError", Log.getStackTraceString(throwable));
+            }
+        };
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
index 1938f5dde..cd42f5024 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/UserStatComputer.java
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.helpers;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,7 +30,7 @@ public class UserStatComputer {
         public String stats;
     }
 
-    public List<StatsRow> computeClassBonus (List<ItemData> itemDataList, HabitRPGUser user) {
+    public List<StatsRow> computeClassBonus (List<Equipment> equipmentList, User user) {
         List<StatsRow> skillRows = new ArrayList<>();
 
         float strAttributes = 0;
@@ -44,7 +44,7 @@ public class UserStatComputer {
         float perClassBonus = 0;
 
         // Summarize stats and fill equipment table
-        for (ItemData i : itemDataList) {
+        for (Equipment i : equipmentList) {
             int str_ = (int) i.getStr();
             int int_ = (int) i.get_int();
             int con_ = (int) i.getCon();
@@ -93,8 +93,8 @@ public class UserStatComputer {
             }
 
             float classBonus = 0.5f;
-            Boolean userClassMatchesGearClass = !classDoesNotExist && itemClass.equals(user.getStats().get_class().toString());
-            Boolean userClassMatchesGearSpecialClass = !specialClassDoesNotExist && itemSpecialClass.equals(user.getStats().get_class().toString());
+            Boolean userClassMatchesGearClass = !classDoesNotExist && itemClass.equals(user.getStats().getHabitClass());
+            Boolean userClassMatchesGearSpecialClass = !specialClassDoesNotExist && itemSpecialClass.equals(user.getStats().getHabitClass());
 
             if (!userClassMatchesGearClass && !userClassMatchesGearSpecialClass) classBonus = 0;
 
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 226e81f95..f6ad14e78 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
@@ -6,8 +6,9 @@ import android.content.SharedPreferences;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.messaging.RemoteMessage;
 import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.PushDevice;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -28,7 +29,7 @@ public class PushNotificationManager {
 
     private String refreshedToken;
     private SharedPreferences sharedPreferences;
-    private HabitRPGUser user;
+    private User user;
 
     public PushNotificationManager(ApiClient apiClient, SharedPreferences sharedPreferences, Context context) {
         this.apiClient = apiClient;
@@ -36,7 +37,7 @@ public class PushNotificationManager {
         this.context = context;
     }
 
-    public void setUser(HabitRPGUser user) {
+    public void setUser(User user) {
         this.user = user;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java
index 7f630e2eb..a70cf9d9f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/CheckClassSelectionUseCase.java
@@ -7,7 +7,7 @@ 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.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
 
 import javax.inject.Inject;
@@ -26,7 +26,7 @@ public class CheckClassSelectionUseCase extends UseCase<CheckClassSelectionUseCa
     protected Observable<Void> buildUseCaseObservable(RequestValues requestValues) {
         return Observable.from(() -> {
 
-            HabitRPGUser user = requestValues.user;
+            User user = requestValues.user;
 
             if(requestValues.selectClassEvent == null) {
                 if (user.getStats().getLvl() > 10 &&
@@ -34,7 +34,7 @@ public class CheckClassSelectionUseCase extends UseCase<CheckClassSelectionUseCa
                         !user.getFlags().getClassSelected()) {
                     SelectClassEvent event = new SelectClassEvent();
                     event.isInitialSelection = true;
-                    event.currentClass = user.getStats().get_class().toString();
+                    event.currentClass = user.getStats().getHabitClass().toString();
                     displayClassSelectionActivity(user, event);
                 }
             } else {
@@ -45,7 +45,7 @@ public class CheckClassSelectionUseCase extends UseCase<CheckClassSelectionUseCa
         });
     }
 
-    private void displayClassSelectionActivity(HabitRPGUser user, SelectClassEvent event) {
+    private void displayClassSelectionActivity(User user, SelectClassEvent event) {
         Bundle bundle = new Bundle();
         bundle.putString("size", user.getPreferences().getSize());
         bundle.putString("skin", user.getPreferences().getSkin());
@@ -66,10 +66,10 @@ public class CheckClassSelectionUseCase extends UseCase<CheckClassSelectionUseCa
     public static final class RequestValues implements UseCase.RequestValues {
 
 
-        private HabitRPGUser user;
+        private User user;
         private SelectClassEvent selectClassEvent;
 
-        public RequestValues(HabitRPGUser user, SelectClassEvent selectClassEvent) {
+        public RequestValues(User user, SelectClassEvent selectClassEvent) {
 
             this.user = user;
             this.selectClassEvent = selectClassEvent;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
index 6a2714c74..d66b205f0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
@@ -10,7 +10,7 @@ import com.habitrpg.android.habitica.events.ShareEvent;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Stats;
 import com.habitrpg.android.habitica.models.user.SuppressedModals;
 import com.habitrpg.android.habitica.ui.AvatarView;
@@ -91,11 +91,11 @@ public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Stats>
     }
 
     public static final class RequestValues implements UseCase.RequestValues {
-        private HabitRPGUser user;
+        private User user;
         private int newLevel;
         private AppCompatActivity compatActivity;
 
-        public RequestValues(HabitRPGUser user, int newLevel, AppCompatActivity compatActivity) {
+        public RequestValues(User user, int newLevel, AppCompatActivity compatActivity) {
 
             this.user = user;
             this.newLevel = newLevel;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
index a33b1dd3e..ba9e7b7aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
@@ -7,7 +7,7 @@ import android.view.View;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Stats;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 
@@ -41,7 +41,7 @@ public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues,
             if (requestValues.lvl > stats.getLvl()) {
                 return levelUpUseCase.observable(new LevelUpUseCase.RequestValues(requestValues.user, requestValues.lvl, requestValues.context))
                         .flatMap(aVoid -> userRepository.retrieveUser(false))
-                        .map(HabitRPGUser::getStats);
+                        .map(User::getStats);
             } else {
                 Pair<String, UiUtils.SnackbarDisplayType> pair = getNotificationAndAddStatsToUser(requestValues.user, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp);
                 showSnackbar(requestValues.context, requestValues.snackbarTargetView, pair.first, pair.second);
@@ -50,7 +50,7 @@ public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues,
         });
     }
 
-    public static Pair<String, UiUtils.SnackbarDisplayType> getNotificationAndAddStatsToUser(HabitRPGUser user, double xp, double hp, double gold, double mp){
+    public static Pair<String, UiUtils.SnackbarDisplayType> getNotificationAndAddStatsToUser(User user, double xp, double hp, double gold, double mp){
 
         StringBuilder message = new StringBuilder();
         Stats stats = user.getStats();
@@ -86,7 +86,7 @@ public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues,
         private AppCompatActivity context;
         private View snackbarTargetView;
         private Action0 retrieveUser;
-        private HabitRPGUser user;
+        private User user;
         private double xp;
         private double hp;
         private double gold;
@@ -94,7 +94,7 @@ public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues,
         private int lvl;
 
         public RequestValues(AppCompatActivity context, View snackbarTargetView, Action0 retrieveUser,
-                             HabitRPGUser user, double xp, double hp, double gold, double mp, int lvl) {
+                             User user, double xp, double hp, double gold, double mp, int lvl) {
             this.context = context;
             this.snackbarTargetView = snackbarTargetView;
             this.retrieveUser = retrieveUser;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
index d1de77ba1..ae11caebc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
@@ -1,11 +1,11 @@
 package com.habitrpg.android.habitica.models;
 
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 
 import java.util.List;
 
 public class ContentGear {
 
-    public List<ItemData> flat;
+    public List<Equipment> flat;
 
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
index 811397f28..bf5ca464c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
@@ -2,9 +2,9 @@ package com.habitrpg.android.habitica.models;
 
 import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Food;
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
@@ -17,9 +17,9 @@ import java.util.List;
  */
 public class ContentResult {
 
-    public ItemData potion;
+    public Equipment potion;
 
-    public ItemData armoire;
+    public Equipment armoire;
 
     public ContentGear gear;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
index 8942bf232..87616e359 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/FAQArticle.java
@@ -1,22 +1,13 @@
 package com.habitrpg.android.habitica.models;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
-/**
- * Created by viirus on 22/01/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class FAQArticle extends BaseModel {
+public class FAQArticle extends RealmObject {
 
     @PrimaryKey
-    @Column
     private Integer position;
 
-    @Column
     private String question, answer;
 
     public Integer getPosition() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
index a5280d43c..3672dfee4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
@@ -1,24 +1,15 @@
 package com.habitrpg.android.habitica.models;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Skill extends BaseModel {
+public class Skill extends RealmObject {
 
-    @Column
-    @PrimaryKey()
+    @PrimaryKey
     public String key;
-
-    @Column
     public String text, notes, target, habitClass;
-
-    @Column
     public Integer mana, lvl;
-
     public boolean isSpecialItem;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java
index 56ec521df..d128d0c96 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/TutorialStep.java
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.models;
 
 import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.user.Flags;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.annotation.Table;
@@ -8,21 +9,15 @@ import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.util.Date;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class TutorialStep extends BaseModel {
+import io.realm.RealmObject;
 
-    @Column
-    public String user_id;
+public class TutorialStep extends RealmObject {
+
+    public Flags flags;
     @PrimaryKey
-    @Column
     private String key;
-    @Column
     private String tutorialGroup, identifier;
-
-    @Column
     private boolean wasCompleted;
-
-    @Column
     private Date displayedOn;
 
     public String getKey() {
@@ -33,14 +28,6 @@ public class TutorialStep extends BaseModel {
         this.key = key;
     }
 
-    public String getUser_id() {
-        return user_id;
-    }
-
-    public void setUser_id(String user_id) {
-        this.user_id = user_id;
-    }
-
     public String getTutorialGroup() {
         return tutorialGroup;
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java
index 25bb23f52..d9e0a48f2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/auth/LocalAuthentication.java
@@ -1,26 +1,17 @@
 package com.habitrpg.android.habitica.models.auth;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
+
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 /**
  * Created by admin on 18/11/15.
  */
-@Table(databaseName = HabitDatabase.NAME)
-public class LocalAuthentication extends BaseModel {
+public class LocalAuthentication extends RealmObject {
 
-    @Column
     @PrimaryKey
-    @NotNull
-    public
-    String user_id;
-
-    @Column
-    String email, username;
+    String username;
+    String email;
 
     public String getEmail() {
         return email;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
index b9122303c..fae915784 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
@@ -4,98 +4,41 @@ import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.structure.BaseModel;
 
-public class Animal extends BaseModel {
+public interface Animal {
 
-    @Column
-    @PrimaryKey
-    String key;
+    public String getKey();
 
-    @Column
-    String animal, color, animalGroup, animalText, colorText;
+    public void setKey(String key);
 
-    @Column
-    Boolean premium, limited;
+    public String getAnimal();
 
-    Integer numberOwned;
+    public void setAnimal(String animal);
 
-    public String getKey() {
-        return key;
-    }
+    public String getColor();
 
-    public void setKey(String key) {
-        this.key = key;
-    }
+    public void setColor(String color);
 
-    public String getAnimal() {
-        return animal;
-    }
+    public String getAnimalGroup();
 
-    public void setAnimal(String animal) {
-        this.animal = animal;
-    }
+    public void setAnimalGroup(String group);
 
-    public String getColor() {
-        return color;
-    }
+    public String getAnimalText();
 
-    public void setColor(String color) {
-        this.color = color;
-    }
+    public void setAnimalText(String animalText);
 
-    public String getAnimalGroup() {
-        return animalGroup;
-    }
+    public String getColorText();
 
-    public void setAnimalGroup(String group) {
-        this.animalGroup = group;
-    }
+    public void setColorText(String colorText);
 
-    public String getAnimalText() {
-        if (animalText == null) {
-            return animal;
-        }
-        return animalText;
-    }
+    public Boolean getPremium();
 
-    public void setAnimalText(String animalText) {
-        this.animalText = animalText;
-    }
+    public void setPremium(Boolean premium);
 
-    public String getColorText() {
-        if (colorText == null) {
-            return color;
-        }
-        return colorText;
-    }
+    public Boolean getLimited();
 
-    public void setColorText(String colorText) {
-        this.colorText = colorText;
-    }
+    public void setLimited(Boolean limited);
 
-    public Boolean getPremium() {
-        return premium;
-    }
+    public Integer getNumberOwned();
 
-    public void setPremium(Boolean premium) {
-        this.premium = premium;
-    }
-
-    public Boolean getLimited() {
-        return limited;
-    }
-
-    public void setLimited(Boolean limited) {
-        this.limited = limited;
-    }
-
-    public Integer getNumberOwned() {
-        if (numberOwned == null) {
-            return 0;
-        }
-        return numberOwned;
-    }
-
-    public void setNumberOwned(Integer numberOwned) {
-        this.numberOwned = numberOwned;
-    }
+    public void setNumberOwned(Integer numberOwned);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
index 558ee1f91..9d8154637 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
@@ -2,31 +2,18 @@ package com.habitrpg.android.habitica.models.inventory;
 
 import android.support.annotation.Nullable;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
 import java.util.Date;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Customization extends BaseModel {
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
+public class Customization extends RealmObject {
 
-    @Column
     @PrimaryKey
     private String id;
-
-    @Column
     private String identifier, category, type, notes, customizationSet, customizationSetName, text;
-
-    @Column
     private boolean purchased, isBuyable;
-
-    @Column
     private Integer price, setPrice;
-
-    @Column
     private Date availableFrom, availableUntil;
 
     private void updateID() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
index 4490619e9..a6ff35765 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Egg.java
@@ -1,13 +1,14 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Egg extends Item {
+public class Egg extends RealmObject implements Item {
 
-    @Column
+    @PrimaryKey
+    String key;
+    String text, notes;
+    Integer value, owned;
     String adjective, mountText;
 
     Integer stableOwned, stableTotal;
@@ -47,8 +48,51 @@ public class Egg extends Item {
         this.stableTotal = stableTotal;
     }
 
-    @Override
     public String getType() {
         return "eggs";
     }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public void setOwned(int size) {
+        owned = size;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    @Override
+    public Integer getOwned() {
+        return owned;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/ItemData.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.java
similarity index 75%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/ItemData.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.java
index d41fa0441..498dade2d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/ItemData.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.java
@@ -1,152 +1,132 @@
-package com.habitrpg.android.habitica.models.inventory;
-
-import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by Negue on 13.07.2015.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class ItemData extends BaseModel {
-    public static final String UNIQUE_IDENTIFIER = "key";
-
-    @Column
-    public double value;
-    @Column
-    public String type;
-    @PrimaryKey
-    @Column
-    public String key;
-
-    @Column
-    public String klass;
-
-    @Column
-    public String specialClass;
-
-    @Column(name = "_index")
-    public String index;
-    @Column
-    public String text;
-    @Column
-    public String notes;
-    @Column
-    public float con, str, per;
-    @Column
-    @SerializedName("int")
-    public float _int;
-    @Column
-    public Boolean owned;
-
-    public ItemData() {
-    }
-
-    public double getValue() {
-        return value;
-    }
-
-    public void setValue(double value) {
-        this.value = value;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getKlass() {
-        return klass;
-    }
-
-    public void setKlass(String klass) {
-        this.klass = klass;
-    }
-
-    public String getSpecialClass() {
-        return specialClass;
-    }
-
-    public void setSpecialClass(String specialClass) {
-        this.specialClass = specialClass;
-    }
-
-
-    public String getIndex() {
-        return index;
-    }
-
-    public void setIndex(String index) {
-        this.index = index;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public float getCon() {
-        return con;
-    }
-
-    public void setCon(float con) {
-        this.con = con;
-    }
-
-    public float getStr() {
-        return str;
-    }
-
-    public void setStr(float str) {
-        this.str = str;
-    }
-
-    public float getPer() {
-        return per;
-    }
-
-    public void setPer(float per) {
-        this.per = per;
-    }
-
-    public float get_int() {
-        return _int;
-    }
-
-    public void set_int(float _int) {
-        this._int = _int;
-    }
-
-    public Boolean getOwned() {
-        return owned;
-    }
-
-    public void setOwned(Boolean owned) {
-        this.owned = owned;
-    }
-}
+package com.habitrpg.android.habitica.models.inventory;
+
+import com.google.gson.annotations.SerializedName;
+
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
+public class Equipment extends RealmObject {
+    public static final String UNIQUE_IDENTIFIER = "key";
+
+    public double value;
+    public String type;
+    @PrimaryKey
+    public String key;
+    public String klass;
+    public String specialClass;
+    public String index;
+    public String text;
+    public String notes;
+    public float con, str, per;
+    @SerializedName("int")
+    public float _int;
+    public Boolean owned;
+
+    public Equipment() {
+    }
+
+    public double getValue() {
+        return value;
+    }
+
+    public void setValue(double value) {
+        this.value = value;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getKlass() {
+        return klass;
+    }
+
+    public void setKlass(String klass) {
+        this.klass = klass;
+    }
+
+    public String getSpecialClass() {
+        return specialClass;
+    }
+
+    public void setSpecialClass(String specialClass) {
+        this.specialClass = specialClass;
+    }
+
+
+    public String getIndex() {
+        return index;
+    }
+
+    public void setIndex(String index) {
+        this.index = index;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public float getCon() {
+        return con;
+    }
+
+    public void setCon(float con) {
+        this.con = con;
+    }
+
+    public float getStr() {
+        return str;
+    }
+
+    public void setStr(float str) {
+        this.str = str;
+    }
+
+    public float getPer() {
+        return per;
+    }
+
+    public void setPer(float per) {
+        this.per = per;
+    }
+
+    public float get_int() {
+        return _int;
+    }
+
+    public void set_int(float _int) {
+        this._int = _int;
+    }
+
+    public Boolean getOwned() {
+        return owned;
+    }
+
+    public void setOwned(Boolean owned) {
+        this.owned = owned;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
index eef32282d..d38725b83 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
@@ -1,16 +1,15 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Food extends Item {
+public class Food extends RealmObject implements Item {
 
-    @Column
+    @PrimaryKey
+    String key;
+    String text, notes;
+    Integer value, owned;
     String target, article;
-
-    @Column
     Boolean canDrop;
 
     public String getTarget() {
@@ -40,4 +39,48 @@ public class Food extends Item {
     public String getType() {
         return "food";
     }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public void setOwned(int size) {
+
+    }
+
+    @Override
+    public String getText() {
+        return text;
+    }
+
+    public Integer getOwned() {
+        return owned;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
index 1ed9bd923..091f758c9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/HatchingPotion.java
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class HatchingPotion extends Item {
+public class HatchingPotion extends RealmObject implements Item {
 
-    @Column
-    Boolean limited, premium;
+    @PrimaryKey
+    String key;
+    String text, notes;
+    Integer value, owned;    Boolean limited, premium;
 
     public Boolean getLimited() {
         return limited;
@@ -30,4 +30,48 @@ public class HatchingPotion extends Item {
     public String getType() {
         return "hatchingPotions";
     }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public void setOwned(int size) {
+        owned = size;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    @Override
+    public Integer getOwned() {
+        return owned;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
index 6cdcda61e..aa4d2f384 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
@@ -4,60 +4,17 @@ import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.structure.BaseModel;
 
-public abstract class Item extends BaseModel {
+public interface Item {
 
-    @Column
-    @PrimaryKey
-    String key;
+    String getType();
 
-    @Column
-    String text, notes;
+    String getKey();
 
-    @Column
-    Integer value, owned;
+    void setOwned(int size);
 
-    public String getKey() {
-        return key;
-    }
+    String getText();
 
-    public void setKey(String key) {
-        this.key = key;
-    }
+    Integer getOwned();
 
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public Integer getValue() {
-        return value;
-    }
-
-    public void setValue(Integer value) {
-        this.value = value;
-    }
-
-    public Integer getOwned() {
-        if (owned == null) {
-            return 0;
-        }
-        return owned;
-    }
-
-    public void setOwned(Integer owned) {
-        this.owned = owned;
-    }
-
-    public abstract String getType();
+    Integer getValue();
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
index b8bc28fd8..c2531d1d1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
@@ -1,14 +1,97 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Mount extends Animal {
+public class Mount extends RealmObject implements Animal {
 
-    @Column
     Boolean owned;
+    @PrimaryKey
+    String key;
+    String animal, color, animalGroup, animalText, colorText;
+    Boolean premium, limited;
+    Integer numberOwned;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAnimal() {
+        return animal;
+    }
+
+    public void setAnimal(String animal) {
+        this.animal = animal;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getAnimalGroup() {
+        return animalGroup;
+    }
+
+    public void setAnimalGroup(String group) {
+        this.animalGroup = group;
+    }
+
+    public String getAnimalText() {
+        if (animalText == null) {
+            return animal;
+        }
+        return animalText;
+    }
+
+    public void setAnimalText(String animalText) {
+        this.animalText = animalText;
+    }
+
+    public String getColorText() {
+        if (colorText == null) {
+            return color;
+        }
+        return colorText;
+    }
+
+    public void setColorText(String colorText) {
+        this.colorText = colorText;
+    }
+
+    public Boolean getPremium() {
+        return premium;
+    }
+
+    public void setPremium(Boolean premium) {
+        this.premium = premium;
+    }
+
+    public Boolean getLimited() {
+        return limited;
+    }
+
+    public void setLimited(Boolean limited) {
+        this.limited = limited;
+    }
+
+    public Integer getNumberOwned() {
+        if (numberOwned == null) {
+            return 0;
+        }
+        return numberOwned;
+    }
+
+    public void setNumberOwned(Integer numberOwned) {
+        this.numberOwned = numberOwned;
+    }
 
     public Boolean getOwned() {
         return owned;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
index 7ef32ba8f..1c047d036 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
@@ -1,16 +1,99 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Pet extends Animal {
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
+public class Pet extends RealmObject implements Animal{
 
-    @Column
     Integer trained;
+    @PrimaryKey
+    String key;
+    String animal, color, animalGroup, animalText, colorText;
+    Boolean premium, limited;
 
+    Integer numberOwned;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getAnimal() {
+        return animal;
+    }
+
+    public void setAnimal(String animal) {
+        this.animal = animal;
+    }
+
+    public String getColor() {
+        return color;
+    }
+
+    public void setColor(String color) {
+        this.color = color;
+    }
+
+    public String getAnimalGroup() {
+        return animalGroup;
+    }
+
+    public void setAnimalGroup(String group) {
+        this.animalGroup = group;
+    }
+
+    public String getAnimalText() {
+        if (animalText == null) {
+            return animal;
+        }
+        return animalText;
+    }
+
+    public void setAnimalText(String animalText) {
+        this.animalText = animalText;
+    }
+
+    public String getColorText() {
+        if (colorText == null) {
+            return color;
+        }
+        return colorText;
+    }
+
+    public void setColorText(String colorText) {
+        this.colorText = colorText;
+    }
+
+    public Boolean getPremium() {
+        return premium;
+    }
+
+    public void setPremium(Boolean premium) {
+        this.premium = premium;
+    }
+
+    public Boolean getLimited() {
+        return limited;
+    }
+
+    public void setLimited(Boolean limited) {
+        this.limited = limited;
+    }
+
+    public Integer getNumberOwned() {
+        if (numberOwned == null) {
+            return 0;
+        }
+        return numberOwned;
+    }
+
+    public void setNumberOwned(Integer numberOwned) {
+        this.numberOwned = numberOwned;
+    }
     public Integer getTrained() {
         return trained;
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java
index 91056be9c..624d9332d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Quest.java
@@ -1,38 +1,20 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
 import java.util.HashMap;
 
-/**
- * Created by viirus on 06/07/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Quest extends BaseModel {
-    @Column
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
+
+public class Quest extends RealmObject {
     @PrimaryKey
     public String key;
-
-    @Column
     public boolean active;
-
-    @Column
     public String leader;
-
-    @Column
     public boolean RSVPNeeded;
 
+    @Ignore
     public HashMap<String, Boolean> members;
-
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "progress_id",
-            columnType = Long.class,
-            foreignColumnName = "id")})
     private QuestProgress progress;
 
     private Quest(String key, QuestProgress progress) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java
index 5c8a88dc6..d0c532be1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestBoss.java
@@ -1,67 +1,30 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class QuestBoss extends BaseModel {
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
+
+public class QuestBoss extends RealmObject {
 
     @PrimaryKey
-    @Column
     public String key;
-
-    @Column
     public String name;
-
-    @Column
     public double hp;
-
-    @Column
     public double str;
-
-    @Column
     public double def;
 
     /* Boss Columns */
 
-    @Column
     public String rage_title;
-
-    @Column
     public String rage_description;
-
-    @Column
     public double rage_value;
-
-    @Column
     public String rage_tavern;
-
-    @Column
     public String rage_stables;
-
-    @Column
     public String rage_market;
+    @Ignore
     public QuestBossRage rage;
 
-    @Override
-    public void save() {
-        // Just to save the Json-Object as DB-Columns
-
-        if (rage != null && rage.title != null && !rage.title.isEmpty()) {
-            rage_title = rage.title;
-            rage_description = rage.description;
-            rage_value = rage.value;
-            rage_tavern = rage.tavern;
-            rage_stables = rage.stables;
-            rage_market = rage.market;
-        }
-
-        super.save();
-    }
-
     public class QuestBossRage {
         public String title;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
index db84cbb90..a85531844 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
@@ -1,40 +1,25 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class QuestContent extends Item {
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
 
-    @Column
+public class QuestContent extends RealmObject implements Item {
+
+    @PrimaryKey
+    String key;
+    String text, notes;
+    Integer value, owned;
     public String previous;
-
-    @Column
     public int lvl;
-
-    @Column
     public boolean canBuy;
-
-    @Column
     public String category;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "boss_id",
-            columnType = String.class,
-            foreignColumnName = "key")})
     public QuestBoss boss;
 
+    @Ignore
     HashMap<String, QuestCollect> collect;
 
     public String getPrevious() {
@@ -77,22 +62,11 @@ public class QuestContent extends Item {
         this.boss = boss;
     }
 
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "collect")
     public Collection<QuestCollect> getCollectCollection() {
         return getCollect().values();
     }
 
     public HashMap<String, QuestCollect> getCollect() {
-        if (collect == null) {
-            List<QuestCollect> collectList = new Select()
-                    .from(QuestCollect.class)
-                    .where(Condition.column("quest_key").eq(this.key))
-                    .queryList();
-            collect = new HashMap<>();
-            for (QuestCollect c : collectList) {
-                collect.put(c.key, c);
-            }
-        }
         return collect;
     }
 
@@ -100,23 +74,53 @@ public class QuestContent extends Item {
         this.collect = collect;
     }
 
-    public void save() {
-
-        if (boss != null) {
-            boss.key = key;
-        }
-
-        if (collect != null) {
-            for (Map.Entry<String, QuestCollect> kv : collect.entrySet()) {
-                kv.getValue().quest_key = key;
-                kv.getValue().key = kv.getKey();
-            }
-        }
-        super.save();
-    }
-
     @Override
     public String getType() {
         return "quests";
     }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public void setOwned(int size) {
+        owned = size;
+    }
+
+    @Override
+    public String getText() {
+        return text;
+    }
+
+    @Override
+    public Integer getOwned() {
+        return owned;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java
index 947a02b2a..a23b2cffe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestProgress.java
@@ -8,29 +8,17 @@ import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.util.HashMap;
 
-/**
- * Created by viirus on 06/07/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class QuestProgress extends BaseModel {
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
 
-    @Column
+public class QuestProgress extends RealmObject {
+
+    Quest quest;
     public double hp, rage;
+    @Ignore
     public HashMap<String, Integer> collect;
-    @Column
-    @PrimaryKey(autoincrement = true)
-    long id;
-    @Column
     private float down, up;
 
-    private QuestProgress(float down, float up) {
-        this.down = down;
-        this.up = up;
-    }
-
-    public QuestProgress() {
-    }
-
     public float getDown() {
         return down;
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java
index acaa4da4b..6faeee59a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/SpecialItem.java
@@ -8,11 +8,18 @@ import com.habitrpg.android.habitica.R;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-public class SpecialItem extends Item {
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
+public class SpecialItem extends RealmObject implements Item {
+
+    @PrimaryKey
+    String key;
+    String text, notes;
+    Integer value, owned;
     public boolean isMysteryItem;
 
-    public static Item makeMysteryItem(Context context) {
+    public static SpecialItem makeMysteryItem(Context context) {
         SpecialItem item = new SpecialItem();
         item.text = context.getString(R.string.mystery_item);
         item.notes = context.getString(R.string.myster_item_notes);
@@ -27,4 +34,29 @@ public class SpecialItem extends Item {
     public String getType() {
         return "special";
     }
+
+    @Override
+    public String getKey() {
+        return key;
+    }
+
+    @Override
+    public void setOwned(int size) {
+        owned = size;
+    }
+
+    @Override
+    public String getText() {
+        return text;
+    }
+
+    @Override
+    public Integer getOwned() {
+        return owned;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java
index 429e0f70f..e91388260 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/GuildInvite.java
@@ -3,21 +3,15 @@ package com.habitrpg.android.habitica.models.invitations;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
-/**
- * Created by keithholliday on 7/2/16.
- */
-public class GuildInvite {
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
-    @SerializedName("inviter")
-    @Expose
+public class GuildInvite extends RealmObject {
+
+    Invitations invitations;
     private String inviter;
-
-    @SerializedName("name")
-    @Expose
     private String name;
-
-    @SerializedName("id")
-    @Expose
+    @PrimaryKey
     private String id;
 
     /**
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
index 131236ca3..0ba1d653e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
@@ -1,35 +1,17 @@
 package com.habitrpg.android.habitica.models.invitations;
 
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
+import com.habitrpg.android.habitica.models.user.User;
 
-import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Created by keithholliday on 7/2/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Invitations extends BaseModel {
+import io.realm.RealmList;
+import io.realm.RealmObject;
 
-    @Column
-    @PrimaryKey
-    @NotNull
-    public String user_id;
+public class Invitations extends RealmObject {
 
-    @SerializedName("party")
-    @Expose
+    User user;
     private PartyInvite party;
-
-    @SerializedName("guilds")
-    @Expose
-    private List<GuildInvite> guilds = new ArrayList<GuildInvite>();
+    private RealmList<GuildInvite> guilds;
 
     /**
      * @return The party invite
@@ -55,7 +37,7 @@ public class Invitations extends BaseModel {
     /**
      * @param guilds The guilds
      */
-    public void setGuilds(List<GuildInvite> guilds) {
+    public void setGuilds(RealmList<GuildInvite> guilds) {
         this.guilds = guilds;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java
index e13b5cddd..56bac0f7f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/PartyInvite.java
@@ -3,18 +3,14 @@ package com.habitrpg.android.habitica.models.invitations;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
-/**
- * Created by keithholliday on 7/2/16.
- */
-public class PartyInvite {
-    @SerializedName("id")
-    @Expose
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
+public class PartyInvite extends RealmObject {
+
+    @PrimaryKey
     private String id;
-    @SerializedName("name")
-    @Expose
     private String name;
-    @SerializedName("inviter")
-    @Expose
     private String inviter;
 
     /**
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
index 9e9c19d5c..70f06ffd4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
@@ -1,14 +1,14 @@
 package com.habitrpg.android.habitica.models.responses;
 
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
 
 public class SkillResponse {
 
-    public HabitRPGUser user;
-    public List<HabitRPGUser> partyMembers;
+    public User user;
+    public List<User> partyMembers;
     public Task task;
 
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
index e9f10a1d2..b538c0f8b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
@@ -1,16 +1,19 @@
 package com.habitrpg.android.habitica.models.responses;
 
-import com.habitrpg.android.habitica.models.user.PlayerMinStats;
-
 /**
  * This class represent the data sent back from the API when calling /user/tasks/{id}/{direction}.
  * It holds almost the same thing as Stats, except toNextLevel & maxHealth & maxHP.
  * It also holds a delta, which represent the task value modification.
  * Created by MagicMicky on 12/06/2014.
  */
-public class TaskDirectionData extends PlayerMinStats {
+public class TaskDirectionData {
     private float delta;
     private TaskDirectionDataTemp _tmp;
+    public Double exp;
+    public Double hp;
+    private Double gp;
+    public Double mp;
+    private Integer lvl;
 
     public float getDelta() {
         return delta;
@@ -27,4 +30,24 @@ public class TaskDirectionData extends PlayerMinStats {
     public void set_tmp(TaskDirectionDataTemp tmp) {
         this._tmp = tmp;
     }
+
+    public Double getExp() {
+        return exp;
+    }
+
+    public Double getHp() {
+        return hp;
+    }
+
+    public Double getGp() {
+        return gp;
+    }
+
+    public Double getMp() {
+        return mp;
+    }
+
+    public Integer getLvl() {
+        return lvl;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
index 435cec7d7..06fbc8b07 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/shops/ShopItem.java
@@ -4,7 +4,7 @@ import android.content.res.Resources;
 
 import com.google.gson.annotations.SerializedName;
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 public class ShopItem {
 
@@ -129,7 +129,7 @@ public class ShopItem {
         this.unlockCondition = unlockCondition;
     }
 
-    public boolean canBuy(HabitRPGUser user) {
+    public boolean canBuy(User user) {
         if (getCurrency().equals("gold")) {
             return getValue() <= user.getStats().getGp();
         } else if (getCurrency().equals("gems")) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
index 1e372627b..b24357bf8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.models.social;
 
 import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.NotNull;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
@@ -70,7 +70,7 @@ public class Challenge extends BaseModel {
 
     public Group group;
 
-    public HabitRPGUser leader;
+    public User leader;
 
     public HashMap<String, String[]> getTasksOrder() {
         HashMap<String, String[]> map = new HashMap();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
index 7a1caa4cc..6e185c26b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.models.social;
 
 import com.google.gson.annotations.SerializedName;
 import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.util.List;
@@ -39,7 +39,7 @@ public class Group extends BaseModel {
 
     public List<ChatMessage> chat;
 
-    public List<HabitRPGUser> members;
+    public List<User> members;
 
     public int challengeCount;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java
index a0b8564af..55617be00 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/UserParty.java
@@ -1,36 +1,18 @@
 package com.habitrpg.android.habitica.models.social;
 
 import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.models.inventory.Quest;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
-/**
- * Created by Negue on 16.09.2015.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class UserParty extends BaseModel {
-    @Column
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
+public class UserParty extends RealmObject {
     @PrimaryKey
     @SerializedName("_id")
     public String id; //id
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "quest_id",
-            columnType = String.class,
-            foreignColumnName = "key")})
     private Quest quest;
-
-    @Column
     @SerializedName("order")
     private String partyOrder;//Order to display ppl
-
-    @Column
     private String orderAscending;//Order type
 
     public UserParty() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
index 90ac4c2b3..97bc0ed68 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
@@ -1,32 +1,15 @@
 package com.habitrpg.android.habitica.models.user;
 
 import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.models.auth.LocalAuthentication;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
-/**
- * Created by admin on 18/11/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Authentication extends BaseModel {
+import io.realm.RealmObject;
+
+public class Authentication extends RealmObject {
 
     @SerializedName("local")
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "localauthentication_user_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
     public LocalAuthentication localAuthentication;
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
+    User user;
 
     public LocalAuthentication getLocalAuthentication() {
         return localAuthentication;
@@ -35,13 +18,4 @@ public class Authentication extends BaseModel {
     public void setLocalAuthentication(LocalAuthentication LocalAuthentication) {
         this.localAuthentication = LocalAuthentication;
     }
-
-    @Override
-    public void save() {
-
-        if (localAuthentication != null)
-            localAuthentication.user_id = user_id;
-
-        super.save();
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
index 7d6d6c04e..0e471431f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
@@ -1,28 +1,19 @@
 package com.habitrpg.android.habitica.models.user;
 
+import com.google.gson.annotations.SerializedName;
 import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
 
-/**
- * Created by viirus on 06/07/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Buffs extends BasicStats {
+import io.realm.RealmObject;
 
-    @Column
-    private Boolean snowball;
+public class Buffs extends RealmObject {
 
-    @Column
+    Stats stats;
+    public Float con, str, per;
+    @SerializedName("int")
+    public Float _int;    private Boolean snowball;
     private Boolean streaks;
-
-    @Column
     private Boolean seafoam;
-
-    @Column
     private Boolean spookySparkles;
-
-    @Column
     private Boolean shinySeed;
 
     public Buffs() {
@@ -78,11 +69,30 @@ public class Buffs extends BasicStats {
         if (stats == null) {
             return;
         }
-        super.merge(stats);
+        this.con = stats.con != null ? stats.con : this.con;
+        this.str = stats.str != null ? stats.str : this.str;
+        this.per = stats.per != null ? stats.per : this.per;
+        this._int = stats._int != null ? stats._int : this._int;
         this.snowball = stats.snowball != null ? stats.snowball : this.snowball;
         this.streaks = stats.streaks != null ? stats.streaks : this.streaks;
         this.seafoam = stats.seafoam != null ? stats.seafoam : this.seafoam;
         this.shinySeed = stats.shinySeed != null ? stats.shinySeed : this.shinySeed;
         this.spookySparkles = stats.spookySparkles != null ? stats.spookySparkles : this.spookySparkles;
     }
+
+    public Float getStr() {
+        return str;
+    }
+
+    public Float get_int() {
+        return _int;
+    }
+
+    public Float getCon() {
+        return con;
+    }
+
+    public Float getPer() {
+        return per;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
index 33572ac83..f601b0149 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
@@ -2,21 +2,12 @@ package com.habitrpg.android.habitica.models.user;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.R;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
 import java.util.HashMap;
 
-/**
- * Created by keithholliday on 7/6/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class ContributorInfo extends BaseModel {
+import io.realm.RealmObject;
+
+public class ContributorInfo extends RealmObject {
 
     public static final HashMap<Integer, Integer> CONTRIBUTOR_COLOR_DICT;
 
@@ -34,25 +25,10 @@ public class ContributorInfo extends BaseModel {
         CONTRIBUTOR_COLOR_DICT.put(9, R.color.contributor_staff);
     }
 
-    @Column
-    @PrimaryKey
-    @NotNull
-    public String user_id;
-
-    @SerializedName("admin")
-    @Expose
+    public User user;
     private boolean admin;
-
-    @SerializedName("contributions")
-    @Expose
     private String contributions;
-
-    @SerializedName("level")
-    @Expose
     private int level;
-
-    @SerializedName("text")
-    @Expose
     private String text;
 
     public Boolean getAdmin() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
index e17668b8d..f3c5150f4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
@@ -1,55 +1,26 @@
 package com.habitrpg.android.habitica.models.user;
 
-import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.models.TutorialStep;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.util.List;
 
-/**
- * Created by viirus on 22/01/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Flags extends BaseModel {
+import io.realm.RealmList;
+import io.realm.RealmObject;
 
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-    List<TutorialStep> tutorial;
-    @Column
+public class Flags extends RealmObject {
+
+    User user;
+    RealmList<TutorialStep> tutorial;
     private boolean showTour, dropsEnabled, itemsEnabled, newStuff, classSelected, rebirthEnabled, welcomed, armoireEnabled, armoireOpened, armoireEmpty;
 
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "tutorial")
     public List<TutorialStep> getTutorial() {
-        if (tutorial == null) {
-            tutorial = new Select()
-                    .from(TutorialStep.class)
-                    .where(Condition.column("user_id").eq(this.user_id))
-                    .queryList();
-        }
         return tutorial;
     }
 
-    public void setTutorial(List<TutorialStep> tutorial) {
+    public void setTutorial(RealmList<TutorialStep> tutorial) {
         this.tutorial = tutorial;
     }
 
-    public String getUser_id() {
-        return user_id;
-    }
-
-    public void setUser_id(String user_id) {
-        this.user_id = user_id;
-    }
-
     public boolean getShowTour() {
         return showTour;
     }
@@ -130,18 +101,4 @@ public class Flags extends BaseModel {
         this.armoireEmpty = armoireEmpty;
     }
 
-    @Override
-    public void save() {
-
-        if (user_id == null) {
-            return;
-        }
-
-        for (TutorialStep step : this.getTutorial()) {
-            step.user_id = user_id;
-        }
-
-        super.save();
-    }
-
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
index 0bfcb58e9..0ae56d393 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
@@ -1,37 +1,16 @@
 package com.habitrpg.android.habitica.models.user;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
 import java.util.HashMap;
 
-/**
- * Created by viirus on 20/07/15.
- */
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Gear extends BaseModel {
+public class Gear extends RealmObject {
 
+    @Ignore
     public HashMap<String, Boolean> owned;
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "equipped_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
+    Items items;
     private Outfit equipped;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "costume_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
     private Outfit costume;
 
     public Outfit getCostume() {
@@ -49,12 +28,4 @@ public class Gear extends BaseModel {
     public void setEquipped(Outfit equipped) {
         this.equipped = equipped;
     }
-
-    @Override
-    public void save() {
-        equipped.user_id = user_id + "_equipped";
-        costume.user_id = user_id + "_costume";
-
-        super.save();
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
index 2435e8166..438ed0537 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
@@ -1,24 +1,11 @@
 package com.habitrpg.android.habitica.models.user;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
+import io.realm.RealmObject;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Hair extends BaseModel {
+public class Hair extends RealmObject {
 
-    @Column
-    @PrimaryKey
-    @NotNull
-    public String userId;
-
-    @Column
+    public Preferences preferences;
     private int mustache, beard, bangs, base, flower;
-
-    @Column
     private String color;
 
     public Hair() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
index a8081e3b6..c756e3a00 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
@@ -2,42 +2,23 @@ package com.habitrpg.android.habitica.models.user;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Created by keithholliday on 6/20/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Inbox extends BaseModel {
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
 
-    @Column
-    @PrimaryKey
-//    @NotNull
-            String user_Id;
+public class Inbox extends RealmObject {
 
-    @SerializedName("optOut")
-    @Expose
+    User user;
     private Boolean optOut;
-
-    @SerializedName("messages")
-    @Expose
+    @Ignore
     private Map<String, ChatMessage> messages;
-
-    @SerializedName("blocks")
-    @Expose
-    private List<Object> blocks = new ArrayList<Object>();
-
-    @SerializedName("newMessages")
-    @Expose
+    @Ignore
+    private List<Object> blocks = new ArrayList<>();
     private Integer newMessages;
 
     /**
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
index 8e3f104c8..7ec112556 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
@@ -1,54 +1,33 @@
 package com.habitrpg.android.habitica.models.user;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
 import java.util.Date;
 import java.util.HashMap;
 
-/**
- * Created by MagicMicky on 16/03/14.
- */
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Items extends BaseModel {
+public class Items extends RealmObject {
 
+    @Ignore
     public HashMap<String, Integer> eggs;
+    @Ignore
     public HashMap<String, Integer> food;
+    @Ignore
     public HashMap<String, Integer> hatchingPotions;
+    @Ignore
     public HashMap<String, Integer> quests;
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
+    User user;
+    @Ignore
     HashMap<String, Integer> pets;
+    @Ignore
     HashMap<String, Boolean> mounts;
-    @Column
     private String currentMount;
-    @Column
     private String currentPet;
-    @Column
     private int lastDrop_count;
-    @Column
     private Date lastDrop_date;
 
     //private QuestContent quest;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "gear_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
     private Gear gear;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "special_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
     private SpecialItems special;
 
     public Items(String currentMount, String currentPet, int lastDrop_count, Date lastDrop_date) {
@@ -109,14 +88,6 @@ public class Items extends BaseModel {
         this.special = specialItems;
     }
 
-    public String getUser_id() {
-        return user_id;
-    }
-
-    public void setUser_id(String user_id) {
-        this.user_id = user_id;
-    }
-
     public HashMap<String, Integer> getEggs() {
         return eggs;
     }
@@ -165,11 +136,4 @@ public class Items extends BaseModel {
         this.mounts = mounts;
     }
 
-    @Override
-    public void save() {
-        gear.user_id = user_id;
-        special.user_id = user_id;
-
-        super.save();
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
index f29844c79..fb8e938ec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
@@ -3,32 +3,15 @@ package com.habitrpg.android.habitica.models.user;
 import android.text.TextUtils;
 
 import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
-/**
- * Created by viirus on 20/07/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Outfit extends BaseModel {
+import io.realm.RealmObject;
 
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
+public class Outfit extends RealmObject {
 
-    @Column
+    Gear gear;
     String armor, back, body, head, shield, weapon;
-
-    @Column
     @SerializedName("eyewear")
     String eyeWear;
-
-    @Column
     String headAccessory;
 
     public String getArmor() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java
deleted file mode 100644
index 9813ecea6..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/PlayerMinStats.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.habitrpg.android.habitica.models.user;
-
-import android.content.Context;
-
-import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.HabitRpgClass;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-
-/**
- * Created by MagicMicky on 12/06/2014.
- */
-
-public abstract class PlayerMinStats extends BasicStats {
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "trainingstats_id",
-            columnType = String.class,
-            foreignColumnName = "id")})
-    public BasicStats training;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "buffs_id",
-            columnType = String.class,
-            foreignColumnName = "id")})
-    public Buffs buffs;
-
-    @Column
-    public Integer points, lvl;
-
-    @Column
-    @SerializedName("class")
-    public HabitRpgClass _class;
-
-    @Column
-    public Double gp, exp, mp, hp;
-
-
-    public BasicStats getTraining() {
-        return training;
-    }
-
-    public void setTraining(BasicStats training) {
-        this.training = training;
-    }
-
-    public Buffs getBuffs() {
-        return buffs;
-    }
-
-    public void setBuffs(Buffs buffs) {
-        this.buffs = buffs;
-    }
-
-    public Integer getPoints() {
-        return points != null ? points : Integer.valueOf(0);
-    }
-
-    public void setPoints(Integer points) {
-        this.points = points;
-    }
-
-    public Integer getLvl() {
-        return lvl != null ? lvl : Integer.valueOf(0);
-    }
-
-    public void setLvl(Integer lvl) {
-        this.lvl = lvl;
-    }
-
-    public HabitRpgClass get_class() {
-        return _class;
-    }
-
-    public void set_class(HabitRpgClass _class) {
-        this._class = _class;
-    }
-
-    public String getTranslatedClassName(Context context) {
-        switch (_class) {
-            case healer:
-                return context.getString(R.string.healer);
-            case rogue:
-                return context.getString(R.string.rogue);
-            case warrior:
-                return context.getString(R.string.warrior);
-            case wizard:
-                return context.getString(R.string.mage);
-            default:
-                return context.getString(R.string.warrior);
-        }
-    }
-
-    public Double getGp() {
-        return gp != null ? gp : Double.valueOf(0);
-    }
-
-    public void setGp(Double gp) {
-        this.gp = gp;
-    }
-
-    public Double getExp() {
-        return exp != null ? exp : Double.valueOf(0);
-    }
-
-    public void setExp(Double exp) {
-        this.exp = exp;
-    }
-
-    public Double getMp() {
-        return mp != null ? mp : Double.valueOf(0);
-    }
-
-    public void setMp(Double mp) {
-        this.mp = mp;
-    }
-
-    public Double getHp() {
-        return hp != null ? hp : Double.valueOf(0);
-    }
-
-    public void setHp(Double hp) {
-        this.hp = hp;
-    }
-
-    @Override
-    public void save() {
-        training.id = id + "_training";
-        buffs.id = id;
-
-        super.save();
-    }
-
-    public void merge(PlayerMinStats stats) {
-        if (stats == null) {
-            return;
-        }
-        super.merge(stats);
-        this.training.merge(stats.getTraining());
-        this.buffs.merge(stats.buffs);
-        this.points = stats.points != null ? stats.points : this.points;
-        this.lvl = stats.lvl != null ? stats.lvl : this.lvl;
-        this._class = stats._class != null ? stats._class : this._class;
-        this.gp = stats.gp != null ? stats.gp : this.gp;
-        this.exp = stats.exp != null ? stats.exp : this.exp;
-        this.hp = stats.hp != null ? stats.hp : this.hp;
-        this.mp = stats.mp != null ? stats.mp : this.mp;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
index 04fcd343b..cadb092f1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
@@ -1,40 +1,15 @@
 package com.habitrpg.android.habitica.models.user;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
-/**
- * Created by MagicMicky on 16/03/14.
- */
+import io.realm.RealmObject;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Preferences extends BaseModel {
+public class Preferences extends RealmObject {
 
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "hair_user_id",
-            columnType = String.class,
-            foreignColumnName = "userId")})
     public Hair hair;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "suppressedModals_user_id",
-            columnType = String.class,
-            foreignColumnName = "userId")})
     SuppressedModals suppressModals;
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-    @Column
+    User user;
     private boolean costume, toolbarCollapsed, advancedCollapsed, tagsCollapsed, newTaskEdit, disableClasses, stickyHeader, sleep, hideHeader, dailyDueDefaultView;
-    @Column
     private String allocationMode, shirt, skin, size, background, chair, language, sound;
-    @Column
     private int dayStart, timezoneOffset;
 
     public Preferences() {
@@ -223,19 +198,6 @@ public class Preferences extends BaseModel {
         this.language = language;
     }
 
-    @Override
-    public void save() {
-        if (user_id == null) {
-            return;
-        }
-        hair.userId = user_id;
-
-        if (suppressModals != null)
-            suppressModals.userId = user_id;
-
-        super.save();
-    }
-
     public boolean getDailyDueDefaultView() {
         return dailyDueDefaultView;
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
index 935510ce5..ee05b41bd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
@@ -1,28 +1,11 @@
 package com.habitrpg.android.habitica.models.user;
 
-/**
- * Created by MagicMicky on 16/03/14.
- */
+import io.realm.RealmObject;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
+public class Profile extends RealmObject {
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Profile extends BaseModel {
-
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_Id;
-
-    @Column
+    User user;
     private String name;
-
-    @Column
     private String blurb, imageUrl;
 
     public Profile(String name) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
index 85383b781..77cd710a4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
@@ -1,33 +1,17 @@
 package com.habitrpg.android.habitica.models.user;
 
-import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.util.List;
 
-/**
- * Created by viirus on 14/01/16.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class Purchases extends BaseModel {
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
 
+public class Purchases extends RealmObject {
 
+    @Ignore
     public List<Customization> customizations;
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "plan_user_id",
-            columnType = String.class,
-            foreignColumnName = "customerId")})
+    User user;
     private SubscriptionPlan plan;
 
     public List<Customization> getCustomizations() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
index 054dec14f..a44c1c027 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
@@ -1,32 +1,13 @@
 package com.habitrpg.android.habitica.models.user;
 
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
+import io.realm.RealmObject;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class SpecialItems extends BaseModel {
-    @Column
-    @PrimaryKey
-    @NotNull
-    String user_id;
+public class SpecialItems extends RealmObject {
 
-    @Column
-    @NotNull
+    Items items;
     int seafoam, shinySeed, snowball, spookySparkles;
 
-    public String getUser_id() {
-        return user_id;
-    }
-
-    public void setUser_id(String user_id) {
-        this.user_id = user_id;
-    }
-
     public int getSeafoam() {
         return seafoam;
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
index 16a5f20de..5531996b5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
@@ -1,17 +1,26 @@
 package com.habitrpg.android.habitica.models.user;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.Table;
+import android.content.Context;
 
-/**
- * Created by MagicMicky on 16/03/14.
- */
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.HabitRpgClass;
 
-@Table(databaseName = HabitDatabase.NAME, allFields = true)
-public class Stats extends PlayerMinStats {
+import io.realm.RealmObject;
 
-    @Column
+
+public class Stats extends RealmObject {
+
+    User user;
+    public Float con, str, per;
+    @SerializedName("int")
+    public Float _int;
+    public Training training;
+    public Buffs buffs;
+    public Integer points, lvl;
+    @SerializedName("class")
+    public String habitClass;
+    public Double gp, exp, mp, hp;
     private Integer toNextLevel, maxHealth, maxMP;
 
 
@@ -43,13 +52,114 @@ public class Stats extends PlayerMinStats {
         }
     }
 
+
+
+    public String getTranslatedClassName(Context context) {
+        switch (habitClass) {
+            case "healer":
+                return context.getString(R.string.healer);
+            case "rogue":
+                return context.getString(R.string.rogue);
+            case "warrior":
+                return context.getString(R.string.warrior);
+            case "wizard":
+                return context.getString(R.string.mage);
+            default:
+                return context.getString(R.string.warrior);
+        }
+    }
+
     public void merge(Stats stats) {
         if (stats == null) {
             return;
         }
-        super.merge(stats);
+        this.con = stats.con != null ? stats.con : this.con;
+        this.str = stats.str != null ? stats.str : this.str;
+        this.per = stats.per != null ? stats.per : this.per;
+        this._int = stats._int != null ? stats._int : this._int;
+        this.training.merge(stats.training);
+        this.buffs.merge(stats.buffs);
+        this.points = stats.points != null ? stats.points : this.points;
+        this.lvl = stats.lvl != null ? stats.lvl : this.lvl;
+        this.habitClass = stats.habitClass != null ? stats.habitClass : this.habitClass;
+        this.gp = stats.gp != null ? stats.gp : this.gp;
+        this.exp = stats.exp != null ? stats.exp : this.exp;
+        this.hp = stats.hp != null ? stats.hp : this.hp;
+        this.mp = stats.mp != null ? stats.mp : this.mp;
         this.toNextLevel = stats.toNextLevel != null ? stats.toNextLevel : this.toNextLevel;
         this.maxHealth = stats.maxHealth != null ? stats.maxHealth : this.maxHealth;
         this.maxMP = stats.maxMP != null ? stats.maxMP : this.maxMP;
     }
+
+    public String getHabitClass() {
+        return habitClass;
+    }
+
+    public void setHabitClass(String habitClass) {
+        this.habitClass = habitClass;
+    }
+
+    public Double getGp() {
+        return gp;
+    }
+
+    public Double getExp() {
+        return exp;
+    }
+
+    public Double getHp() {
+        return hp;
+    }
+
+    public Double getMp() {
+        return mp;
+    }
+
+    public Integer getLvl() {
+        return lvl;
+    }
+
+    public void setExp(double exp) {
+        this.exp = exp;
+    }
+
+    public void setHp(double hp) {
+        this.hp = hp;
+    }
+
+    public void setGp(double gp) {
+        this.gp = gp;
+    }
+
+    public void setMp(double mp) {
+        this.mp = mp;
+    }
+
+    public void setLvl(Integer lvl) {
+        this.lvl = lvl;
+    }
+
+    public Buffs getBuffs() {
+        return buffs;
+    }
+
+    public Float getStr() {
+        return str;
+    }
+
+    public Float get_int() {
+        return _int;
+    }
+
+    public Float getCon() {
+        return con;
+    }
+
+    public Float getPer() {
+        return per;
+    }
+
+    public void setHabitClass(HabitRpgClass habitRpgClass) {
+        habitClass = habitRpgClass.toString();
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
index 44dfe7eb6..685f989bb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
@@ -2,19 +2,15 @@ package com.habitrpg.android.habitica.models.user;
 
 import android.support.annotation.Nullable;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.util.Date;
 import java.util.List;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class SubscriptionPlan extends BaseModel {
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
+
+public class SubscriptionPlan extends RealmObject {
 
     public static String PLANID_BASIC = "basic";
     public static String PLANID_BASICEARNED = "basic_earned";
@@ -23,34 +19,22 @@ public class SubscriptionPlan extends BaseModel {
     public static String PLANID_GOOGLE6MONTH = "google_6mo";
     public static String PLANID_BASIC12MONTH = "basic_12mo";
 
-    @Column
     @PrimaryKey
     public String customerId;
-    @Column
     public Date dateCreated;
-    @Column
     public Date dateUpdated;
-    @Column
     @Nullable
     public Date dateTerminated;
-    @Column
     @Nullable
     public String paymentMethod;
-    @Column
     @Nullable
     public String planId;
-    @Column
     public Integer gemsBought;
-    @Column
     public Integer extraMonths;
-    @Column
     public Integer quantity;
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "consecutive_user_id",
-            columnType = String.class,
-            foreignColumnName = "customerId")})
     public SubscriptionPlanConsecutive consecutive;
 
+    @Ignore
     public List<String> mysteryItems;
 
     public boolean isActive() {
@@ -58,16 +42,6 @@ public class SubscriptionPlan extends BaseModel {
         return planId != null && (this.dateTerminated == null || this.dateTerminated.after(today));
     }
 
-    @Override
-    public void save() {
-
-        if (consecutive != null) {
-            consecutive.customerId = customerId;
-        }
-
-        super.save();
-    }
-
     public Integer numberOfGemsLeft() {
         if (customerId == null) {
             return 0;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
index 5757af47b..6d0d8d54c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
@@ -1,24 +1,13 @@
 package com.habitrpg.android.habitica.models.user;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
+import io.realm.RealmObject;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class SubscriptionPlanConsecutive extends BaseModel {
+public class SubscriptionPlanConsecutive extends RealmObject {
 
-    @Column
-    @PrimaryKey
-    public String customerId;
-    @Column
+    SubscriptionPlan subscriptionPlan;
     private int trinkets;
-    @Column
     private int gemCapExtra;
-    @Column
     private int offset;
-    @Column
     private int count;
 
     public int getTrinkets() {
@@ -52,12 +41,4 @@ public class SubscriptionPlanConsecutive extends BaseModel {
     public void setCount(int count) {
         this.count = count;
     }
-
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
index 015c0034f..d82580043 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
@@ -7,18 +7,11 @@ import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.annotation.Table;
 import com.raizlabs.android.dbflow.structure.BaseModel;
 
-/**
- * Created by viirus on 15/11/15.
- */
-@Table(databaseName = HabitDatabase.NAME)
-public class SuppressedModals extends BaseModel {
+import io.realm.RealmObject;
 
-    @Column
-    @PrimaryKey
-    @NotNull
-    public String userId;
+public class SuppressedModals extends RealmObject {
 
-    @Column
+    Preferences preferences;
     private Boolean streak, raisePet, hatchPet, levelUp;
 
     public Boolean getStreak() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/BasicStats.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.java
similarity index 62%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/models/user/BasicStats.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.java
index 0a7db1349..bca988b14 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/BasicStats.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.java
@@ -1,71 +1,56 @@
-package com.habitrpg.android.habitica.models.user;
-
-import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-/**
- * Created by MagicMicky on 10/06/2014.
- */
-
-@Table(databaseName = HabitDatabase.NAME)
-public class BasicStats extends BaseModel {
-
-    @Column
-    public Float con, str, per;
-    @Column
-    @SerializedName("int")
-    public Float _int;
-    @Column
-    @PrimaryKey
-    @NotNull
-    protected
-    String id;
-
-    public Float getCon() {
-        return con != null ? con : Float.valueOf(0);
-    }
-
-    public void setCon(Float con) {
-        this.con = con;
-    }
-
-    public Float getStr() {
-        return str != null ? str : Float.valueOf(0);
-    }
-
-    public void setStr(Float str) {
-        this.str = str;
-    }
-
-    public Float getPer() {
-        return per != null ? per : Float.valueOf(0);
-    }
-
-    public void setPer(Float per) {
-        this.per = per;
-    }
-
-    public Float get_int() {
-        return _int != null ? _int : Float.valueOf(0);
-    }
-
-    public void set_int(Float _int) {
-        this._int = _int;
-    }
-
-    public void merge(BasicStats stats) {
-        if (stats == null) {
-            return;
-        }
-        this.con = stats.con != null ? stats.con : this.con;
-        this.str = stats.str != null ? stats.str : this.str;
-        this.per = stats.per != null ? stats.per : this.per;
-        this._int = stats._int != null ? stats._int : this._int;
-    }
-}
-
+package com.habitrpg.android.habitica.models.user;
+
+import com.google.gson.annotations.SerializedName;
+
+import io.realm.RealmObject;
+
+public class Training extends RealmObject {
+
+    Stats stats;
+    public Float con, str, per;
+    @SerializedName("int")
+    public Float _int;
+
+    public Float getCon() {
+        return con != null ? con : Float.valueOf(0);
+    }
+
+    public void setCon(Float con) {
+        this.con = con;
+    }
+
+    public Float getStr() {
+        return str != null ? str : Float.valueOf(0);
+    }
+
+    public void setStr(Float str) {
+        this.str = str;
+    }
+
+    public Float getPer() {
+        return per != null ? per : Float.valueOf(0);
+    }
+
+    public void setPer(Float per) {
+        this.per = per;
+    }
+
+    public Float get_int() {
+        return _int != null ? _int : Float.valueOf(0);
+    }
+
+    public void set_int(Float _int) {
+        this._int = _int;
+    }
+
+    public void merge(Training stats) {
+        if (stats == null) {
+            return;
+        }
+        this.con = stats.con != null ? stats.con : this.con;
+        this.str = stats.str != null ? stats.str : this.str;
+        this.per = stats.per != null ? stats.per : this.per;
+        this._int = stats._int != null ? stats._int : this._int;
+    }
+}
+
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
similarity index 69%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
index dff20ff7e..e294c76ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
@@ -1,532 +1,401 @@
-package com.habitrpg.android.habitica.models.user;
-
-import android.database.sqlite.SQLiteException;
-import android.text.TextUtils;
-
-import com.google.gson.annotations.SerializedName;
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.habitrpg.android.habitica.models.PushDevice;
-import com.habitrpg.android.habitica.models.Tag;
-import com.habitrpg.android.habitica.models.invitations.Invitations;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.social.UserParty;
-import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TasksOrder;
-import com.habitrpg.android.habitica.ui.AvatarView;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.OneToMany;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-
-@Table(databaseName = HabitDatabase.NAME)
-public class HabitRPGUser extends BaseModel {
-
-    List<Challenge> challengeList;
-
-    @Column
-    @PrimaryKey
-    @SerializedName("_id")
-    private String id;
-    @Column
-    private double balance;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "stats_id",
-            columnType = String.class,
-            foreignColumnName = "id")})
-    private Stats stats;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "inbox_id",
-            columnType = String.class,
-            foreignColumnName = "user_Id")})
-    private Inbox inbox;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "preferences_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Preferences preferences;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "profile_id",
-            columnType = String.class,
-            foreignColumnName = "user_Id")})
-    private Profile profile;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "party_id",
-            columnType = String.class,
-            foreignColumnName = "id")})
-    private UserParty party;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "items_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Items items;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "authentication_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    @SerializedName("auth")
-    private Authentication authentication;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "flags_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Flags flags;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "contributor_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private ContributorInfo contributor;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "invitations_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Invitations invitations;
-
-    private List<PushDevice> pushDevices;
-
-    @Column
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "purchased_id",
-            columnType = String.class,
-            foreignColumnName = "user_id")})
-    private Purchases purchased;
-
-    private TasksOrder tasksOrder;
-
-    private List<String> challenges;
-
-
-    @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "challengeList")
-    public List<Challenge> getChallengeList() {
-        if (challengeList == null) {
-            try {
-                challengeList = new Select()
-                        .from(Challenge.class)
-                        .where(Condition.column("user_id").eq(this.id))
-                        .queryList();
-            } catch (SQLiteException exception) {
-                challengeList = new ArrayList<>();
-            }
-        }
-        return challengeList;
-    }
-
-    public void setChallengeList(List<Challenge> challenges) {
-        this.challengeList = challenges;
-    }
-
-    public void resetChallengeList() {
-        challengeList = null;
-    }
-
-    public Preferences getPreferences() {
-        return preferences;
-    }
-
-    public void setPreferences(Preferences preferences) {
-        this.preferences = preferences;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Stats getStats() {
-        return stats;
-    }
-
-    public void setStats(Stats stats) {
-        this.stats = stats;
-    }
-
-    public Inbox getInbox() {
-        return inbox;
-    }
-
-    public void setInbox(Inbox inbox) {
-        this.inbox = inbox;
-    }
-
-    public Profile getProfile() {
-        return profile;
-    }
-
-    public void setProfile(Profile profile) {
-        this.profile = profile;
-    }
-
-    public ContributorInfo getContributor() {
-        return contributor;
-    }
-
-    public void setContributor(ContributorInfo contributor) {
-        this.contributor = contributor;
-    }
-
-    public Invitations getInvitations() {
-        return invitations;
-    }
-
-    public void setInvitations(Invitations invitations) {
-        this.invitations = invitations;
-    }
-
-    public UserParty getParty() {
-        return party;
-    }
-
-    public void setParty(UserParty party) {
-        this.party = party;
-    }
-
-    public Items getItems() {
-        return items;
-    }
-
-    public void setItems(Items items) {
-        this.items = items;
-        this.items.user_id = id;
-    }
-
-    public double getBalance() {
-        return this.balance;
-    }
-
-    public void setBalance(double balance) {
-        this.balance = balance;
-    }
-
-    public Authentication getAuthentication() {
-        return authentication;
-    }
-
-    public void setAuthentication(Authentication authentication) {
-        this.authentication = authentication;
-    }
-
-    public Purchases getPurchased() {
-        return purchased;
-    }
-
-    public void setPurchased(Purchases purchased) {
-        this.purchased = purchased;
-    }
-
-    public Flags getFlags() {
-        return flags;
-    }
-
-    public void setFlags(Flags flags) {
-        this.flags = flags;
-    }
-
-    public TasksOrder getTasksOrder() {
-        return tasksOrder;
-    }
-
-    public void setTasksOrder(TasksOrder tasksOrder) {
-        this.tasksOrder = tasksOrder;
-    }
-
-    public List<PushDevice> getPushDevices() {
-        return this.pushDevices;
-    }
-
-    public void setPushDevices(List<PushDevice> pushDevices) {
-        this.pushDevices = pushDevices;
-    }
-
-    public List<String> getChallenges() {
-        return challenges;
-    }
-
-    public void setChallenges(List<String> challenges) {
-        this.challenges = challenges;
-    }
-
-
-    @Override
-    public void save() {
-        // We need to set the userId to all other objects
-        if (id == null) {
-            return;
-        }
-        preferences.user_id = id;
-        stats.id = id;
-        profile.user_Id = id;
-        if (inbox != null) {
-            inbox.user_Id = id;
-        }
-        items.user_id = id;
-        authentication.user_id = id;
-        flags.user_id = id;
-        if (purchased != null) {
-            purchased.user_id = id;
-        }
-        if (contributor != null) {
-            contributor.user_id = id;
-        }
-        if (invitations != null) {
-            invitations.user_id = id;
-        }
-
-        List<Challenge> challenges = getChallengeList();
-        List<Challenge> newChallenges = new ArrayList<>();
-        if (getChallenges() != null) {
-            for (String s : getChallenges()) {
-
-                boolean challengeExistInDatabase = false;
-
-                for (Challenge challenge : challenges) {
-                    if (challenge.id.equals(s)) {
-                        challengeExistInDatabase = true;
-                        challenges.remove(challenge);
-                        newChallenges.add(challenge);
-                        break;
-                    }
-                }
-
-                if (!challengeExistInDatabase) {
-                    Challenge challenge = new Challenge();
-                    challenge.id = s;
-                    challenge.user_id = id;
-
-                    newChallenges.add(challenge);
-                }
-            }
-            for (Challenge challenge : challenges) {
-                challenge.user_id = null;
-            }
-        }
-
-        setChallengeList(newChallenges);
-
-        super.save();
-    }
-
-    public List<String> getAvatarLayerNames() {
-        List<String> layerNames = new ArrayList<String>();
-
-        Preferences prefs = this.getPreferences();
-
-        if (prefs.getChair() != null) {
-            layerNames.add(prefs.getChair());
-        }
-
-        Outfit outfit = null;
-        if (this.getItems() != null) {
-            if (prefs.getCostume()) {
-                outfit = this.getItems().getGear().getCostume();
-            } else {
-                outfit = this.getItems().getGear().getEquipped();
-            }
-        }
-
-        if (outfit != null) {
-            if (outfit.getBack() != null) {
-                layerNames.add(outfit.getBack());
-            }
-        }
-
-        if (prefs.getSleep()) {
-            layerNames.add("skin_" + prefs.getSkin() + "_sleep");
-        } else {
-            layerNames.add("skin_" + prefs.getSkin());
-        }
-        layerNames.add(prefs.getSize() + "_shirt_" + prefs.getShirt());
-        layerNames.add("head_0");
-
-        if (outfit != null) {
-            String armor = outfit.getArmor();
-
-            if (armor != null && !armor.equals("armor_base_0")) {
-                layerNames.add(prefs.getSize() + "_" + armor);
-            }
-            if (outfit.getBody() != null && !outfit.getBody().equals("body_base_0")) {
-                layerNames.add(outfit.getBody());
-            }
-        }
-
-        Hair hair = prefs.getHair();
-        if (hair != null) {
-            String hairColor = hair.getColor();
-
-            if (hair.getBase() > 0) {
-                layerNames.add("hair_base_" + hair.getBase() + "_" + hairColor);
-            }
-            if (hair.getBangs() > 0) {
-                layerNames.add("hair_bangs_" + hair.getBangs() + "_" + hairColor);
-            }
-            if (hair.getMustache() > 0) {
-                layerNames.add("hair_mustache_" + hair.getMustache() + "_" + hairColor);
-            }
-            if (hair.getBeard() > 0) {
-                layerNames.add("hair_beard_" + hair.getBeard() + "_" + hairColor);
-            }
-        }
-
-        if (outfit != null) {
-            if (outfit.getEyeWear() != null && !outfit.getEyeWear().equals("eyewear_base_0")) {
-                layerNames.add(outfit.getEyeWear());
-            }
-            if (outfit.getHead() != null && !outfit.getHead().equals("head_base_0")) {
-                layerNames.add(outfit.getHead());
-            }
-            if (outfit.getHeadAccessory() != null && !outfit.getHeadAccessory().equals("headAccessory_base_0")) {
-                layerNames.add(outfit.getHeadAccessory());
-            }
-            if (outfit.getShield() != null && !outfit.getShield().equals("shield_base_0")) {
-                layerNames.add(outfit.getShield());
-            }
-            if (outfit.getWeapon() != null && !outfit.getWeapon().equals("weapon_base_0")) {
-                layerNames.add(outfit.getWeapon());
-            }
-        }
-
-        if (prefs.getSleep()) {
-            layerNames.add("zzz");
-        }
-
-        return layerNames;
-    }
-
-    public EnumMap<AvatarView.LayerType, String> getAvatarLayerMap() {
-        EnumMap<AvatarView.LayerType, String> layerMap = new EnumMap<>(AvatarView.LayerType.class);
-
-        Preferences prefs = getPreferences();
-        Outfit outfit = (prefs.getCostume()) ? getItems().getGear().getCostume() : getItems().getGear().getEquipped();
-
-        boolean hasVisualBuffs = false;
-
-        if (stats != null && stats.getBuffs() != null) {
-            Buffs buffs = stats.getBuffs();
-
-            if (buffs.getSnowball()) {
-                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "snowman");
-                hasVisualBuffs = true;
-            }
-
-            if (buffs.getSeafoam()) {
-                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "seafoam_star");
-                hasVisualBuffs = true;
-            }
-
-            if (buffs.getShinySeed()) {
-                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "avatar_floral_" + stats.get_class());
-                hasVisualBuffs = true;
-            }
-
-            if (buffs.getSpookySparkles()) {
-                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "ghost");
-                hasVisualBuffs = true;
-            }
-        }
-
-        if (!hasVisualBuffs) {
-            if (!TextUtils.isEmpty(prefs.getChair())) {
-                layerMap.put(AvatarView.LayerType.CHAIR, prefs.getChair());
-            }
-
-            if (outfit != null) {
-                if (!TextUtils.isEmpty(outfit.getBack())) {
-                    layerMap.put(AvatarView.LayerType.BACK, outfit.getBack());
-                }
-                if (outfit.isAvailable(outfit.getArmor())) {
-                    layerMap.put(AvatarView.LayerType.ARMOR, prefs.getSize() + "_" + outfit.getArmor());
-                }
-                if (outfit.isAvailable(outfit.getBody())) {
-                    layerMap.put(AvatarView.LayerType.BODY, outfit.getBody());
-                }
-                if (outfit.isAvailable(outfit.getEyeWear())) {
-                    layerMap.put(AvatarView.LayerType.EYEWEAR, outfit.getEyeWear());
-                }
-                if (outfit.isAvailable(outfit.getHead())) {
-                    layerMap.put(AvatarView.LayerType.HEAD, outfit.getHead());
-                }
-                if (outfit.isAvailable(outfit.getHeadAccessory())) {
-                    layerMap.put(AvatarView.LayerType.HEAD_ACCESSORY, outfit.getHeadAccessory());
-                }
-                if (outfit.isAvailable(outfit.getShield())) {
-                    layerMap.put(AvatarView.LayerType.SHIELD, outfit.getShield());
-                }
-                if (outfit.isAvailable(outfit.getWeapon())) {
-                    layerMap.put(AvatarView.LayerType.WEAPON, outfit.getWeapon());
-                }
-            }
-
-            layerMap.put(AvatarView.LayerType.SKIN, "skin_" + prefs.getSkin() + ((prefs.getSleep()) ? "_sleep" : ""));
-            layerMap.put(AvatarView.LayerType.SHIRT, prefs.getSize() + "_shirt_" + prefs.getShirt());
-            layerMap.put(AvatarView.LayerType.HEAD_0, "head_0");
-
-            Hair hair = prefs.getHair();
-            if (hair != null) {
-                String hairColor = hair.getColor();
-
-                if (hair.isAvailable(hair.getBase())) {
-                    layerMap.put(AvatarView.LayerType.HAIR_BASE, "hair_base_" + hair.getBase() + "_" + hairColor);
-                }
-                if (hair.isAvailable(hair.getBangs())) {
-                    layerMap.put(AvatarView.LayerType.HAIR_BANGS, "hair_bangs_" + hair.getBangs() + "_" + hairColor);
-                }
-                if (hair.isAvailable(hair.getMustache())) {
-                    layerMap.put(AvatarView.LayerType.HAIR_MUSTACHE, "hair_mustache_" + hair.getMustache() + "_" + hairColor);
-                }
-                if (hair.isAvailable(hair.getBeard())) {
-                    layerMap.put(AvatarView.LayerType.HAIR_BEARD, "hair_beard_" + hair.getBeard() + "_" + hairColor);
-                }
-                if (hair.isAvailable(hair.getFlower())) {
-                    layerMap.put(AvatarView.LayerType.HAIR_FLOWER, "hair_flower_" + hair.getFlower());
-                }
-            }
-        } else {
-            Hair hair = prefs.getHair();
-
-            // Show flower all the time!
-            if (hair != null && hair.isAvailable(hair.getFlower())) {
-                layerMap.put(AvatarView.LayerType.HAIR_FLOWER, "hair_flower_" + hair.getFlower());
-            }
-        }
-
-        return layerMap;
-    }
-
-    public int getPetsFoundCount() {
-        return getNullableMapSize(items.getPets());
-    }
-
-    public int getMountsTamedCount() {
-        return getNullableMapSize(items.getMounts());
-    }
-
-    private int getNullableMapSize(Map map) {
-        int mapSize = 0;
-
-        if (map != null) {
-            mapSize = map.size();
-        }
-
-        return mapSize;
-    }
-}
+package com.habitrpg.android.habitica.models.user;
+
+import android.database.sqlite.SQLiteException;
+import android.text.TextUtils;
+
+import com.google.gson.annotations.SerializedName;
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.habitrpg.android.habitica.models.PushDevice;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.invitations.Invitations;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.UserParty;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+import com.habitrpg.android.habitica.ui.AvatarView;
+
+import java.util.ArrayList;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
+
+public class User extends RealmObject {
+
+    @Ignore
+    List<Challenge> challengeList;
+
+    @PrimaryKey
+    @SerializedName("_id")
+    private String id;
+    private double balance;
+    private Stats stats;
+    private Inbox inbox;
+    private Preferences preferences;
+    private Profile profile;
+    private UserParty party;
+    private Items items;
+    @SerializedName("auth")
+    private Authentication authentication;
+    private Flags flags;
+    private ContributorInfo contributor;
+    private Invitations invitations;
+
+    @Ignore
+    private List<PushDevice> pushDevices;
+    private Purchases purchased;
+
+    @Ignore
+    private TasksOrder tasksOrder;
+
+    @Ignore
+    private List<String> challenges;
+
+
+    public List<Challenge> getChallengeList() {
+        return challengeList;
+    }
+
+    public void setChallengeList(List<Challenge> challenges) {
+        this.challengeList = challenges;
+    }
+
+    public void resetChallengeList() {
+        challengeList = null;
+    }
+
+    public Preferences getPreferences() {
+        return preferences;
+    }
+
+    public void setPreferences(Preferences preferences) {
+        this.preferences = preferences;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public Stats getStats() {
+        return stats;
+    }
+
+    public void setStats(Stats stats) {
+        this.stats = stats;
+    }
+
+    public Inbox getInbox() {
+        return inbox;
+    }
+
+    public void setInbox(Inbox inbox) {
+        this.inbox = inbox;
+    }
+
+    public Profile getProfile() {
+        return profile;
+    }
+
+    public void setProfile(Profile profile) {
+        this.profile = profile;
+    }
+
+    public ContributorInfo getContributor() {
+        return contributor;
+    }
+
+    public void setContributor(ContributorInfo contributor) {
+        this.contributor = contributor;
+    }
+
+    public Invitations getInvitations() {
+        return invitations;
+    }
+
+    public void setInvitations(Invitations invitations) {
+        this.invitations = invitations;
+    }
+
+    public UserParty getParty() {
+        return party;
+    }
+
+    public void setParty(UserParty party) {
+        this.party = party;
+    }
+
+    public Items getItems() {
+        return items;
+    }
+
+    public void setItems(Items items) {
+        this.items = items;
+    }
+
+    public double getBalance() {
+        return this.balance;
+    }
+
+    public void setBalance(double balance) {
+        this.balance = balance;
+    }
+
+    public Authentication getAuthentication() {
+        return authentication;
+    }
+
+    public void setAuthentication(Authentication authentication) {
+        this.authentication = authentication;
+    }
+
+    public Purchases getPurchased() {
+        return purchased;
+    }
+
+    public void setPurchased(Purchases purchased) {
+        this.purchased = purchased;
+    }
+
+    public Flags getFlags() {
+        return flags;
+    }
+
+    public void setFlags(Flags flags) {
+        this.flags = flags;
+    }
+
+    public TasksOrder getTasksOrder() {
+        return tasksOrder;
+    }
+
+    public void setTasksOrder(TasksOrder tasksOrder) {
+        this.tasksOrder = tasksOrder;
+    }
+
+    public List<PushDevice> getPushDevices() {
+        return this.pushDevices;
+    }
+
+    public void setPushDevices(List<PushDevice> pushDevices) {
+        this.pushDevices = pushDevices;
+    }
+
+    public List<String> getChallenges() {
+        return challenges;
+    }
+
+    public void setChallenges(List<String> challenges) {
+        this.challenges = challenges;
+    }
+
+    public List<String> getAvatarLayerNames() {
+        List<String> layerNames = new ArrayList<String>();
+
+        Preferences prefs = this.getPreferences();
+
+        if (prefs.getChair() != null) {
+            layerNames.add(prefs.getChair());
+        }
+
+        Outfit outfit = null;
+        if (this.getItems() != null) {
+            if (prefs.getCostume()) {
+                outfit = this.getItems().getGear().getCostume();
+            } else {
+                outfit = this.getItems().getGear().getEquipped();
+            }
+        }
+
+        if (outfit != null) {
+            if (outfit.getBack() != null) {
+                layerNames.add(outfit.getBack());
+            }
+        }
+
+        if (prefs.getSleep()) {
+            layerNames.add("skin_" + prefs.getSkin() + "_sleep");
+        } else {
+            layerNames.add("skin_" + prefs.getSkin());
+        }
+        layerNames.add(prefs.getSize() + "_shirt_" + prefs.getShirt());
+        layerNames.add("head_0");
+
+        if (outfit != null) {
+            String armor = outfit.getArmor();
+
+            if (armor != null && !armor.equals("armor_base_0")) {
+                layerNames.add(prefs.getSize() + "_" + armor);
+            }
+            if (outfit.getBody() != null && !outfit.getBody().equals("body_base_0")) {
+                layerNames.add(outfit.getBody());
+            }
+        }
+
+        Hair hair = prefs.getHair();
+        if (hair != null) {
+            String hairColor = hair.getColor();
+
+            if (hair.getBase() > 0) {
+                layerNames.add("hair_base_" + hair.getBase() + "_" + hairColor);
+            }
+            if (hair.getBangs() > 0) {
+                layerNames.add("hair_bangs_" + hair.getBangs() + "_" + hairColor);
+            }
+            if (hair.getMustache() > 0) {
+                layerNames.add("hair_mustache_" + hair.getMustache() + "_" + hairColor);
+            }
+            if (hair.getBeard() > 0) {
+                layerNames.add("hair_beard_" + hair.getBeard() + "_" + hairColor);
+            }
+        }
+
+        if (outfit != null) {
+            if (outfit.getEyeWear() != null && !outfit.getEyeWear().equals("eyewear_base_0")) {
+                layerNames.add(outfit.getEyeWear());
+            }
+            if (outfit.getHead() != null && !outfit.getHead().equals("head_base_0")) {
+                layerNames.add(outfit.getHead());
+            }
+            if (outfit.getHeadAccessory() != null && !outfit.getHeadAccessory().equals("headAccessory_base_0")) {
+                layerNames.add(outfit.getHeadAccessory());
+            }
+            if (outfit.getShield() != null && !outfit.getShield().equals("shield_base_0")) {
+                layerNames.add(outfit.getShield());
+            }
+            if (outfit.getWeapon() != null && !outfit.getWeapon().equals("weapon_base_0")) {
+                layerNames.add(outfit.getWeapon());
+            }
+        }
+
+        if (prefs.getSleep()) {
+            layerNames.add("zzz");
+        }
+
+        return layerNames;
+    }
+
+    public EnumMap<AvatarView.LayerType, String> getAvatarLayerMap() {
+        EnumMap<AvatarView.LayerType, String> layerMap = new EnumMap<>(AvatarView.LayerType.class);
+
+        Preferences prefs = getPreferences();
+        Outfit outfit = (prefs.getCostume()) ? getItems().getGear().getCostume() : getItems().getGear().getEquipped();
+
+        boolean hasVisualBuffs = false;
+
+        if (stats != null && stats.getBuffs() != null) {
+            Buffs buffs = stats.getBuffs();
+
+            if (buffs.getSnowball()) {
+                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "snowman");
+                hasVisualBuffs = true;
+            }
+
+            if (buffs.getSeafoam()) {
+                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "seafoam_star");
+                hasVisualBuffs = true;
+            }
+
+            if (buffs.getShinySeed()) {
+                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "avatar_floral_" + stats.getHabitClass());
+                hasVisualBuffs = true;
+            }
+
+            if (buffs.getSpookySparkles()) {
+                layerMap.put(AvatarView.LayerType.VISUAL_BUFF, "ghost");
+                hasVisualBuffs = true;
+            }
+        }
+
+        if (!hasVisualBuffs) {
+            if (!TextUtils.isEmpty(prefs.getChair())) {
+                layerMap.put(AvatarView.LayerType.CHAIR, prefs.getChair());
+            }
+
+            if (outfit != null) {
+                if (!TextUtils.isEmpty(outfit.getBack())) {
+                    layerMap.put(AvatarView.LayerType.BACK, outfit.getBack());
+                }
+                if (outfit.isAvailable(outfit.getArmor())) {
+                    layerMap.put(AvatarView.LayerType.ARMOR, prefs.getSize() + "_" + outfit.getArmor());
+                }
+                if (outfit.isAvailable(outfit.getBody())) {
+                    layerMap.put(AvatarView.LayerType.BODY, outfit.getBody());
+                }
+                if (outfit.isAvailable(outfit.getEyeWear())) {
+                    layerMap.put(AvatarView.LayerType.EYEWEAR, outfit.getEyeWear());
+                }
+                if (outfit.isAvailable(outfit.getHead())) {
+                    layerMap.put(AvatarView.LayerType.HEAD, outfit.getHead());
+                }
+                if (outfit.isAvailable(outfit.getHeadAccessory())) {
+                    layerMap.put(AvatarView.LayerType.HEAD_ACCESSORY, outfit.getHeadAccessory());
+                }
+                if (outfit.isAvailable(outfit.getShield())) {
+                    layerMap.put(AvatarView.LayerType.SHIELD, outfit.getShield());
+                }
+                if (outfit.isAvailable(outfit.getWeapon())) {
+                    layerMap.put(AvatarView.LayerType.WEAPON, outfit.getWeapon());
+                }
+            }
+
+            layerMap.put(AvatarView.LayerType.SKIN, "skin_" + prefs.getSkin() + ((prefs.getSleep()) ? "_sleep" : ""));
+            layerMap.put(AvatarView.LayerType.SHIRT, prefs.getSize() + "_shirt_" + prefs.getShirt());
+            layerMap.put(AvatarView.LayerType.HEAD_0, "head_0");
+
+            Hair hair = prefs.getHair();
+            if (hair != null) {
+                String hairColor = hair.getColor();
+
+                if (hair.isAvailable(hair.getBase())) {
+                    layerMap.put(AvatarView.LayerType.HAIR_BASE, "hair_base_" + hair.getBase() + "_" + hairColor);
+                }
+                if (hair.isAvailable(hair.getBangs())) {
+                    layerMap.put(AvatarView.LayerType.HAIR_BANGS, "hair_bangs_" + hair.getBangs() + "_" + hairColor);
+                }
+                if (hair.isAvailable(hair.getMustache())) {
+                    layerMap.put(AvatarView.LayerType.HAIR_MUSTACHE, "hair_mustache_" + hair.getMustache() + "_" + hairColor);
+                }
+                if (hair.isAvailable(hair.getBeard())) {
+                    layerMap.put(AvatarView.LayerType.HAIR_BEARD, "hair_beard_" + hair.getBeard() + "_" + hairColor);
+                }
+                if (hair.isAvailable(hair.getFlower())) {
+                    layerMap.put(AvatarView.LayerType.HAIR_FLOWER, "hair_flower_" + hair.getFlower());
+                }
+            }
+        } else {
+            Hair hair = prefs.getHair();
+
+            // Show flower all the time!
+            if (hair != null && hair.isAvailable(hair.getFlower())) {
+                layerMap.put(AvatarView.LayerType.HAIR_FLOWER, "hair_flower_" + hair.getFlower());
+            }
+        }
+
+        return layerMap;
+    }
+
+    public int getPetsFoundCount() {
+        return getNullableMapSize(items.getPets());
+    }
+
+    public int getMountsTamedCount() {
+        return getNullableMapSize(items.getMounts());
+    }
+
+    private int getNullableMapSize(Map map) {
+        int mapSize = 0;
+
+        if (map != null) {
+            mapSize = map.size();
+        }
+
+        return mapSize;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
index c0b4e8c9d..5ed9ddcea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
@@ -30,21 +30,20 @@ import com.habitrpg.android.habitica.data.local.TagLocalRepository;
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
 import com.habitrpg.android.habitica.data.local.TutorialLocalRepository;
 import com.habitrpg.android.habitica.data.local.UserLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowCustomizationLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowFAQLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowInventoryLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.DbFlowSocialLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowTutorialLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowUserLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.RealmCustomizationLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.RealmFAQLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.RealmInventoryLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.RealmTagLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.RealmTaskLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.RealmTutorialLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.RealmUserLocalRepository;
 
 import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
 import io.realm.Realm;
-import io.realm.RealmConfiguration;
 
 @Module
 public class RepositoryModule {
@@ -81,8 +80,8 @@ public class RepositoryModule {
     }
 
     @Provides
-    UserLocalRepository providesUserLocalRepository() {
-        return new DbFlowUserLocalRepository();
+    UserLocalRepository providesUserLocalRepository(Realm realm) {
+        return new RealmUserLocalRepository(realm);
     }
 
     @Provides
@@ -101,8 +100,8 @@ public class RepositoryModule {
     }
 
     @Provides
-    InventoryLocalRepository providesInventoryLocalRepository() {
-        return new DbFlowInventoryLocalRepository();
+    InventoryLocalRepository providesInventoryLocalRepository(Realm realm) {
+        return new RealmInventoryLocalRepository(realm);
     }
 
     @Provides
@@ -111,8 +110,8 @@ public class RepositoryModule {
     }
 
     @Provides
-    FAQLocalRepository providesFAQLocalRepository() {
-        return new DbFlowFAQLocalRepository();
+    FAQLocalRepository providesFAQLocalRepository(Realm realm) {
+        return new RealmFAQLocalRepository(realm);
     }
 
     @Provides
@@ -121,8 +120,8 @@ public class RepositoryModule {
     }
 
     @Provides
-    TutorialLocalRepository providesTutorialLocalRepository() {
-        return new DbFlowTutorialLocalRepository();
+    TutorialLocalRepository providesTutorialLocalRepository(Realm realm) {
+        return new RealmTutorialLocalRepository(realm);
     }
 
     @Provides
@@ -131,8 +130,8 @@ public class RepositoryModule {
     }
 
     @Provides
-    CustomizationLocalRepository providesCustomizationLocalRepository() {
-        return new DbFlowCustomizationLocalRepository();
+    CustomizationLocalRepository providesCustomizationLocalRepository(Realm realm) {
+        return new RealmCustomizationLocalRepository(realm);
     }
 
     @Provides
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 c62238e7e..6860943c4 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
@@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.data.ApiClient;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import javax.inject.Inject;
 
@@ -22,7 +22,7 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver implement
     @Inject
     public ApiClient apiClient;
 
-    private HabitRPGUser user;
+    private User user;
     private String action;
     private Resources resources;
     private Intent intent;
@@ -43,7 +43,7 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver implement
     }
 
     @Override
-    public void onUserReceived(HabitRPGUser user) {
+    public void onUserReceived(User user) {
         this.user = user;
         this.handleLocalNotificationAction(action);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
index 550fc7e1b..b7e2764c6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarView.java
@@ -26,7 +26,7 @@ import com.facebook.drawee.view.DraweeHolder;
 import com.facebook.drawee.view.MultiDraweeHolder;
 import com.facebook.imagepipeline.image.ImageInfo;
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.Collections;
 import java.util.EnumMap;
@@ -60,7 +60,7 @@ public class AvatarView extends View {
     private boolean hasPet;
     private boolean isOrphan;
     private MultiDraweeHolder<GenericDraweeHierarchy> multiDraweeHolder = new MultiDraweeHolder<>();
-    private HabitRPGUser user;
+    private User user;
     private RectF avatarRectF;
     private Matrix matrix = new Matrix();
     private AtomicInteger numberLayersInProcess = new AtomicInteger(0);
@@ -170,7 +170,7 @@ public class AvatarView extends View {
         return getLayerMap(user, true);
     }
 
-    private Map<LayerType, String> getLayerMap(@NonNull HabitRPGUser user, boolean resetHasAttributes) {
+    private Map<LayerType, String> getLayerMap(@NonNull User user, boolean resetHasAttributes) {
         EnumMap<LayerType, String> layerMap = user.getAvatarLayerMap();
 
         if (resetHasAttributes) hasBackground = hasMount = hasPet = false;
@@ -322,8 +322,8 @@ public class AvatarView extends View {
         }
     }
 
-    public void setUser(@NonNull HabitRPGUser user) {
-        HabitRPGUser oldUser = this.user;
+    public void setUser(@NonNull User user) {
+        User oldUser = this.user;
         this.user = user;
 
         if (oldUser != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index d8b4f4b9c..22bd54008 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.events.BoughtGemsEvent;
 import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
 import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Stats;
 import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
 
@@ -40,7 +40,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
     private Context context;
 
     private TextView lvlText, goldText, silverText, gemsText;
-    private HabitRPGUser userObject;
+    private User userObject;
 
     private int cachedMaxHealth, cachedMaxExp, cachedMaxMana;
 
@@ -98,7 +98,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
     }
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-    public void updateData(HabitRPGUser user) {
+    public void updateData(User user) {
         userObject = user;
 
         Stats stats = user.getStats();
@@ -109,32 +109,31 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
 
         avatarView.setUser(user);
 
-        if (stats.get_class() != null) {
+        if (stats.getHabitClass() != null) {
             userClass = stats.getTranslatedClassName(context);
         }
 
-        mpBar.valueBarLayout.setVisibility((stats.get_class() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
+        mpBar.valueBarLayout.setVisibility((stats.getHabitClass() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
 
-        if (user.getPreferences() != null && user.getFlags() != null && (user.getPreferences().getDisableClasses() || !user.getFlags().getClassSelected())) {
+        if (user.getPreferences() != null && user.getFlags() != null && (user.getPreferences().getDisableClasses() || !user.getFlags().getClassSelected() || userClass.length() == 0)) {
             lvlText.setText(context.getString(R.string.user_level, user.getStats().getLvl()));
             lvlText.setCompoundDrawables(null, null, null, null);
         } else {
             lvlText.setText(context.getString(R.string.user_level_with_class, user.getStats().getLvl(), userClass.substring(0, 1).toUpperCase(Locale.getDefault()) + userClass.substring(1)));
             Drawable drawable;
-            switch (stats.get_class()) {
-                case warrior:
+            switch (stats.getHabitClass()) {
+                case "warrior":
                     drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_warrior, null);
                     break;
-                case rogue:
+                case "rogue":
                     drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_rogue, null);
                     break;
-                case wizard:
+                case "wizard":
                     drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_mage, null);
                     break;
-                case healer:
+                case "healer":
                     drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_healer, null);
                     break;
-                case base:
                 default:
                     drawable = ResourcesCompat.getDrawable(res, R.drawable.ic_header_warrior, null);
 
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 7dc5579da..19fc36549 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
@@ -27,6 +27,7 @@ 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.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.interactors.BuyRewardUseCase;
 import com.habitrpg.android.habitica.interactors.ChecklistCheckUseCase;
 import com.habitrpg.android.habitica.interactors.DailyCheckUseCase;
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 487bf81f5..bb90f02a2 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
@@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.models.user.Gear;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Hair;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.Outfit;
@@ -22,7 +22,7 @@ import butterknife.BindView;
 import butterknife.OnClick;
 import rx.functions.Action1;
 
-public class ClassSelectionActivity extends BaseActivity implements Action1<HabitRPGUser> {
+public class ClassSelectionActivity extends BaseActivity implements Action1<User> {
 
     String currentClass;
     Boolean isInitialSelection;
@@ -75,14 +75,14 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
         healerOutfit.setHead("head_healer_5");
         healerOutfit.setShield("shield_healer_5");
         healerOutfit.setWeapon("weapon_healer_6");
-        HabitRPGUser healer = this.makeUser(preferences, healerOutfit);
+        User healer = this.makeUser(preferences, healerOutfit);
         healerAvatarView.setUser(healer);
 
         Outfit mageOutfit = new Outfit();
         mageOutfit.setArmor("armor_wizard_5");
         mageOutfit.setHead("head_wizard_5");
         mageOutfit.setWeapon("weapon_wizard_6");
-        HabitRPGUser mage = this.makeUser(preferences, mageOutfit);
+        User mage = this.makeUser(preferences, mageOutfit);
         mageAvatarView.setUser(mage);
 
         Outfit rogueOutfit = new Outfit();
@@ -90,7 +90,7 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
         rogueOutfit.setHead("head_rogue_5");
         rogueOutfit.setShield("shield_rogue_6");
         rogueOutfit.setWeapon("weapon_rogue_6");
-        HabitRPGUser rogue = this.makeUser(preferences, rogueOutfit);
+        User rogue = this.makeUser(preferences, rogueOutfit);
         rogueAvatarView.setUser(rogue);
 
         Outfit warriorOutfit = new Outfit();
@@ -98,7 +98,7 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
         warriorOutfit.setHead("head_warrior_5");
         warriorOutfit.setShield("shield_warrior_5");
         warriorOutfit.setWeapon("weapon_warrior_6");
-        HabitRPGUser warrior = this.makeUser(preferences, warriorOutfit);
+        User warrior = this.makeUser(preferences, warriorOutfit);
         warriorAvatarView.setUser(warrior);
 
         if (!isInitialSelection) {
@@ -115,8 +115,8 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
         component.inject(this);
     }
 
-    public HabitRPGUser makeUser(Preferences preferences, Outfit outfit) {
-        HabitRPGUser user = new HabitRPGUser();
+    public User makeUser(Preferences preferences, Outfit outfit) {
+        User user = new User();
         user.setPreferences(preferences);
         user.setItems(new Items());
         user.getItems().setGear(new Gear());
@@ -223,7 +223,7 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
     }
 
     @Override
-    public void call(HabitRPGUser user) {
+    public void call(User user) {
         if (shouldFinish) {
             if (progressDialog != null) {
                 progressDialog.dismiss();
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 1a41dd753..1bfd20807 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
@@ -30,13 +30,14 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.UserStatComputer;
 import com.habitrpg.android.habitica.models.Achievement;
 import com.habitrpg.android.habitica.models.AchievementGroup;
 import com.habitrpg.android.habitica.models.AchievementResult;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.user.Buffs;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Outfit;
 import com.habitrpg.android.habitica.models.user.Profile;
 import com.habitrpg.android.habitica.models.user.Stats;
@@ -55,6 +56,7 @@ import java.util.List;
 import javax.inject.Inject;
 
 import butterknife.BindView;
+import io.realm.RealmResults;
 import rx.Observable;
 
 public class FullProfileActivity extends BaseActivity {
@@ -190,7 +192,7 @@ public class FullProfileActivity extends BaseActivity {
         addMessageDialog.show();
     }
 
-    private void updateView(HabitRPGUser user) {
+    private void updateView(User user) {
         Profile profile = user.getProfile();
         Stats stats = user.getStats();
 
@@ -331,7 +333,7 @@ public class FullProfileActivity extends BaseActivity {
         return gearRow;
     }
 
-    private void addLevelAttributes(Stats stats, HabitRPGUser user) {
+    private void addLevelAttributes(Stats stats, User user) {
         float byLevelStat = Math.min(stats.getLvl() / 2.0f, 50f);
 
         addAttributeRow(getString(R.string.profile_level), byLevelStat, byLevelStat, byLevelStat, byLevelStat, true, false);
@@ -345,7 +347,7 @@ public class FullProfileActivity extends BaseActivity {
         }
     }
 
-    private Observable<List<ItemData>> loadItemDataByOutfit(Outfit outfit) {
+    private Observable<RealmResults<Equipment>> loadItemDataByOutfit(Outfit outfit) {
         ArrayList<String> outfitList = new ArrayList<>();
         outfitList.add(outfit.getArmor());
         outfitList.add(outfit.getBack());
@@ -359,9 +361,9 @@ public class FullProfileActivity extends BaseActivity {
         return inventoryRepository.getItems(outfitList);
     }
 
-    public void gotGear(List<ItemData> itemDataList, HabitRPGUser user) {
+    public void gotGear(List<Equipment> equipmentList, User user) {
         UserStatComputer userStatComputer = new UserStatComputer();
-        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
 
         for (UserStatComputer.StatsRow row : statsRows) {
             if (row.getClass().equals(UserStatComputer.EquipmentRow.class)) {
@@ -380,9 +382,9 @@ public class FullProfileActivity extends BaseActivity {
         attributesTableLayout.setVisibility(View.VISIBLE);
     }
 
-    public void gotCostume(List<ItemData> obj) {
+    public void gotCostume(List<Equipment> obj) {
         // fill costume table
-        for (ItemData i : obj) {
+        for (Equipment i : obj) {
             addEquipmentRow(costumeTableLayout, i.getKey(), i.getText(), "");
         }
 
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 f7c9b339d..329613149 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
@@ -18,6 +18,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
 import com.viewpagerindicator.IconPageIndicator;
 import com.viewpagerindicator.IconPagerAdapter;
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 3397b7c76..98409608a 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
@@ -57,7 +57,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
 import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
@@ -416,7 +416,7 @@ public class LoginActivity extends BaseActivity
     }
 
     @Override
-    public void onUserReceived(HabitRPGUser user) {
+    public void onUserReceived(User user) {
         try {
             saveTokens(mTmpApiToken, mTmpUserToken);
         } catch (Exception e) {
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 e1d4f2c7d..4fce52b3d 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
@@ -61,7 +61,6 @@ import com.habitrpg.android.habitica.events.ReloadContentEvent;
 import com.habitrpg.android.habitica.events.SelectClassEvent;
 import com.habitrpg.android.habitica.events.ShareEvent;
 import com.habitrpg.android.habitica.events.TaskRemovedEvent;
-import com.habitrpg.android.habitica.events.TaskSaveEvent;
 import com.habitrpg.android.habitica.events.ToggledEditTagsEvent;
 import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
 import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
@@ -80,6 +79,7 @@ import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
 import com.habitrpg.android.habitica.helpers.LanguageHelper;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
@@ -97,7 +97,7 @@ import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.habitrpg.android.habitica.models.shops.Shop;
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Preferences;
 import com.habitrpg.android.habitica.models.user.SpecialItems;
 import com.habitrpg.android.habitica.models.user.Stats;
@@ -161,7 +161,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Inject
     public MaintenanceApiService maintenanceService;
-    public HabitRPGUser user;
+    public User user;
     @BindView(R.id.floating_menu_wrapper)
     public ViewGroup floatingMenuWrapper;
     @BindView(R.id.bottom_navigation)
@@ -587,7 +587,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     }
 
     @Override
-    public void onUserReceived(HabitRPGUser user) {
+    public void onUserReceived(User user) {
         this.user = user;
         this.lastSync = new Date();
         MainActivity.this.setUserData(false);
@@ -614,9 +614,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         if (this.activeTutorialView != null) {
             this.removeActiveTutorialView();
         }
-        if (drawer.isDrawerOpen()) {
+        if (drawer != null && drawer.isDrawerOpen()) {
             drawer.closeDrawer();
-        } else if (drawer.getDrawerLayout().isDrawerOpen(GravityCompat.END)) {
+        } else if (drawer != null && drawer.getDrawerLayout().isDrawerOpen(GravityCompat.END)) {
             drawer.getDrawerLayout().closeDrawer(GravityCompat.END);
             EventBus.getDefault().post(new ToggledEditTagsEvent(false));
         } else {
@@ -763,7 +763,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                                     user.getStats().setLvl(buyResponse.lvl);
                                 }
 
-                                user.async().save();
                                 MainActivity.this.setUserData(true);
 
                                 showSnackbar(MainActivity.this, floatingMenuWrapper, snackbarMessage, SnackbarDisplayType.NORMAL);
@@ -782,7 +781,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         stats.setGp(gp);
 
         avatarInHeader.updateData(user);
-        user.async().save();
     }
 
     @Subscribe
@@ -830,7 +828,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         this.apiClient.sellItem(event.item.getType(), event.item.getKey())
                 .subscribe(habitRPGUser -> {
                     user.setItems(habitRPGUser.getItems());
-                    user.save();
                     user.setStats(habitRPGUser.getStats());
                     setUserData(false);
                 }, throwable -> {
@@ -1014,6 +1011,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         if (this.userRepository != null) {
             this.userRepository.retrieveUser(true)
                     .subscribe(this::onUserReceived, throwable -> {
+
                     });
         }
     }
@@ -1077,7 +1075,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     @Override
     public void onTutorialDeferred(TutorialStep step) {
         step.setDisplayedOn(new Date());
-        step.save();
 
         this.removeActiveTutorialView();
     }
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 55aa974c2..a947ca45d 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
@@ -16,7 +16,8 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.modules.AppModule;
 import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
@@ -167,7 +168,7 @@ public class PartyInviteActivity extends BaseActivity {
         }
     }
 
-    public void handleUserRecieved(HabitRPGUser user) {
+    public void handleUserRecieved(User user) {
 
         if (this.userIdToInvite == null) {
             return;
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 c64ede3b3..05c5dcea4 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
@@ -29,7 +29,7 @@ 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.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.fragments.setup.AvatarSetupFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment;
 import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment;
@@ -73,7 +73,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
     AvatarSetupFragment avatarSetupFragment;
     TaskSetupFragment taskSetupFragment;
     @Nullable
-    HabitRPGUser user;
+    User user;
     boolean completedSetup = false;
 
     @Override
@@ -223,7 +223,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
     }
 
     @Override
-    public void onUserReceived(HabitRPGUser user) {
+    public void onUserReceived(User user) {
         if (completedSetup) {
             this.startMainActivity();
             return;
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 c4b5f428e..85df942ac 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
@@ -42,6 +42,7 @@ import com.habitrpg.android.habitica.data.TaskRepository;
 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.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.RemindersManager;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.models.Tag;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
index 3d23b093d..97912d5da 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
@@ -12,6 +12,7 @@ import android.widget.TextView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.ui.activities.TaskClickActivity;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
index 0122b7b95..7b5fb5057 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
@@ -12,7 +12,7 @@ import android.widget.TextView;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.EquipCommand;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -26,9 +26,9 @@ public class EquipmentRecyclerViewAdapter extends RecyclerView.Adapter<Equipment
     public String equippedGear;
     public Boolean isCostume;
     public String type;
-    private List<ItemData> gearList;
+    private List<Equipment> gearList;
 
-    public void setGearList(List<ItemData> gearList) {
+    public void setGearList(List<Equipment> gearList) {
         this.gearList = gearList;
         this.notifyDataSetChanged();
     }
@@ -69,7 +69,7 @@ public class EquipmentRecyclerViewAdapter extends RecyclerView.Adapter<Equipment
         @BindView(R.id.equippedIndicator)
         View equippedIndicator;
 
-        ItemData gear;
+        Equipment gear;
 
         Context context;
 
@@ -82,7 +82,7 @@ public class EquipmentRecyclerViewAdapter extends RecyclerView.Adapter<Equipment
             itemView.setOnClickListener(this);
         }
 
-        public void bind(ItemData gear) {
+        public void bind(Equipment gear) {
             this.gear = gear;
             this.gearNameTextView.setText(this.gear.text);
             this.gearNotesTextView.setText(this.gear.notes);
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 f92557e7e..cf0ad3588 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
@@ -15,7 +15,7 @@ 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.models.SetupCustomization;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Preferences;
 
 import org.greenrobot.eventbus.EventBus;
@@ -30,7 +30,7 @@ import butterknife.ButterKnife;
 public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     public String userSize;
-    public HabitRPGUser user;
+    public User user;
     private List<SetupCustomization> customizationList;
 
     public void setCustomizationList(List<SetupCustomization> newCustomizationList) {
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 96ff8f30f..a13976adc 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
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
 import com.habitrpg.android.habitica.models.social.Challenge;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeFilterOptions;
 
 import net.pherth.android.emoji_library.EmojiParser;
@@ -37,9 +37,9 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
 
     private boolean viewUserChallengesOnly;
     @Nullable
-    private HabitRPGUser user;
+    private User user;
 
-    public ChallengesListViewAdapter(boolean viewUserChallengesOnly, @Nullable HabitRPGUser user) {
+    public ChallengesListViewAdapter(boolean viewUserChallengesOnly, @Nullable User user) {
         this.viewUserChallengesOnly = viewUserChallengesOnly;
         this.user = user;
     }
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 b80df0f00..cafca8b56 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
@@ -26,7 +26,7 @@ import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
 import com.habitrpg.android.habitica.events.commands.OpenNewPMActivityCommand;
 import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 
 import net.pherth.android.emoji_library.EmojiTextView;
@@ -43,14 +43,14 @@ import butterknife.ButterKnife;
 public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerViewAdapter.ChatRecyclerViewHolder> {
 
     private List<ChatMessage> messages;
-    private HabitRPGUser user;
+    private User user;
     private String uuid;
     private String groupId;
     private boolean isInboxChat = false;
     private String replyToUserUUID;
-    private HabitRPGUser sendingUser;
+    private User sendingUser;
 
-    public ChatRecyclerViewAdapter(List<ChatMessage> messages, HabitRPGUser user, String groupId) {
+    public ChatRecyclerViewAdapter(List<ChatMessage> messages, User user, String groupId) {
         this.messages = messages;
         this.user = user;
         if (user != null) this.uuid = user.getId();
@@ -62,7 +62,7 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
         this.isInboxChat = true;
     }
 
-    public void setSendingUser(@Nullable HabitRPGUser user) {
+    public void setSendingUser(@Nullable User user) {
         this.sendingUser = user;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
index 4c7714404..2b695ccd1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
@@ -14,7 +14,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
 import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
 import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
@@ -30,10 +30,10 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
 
 
     public Context context;
-    private List<HabitRPGUser> memberList;
+    private List<User> memberList;
     private boolean isMemberSelection;
 
-    public void setMemberList(List<HabitRPGUser> memberList, boolean isMemberSelection) {
+    public void setMemberList(List<User> memberList, boolean isMemberSelection) {
         this.memberList = memberList;
         this.isMemberSelection = isMemberSelection;
         this.notifyDataSetChanged();
@@ -93,7 +93,7 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
             resources = itemView.getResources();
         }
 
-        public void bind(HabitRPGUser user) {
+        public void bind(User user) {
             android.content.Context ctx = itemView.getContext();
 
             avatarView.setUser(user);
@@ -105,20 +105,20 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
             classLabel.setText(user.getStats().getTranslatedClassName(context));
 
             int colorResourceID;
-            switch (user.getStats()._class) {
-                case healer: {
+            switch (user.getStats().habitClass) {
+                case "healer": {
                     colorResourceID = R.color.class_healer;
                     break;
                 }
-                case warrior: {
+                case "warrior": {
                     colorResourceID = R.color.class_warrior;
                     break;
                 }
-                case rogue: {
+                case "rogue": {
                     colorResourceID = R.color.class_rogue;
                     break;
                 }
-                case wizard: {
+                case "wizard": {
                     colorResourceID = R.color.class_wizard;
                     break;
                 }
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 740e27340..b41e1b617 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
@@ -5,14 +5,12 @@ import android.content.Context;
 import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.InventoryRepository;
-import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
 
 import java.util.ArrayList;
@@ -26,7 +24,7 @@ public class RewardsRecyclerViewAdapter extends RealmBaseTasksRecyclerViewAdapte
     private final Context context;
     private InventoryRepository inventoryRepository;
     @Nullable
-    private HabitRPGUser user;
+    private User user;
 
     public RewardsRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource, Context context) {
         super(data, autoUpdate, layoutResource);
@@ -45,7 +43,7 @@ public class RewardsRecyclerViewAdapter extends RealmBaseTasksRecyclerViewAdapte
                     .flatMap(items -> {
                         // get itemdata list
                         ArrayList<String> itemKeys = new ArrayList<>();
-                        for (ItemData item : items) {
+                        for (Equipment item : items) {
                             itemKeys.add(item.key);
                         }
                         itemKeys.add("potion");
@@ -55,7 +53,7 @@ public class RewardsRecyclerViewAdapter extends RealmBaseTasksRecyclerViewAdapte
                         return Observable.create((Observable.OnSubscribe<List<Task>>) subscriber -> inventoryRepository.getItems(itemKeys).subscribe(obj -> {
                             ArrayList<Task> buyableItems = new ArrayList<>();
                             if (obj != null) {
-                                for (ItemData item : obj) {
+                                for (Equipment item : obj) {
                                     Task reward = new Task();
                                     reward.text = item.text;
                                     reward.notes = item.notes;
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 c94270c9f..2dfd6ad7f 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
@@ -14,6 +14,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.TutorialRepository;
 import com.habitrpg.android.habitica.events.DisplayTutorialEvent;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.squareup.leakcanary.RefWatcher;
 
 import org.greenrobot.eventbus.EventBus;
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 e288d4fce..6195a0536 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
@@ -10,8 +10,9 @@ import android.view.ViewGroup;
 
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.roughike.bottombar.BottomBar;
 
@@ -36,13 +37,13 @@ public abstract class BaseMainFragment extends BaseFragment {
     @Inject
     protected SoundManager soundManager;
     @Nullable
-    protected HabitRPGUser user;
+    protected User user;
 
-    public void setUser(@Nullable HabitRPGUser user) {
+    public void setUser(@Nullable User user) {
         this.user = user;
     }
 
-    public void updateUserData(HabitRPGUser user) {
+    public void updateUserData(User user) {
         this.user = user;
     }
 
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 8e7785272..484c07985 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
@@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.events.UserSubscribedEvent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
@@ -104,7 +104,7 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
     private GemPurchaseActivity listener;
     private BillingRequests billingRequests;
 
-    private HabitRPGUser user;
+    private User user;
     private boolean hasLoadedSubscriptionOptions;
 
     @Override
@@ -268,7 +268,7 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
         }
     }
 
-    public void setUser(HabitRPGUser newUser) {
+    public void setUser(User newUser) {
         user = newUser;
         this.updateSubscriptionInfo();
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
index ea9cd8f7c..d00ba6c50 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
@@ -11,6 +11,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.FAQRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.ui.adapter.FAQOverviewRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
index 79841247a..0b26e78b4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
@@ -10,8 +10,9 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.CustomizationRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Preferences;
 import com.habitrpg.android.habitica.ui.adapter.CustomizationRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -105,7 +106,7 @@ public class AvatarCustomizationFragment extends BaseMainFragment {
     }
 
     @Override
-    public void updateUserData(HabitRPGUser user) {
+    public void updateUserData(User user) {
         super.updateUserData(user);
         this.adapter.gemBalance = user.getBalance() * 4;
         this.updateActiveCustomization();
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 789f7add9..06a331653 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
@@ -13,7 +13,8 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.databinding.FragmentAvatarOverviewBinding;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 
 import java.util.HashMap;
@@ -115,7 +116,7 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
     }
 
     @Override
-    public void updateUserData(HabitRPGUser user) {
+    public void updateUserData(User user) {
         super.updateUserData(user);
         if (user != null && viewBinding != null) {
             viewBinding.setPreferences(user.getPreferences());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
index b17ce3a7f..77c932665 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
@@ -10,6 +10,7 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
index 1fae83f1a..feb0ac268 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
@@ -12,7 +12,8 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.databinding.FragmentEquipmentOverviewBinding;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 
 import org.greenrobot.eventbus.EventBus;
@@ -128,7 +129,7 @@ public class EquipmentOverviewFragment extends BaseMainFragment {
             inventoryRepository.getOwnedEquipment().subscribe(items -> {
                 this.nameMapping = new HashMap<>();
 
-                for (ItemData gear : items) {
+                for (Equipment gear : items) {
                     this.nameMapping.put(gear.key, gear.text);
                 }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
index 2e7d2063b..b32eeb7f8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
@@ -16,10 +16,11 @@ import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.events.ContentReloadedEvent;
 import com.habitrpg.android.habitica.events.OpenedMysteryItemEvent;
 import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.inventory.Item;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.SpecialItem;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
@@ -68,7 +69,7 @@ public class ItemRecyclerFragment extends BaseFragment {
     public Pet feedingPet;
     public HashMap<String, Integer> ownedPets;
     @Nullable
-    public HabitRPGUser user;
+    public User user;
     LinearLayoutManager layoutManager = null;
 
     private View view;
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 cef769dc3..950b0942f 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
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.events.UpdateGoldGemsPurchasedevent;
 import com.habitrpg.android.habitica.models.shops.Shop;
 import com.habitrpg.android.habitica.models.shops.ShopCategory;
 import com.habitrpg.android.habitica.models.shops.ShopItem;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.adapter.inventory.ShopRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
@@ -39,7 +39,7 @@ public class ShopFragment extends BaseFragment {
     public TextView emptyView;
     public ShopRecyclerAdapter adapter;
     public String shopIdentifier;
-    public HabitRPGUser user;
+    public User user;
     public Shop shop;
     @Inject
     ApiClient apiClient;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
index 2262efa47..a7ee16f43 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
@@ -12,8 +12,9 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.events.commands.FeedCommand;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.adapter.inventory.PetDetailRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
@@ -128,7 +129,7 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
     }
 
     @Override
-    public void updateUserData(HabitRPGUser user) {
+    public void updateUserData(User user) {
         super.updateUserData(user);
         adapter.setOwnedMapping(user.getItems().getPets());
         adapter.setOwnedMountsMapping(user.getItems().getMounts());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
index 278356f1b..ed9ff4120 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
@@ -13,8 +13,9 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.events.ContentReloadedEvent;
 import com.habitrpg.android.habitica.events.ReloadContentEvent;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.inventory.Animal;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
@@ -48,7 +49,7 @@ public class StableRecyclerFragment extends BaseFragment {
     public StableRecyclerAdapter adapter;
     public String itemType;
     public String itemTypeText;
-    public HabitRPGUser user;
+    public User user;
     GridLayoutManager layoutManager = null;
 
     private View view;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
index 74b14b4dc..07b610da1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
@@ -13,7 +13,8 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
 import com.habitrpg.android.habitica.helpers.QrCodeManager;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
 import com.habitrpg.android.habitica.ui.views.subscriptions.SubscriptionDetailsView;
 
@@ -31,7 +32,7 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
     UserRepository userRepository;
 
     private QrCodeManager qrCodeManager;
-    private HabitRPGUser user;
+    private User user;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -45,7 +46,7 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
         }
     }
 
-    public void setUser(HabitRPGUser user) {
+    public void setUser(User user) {
         this.user = user;
     }
 
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 490f0f407..1cb578ce3 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
@@ -17,10 +17,11 @@ import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
 import com.habitrpg.android.habitica.helpers.LanguageHelper;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 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.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Preferences;
 import com.habitrpg.android.habitica.prefs.TimePreference;
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
@@ -47,7 +48,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
     private TimePreference timePreference;
     private PreferenceScreen pushNotificationsPreference;
     private Preference classSelectionPreference;
-    private HabitRPGUser user;
+    private User user;
     @Inject
     PushNotificationManager pushNotificationManager;
 
@@ -252,7 +253,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
         }
     }
 
-    public void setUser(HabitRPGUser user) {
+    public void setUser(User user) {
         this.user = user;
         if (user != null && user.getFlags() != null && user.getStats() != null) {
             if (user.getStats().getLvl() >= 10) {
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 6e556f19d..9c1640d48 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
@@ -20,7 +20,7 @@ import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.SetupCustomizationRepository;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.models.SetupCustomization;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.SpeechBubbleView;
 import com.habitrpg.android.habitica.ui.activities.SetupActivity;
@@ -74,7 +74,7 @@ public class AvatarSetupFragment extends BaseFragment {
     @Inject
     ApiClient apiClient;
 
-    private HabitRPGUser user;
+    private User user;
     private List<String> subcategories;
     private AvatarCategoryView activeButton;
     private String activeCategory;
@@ -155,7 +155,7 @@ public class AvatarSetupFragment extends BaseFragment {
         this.adapter.setCustomizationList(customizationRepository.getCustomizations(activeCategory, activeSubCategory, user));
     }
 
-    public void setUser(@Nullable HabitRPGUser user) {
+    public void setUser(@Nullable User user) {
         this.user = user;
         if (avatarView != null) {
             updateAvatar();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java
index 4d9a41b39..3efbed2ca 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
@@ -12,7 +12,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.models.tasks.Days;
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.SpeechBubbleView;
 import com.habitrpg.android.habitica.ui.activities.SetupActivity;
@@ -41,7 +41,7 @@ public class TaskSetupFragment extends BaseFragment {
     TaskSetupAdapter adapter;
     private String[][] taskGroups;
     private Object[][] tasks;
-    private HabitRPGUser user;
+    private User user;
 
     @Nullable
     @Override
@@ -73,7 +73,7 @@ public class TaskSetupFragment extends BaseFragment {
         }
     }
 
-    public void setUser(@Nullable HabitRPGUser user) {
+    public void setUser(@Nullable User user) {
         this.user = user;
         if (avatarView != null) {
             updateAvatar();
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 a0a429bda..67d40463a 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
@@ -17,9 +17,10 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.events.SkillUsedEvent;
 import com.habitrpg.android.habitica.events.commands.UseSkillCommand;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
 import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
 import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter;
@@ -97,7 +98,7 @@ public class SkillsFragment extends BaseMainFragment {
     }
 
     @Override
-    public void setUser(HabitRPGUser user) {
+    public void setUser(User user) {
         super.setUser(user);
 
         checkUserLoadSkills();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
index ff707859a..3bc609dbd 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
@@ -24,8 +24,9 @@ import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand;
 import com.habitrpg.android.habitica.events.commands.SendNewGroupMessageCommand;
 import com.habitrpg.android.habitica.events.commands.ToggleInnCommand;
 import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
@@ -57,7 +58,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     SwipeRefreshLayout swipeRefreshLayout;
     LinearLayoutManager layoutManager;
     private String groupId;
-    private HabitRPGUser user;
+    private User user;
     private String userId;
     private ChatRecyclerViewAdapter chatAdapter;
     private View view;
@@ -65,7 +66,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     private boolean navigatedOnceToFragment = false;
     private boolean gotNewMessages = false;
 
-    public void configure(String groupId, @Nullable HabitRPGUser user, boolean isTavern) {
+    public void configure(String groupId, @Nullable User user, boolean isTavern) {
         this.groupId = groupId;
         this.user = user;
         if (this.user != null) {
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 b6447ed13..22fbd7d54 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
@@ -22,9 +22,10 @@ import com.habitrpg.android.habitica.data.UserRepository;
 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.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
 import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.adapter.social.QuestCollectRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 
@@ -62,7 +63,7 @@ public class GroupInformationFragment extends BaseFragment {
     @Nullable
     private Group group;
     @Nullable
-    private HabitRPGUser user;
+    private User user;
     private QuestContent quest;
     private ValueBarBinding bossHpBar;
     private ValueBarBinding bossRageBar;
@@ -73,7 +74,7 @@ public class GroupInformationFragment extends BaseFragment {
 
     }
 
-    public static GroupInformationFragment newInstance(@Nullable Group group, @Nullable HabitRPGUser user) {
+    public static GroupInformationFragment newInstance(@Nullable Group group, @Nullable User user) {
         Bundle args = new Bundle();
 
         GroupInformationFragment fragment = new GroupInformationFragment();
@@ -196,7 +197,7 @@ public class GroupInformationFragment extends BaseFragment {
         }
         viewBinding.setHideParticipantCard(false);
         LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        for (HabitRPGUser member : group.members) {
+        for (User member : group.members) {
             final LinearLayout itemView = (LinearLayout) layoutInflater.inflate(R.layout.party_member_quest, questMemberView, false);
             TextView questResponse = (TextView) itemView.findViewById(R.id.rsvpneeded);
             TextView userName = (TextView) itemView.findViewById(R.id.username);
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 844189bef..72127bfb5 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
@@ -22,7 +22,7 @@ import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -187,7 +187,7 @@ public class InboxFragment extends BaseMainFragment
     }
 
     @Override
-    public void onUserReceived(HabitRPGUser user) {
+    public void onUserReceived(User user) {
         this.user = user;
         this.messages = user.getInbox().getMessages();
         this.setInboxMessages();
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 b26ef3a74..068236a3a 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
@@ -14,8 +14,9 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.events.commands.SendNewInboxMessageCommand;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
@@ -117,7 +118,7 @@ public class InboxMessageListFragment extends BaseMainFragment
     }
 
     @Override
-    public void onUserReceived(HabitRPGUser user) {
+    public void onUserReceived(User user) {
         this.user = user;
         this.setMessages(user.getInbox().getMessages(), this.chatRoomUser, this.replyToUserUUID);
         swipeRefreshLayout.setRefreshing(false);
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 47fd73f79..a70823595 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
@@ -12,6 +12,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.social.Group;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
index 3170a91d5..6957ab8a7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
@@ -17,7 +17,7 @@ import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
 import com.habitrpg.android.habitica.models.LeaveChallengeBody;
 import com.habitrpg.android.habitica.models.social.Challenge;
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 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;
@@ -70,7 +70,7 @@ public class ChallengeDetailDialogHolder {
     private AlertDialog dialog;
     private ApiClient apiClient;
     @Nullable
-    private HabitRPGUser user;
+    private User user;
     private Challenge challenge;
     private Action1<Challenge> challengeJoinedAction;
     private Action1<Challenge> challengeLeftAction;
@@ -82,7 +82,7 @@ public class ChallengeDetailDialogHolder {
         ButterKnife.bind(this, view);
     }
 
-    public static void showDialog(Activity activity, ApiClient apiClient, @Nullable HabitRPGUser user, Challenge challenge,
+    public static void showDialog(Activity activity, ApiClient apiClient, @Nullable User user, Challenge challenge,
                                   Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
         View dialogLayout = activity.getLayoutInflater().inflate(R.layout.dialog_challenge_detail, null);
 
@@ -94,7 +94,7 @@ public class ChallengeDetailDialogHolder {
         challengeDetailDialogHolder.bind(builder.show(), apiClient, user, challenge, challengeJoinedAction, challengeLeftAction);
     }
 
-    public void bind(AlertDialog dialog, ApiClient apiClient, @Nullable HabitRPGUser user, Challenge challenge,
+    public void bind(AlertDialog dialog, ApiClient apiClient, @Nullable User user, Challenge challenge,
                      Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
         this.dialog = dialog;
         this.apiClient = apiClient;
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 88e54e832..9bcb7bb92 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
@@ -13,6 +13,7 @@ import android.widget.LinearLayout;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.social.Challenge;
 import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
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 1b7c33b7e..a58955722 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
@@ -16,7 +16,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.modules.AppModule;
 import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
@@ -40,10 +40,10 @@ public class ChallengeTasksRecyclerViewFragment extends BaseFragment {
     ObservableList<Task> tasksOnInitialize;
 
     LinearLayoutManager layoutManager = null;
-    private HabitRPGUser user;
+    private User user;
     private View view;
 
-    public static ChallengeTasksRecyclerViewFragment newInstance(HabitRPGUser user, ObservableList<Task> tasks) {
+    public static ChallengeTasksRecyclerViewFragment newInstance(User user, ObservableList<Task> tasks) {
         ChallengeTasksRecyclerViewFragment fragment = new ChallengeTasksRecyclerViewFragment();
         fragment.setRetainInstance(true);
         fragment.user = user;
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 5dbf20391..a731120ef 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
@@ -14,6 +14,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.social.Challenge;
 import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
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 571d3b69a..6a51b4587 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
@@ -19,6 +19,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.social.Group;
 import com.habitrpg.android.habitica.models.social.UserParty;
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
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 f94d5feea..1a7e6cc6c 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
@@ -11,7 +11,7 @@ import android.view.ViewGroup;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 
@@ -27,11 +27,11 @@ public class PartyMemberListFragment extends BaseFragment {
     @BindView(R.id.recyclerView)
     RecyclerView mRecyclerView;
     private Context ctx;
-    private List<HabitRPGUser> members;
+    private List<User> members;
     private PartyMemberRecyclerViewAdapter viewAdapter;
     private View view;
 
-    public void configure(@Nullable Context ctx, @Nullable List<HabitRPGUser> members) {
+    public void configure(@Nullable Context ctx, @Nullable List<User> members) {
         this.ctx = ctx;
         this.members = members;
 
@@ -65,7 +65,7 @@ public class PartyMemberListFragment extends BaseFragment {
         }
     }
 
-    public void setMemberList(List<HabitRPGUser> members) {
+    public void setMemberList(List<User> members) {
         this.members = members;
         viewAdapter.setMemberList(members, false);
     }
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 c172e7d07..52982417b 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
@@ -21,18 +21,13 @@ import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.TaskCreatedEvent;
-import com.habitrpg.android.habitica.events.TaskRemovedEvent;
-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.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.modules.AppModule;
 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;
 import com.habitrpg.android.habitica.ui.adapter.tasks.RealmBaseTasksRecyclerViewAdapter;
@@ -45,7 +40,6 @@ import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperDropCallback;
 import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
 
 import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -56,7 +50,6 @@ import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import io.realm.RealmList;
 
 /**
  * TaskRecyclerViewFragment
@@ -98,13 +91,13 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     @Nullable
     String classType;
     @Nullable
-    private HabitRPGUser user;
+    private User user;
     private View view;
     @Nullable
     private SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback;
     private ItemTouchHelper.Callback mItemTouchCallback;
 
-    public static TaskRecyclerViewFragment newInstance(Context context, @Nullable HabitRPGUser user, String classType,
+    public static TaskRecyclerViewFragment newInstance(Context context, @Nullable User user, String classType,
                                                        @Nullable SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback) {
         TaskRecyclerViewFragment fragment = new TaskRecyclerViewFragment();
         fragment.setRetainInstance(true);
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 aa0b8206b..b73aad7d3 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
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments.tasks;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
@@ -29,13 +28,13 @@ 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.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.models.TutorialStep;
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 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.RealmBaseTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
@@ -346,7 +345,7 @@ public class TasksFragment extends BaseMainFragment {
     // endregion
 
     //region Events
-    public void updateUserData(HabitRPGUser user) {
+    public void updateUserData(User user) {
         super.updateUserData(user);
         if (this.user != null) {
             for (int index = 0; index < viewFragmentsDictionary.size(); index++) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
index deac2de4b..de1f13c68 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
@@ -28,6 +28,7 @@ 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.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.Tag;
 import com.habitrpg.android.habitica.models.tasks.Task;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
index 1839a9e15..2eb5501fc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
@@ -15,7 +15,7 @@ import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.habitrpg.android.habitica.models.inventory.Egg;
 import com.habitrpg.android.habitica.models.inventory.Food;
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
@@ -32,6 +32,8 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import io.realm.RealmObject;
+
 public class ContentDeserializer implements JsonDeserializer<ContentResult> {
 
     @Inject
@@ -39,13 +41,13 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
 
     @Override
     public ContentResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<BaseModel> items = new ArrayList<>();
+        List<RealmObject> items = new ArrayList<>();
 
         ContentResult result = new ContentResult();
         JsonObject object = json.getAsJsonObject();
 
-        result.potion = context.deserialize(object.get("potion"), ItemData.class);
-        result.armoire = context.deserialize(object.get("armoire"), ItemData.class);
+        result.potion = context.deserialize(object.get("potion"), Equipment.class);
+        result.armoire = context.deserialize(object.get("armoire"), Equipment.class);
         result.gear = context.deserialize(object.get("gear"), ContentGear.class);
 
         items.add(result.potion);
@@ -154,12 +156,12 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
         for (Skill skill : result.spells) {
             spellKeys.add(skill.key);
         }
-        List<Skill> oldSkills = new Select().from(Skill.class).queryList();
+        /*List<Skill> oldSkills = new Select().from(Skill.class).queryList();
         for (Skill skill : oldSkills) {
             if (!spellKeys.contains(skill.key)) {
                 skill.delete();
             }
-        }
+        }*/
 
         result.appearances = context.deserialize(object.get("appearances"), new TypeToken<List<Customization>>() {
         }.getType());
@@ -176,7 +178,6 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
 
         items.addAll(result.faq);
 
-        TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(items)));
         return result;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
index 08968c9e3..aebb52929 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
@@ -27,7 +27,8 @@ public class CustomizationDeserializer implements JsonDeserializer<List<Customiz
 
 
         if (object.has("shirt")) {
-            List<Customization> existingCustomizations = new Select().from(Customization.class).where(Condition.column("type").isNot("background")).queryList();
+            // TODO: fix this
+            List<Customization> existingCustomizations = new ArrayList<>();
 
             for (Customization customization : existingCustomizations) {
                 if (object.has(customization.getType())) {
@@ -59,7 +60,8 @@ public class CustomizationDeserializer implements JsonDeserializer<List<Customiz
             }
         } else {
 
-            List<Customization> existingCustomizations = new Select().from(Customization.class).where(Condition.column("type").is("background")).queryList();
+            // TODO: fix this
+            List<Customization> existingCustomizations = new ArrayList<>();
 
             for (Customization customization : existingCustomizations) {
                 if (object.has(customization.getCustomizationSet())) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
index f275bec8a..1fc30cfce 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
@@ -20,7 +20,8 @@ public class EggListDeserializer implements JsonDeserializer<List<Egg>> {
         if (json.isJsonObject()) {
             JsonObject object = json.getAsJsonObject();
 
-            List<Egg> existingItems = new Select().from(Egg.class).queryList();
+            // TODO: fix this
+            List<Egg> existingItems = new ArrayList<>();
 
             for (Egg item : existingItems) {
                 if (object.has(item.getKey())) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
index 49cc10d8d..3bc78502e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
@@ -20,7 +20,8 @@ public class FoodListDeserializer implements JsonDeserializer<List<Food>> {
         if (json.isJsonObject()) {
             JsonObject object = json.getAsJsonObject();
 
-            List<Food> existingItems = new Select().from(Food.class).queryList();
+            // TODO: fix this
+            List<Food> existingItems = new ArrayList<>();
 
             for (Food item : existingItems) {
                 if (object.has(item.getKey())) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java
index 71e38be7b..13d532fa6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/GroupSerialization.java
@@ -12,7 +12,7 @@ import com.google.gson.reflect.TypeToken;
 import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.social.Group;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.lang.reflect.Type;
 import java.util.List;
@@ -52,7 +52,7 @@ public class GroupSerialization implements JsonDeserializer<Group>, JsonSerializ
         if (obj.has("members")) {
             JsonArray memberList = obj.get("members").getAsJsonArray();
             if (memberList.size() > 0 && memberList.get(0).isJsonObject()) {
-                group.members = context.deserialize(memberList, new TypeToken<List<HabitRPGUser>>() {
+                group.members = context.deserialize(memberList, new TypeToken<List<User>>() {
                 }.getType());
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
index e772ac111..144e98059 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
@@ -20,7 +20,8 @@ public class HatchingPotionListDeserializer implements JsonDeserializer<List<Hat
         if (json.isJsonObject()) {
             JsonObject object = json.getAsJsonObject();
 
-            List<HatchingPotion> existingItems = new Select().from(HatchingPotion.class).queryList();
+            // TODO: fix this
+            List<HatchingPotion> existingItems = new ArrayList<>();
 
             for (HatchingPotion item : existingItems) {
                 if (object.has(item.getKey())) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
index 57e2779ce..787b8513b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
@@ -5,7 +5,7 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.lang.reflect.Type;
@@ -13,21 +13,22 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-public class ItemDataListDeserializer implements JsonDeserializer<List<ItemData>> {
+public class ItemDataListDeserializer implements JsonDeserializer<List<Equipment>> {
     @Override
-    public List<ItemData> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<ItemData> vals = new ArrayList<>();
+    public List<Equipment> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<Equipment> vals = new ArrayList<>();
         if (json.isJsonObject()) {
             JsonObject object = json.getAsJsonObject();
 
-            List<ItemData> existingItems = new Select().from(ItemData.class).queryList();
+            // TODO: fix this
+            List<Equipment> existingItems = new ArrayList<>();
 
-            for (ItemData item : existingItems) {
+            for (Equipment item : existingItems) {
                 if (object.has(item.key)) {
                     JsonElement itemObject = object.get(item.key);
 
                     if (itemObject.isJsonObject()) {
-                        ItemData parsedItem = context.deserialize(itemObject.getAsJsonObject(), ItemData.class);
+                        Equipment parsedItem = context.deserialize(itemObject.getAsJsonObject(), Equipment.class);
                         item.text = parsedItem.text;
                         item.value = parsedItem.value;
                         item.type = parsedItem.type;
@@ -46,18 +47,18 @@ public class ItemDataListDeserializer implements JsonDeserializer<List<ItemData>
             }
 
             for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-                ItemData item;
+                Equipment item;
                 if (entry.getValue().isJsonObject()) {
-                    item = context.deserialize(entry.getValue(), ItemData.class);
+                    item = context.deserialize(entry.getValue(), Equipment.class);
                 } else {
-                    item = new ItemData();
+                    item = new Equipment();
                     item.key = entry.getKey();
                 }
                 vals.add(item);
             }
         } else {
             for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((ItemData) context.deserialize(item.getAsJsonObject(), ItemData.class));
+                vals.add((Equipment) context.deserialize(item.getAsJsonObject(), Equipment.class));
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
index 4c21202be..3bb300665 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
@@ -32,7 +32,9 @@ public class PurchasedDeserializer implements JsonDeserializer<Purchases> {
 
         List<Customization> existingCustomizations;
         try {
-            existingCustomizations = new Select().from(Customization.class).queryList();
+
+            // TODO: fix this
+            existingCustomizations = new ArrayList<>();
         } catch (RuntimeException e) {
             //Tests don't have a database
             existingCustomizations = new ArrayList<>();
@@ -70,7 +72,8 @@ public class PurchasedDeserializer implements JsonDeserializer<Purchases> {
             }
         }
 
-        TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(customizations)));
+        // TODO: fix this
+        //TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(customizations)));
 
         purchases.customizations = customizations;
         purchases.setPlan(context.deserialize(object.get("plan"), SubscriptionPlan.class));
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
index 92616d1ba..278082f52 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
@@ -23,7 +23,8 @@ public class QuestListDeserializer implements JsonDeserializer<List<QuestContent
         if (json.isJsonObject()) {
             JsonObject object = json.getAsJsonObject();
 
-            List<QuestContent> existingItems = new Select().from(QuestContent.class).queryList();
+            // TODO: fix this
+            List<QuestContent> existingItems = new ArrayList<>();
 
             for (QuestContent item : existingItems) {
                 if (object.has(item.getKey())) {
@@ -63,10 +64,10 @@ public class QuestListDeserializer implements JsonDeserializer<List<QuestContent
                 }
                 vals.add(item);
             }
-            TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(vals)));
+            //TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(vals)));
         } else {
             for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((QuestContent) context.deserialize(item.getAsJsonObject(), QuestContent.class));
+                vals.add(context.deserialize(item.getAsJsonObject(), QuestContent.class));
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
index c824becf2..dc30d3c7f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TutorialStepListDeserializer.java
@@ -12,10 +12,12 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.RealmList;
+
 public class TutorialStepListDeserializer implements JsonDeserializer<List<TutorialStep>> {
     @Override
     public List<TutorialStep> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<TutorialStep> vals = new ArrayList<>();
+        RealmList<TutorialStep> vals = new RealmList<>();
         for (String group : Arrays.asList("common", "android")) {
             if (json.getAsJsonObject().has(group)) {
                 for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().get(group).getAsJsonObject().entrySet()) {
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 5afb0f7e7..9d4b886d7 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
@@ -13,7 +13,8 @@ import android.widget.RemoteViews;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Stats;
 import com.habitrpg.android.habitica.modules.AppModule;
 import com.habitrpg.android.habitica.ui.AvatarView;
@@ -71,7 +72,7 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
         return remoteViews;
     }
 
-    private void updateData(HabitRPGUser user) {
+    private void updateData(User user) {
         if (user == null || user.getStats() == null) {
             return;
         }
@@ -92,7 +93,7 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
             remoteViews.setProgressBar(R.id.hp_bar, stats.getMaxHealth(), stats.getHp().intValue(), false);
             remoteViews.setProgressBar(R.id.exp_bar, stats.getToNextLevel(), stats.getExp().intValue(), false);
             remoteViews.setProgressBar(R.id.mp_bar, stats.getMaxMP(), stats.getMp().intValue(), false);
-            remoteViews.setViewVisibility(R.id.mp_wrapper, (stats.get_class() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
+            remoteViews.setViewVisibility(R.id.mp_wrapper, (stats.getHabitClass() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
 
             int gp = (stats.getGp().intValue());
             int sp = (int) ((stats.getGp() - gp) * 100);
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 018652908..88fabeffe 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,6 +12,7 @@ import android.widget.Toast;
 
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.interactors.NotifyUserUseCase;
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
index 6c9ea91a7..154a68787 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
@@ -16,6 +16,7 @@ import android.widget.RemoteViews;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.data.TaskRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.responses.TaskDirection;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.modules.AppModule;
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 8e75c197d..937332638 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
@@ -7,7 +7,7 @@ import com.habitrpg.android.habitica.proxy.impl.EmptyCrashlyticsProxy;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
 
 import org.junit.After;
@@ -56,15 +56,15 @@ public class BaseAPITests {
         hostConfig.setApi(response.getApiToken() != null ? response.getApiToken() : response.getToken());
     }
 
-    public HabitRPGUser getUser() {
-        TestSubscriber<HabitRPGUser> userSubscriber = new TestSubscriber<>();
+    public User getUser() {
+        TestSubscriber<User> userSubscriber = new TestSubscriber<>();
 
         apiClient.getUser()
                 .subscribe(userSubscriber);
         userSubscriber.awaitTerminalEvent();
         userSubscriber.assertNoErrors();
         userSubscriber.assertCompleted();
-        HabitRPGUser user = userSubscriber.getOnNextEvents().get(0);
+        User user = userSubscriber.getOnNextEvents().get(0);
 
         return user;
     }
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 541b68a6e..83c410469 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/api/UserAPITests.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/api/UserAPITests.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.api;
 
 
 import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.auth.UserAuthResponse;
 
 import org.junit.Test;
@@ -25,7 +25,7 @@ public class UserAPITests extends BaseAPITests {
 
     @Test
     public void shouldLoadUserFromServer() {
-        TestSubscriber<HabitRPGUser> testSubscriber = new TestSubscriber<>();
+        TestSubscriber<User> testSubscriber = new TestSubscriber<>();
         apiClient.getUser()
                 .subscribe(testSubscriber);
         testSubscriber.awaitTerminalEvent();
@@ -36,7 +36,7 @@ public class UserAPITests extends BaseAPITests {
 
     @Test
     public void shouldLoadCompleteUserFromServer() {
-        TestSubscriber<HabitRPGUser> testSubscriber = new TestSubscriber<>();
+        TestSubscriber<User> testSubscriber = new TestSubscriber<>();
         apiClient.retrieveUser(true)
                 .subscribe(testSubscriber);
         testSubscriber.awaitTerminalEvent();
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
index 7a585dcb5..65365bed1 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/UserStatComputerTest.java
@@ -1,10 +1,10 @@
 package com.habitrpg.android.habitica.helpers;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.HabitRpgClass;
 import com.habitrpg.android.habitica.models.user.Stats;
-import com.habitrpg.android.habitica.models.inventory.ItemData;
 
 import junit.framework.Assert;
 
@@ -20,9 +20,9 @@ import java.util.List;
 public class UserStatComputerTest {
 
     private UserStatComputer userStatComputer;
-    private HabitRPGUser user;
-    private ItemData itemData;
-    private List<ItemData> itemDataList;
+    private User user;
+    private Equipment equipment;
+    private List<Equipment> equipmentList;
     private String key;
     private String text;
 
@@ -33,28 +33,28 @@ public class UserStatComputerTest {
 
     public UserStatComputerTest () {
         userStatComputer = new UserStatComputer();
-        user = new HabitRPGUser();
+        user = new User();
         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);
+        equipment = new Equipment();
+        equipment.setKey(key);
+        equipment.setText(text);
+        equipment.setStr(str);
+        equipment.set_int(intStat);
+        equipment.setPer(per);
+        equipment.setCon(con);
 
-        itemDataList = new ArrayList<>();
-        itemDataList.add(itemData);
+        equipmentList = new ArrayList<>();
+        equipmentList.add(equipment);
     }
 
     @Test
     public void shouldReturnCorrectEquipmentRow () {
-        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
         UserStatComputer.EquipmentRow equipmentRow = (UserStatComputer.EquipmentRow) statsRows.get(0);
 
         Assert.assertEquals(key, equipmentRow.gearKey);
@@ -64,10 +64,10 @@ public class UserStatComputerTest {
 
     @Test
     public void shouldReturnClassBonusRowWhenClassMatches () {
-        user.getStats().set_class(HabitRpgClass.rogue);
-        itemData.setKlass(HabitRpgClass.rogue.toString());
+        user.getStats().setHabitClass(HabitRpgClass.rogue);
+        equipment.setKlass(HabitRpgClass.rogue.toString());
 
-        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
         UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
 
         Assert.assertEquals(R.string.profile_class_bonus, attributeRow.labelId);
@@ -81,11 +81,11 @@ public class UserStatComputerTest {
 
     @Test
     public void ShouldReturnClassBonusRowWhenSpecialClassMatches () {
-        user.getStats().set_class(HabitRpgClass.rogue);
-        itemData.setKlass("");
-        itemData.setSpecialClass(HabitRpgClass.rogue.toString());
+        user.getStats().setHabitClass(HabitRpgClass.rogue);
+        equipment.setKlass("");
+        equipment.setSpecialClass(HabitRpgClass.rogue.toString());
 
-        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
         UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
 
         Assert.assertEquals(R.string.profile_class_bonus, attributeRow.labelId);
@@ -99,11 +99,11 @@ public class UserStatComputerTest {
 
     @Test
     public void shouldNotReturnClassBonusWhenClassDoesNotMatch () {
-        user.getStats().set_class(HabitRpgClass.rogue);
-        itemData.setKlass("");
-        itemData.setSpecialClass("");
+        user.getStats().setHabitClass(HabitRpgClass.rogue);
+        equipment.setKlass("");
+        equipment.setSpecialClass("");
 
-        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(itemDataList, user);
+        List<UserStatComputer.StatsRow> statsRows = userStatComputer.computeClassBonus(equipmentList, user);
         UserStatComputer.AttributeRow attributeRow = (UserStatComputer.AttributeRow) statsRows.get(2);
 
         Assert.assertEquals(R.string.profile_class_bonus, attributeRow.labelId);
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
index 976c0ad1c..de10fda57 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.models;
 
 import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Items;
 
 import org.junit.Before;
@@ -18,11 +18,11 @@ import static org.junit.Assert.assertEquals;
 @RunWith(RobolectricTestRunner.class)
 public class UserTest {
 
-    private HabitRPGUser user;
+    private User user;
 
     @Before
     public void setup() {
-        user = new HabitRPGUser();
+        user = new User();
         Items items = new Items();
         user.setItems(items);
     }
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java
index 720051200..3da7b9953 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.customization;
 
 import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Hair;
 import com.habitrpg.android.habitica.models.user.Preferences;
 
@@ -11,7 +11,7 @@ public class AvatarCustomizationFragmentTest extends BaseFragmentTests<AvatarCus
     public void setUp() {
         super.setUp();
         this.fragment = new AvatarCustomizationFragment();
-        HabitRPGUser user = new HabitRPGUser();
+        User user = new User();
         user.setPreferences(new Preferences());
         user.getPreferences().setSkin("");
         user.getPreferences().setHair(new Hair());
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java
index 438956b68..a54a4a708 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java
@@ -1,8 +1,8 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.equipment;
 
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
 import com.habitrpg.android.habitica.models.user.Gear;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.Outfit;
 import com.habitrpg.android.habitica.models.user.Preferences;
@@ -13,7 +13,7 @@ public class EquipmentOverviewFragmentTest extends BaseFragmentTests<EquipmentOv
     public void setUp() {
         super.setUp();
         this.fragment = new EquipmentOverviewFragment();
-        HabitRPGUser user = new HabitRPGUser();
+        User user = new User();
         user.setItems(new Items());
         user.getItems().setGear(new Gear());
         user.getItems().getGear().setCostume(new Outfit());
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java
index c4c971a73..e45e6fcdd 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
 
 import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Items;
 
 import java.util.HashMap;
@@ -12,7 +12,7 @@ public class MountDetailRecyclerFragmentTest extends BaseFragmentTests<MountDeta
     public void setUp() {
         super.setUp();
         this.fragment = new MountDetailRecyclerFragment();
-        HabitRPGUser user = new HabitRPGUser();
+        User user = new User();
         user.setItems(new Items());
         user.getItems().setMounts(new HashMap<>());
         this.fragment.setUser(user);
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java
index 86c45c4ad..660def0dd 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java
@@ -1,7 +1,7 @@
 package com.habitrpg.android.habitica.ui.fragments.inventory.stable;
 
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.habitrpg.android.habitica.models.user.HabitRPGUser;
 import com.habitrpg.android.habitica.models.user.Items;
 
 import java.util.HashMap;
@@ -12,7 +12,7 @@ public class PetDetailRecyclerFragmentTest extends BaseFragmentTests<PetDetailRe
     public void setUp() {
         super.setUp();
         this.fragment = new PetDetailRecyclerFragment();
-        HabitRPGUser user = new HabitRPGUser();
+        User user = new User();
         user.setItems(new Items());
         user.getItems().setPets(new HashMap<>());
         this.fragment.setUser(user);

From 1b242e06ec439950b3f6f1944f9006f40abc7de4 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 21 Apr 2017 21:06:36 +0200
Subject: [PATCH 07/17] Continue reworking app for realm

---
 Habitica/res/layout/activity_full_profile.xml |  29 +-
 Habitica/res/layout/avatar_with_bars.xml      |  21 +-
 Habitica/res/layout/dialog_faint.xml          |   9 +-
 Habitica/res/layout/value_bar.xml             | 139 ++++-----
 Habitica/res/values/attrs.xml                 |   6 +
 .../habitica/HabiticaBaseApplication.java     |   1 -
 .../habitica/callbacks/ItemsCallback.java     |  24 --
 .../habitica/callbacks/MergeUserCallback.java |  24 --
 .../callbacks/TaskUpdateCallback.java         |  19 --
 .../habitica/callbacks/UnlockCallback.java    |  30 --
 .../habitica/data/InventoryRepository.java    |   7 +-
 .../android/habitica/data/TaskRepository.java |   6 +-
 .../data/implementation/ApiClientImpl.java    |   2 +-
 .../InventoryRepositoryImpl.java              |  25 +-
 .../implementation/TaskRepositoryImpl.java    |  43 ++-
 .../implementation/UserRepositoryImpl.java    |  14 +-
 .../data/local/InventoryLocalRepository.java  |   6 +-
 .../RealmInventoryLocalRepository.java        |  47 ++-
 .../RealmTagLocalRepository.java              |   2 +-
 .../events/commands/CreateTagCommand.java     |  12 -
 .../events/commands/DeleteTagCommand.java     |  15 -
 .../events/commands/DeleteTaskCommand.java    |  12 -
 .../events/commands/EditTagCommand.java       |  14 -
 .../commands/FilterTasksByTagsCommand.java    |  13 -
 .../events/commands/JoinChallengeCommand.java |  11 -
 .../commands/LeaveChallengeCommand.java       |   9 -
 .../events/commands/RefreshTasksCommand.java  |   4 -
 .../events/commands/RefreshUserCommand.java   |   8 -
 .../events/commands/SellItemCommand.java      |   9 -
 .../events/commands/UpdateTagCommand.java     |  16 -
 .../habitica/helpers/TaskAlarmManager.java    |  12 -
 .../habitica/helpers/TaskFilterHelper.java    |  45 +++
 .../interactors/BuyRewardUseCase.java         |  17 +-
 .../interactors/DailyCheckUseCase.java        |  12 +-
 .../interactors/DisplayItemDropUseCase.java   |  14 +-
 .../interactors/HabitScoreUseCase.java        |  17 +-
 .../habitica/interactors/LevelUpUseCase.java  |  15 +-
 .../interactors/NotifyUserUseCase.java        |  43 ++-
 .../interactors/TodoCheckUseCase.java         |  12 +-
 .../habitrpg/android/habitica/models/Tag.java |   9 +-
 .../habitica/models/inventory/Item.java       |   4 +-
 .../models/responses/TaskDirectionData.java   |   4 +-
 .../models/responses/TaskScoringResult.java   |  12 +
 .../android/habitica/models/tasks/Days.java   |  20 +-
 .../android/habitica/models/tasks/Task.java   |  19 +-
 .../android/habitica/models/user/User.java    |   7 +
 .../habitica/ui/AvatarWithBarsViewModel.java  |  89 +++---
 .../activities/ChallengeDetailActivity.java   |  61 ++--
 .../habitica/ui/activities/MainActivity.java  | 274 +++++++-----------
 .../habitica/ui/activities/SetupActivity.java |   3 +-
 .../ui/activities/TaskFormActivity.java       |  30 +-
 .../inventory/ItemRecyclerAdapter.java        |  51 ++--
 .../PartyMemberRecyclerViewAdapter.java       |  13 +-
 .../tasks/DailiesRecyclerViewHolder.java      |   4 +-
 .../tasks/HabitsRecyclerViewAdapter.java      |   4 +-
 .../RealmBaseTasksRecyclerViewAdapter.java    |  29 +-
 .../tasks/RewardsRecyclerViewAdapter.java     |   2 +-
 .../tasks/TodosRecyclerViewAdapter.java       |   4 +-
 .../customization/AvatarOverviewFragment.java |  15 +-
 .../inventory/items/ItemRecyclerFragment.java |  17 +-
 .../stable/StableRecyclerFragment.java        |   5 -
 .../preferences/PreferencesFragment.java      |   5 -
 .../ui/fragments/skills/SkillsFragment.java   |  10 +-
 .../tasks/TaskRecyclerViewFragment.java       |  14 +-
 .../ui/fragments/tasks/TasksFragment.java     |  26 +-
 .../android/habitica/ui/views/ValueBar.java   | 101 +++++++
 .../habitica/utils/TaskSerializer.java        |   5 +-
 .../habitica/utils/TaskTagDeserializer.java   |  41 +--
 .../habitica/widget/BaseWidgetProvider.java   |   7 +-
 .../widget/HabitButtonWidgetProvider.java     |   6 +-
 .../widget/TaskListWidgetProvider.java        |   2 +-
 71 files changed, 799 insertions(+), 858 deletions(-)
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CreateTagCommand.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTaskCommand.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FilterTasksByTagsCommand.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/JoinChallengeCommand.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/LeaveChallengeCommand.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/RefreshTasksCommand.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/RefreshUserCommand.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.java

diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index 6e398d916..15a515208 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -56,17 +56,34 @@
                             android:layout_height="wrap_content"
                             android:orientation="vertical">
 
-                            <include
+                            <com.habitrpg.android.habitica.ui.views.ValueBar
                                 android:id="@+id/hpBar"
-                                layout="@layout/value_bar" />
+                                layout="@layout/value_bar"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="@dimen/header_bar_spacing"
+                                app:barForegroundColor="@color/hpColor"
+                                app:description="@string/HP_default"
+                                app:barIconDrawable="@drawable/ic_header_heart" />
 
-                            <include
+                            <com.habitrpg.android.habitica.ui.views.ValueBar
                                 android:id="@+id/xpBar"
-                                layout="@layout/value_bar" />
+                                layout="@layout/value_bar"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginBottom="@dimen/header_bar_spacing"
+                                app:barForegroundColor="@color/xpColor"
+                                app:description="@string/XP_default"
+                                app:barIconDrawable="@drawable/ic_header_exp"  />
 
-                            <include
+                            <com.habitrpg.android.habitica.ui.views.ValueBar
                                 android:id="@+id/mpBar"
-                                layout="@layout/value_bar" />
+                                layout="@layout/value_bar"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                app:barForegroundColor="@color/mpColor"
+                                app:description="@string/MP_default"
+                                app:barIconDrawable="@drawable/ic_header_magic" />
 
                         </LinearLayout>
                     </LinearLayout>
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index 399ca57d6..6c473be16 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -36,25 +36,34 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <include
+            <com.habitrpg.android.habitica.ui.views.ValueBar
                 android:id="@+id/hpBar"
                 layout="@layout/value_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/header_bar_spacing" />
+                android:layout_marginBottom="@dimen/header_bar_spacing"
+                app:barForegroundColor="@color/hpColor"
+                app:description="@string/HP_default"
+                app:barIconDrawable="@drawable/ic_header_heart" />
 
-            <include
+            <com.habitrpg.android.habitica.ui.views.ValueBar
                 android:id="@+id/xpBar"
                 layout="@layout/value_bar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/header_bar_spacing"  />
+                android:layout_marginBottom="@dimen/header_bar_spacing"
+                app:barForegroundColor="@color/xpColor"
+                app:description="@string/XP_default"
+                app:barIconDrawable="@drawable/ic_header_exp"  />
 
-            <include
+            <com.habitrpg.android.habitica.ui.views.ValueBar
                 android:id="@+id/mpBar"
                 layout="@layout/value_bar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                app:barForegroundColor="@color/mpColor"
+                app:description="@string/MP_default"
+                app:barIconDrawable="@drawable/ic_header_magic" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/Habitica/res/layout/dialog_faint.xml b/Habitica/res/layout/dialog_faint.xml
index 04fa5ae14..0082de008 100644
--- a/Habitica/res/layout/dialog_faint.xml
+++ b/Habitica/res/layout/dialog_faint.xml
@@ -9,12 +9,15 @@
     android:paddingRight="24dip">
 
 
-    <include
+    <com.habitrpg.android.habitica.ui.views.ValueBar
         android:id="@+id/hpBar"
         layout="@layout/value_bar"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="8dp" />
+        android:layout_marginBottom="@dimen/header_bar_spacing"
+        app:barForegroundColor="@color/hpColor"
+        app:description="@string/HP_default"
+        app:barIconDrawable="@drawable/ic_header_heart" />
 
     <com.habitrpg.android.habitica.ui.AvatarView
         android:layout_width="@dimen/avatar_small_width"
diff --git a/Habitica/res/layout/value_bar.xml b/Habitica/res/layout/value_bar.xml
index a1ee2880f..202519eaa 100644
--- a/Habitica/res/layout/value_bar.xml
+++ b/Habitica/res/layout/value_bar.xml
@@ -1,98 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+<RelativeLayout 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="wrap_content"
+    android:layout_marginBottom="@dimen/bar_padding"
+    android:orientation="horizontal"
+    android:id="@+id/value_bar_layout">
+    <ImageView
+        android:id="@+id/ic_header"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/bar_icon_padding"
+        android:layout_marginEnd="@dimen/bar_icon_padding"
+        android:layout_alignTop="@+id/bar_full"
+        android:layout_alignBottom="@id/bar_full"
+        android:scaleType="center"
+        android:contentDescription="Bar Icon" />
+    <LinearLayout
+        android:id="@id/bar_full"
+        android:layout_toRightOf="@id/ic_header"
+        android:layout_toEndOf="@id/ic_header"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/bar_size"
+        android:orientation="horizontal"
+        android:weightSum="1">
 
-    <data>
+        <View
+            android:id="@+id/bar"
+            android:layout_width="0dip"
+            android:layout_height="match_parent" />
 
-        <variable
-            name="text"
-            type="String" />
-        <variable
-            name="description"
-            type="String" />
+        <View
+            android:id="@+id/empty_bar_space"
+            android:layout_width="0dip"
+            android:layout_height="match_parent" />
+    </LinearLayout>
 
-        <variable
-            name="textColor"
-            type="int" />
-
-        <variable
-            name="weightToShow"
-            type="float" />
-
-        <variable
-            name="barForegroundColor"
-            type="int" />
-        <variable
-            name="icon"
-            type="int"/>
-        <variable
-            name="partyMembers"
-            type="boolean"/>
-
-    </data>
-
-    <RelativeLayout
+    <LinearLayout
+        android:layout_below="@id/bar_full"
+        android:layout_toRightOf="@id/ic_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/bar_padding"
-        android:orientation="horizontal"
-        android:id="@+id/value_bar_layout">
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:id="@+id/ic_header"
-            android:layout_width="wrap_content"
+        android:layout_marginTop="1dp">
+        <TextView
+            android:id="@+id/valueLabel"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/bar_icon_padding"
-            android:layout_marginEnd="@dimen/bar_icon_padding"
-            android:layout_alignTop="@+id/bar_full"
-            android:layout_alignBottom="@id/bar_full"
-            android:scaleType="center"
-            android:contentDescription="Bar Icon" />
-        <LinearLayout
-            android:id="@id/bar_full"
-            android:layout_toRightOf="@id/ic_header"
-            android:layout_toEndOf="@id/ic_header"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/bar_size"
-            android:orientation="horizontal"
-            android:background="@{partyMembers ? @drawable/layout_rounded_bg_light_gray : @drawable/layout_rounded_bg_brand}"
-            android:weightSum="1">
-
-            <View
-                android:id="@+id/bar"
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:layout_weight="@{weightToShow}"
-                app:rounded_background="@{barForegroundColor}" />
-
-            <View
-                android:layout_width="0dip"
-                android:layout_height="match_parent"
-                android:layout_weight="@{1.0f - weightToShow}" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_below="@id/bar_full"
-            android:layout_toRightOf="@id/ic_header"
-            android:layout_width="match_parent"
+            android:layout_weight="1"
+            />
+        <TextView
+            android:id="@+id/descriptionLabel"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-                android:layout_marginTop="1dp">
-            <TextView
-                android:id="@+id/TV_value"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:textColor="@{partyMembers ? @color/md_black_1000 : @color/brand_500}"
-                android:text="@{text}"
-                android:layout_weight="1"
-                />
-            <TextView
-                android:id="@+id/TV_label"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:gravity="center|right"
-                android:textColor="@{partyMembers ? @color/md_black_1000 : @color/brand_500}"
-                android:text="@{description}"
-                android:layout_weight="1" />
-        </LinearLayout>
+            android:gravity="center|right"
+            android:layout_weight="1" />
+    </LinearLayout>
 
-    </RelativeLayout>
-</layout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 8852fc9e4..67247ab26 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -30,4 +30,10 @@
         <attr name="iconDrawable" format="integer" />
         <attr name="categoryTitle" format="string" />
     </declare-styleable>
+    <declare-styleable name="ValueBar">
+        <attr name="barForegroundColor" format="color" />
+        <attr name="barIconDrawable" format="integer" />
+        <attr name="lightBackground" format="boolean" />
+        <attr name="description" format="string" />
+    </declare-styleable>
 </resources>
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 f37332117..0ef2243fb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -47,7 +47,6 @@ import io.realm.RealmConfiguration;
 //contains all HabiticaApplicationLogic except dagger componentInitialisation
 public abstract class HabiticaBaseApplication extends MultiDexApplication {
 
-    public static com.habitrpg.android.habitica.models.user.User User;
     public static Activity currentActivity = null;
     private static AppComponent component;
     public RefWatcher refWatcher;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
deleted file mode 100644
index 1ceb57432..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/ItemsCallback.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.models.user.User;
-import com.habitrpg.android.habitica.models.user.Items;
-
-import rx.functions.Action1;
-
-public class ItemsCallback implements Action1<Items> {
-
-    private final HabitRPGUserCallback.OnUserReceived mCallback;
-
-    private User user;
-
-    public ItemsCallback(HabitRPGUserCallback.OnUserReceived callback, User user) {
-        this.mCallback = callback;
-        this.user = user;
-    }
-
-    @Override
-    public void call(Items items) {
-        this.user.setItems(items);
-        mCallback.onUserReceived(this.user);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
deleted file mode 100644
index 5c08bb976..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/MergeUserCallback.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import android.support.annotation.Nullable;
-
-import com.habitrpg.android.habitica.models.user.User;
-
-
-public class MergeUserCallback extends HabitRPGUserCallback {
-
-    private User user;
-
-    public MergeUserCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, User user) {
-        super(callback);
-        this.user = user;
-    }
-
-    @Override
-    public void call(User user) {
-
-        if (callBack != null) {
-            callBack.onUserReceived(this.user);
-        }
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
deleted file mode 100644
index 53f8277df..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskUpdateCallback.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import org.greenrobot.eventbus.EventBus;
-
-import rx.functions.Action1;
-
-/**
- * Created by magicmicky on 02/04/15.
- */
-public class TaskUpdateCallback implements Action1<Task> {
-
-    @Override
-    public void call(Task task) {
-        EventBus.getDefault().post(new TaskUpdatedEvent(task));
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
deleted file mode 100644
index acfa4d1b3..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/UnlockCallback.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.models.responses.UnlockResponse;
-import com.habitrpg.android.habitica.models.user.User;
-
-import rx.functions.Action1;
-
-/**
- * Created by magicmicky on 18/02/15.
- */
-public class UnlockCallback implements Action1<UnlockResponse> {
-
-    private final HabitRPGUserCallback.OnUserReceived callback;
-
-    private User user;
-
-    public UnlockCallback(HabitRPGUserCallback.OnUserReceived callback, User user) {
-        this.callback = callback;
-        this.user = user;
-    }
-
-    @Override
-    public void call(UnlockResponse unlockResponse) {
-        this.user.setPurchased(unlockResponse.purchased);
-        this.user.setItems(unlockResponse.items);
-        this.user.setPreferences(unlockResponse.preferences);
-
-        callback.onUserReceived(this.user);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
index f03f48c7c..80d277db9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
@@ -1,5 +1,7 @@
 package com.habitrpg.android.habitica.data;
 
+import android.support.annotation.Nullable;
+
 import com.habitrpg.android.habitica.models.inventory.Item;
 import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Mount;
@@ -25,7 +27,7 @@ public interface InventoryRepository extends ContentRepository {
     Observable<RealmResults<Equipment>> getOwnedEquipment(String type);
     Observable<RealmResults<Equipment>> getOwnedEquipment();
 
-    Observable<List<Item>> getOwnedItems(String itemType);
+    Observable<? extends RealmResults<? extends Item>> getOwnedItems(String itemType);
 
     Observable<Equipment> getEquipment(String key);
 
@@ -42,4 +44,7 @@ public interface InventoryRepository extends ContentRepository {
     void updateOwnedEquipment(User user);
 
     void changeOwnedCount(String type, String key, int amountToAdd);
+
+    Observable<User> sellItem(User user, String type, String key);
+    Observable<User> sellItem(User user, Item item);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
index fe731089e..81342df18 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
@@ -1,12 +1,14 @@
 package com.habitrpg.android.habitica.data;
 
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
 import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
 import com.habitrpg.android.habitica.models.tasks.TaskTag;
 import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
 
@@ -20,8 +22,8 @@ public interface TaskRepository extends BaseRepository  {
 
     Observable<TaskList> refreshTasks(TasksOrder tasksOrder);
 
-    Observable<TaskDirectionData> taskChecked(Task task, boolean up);
-    Observable<TaskDirectionData> taskChecked(String taskId, boolean up);
+    Observable<TaskScoringResult> taskChecked(User user, Task task, boolean up);
+    Observable<TaskScoringResult> taskChecked(User user, String taskId, boolean up);
     Observable<Task> scoreChecklistItem(String taskId, String itemId);
 
     Observable<Task> getTask(String taskId);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index a95bb36bd..e86f79202 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -206,7 +206,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
     }
 
     public static GsonConverterFactory createGsonFactory() {
-        Type taskTagClassListType = new TypeToken<RealmList<TaskTag>>() {
+        Type taskTagClassListType = new TypeToken<RealmList<Tag>>() {
         }.getType();
         Type skillListType = new TypeToken<List<Skill>>() {
         }.getType();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
index deaeec1af..591a3b37e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
@@ -28,7 +28,7 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
 
     @Override
     public Observable<RealmResults<Equipment>> getItems(List<String> searchedKeys) {
-        return localRepository.getItems(searchedKeys);
+        return localRepository.getEquipment(searchedKeys);
     }
 
     @Override
@@ -52,7 +52,7 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
     }
 
     @Override
-    public Observable<List<Item>> getOwnedItems(String itemType) {
+    public Observable<? extends RealmResults<? extends Item>> getOwnedItems(String itemType) {
         return localRepository.getOwnedItems(itemType);
     }
 
@@ -103,4 +103,25 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
     public void changeOwnedCount(String type, String key, int amountToAdd) {
         localRepository.changeOwnedCount(type, key, amountToAdd);
     }
+
+    @Override
+    public Observable<User> sellItem(User user, String type, String key) {
+        return localRepository.getItem(type, key)
+                .flatMap(item -> sellItem(user, item));
+    }
+
+    @Override
+    public Observable<User> sellItem(User user, Item item) {
+        return apiClient.sellItem(item.getType(), item.getKey())
+                .map(user1 -> {
+                    localRepository.executeTransaction(realm -> {
+                        if (user != null) {
+                            user.setItems(user1.getItems());
+                            user.setStats(user1.getStats());
+                            item.setOwned(item.getOwned()-1);
+                        }
+                    });
+                    return user;
+                });
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
index 79f7979db..ba1f3a968 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -7,12 +7,15 @@ import com.habitrpg.android.habitica.events.TaskCreatedEvent;
 import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
 import com.habitrpg.android.habitica.models.responses.TaskDirection;
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
 import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
 import com.habitrpg.android.habitica.models.tasks.TaskTag;
 import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.models.user.User;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -22,6 +25,7 @@ import java.util.List;
 import io.realm.Realm;
 import io.realm.RealmResults;
 import rx.Observable;
+import rx.functions.Func2;
 
 
 public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository> implements TaskRepository {
@@ -49,35 +53,60 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
     }
 
     @Override
-    public Observable<TaskDirectionData> taskChecked(Task task, boolean up) {
+    public Observable<TaskScoringResult> taskChecked(User user, 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 -> {
+                .map(res -> {
                     // save local task changes
-                    if (task.type != null && !task.type.equals("reward")) {
+                    TaskScoringResult result = new TaskScoringResult();
+                    Stats stats = user.getStats();
 
+                    result.taskValueDelta = res.getDelta();
+                    result.healthDelta = res.hp - stats.getHp();
+                    result.experienceDelta = res.exp - stats.getExp();
+                    result.manaDelta = res.mp - stats.getMp();
+                    result.goldDelta = res.gp - stats.getGp();
+                    result.hasLeveledUp = res.lvl > stats.getLvl();
+                    if (res.get_tmp() != null) {
+                        result.drop = res.get_tmp().getDrop();
+                    }
+
+                    if (task.type != null && !task.type.equals("reward")) {
                         this.localRepository.executeTransaction(realm -> {
                             task.value = task.value + res.getDelta();
                             if (Task.TYPE_DAILY.equals(task.type) || Task.TYPE_TODO.equals(task.type)) {
                                 task.completed = up;
                             }
+
+                            stats.setHp(res.hp);
+                            stats.setExp(res.exp);
+                            stats.setMp(res.mp);
+                            stats.setGp(res.gp);
+                            stats.setLvl(res.lvl);
+                            user.setStats(stats);
                         });
                     }
+
+                    return result;
                 });
     }
 
     @Override
-    public Observable<TaskDirectionData> taskChecked(String taskId, boolean up) {
+    public Observable<TaskScoringResult> taskChecked(User user, String taskId, boolean up) {
         return localRepository.getTask(taskId)
-                .flatMap(task -> taskChecked(task, up));
+                .flatMap(task -> taskChecked(user, task, up));
     }
 
     public Observable<Task> scoreChecklistItem(String taskId, String itemId){
         return apiClient.scoreChecklistItem(taskId, itemId)
+                .zipWith(localRepository.getTask(taskId), (newTask, oldTask) -> {
+                    newTask.position = oldTask.position;
+                    return newTask;
+                })
                 .doOnNext(this.localRepository::saveTask);
     }
 
@@ -110,6 +139,10 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         }
         lastTaskAction = now;
         return apiClient.updateTask(task.getId(), task)
+                .map(task1 -> {
+                    task1.position = task.position;
+                    return task1;
+                })
                 .doOnNext(localRepository::saveTask);
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 4d75bfd22..7007b5230 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -7,8 +7,10 @@ import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.TutorialStep;
 import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 import com.habitrpg.android.habitica.models.user.User;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,6 +20,8 @@ import rx.Observable;
 
 public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository> implements UserRepository {
 
+    private Date lastSync;
+
     public UserRepositoryImpl(UserLocalRepository localRepository, ApiClient apiClient) {
         super(localRepository, apiClient);
     }
@@ -25,7 +29,6 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
     @Override
     public Observable<User> getUser(String userID) {
         return localRepository.getUser(userID)
-                .first()
                 .flatMap(habitRPGUser -> {
                     if (habitRPGUser == null || !habitRPGUser.isValid()) {
                         return retrieveUser(true);
@@ -50,8 +53,13 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
 
     @Override
     public Observable<User> retrieveUser(Boolean withTasks) {
-        return apiClient.retrieveUser(withTasks)
-                .doOnNext(localRepository::saveUser);
+        if (this.lastSync == null || (new Date().getTime() - this.lastSync.getTime()) > 180000) {
+            return apiClient.retrieveUser(withTasks)
+                    .doOnNext(localRepository::saveUser)
+                    .doOnNext(user -> lastSync = new Date());
+        } else {
+            return Observable.empty();
+        }
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
index ccd001864..aa20cd193 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
@@ -15,14 +15,14 @@ import rx.Observable;
 public interface InventoryLocalRepository extends BaseLocalRepository {
     Observable<QuestContent> getQuestContent(String key);
 
-    Observable<RealmResults<Equipment>> getItems(List<String> searchedKeys);
+    Observable<RealmResults<Equipment>> getEquipment(List<String> searchedKeys);
 
     long getArmoireRemainingCount();
 
     Observable<RealmResults<Equipment>> getOwnedEquipment(String type);
     Observable<RealmResults<Equipment>> getOwnedEquipment();
 
-    Observable<List<Item>> getOwnedItems(String itemType);
+    Observable<? extends RealmResults<? extends Item>> getOwnedItems(String itemType);
 
     Observable<Equipment> getEquipment(String key);
 
@@ -37,4 +37,6 @@ public interface InventoryLocalRepository extends BaseLocalRepository {
     void updateOwnedEquipment(User user);
 
     void changeOwnedCount(String type, String key, int amountToAdd);
+
+    Observable<Item> getItem(String type, String key);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
index 424da2e5d..191fdb7a1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
@@ -1,7 +1,10 @@
 package com.habitrpg.android.habitica.data.local.implementation;
 
 import com.habitrpg.android.habitica.data.local.InventoryLocalRepository;
+import com.habitrpg.android.habitica.models.inventory.Egg;
 import com.habitrpg.android.habitica.models.inventory.Equipment;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
 import com.habitrpg.android.habitica.models.inventory.Item;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
@@ -11,7 +14,7 @@ import com.habitrpg.android.habitica.models.user.User;
 import java.util.List;
 
 import io.realm.Realm;
-import io.realm.RealmQuery;
+import io.realm.RealmObject;
 import io.realm.RealmResults;
 import rx.Observable;
 
@@ -30,7 +33,7 @@ public class RealmInventoryLocalRepository extends RealmBaseLocalRepository impl
     }
 
     @Override
-    public Observable<RealmResults<Equipment>> getItems(List<String> searchedKeys) {
+    public Observable<RealmResults<Equipment>> getEquipment(List<String> searchedKeys) {
         return realm.where(Equipment.class)
                 .in("key", (String[]) searchedKeys.toArray())
                 .findAll()
@@ -63,8 +66,23 @@ public class RealmInventoryLocalRepository extends RealmBaseLocalRepository impl
     }
 
     @Override
-    public Observable<List<Item>> getOwnedItems(String itemType) {
-        return null;
+    public Observable<? extends RealmResults<? extends Item>> getOwnedItems(String itemType) {
+        Class<? extends Item> itemClass = null;
+        switch (itemType) {
+            case "eggs":
+                itemClass = Egg.class;
+                break;
+            case "hatchingPotions":
+                itemClass = HatchingPotion.class;
+                break;
+            case "food":
+                itemClass = Food.class;
+                break;
+            case "quests":
+                itemClass = QuestContent.class;
+        }
+        return realm.where(itemClass).findAllAsync().asObservable()
+                .filter(RealmResults::isLoaded);
     }
 
     @Override
@@ -123,4 +141,25 @@ public class RealmInventoryLocalRepository extends RealmBaseLocalRepository impl
     @Override
     public void changeOwnedCount(String type, String key, int amountToAdd) {
     }
+
+    @Override
+    public Observable<Item> getItem(String type, String key) {
+        Class<? extends RealmObject> itemClass = null;
+        switch (type) {
+            case "eggs":
+                itemClass = Egg.class;
+                break;
+            case "hatchingPotions":
+                itemClass = HatchingPotion.class;
+                break;
+            case "food":
+                itemClass = Food.class;
+                break;
+            case "quests":
+                itemClass = QuestContent.class;
+        }
+        return realm.where(itemClass).equalTo("key", key).findFirstAsync().asObservable()
+                .filter(realmObject -> realmObject.isLoaded())
+                .cast(Item.class);
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java
index 0b9d14de4..f0346f7df 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTagLocalRepository.java
@@ -17,7 +17,7 @@ public class RealmTagLocalRepository extends RealmBaseLocalRepository implements
 
     @Override
     public Observable<RealmResults<Tag>> getTags(String userId) {
-        return realm.where(Tag.class).equalTo("userId", userId).findAll().asObservable();
+        return realm.where(Tag.class).equalTo("user.id", userId).findAll().asObservable();
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CreateTagCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CreateTagCommand.java
deleted file mode 100644
index ca65d36db..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/CreateTagCommand.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-/**
- * Created by Negue on 09.09.2015.
- */
-public class CreateTagCommand {
-    public String tagName;
-
-    public CreateTagCommand(String tagName) {
-        this.tagName = tagName;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java
deleted file mode 100644
index 623815646..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTagCommand.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.Tag;
-
-/**
- * Created by jjbillings on 8.9.2016.
- */
-public class DeleteTagCommand {
-    public Tag tag;
-
-    public DeleteTagCommand(Tag tag) {
-        this.tag = tag;
-    }
-}
-
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTaskCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTaskCommand.java
deleted file mode 100644
index 451abb810..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/DeleteTaskCommand.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-/**
- * Created by Negue on 02.12.2015.
- */
-public class DeleteTaskCommand {
-    public String TaskIdToDelete;
-
-    public DeleteTaskCommand(String id) {
-        TaskIdToDelete = id;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java
deleted file mode 100644
index 8692ead77..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/EditTagCommand.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.Tag;
-
-/**
- * Created by jjbillings on 8/16/16.
- */
-public class EditTagCommand {
-    public Tag tag;
-
-    public EditTagCommand(Tag tag) {
-        this.tag = tag;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FilterTasksByTagsCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FilterTasksByTagsCommand.java
deleted file mode 100644
index 2b8dad12f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/FilterTasksByTagsCommand.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import java.util.ArrayList;
-
-/**
- * Created by Negue on 09.09.2015.
- */
-public class FilterTasksByTagsCommand {
-    public ArrayList<String> tagList;
-
-    public FilterTasksByTagsCommand() {
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/JoinChallengeCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/JoinChallengeCommand.java
deleted file mode 100644
index 45e95ac2c..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/JoinChallengeCommand.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-public class JoinChallengeCommand {
-    public String challengeId;
-
-    public JoinChallengeCommand(String challengeId) {
-        this.challengeId = challengeId;
-    }
-}
-
-
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/LeaveChallengeCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/LeaveChallengeCommand.java
deleted file mode 100644
index 0b70cc247..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/LeaveChallengeCommand.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-public class LeaveChallengeCommand {
-    public String challengeId;
-
-    public LeaveChallengeCommand(String challengeId) {
-        this.challengeId = challengeId;
-    }
-}
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
deleted file mode 100644
index 45fc11c3f..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/RefreshTasksCommand.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-public class RefreshTasksCommand {
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/RefreshUserCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/RefreshUserCommand.java
deleted file mode 100644
index dacea6b20..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/RefreshUserCommand.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-/**
- * Created by jbillz on 8/19/16.
- */
-public class RefreshUserCommand {
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java
deleted file mode 100644
index 185a4a213..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SellItemCommand.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.inventory.Item;
-
-public class SellItemCommand {
-
-    public Item item;
-
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java
deleted file mode 100644
index 5146628a4..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/UpdateTagCommand.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.habitrpg.android.habitica.events.commands;
-
-import com.habitrpg.android.habitica.models.Tag;
-
-/**
- * Created by jjbillings on 8/17/16.
- */
-public class UpdateTagCommand {
-    public Tag tag;
-    public String uuid;
-
-    public UpdateTagCommand(Tag tag, String uuid) {
-        this.tag = tag;
-        this.uuid = uuid;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
index 519b3469e..8cbd47bd4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
@@ -116,18 +116,6 @@ public class TaskAlarmManager {
         }
     }
 
-    @Subscribe
-    public void onEvent(TaskSaveEvent event) {
-        Task task = event.task;
-        this.setAlarmsForTask(task);
-    }
-
-    @Subscribe
-    public void onEvent(TaskDeleteEvent event) {
-        Task task = event.task;
-        this.removeAlarmsForTask(task);
-    }
-
     @Subscribe
     public void onEvent(ReminderDeleteEvent event) {
         RemindersItem remindersItem = event.reminder;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java
index 4c8029166..e4a65d48f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.java
@@ -9,6 +9,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.OrderedRealmCollection;
+import io.realm.RealmQuery;
+
 /**
  * Created by magicmicky on 02/10/15.
  */
@@ -104,4 +107,46 @@ public class TaskFilterHelper {
     public String getActiveFilter(String type) {
         return activeFilters.get(type);
     }
+
+    public RealmQuery<Task> createQuery(OrderedRealmCollection<Task> unfilteredData) {
+        RealmQuery<Task> query = unfilteredData.where();
+
+        if (unfilteredData.size() == 0) {
+            return query;
+        }
+
+        String taskType = unfilteredData.get(0).getType();
+        String activeFilter = getActiveFilter(taskType);
+
+        if (tagsId != null && tagsId.size() > 0) {
+            query = query.in("tags.id", tagsId.toArray(new String[0]));
+        }
+        if (activeFilter != null && !activeFilter.equals(Task.FILTER_ALL)) {
+            switch (activeFilter) {
+                case Task.FILTER_ACTIVE:
+                    if (Task.TYPE_DAILY.equals(taskType)) {
+                        query = query.equalTo("completed", false);
+                    } else {
+                        query = query.equalTo("completed", false);
+                    }
+                    break;
+                case Task.FILTER_GRAY:
+                    query = query.equalTo("completed", true);
+                break;
+                case Task.FILTER_WEAK:
+                    query = query.lessThan("value", 0.0d);
+                    break;
+                case Task.FILTER_STRONG:
+                    query = query.greaterThanOrEqualTo("value", 0.0d);
+                    break;
+                case Task.FILTER_DATED:
+                    query = query.isNotNull("duedate");
+                    break;
+                case Task.FILTER_COMPLETED:
+                    query = query.equalTo("completed", true);
+                    break;
+            }
+        }
+        return query;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java
index 631b827b8..615bafaf3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/BuyRewardUseCase.java
@@ -5,13 +5,15 @@ import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
 import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.User;
 
 import javax.inject.Inject;
 
 import rx.Observable;
 
-public class BuyRewardUseCase extends UseCase<BuyRewardUseCase.RequestValues, TaskDirectionData> {
+public class BuyRewardUseCase extends UseCase<BuyRewardUseCase.RequestValues, TaskScoringResult> {
 
     private TaskRepository taskRepository;
     private SoundManager soundManager;
@@ -25,17 +27,18 @@ public class BuyRewardUseCase extends UseCase<BuyRewardUseCase.RequestValues, Ta
     }
 
     @Override
-    protected Observable<TaskDirectionData> buildUseCaseObservable(BuyRewardUseCase.RequestValues requestValues) {
-        return taskRepository.taskChecked(requestValues.task, false).doOnNext(res -> {
-
-            soundManager.loadAndPlayAudio(SoundManager.SoundReward);
-        });
+    protected Observable<TaskScoringResult> buildUseCaseObservable(BuyRewardUseCase.RequestValues requestValues) {
+        return taskRepository
+                .taskChecked(requestValues.user, requestValues.task, false)
+                .doOnNext(res -> soundManager.loadAndPlayAudio(SoundManager.SoundReward));
     }
 
     public static final class RequestValues implements UseCase.RequestValues {
         protected final Task task;
+        private final User user;
 
-        public RequestValues(Task task) {
+        public RequestValues(User user, Task task) {
+            this.user = user;
             this.task = task;
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java
index 69ec0a7ea..81dfe0fa5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DailyCheckUseCase.java
@@ -5,13 +5,15 @@ import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
 import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.User;
 
 import javax.inject.Inject;
 
 import rx.Observable;
 
-public class DailyCheckUseCase extends UseCase<DailyCheckUseCase.RequestValues, TaskDirectionData> {
+public class DailyCheckUseCase extends UseCase<DailyCheckUseCase.RequestValues, TaskScoringResult> {
 
     private TaskRepository taskRepository;
     private SoundManager soundManager;
@@ -25,8 +27,8 @@ public class DailyCheckUseCase extends UseCase<DailyCheckUseCase.RequestValues,
     }
 
     @Override
-    protected Observable<TaskDirectionData> buildUseCaseObservable(RequestValues requestValues) {
-        return taskRepository.taskChecked(requestValues.task, requestValues.up).doOnNext(res -> {
+    protected Observable<TaskScoringResult> buildUseCaseObservable(RequestValues requestValues) {
+        return taskRepository.taskChecked(requestValues.user, requestValues.task, requestValues.up).doOnNext(res -> {
 
             soundManager.loadAndPlayAudio(SoundManager.SoundDaily);
         });
@@ -37,8 +39,10 @@ public class DailyCheckUseCase extends UseCase<DailyCheckUseCase.RequestValues,
         protected boolean up = false;
 
         protected final Task task;
+        public User user;
 
-        public RequestValues(Task task, boolean up) {
+        public RequestValues(User user, Task task, boolean up) {
+            this.user = user;
             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
index 1b95de4fe..d62050da5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
@@ -8,6 +8,7 @@ import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 
 import javax.inject.Inject;
@@ -29,16 +30,15 @@ public class DisplayItemDropUseCase extends UseCase<DisplayItemDropUseCase.Reque
     @Override
     protected Observable<Void> buildUseCaseObservable(RequestValues requestValues) {
         return Observable.from(() -> {
-            TaskDirectionData data = requestValues.data;
+            TaskScoringResult data = requestValues.data;
 
-            if (data.get_tmp() != null) {
-                if (data.get_tmp().getDrop() != null) {
+            if (data != null) {
+                if (data.drop != null) {
                     new Handler().postDelayed(() -> {
                         showSnackbar(requestValues.context, requestValues.snackbarTargetView,
-                                data.get_tmp().getDrop().getDialog(), UiUtils.SnackbarDisplayType.DROP);
+                                data.drop.getDialog(), UiUtils.SnackbarDisplayType.DROP);
                         soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop);
                     }, 3000L);
-
                 }
             }
 
@@ -48,11 +48,11 @@ public class DisplayItemDropUseCase extends UseCase<DisplayItemDropUseCase.Reque
 
     public static final class RequestValues implements UseCase.RequestValues {
 
-        private TaskDirectionData data;
+        private TaskScoringResult data;
         private AppCompatActivity context;
         private View snackbarTargetView;
 
-        public RequestValues(TaskDirectionData data, AppCompatActivity context, View snackbarTargetView) {
+        public RequestValues(TaskScoringResult data, AppCompatActivity context, View snackbarTargetView) {
             this.data = data;
             this.context = context;
             this.snackbarTargetView = snackbarTargetView;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java
index a5e2537f5..35568ee85 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HabitScoreUseCase.java
@@ -5,13 +5,15 @@ import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
 import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.User;
 
 import javax.inject.Inject;
 
 import rx.Observable;
 
-public class HabitScoreUseCase extends UseCase<HabitScoreUseCase.RequestValues, TaskDirectionData> {
+public class HabitScoreUseCase extends UseCase<HabitScoreUseCase.RequestValues, TaskScoringResult> {
 
     private TaskRepository taskRepository;
     private SoundManager soundManager;
@@ -25,20 +27,21 @@ public class HabitScoreUseCase extends UseCase<HabitScoreUseCase.RequestValues,
     }
 
     @Override
-    protected Observable<TaskDirectionData> buildUseCaseObservable(RequestValues requestValues) {
-        return taskRepository.taskChecked(requestValues.habit, requestValues.up).doOnNext(res -> {
-
-            soundManager.loadAndPlayAudio(requestValues.up ? SoundManager.SoundPlusHabit : SoundManager.SoundMinusHabit);
-        });
+    protected Observable<TaskScoringResult> buildUseCaseObservable(RequestValues requestValues) {
+        return taskRepository
+                .taskChecked(requestValues.user, requestValues.habit, requestValues.up)
+                .doOnNext(res -> soundManager.loadAndPlayAudio(requestValues.up ? SoundManager.SoundPlusHabit : SoundManager.SoundMinusHabit));
     }
 
     public static final class RequestValues implements UseCase.RequestValues {
 
+        private final User user;
         protected boolean up = false;
 
         protected final Task habit;
 
-        public RequestValues(Task habit, boolean up) {
+        public RequestValues(User user, Task habit, boolean up) {
+            this.user = user;
             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
index d66b205f0..393d1ddf6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
@@ -69,12 +69,10 @@ public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Stats>
             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 -> {
-                                });
-                    })
+                    .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();
@@ -95,10 +93,9 @@ public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Stats>
         private int newLevel;
         private AppCompatActivity compatActivity;
 
-        public RequestValues(User user, int newLevel, AppCompatActivity compatActivity) {
-
+        public RequestValues(User user, AppCompatActivity compatActivity) {
             this.user = user;
-            this.newLevel = newLevel;
+            this.newLevel = user.getStats().getLvl();
             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
index ba9e7b7aa..17fb71ae5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
@@ -38,44 +38,38 @@ public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues,
         return Observable.defer(() -> {
             Stats stats = requestValues.user.getStats();
 
-            if (requestValues.lvl > stats.getLvl()) {
-                return levelUpUseCase.observable(new LevelUpUseCase.RequestValues(requestValues.user, requestValues.lvl, requestValues.context))
+            if (requestValues.hasLeveledUp) {
+                return levelUpUseCase.observable(new LevelUpUseCase.RequestValues(requestValues.user, requestValues.context))
                         .flatMap(aVoid -> userRepository.retrieveUser(false))
                         .map(User::getStats);
             } else {
-                Pair<String, UiUtils.SnackbarDisplayType> pair = getNotificationAndAddStatsToUser(requestValues.user, requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp);
+                Pair<String, UiUtils.SnackbarDisplayType> pair = getNotificationAndAddStatsToUser(requestValues.xp, requestValues.hp, requestValues.gold, requestValues.mp);
                 showSnackbar(requestValues.context, requestValues.snackbarTargetView, pair.first, pair.second);
                 return Observable.just(stats);
             }
         });
     }
 
-    public static Pair<String, UiUtils.SnackbarDisplayType> getNotificationAndAddStatsToUser(User user, double xp, double hp, double gold, double mp){
+    public static Pair<String, UiUtils.SnackbarDisplayType> getNotificationAndAddStatsToUser(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 (xp > 0) {
+            message.append(" + ").append(round(xp, 2)).append(" XP");
         }
-        if (hp != stats.getHp()) {
+        if (hp != 0) {
             displayType = UiUtils.SnackbarDisplayType.FAILURE;
-            message.append(" - ").append(round(stats.getHp() - hp, 2)).append(" HP");
-            stats.setHp(hp);
+            message.append(" - ").append(round(hp, 2)).append(" HP");
         }
-        if (gold > stats.getGp()) {
-            message.append(" + ").append(round(gold - stats.getGp(), 2)).append(" GP");
-            stats.setGp(gold);
-        } else if (gold < stats.getGp()) {
+        if (gold > 0) {
+            message.append(" + ").append(round(gold, 2)).append(" GP");
+        } else if (gold < 0) {
             displayType = UiUtils.SnackbarDisplayType.FAILURE;
-            message.append(" - ").append(round(stats.getGp() - gold, 2)).append(" GP");
-            stats.setGp(gold);
+            message.append(" - ").append(round(gold, 2)).append(" GP");
         }
-        if (mp > stats.getMp() && stats.getLvl() >= MIN_LEVEL_FOR_SKILLS) {
-            message.append(" + ").append(round(mp - stats.getMp(), 2)).append(" MP");
-            stats.setMp(mp);
+        if (mp > 0) {
+            message.append(" + ").append(round(mp, 2)).append(" MP");
         }
 
         return new Pair<>(message.toString(), displayType);
@@ -85,25 +79,22 @@ public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues,
 
         private AppCompatActivity context;
         private View snackbarTargetView;
-        private Action0 retrieveUser;
         private User user;
         private double xp;
         private double hp;
         private double gold;
         private double mp;
-        private int lvl;
+        private boolean hasLeveledUp;
 
-        public RequestValues(AppCompatActivity context, View snackbarTargetView, Action0 retrieveUser,
-                             User user, double xp, double hp, double gold, double mp, int lvl) {
+        public RequestValues(AppCompatActivity context, View snackbarTargetView, User user, double xp, double hp, double gold, double mp, boolean hasLeveledUp) {
             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;
+            this.hasLeveledUp = hasLeveledUp;
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java
index b0eb5a41e..7cb456fe4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/TodoCheckUseCase.java
@@ -5,13 +5,15 @@ import com.habitrpg.android.habitica.executors.PostExecutionThread;
 import com.habitrpg.android.habitica.executors.ThreadExecutor;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
 import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.User;
 
 import javax.inject.Inject;
 
 import rx.Observable;
 
-public class TodoCheckUseCase  extends UseCase<TodoCheckUseCase.RequestValues, TaskDirectionData> {
+public class TodoCheckUseCase  extends UseCase<TodoCheckUseCase.RequestValues, TaskScoringResult> {
 
     private TaskRepository taskRepository;
     private SoundManager soundManager;
@@ -25,8 +27,8 @@ public class TodoCheckUseCase  extends UseCase<TodoCheckUseCase.RequestValues, T
     }
 
     @Override
-    protected Observable<TaskDirectionData> buildUseCaseObservable(TodoCheckUseCase.RequestValues requestValues) {
-        return taskRepository.taskChecked(requestValues.task, requestValues.up).doOnNext(res -> {
+    protected Observable<TaskScoringResult> buildUseCaseObservable(TodoCheckUseCase.RequestValues requestValues) {
+        return taskRepository.taskChecked(requestValues.user, requestValues.task, requestValues.up).doOnNext(res -> {
 
             soundManager.loadAndPlayAudio(SoundManager.SoundTodo);
         });
@@ -37,8 +39,10 @@ public class TodoCheckUseCase  extends UseCase<TodoCheckUseCase.RequestValues, T
         protected boolean up = false;
 
         protected final Task task;
+        public User user;
 
-        public RequestValues(Task task, boolean up) {
+        public RequestValues(User user, Task task, boolean up) {
+            this.user = user;
             this.task = task;
             this.up = up;
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
index b9d9d6409..154f8a3f3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Tag.java
@@ -1,6 +1,8 @@
 package com.habitrpg.android.habitica.models;
 
+import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
 
@@ -18,11 +20,12 @@ public class Tag extends RealmObject {
     @PrimaryKey
     public String id;
 
-    public String userId;
-    public RealmList<TaskTag> tasks;
+    public User user;
+    public RealmList<Task> tasks;
     String name;
+    boolean challenge;
 
-    public List<TaskTag> getTasks() {
+    public List<Task> getTasks() {
         return tasks;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
index aa4d2f384..b45419172 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Item.java
@@ -4,7 +4,9 @@ import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.structure.BaseModel;
 
-public interface Item {
+import io.realm.RealmModel;
+
+public interface Item extends RealmModel {
 
     String getType();
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
index b538c0f8b..dd571d73a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskDirectionData.java
@@ -11,9 +11,9 @@ public class TaskDirectionData {
     private TaskDirectionDataTemp _tmp;
     public Double exp;
     public Double hp;
-    private Double gp;
+    public Double gp;
     public Double mp;
-    private Integer lvl;
+    public Integer lvl;
 
     public float getDelta() {
         return delta;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.java
new file mode 100644
index 000000000..2360d4213
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/TaskScoringResult.java
@@ -0,0 +1,12 @@
+package com.habitrpg.android.habitica.models.responses;
+
+public class TaskScoringResult {
+
+    public float taskValueDelta;
+    public TaskDirectionDataDrop drop;
+    public Double experienceDelta;
+    public Double healthDelta;
+    public Double goldDelta;
+    public Double manaDelta;
+    public boolean hasLeveledUp;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
index 9fe5dc905..2579e48f4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Days.java
@@ -1,30 +1,12 @@
 package com.habitrpg.android.habitica.models.tasks;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-
 import io.realm.RealmObject;
-import io.realm.annotations.PrimaryKey;
 
-/**
- * Created by viirus on 06/07/15.
- */
 public class Days extends RealmObject {
 
-    @PrimaryKey
-    String task_id;
-
+    Task task;
     private boolean m, t, w, th, f, s, su;
 
-    public Days() {
-        this.m = false;
-        this.t = false;
-        this.w = false;
-        this.th = false;
-        this.f = false;
-        this.s = true;
-        this.su = true;
-    }
-
     public boolean getT() {
         return t;
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
index c2dcbeb5f..6972b2367 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
@@ -5,6 +5,7 @@ import android.support.annotation.Nullable;
 import com.google.gson.annotations.SerializedName;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.TaskDeleteEvent;
+import com.habitrpg.android.habitica.models.Tag;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
 
 import org.greenrobot.eventbus.EventBus;
@@ -39,11 +40,13 @@ public class Task extends RealmObject {
     public static final String ATTRIBUTE_CONSTITUTION = "con";
     public static final String ATTRIBUTE_INTELLIGENCE = "int";
     public static final String ATTRIBUTE_PERCEPTION = "per";
+
+
     public String userId;
     public Float priority;
     public String text, notes, attribute, type;
-    public double value;
-    public RealmList<TaskTag> tags;
+    public Double value;
+    public RealmList<Tag> tags;
     public Date dateCreated;
     public int position;
     public TaskGroupPlan group;
@@ -164,19 +167,19 @@ public class Task extends RealmObject {
         this.type = type;
     }
 
-    public List<TaskTag> getTags() {
+    public List<Tag> getTags() {
         return tags;
     }
 
-    public void setTags(RealmList<TaskTag> tags) {
+    public void setTags(RealmList<Tag> tags) {
         this.tags = tags;
     }
 
     public boolean containsAnyTagId(List<String> tagIdList) {
         getTags();
 
-        for (TaskTag t : tags) {
-            if (tagIdList.contains(t.getTag().getId())) {
+        for (Tag t : tags) {
+            if (tagIdList.contains(t.getId())) {
                 return true;
             }
         }
@@ -189,8 +192,8 @@ public class Task extends RealmObject {
 
         List<String> allTagIds = new ArrayList<String>();
 
-        for (TaskTag t : tags) {
-            allTagIds.add(t.getTag().getId());
+        for (Tag t : tags) {
+            allTagIds.add(t.getId());
         }
 
         return allTagIds.containsAll(tagIdList);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
index e294c76ff..ab47368eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
@@ -19,6 +19,7 @@ import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.RealmList;
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
 import io.realm.annotations.PrimaryKey;
@@ -44,6 +45,8 @@ public class User extends RealmObject {
     private ContributorInfo contributor;
     private Invitations invitations;
 
+    RealmList<Tag> tags;
+
     @Ignore
     private List<PushDevice> pushDevices;
     private Purchases purchased;
@@ -398,4 +401,8 @@ public class User extends RealmObject {
 
         return mapSize;
     }
+
+    public RealmList<Tag> getTags() {
+        return tags;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index 22bd54008..e73e3a630 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.databinding.DataBindingUtil;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.support.v4.content.ContextCompat;
@@ -19,34 +18,45 @@ import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Stats;
 import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
+import com.habitrpg.android.habitica.ui.views.ValueBar;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.Locale;
 
-/**
- * Created by Negue on 14.06.2015.
- */
-public class AvatarWithBarsViewModel implements View.OnClickListener {
-    private ValueBarBinding hpBar;
-    private ValueBarBinding xpBar;
-    private ValueBarBinding mpBar;
+import butterknife.BindView;
+import butterknife.ButterKnife;
 
-    private AvatarView avatarView;
+public class AvatarWithBarsViewModel implements View.OnClickListener {
+    @BindView(R.id.hpBar)
+    ValueBar hpBar;
+    @BindView(R.id.xpBar)
+    ValueBar xpBar;
+    @BindView(R.id.mpBar)
+    ValueBar mpBar;
+    @BindView(R.id.avatarView)
+    AvatarView avatarView;
 
     private android.content.res.Resources res;
 
     private Context context;
 
-    private TextView lvlText, goldText, silverText, gemsText;
+    @BindView(R.id.lvl_tv)
+    TextView lvlText;
+    @BindView(R.id.gold_tv)
+    TextView goldText;
+    @BindView(R.id.silver_tv)
+    TextView silverText;
+    @BindView(R.id.gems_tv)
+    TextView gemsText;
+
     private User userObject;
 
     private int cachedMaxHealth, cachedMaxExp, cachedMaxMana;
 
     public AvatarWithBarsViewModel(Context context, View v) {
         this.context = context;
-
         res = context.getResources();
 
         if (v == null) {
@@ -54,16 +64,8 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
             return;
         }
 
-        lvlText = (TextView) v.findViewById(R.id.lvl_tv);
-        goldText = (TextView) v.findViewById(R.id.gold_tv);
-        silverText = (TextView) v.findViewById(R.id.silver_tv);
-        gemsText = (TextView) v.findViewById(R.id.gems_tv);
-        View hpBarView = v.findViewById(R.id.hpBar);
+        ButterKnife.bind(this, v);
 
-        avatarView = (AvatarView) v.findViewById(R.id.avatarView);
-        hpBar = DataBindingUtil.bind(hpBarView);
-        xpBar = DataBindingUtil.bind(v.findViewById(R.id.xpBar));
-        mpBar = DataBindingUtil.bind(v.findViewById(R.id.mpBar));
 
         setHpBarData(0, 50);
         setXpBarData(0, 1);
@@ -76,25 +78,13 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
         avatarView.setOnClickListener(this);
     }
 
-    public static void setHpBarData(ValueBarBinding valueBar, Stats stats, Context ctx) {
-        Integer maxHP = stats.getMaxHealth();
-        if (maxHP == null || maxHP == 0) {
-            maxHP = 50;
-        }
-
-        setValueBar(valueBar, (float) Math.ceil(stats.getHp().floatValue()), maxHP, ctx.getString(R.string.HP_default), ContextCompat.getColor(ctx, R.color.hpColor), R.drawable.ic_header_heart);
-    }
-
     // Layout_Weight don't accepts 0.7/0.3 to have 70% filled instead it shows the 30% , so I had to switch the values
     // but on a 1.0/0.0 which switches to 0.0/1.0 it shows the blank part full size...
-    private static void setValueBar(ValueBarBinding valueBar, float value, float valueMax, String description, int color, int icon) {
+    private static void setValueBar(ValueBar valueBar, float value, float valueMax) {
         double percent = Math.min(1, value / valueMax);
 
-        valueBar.setWeightToShow((float) percent);
-        valueBar.setText((int) value + "/" + (int) valueMax);
-        valueBar.setDescription(description);
-        valueBar.setBarForegroundColor(color);
-        valueBar.icHeader.setImageResource(icon);
+        valueBar.setBarWight((float) percent);
+        valueBar.setValueText((int) value + "/" + (int) valueMax);
     }
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
@@ -113,7 +103,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
             userClass = stats.getTranslatedClassName(context);
         }
 
-        mpBar.valueBarLayout.setVisibility((stats.getHabitClass() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
+        mpBar.setVisibility((stats.getHabitClass() == null || stats.getLvl() < 10 || user.getPreferences().getDisableClasses()) ? View.GONE : View.VISIBLE);
 
         if (user.getPreferences() != null && user.getFlags() != null && (user.getPreferences().getDisableClasses() || !user.getFlags().getClassSelected() || userClass.length() == 0)) {
             lvlText.setText(context.getString(R.string.user_level, user.getStats().getLvl()));
@@ -156,31 +146,31 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
         gemsText.setText(String.valueOf(gems.intValue()));
     }
 
-    public void setHpBarData(float value, int valueMax) {
+    private void setHpBarData(float value, int valueMax) {
         if (valueMax == 0) {
             valueMax = cachedMaxHealth;
         } else {
             cachedMaxHealth = valueMax;
         }
-        setValueBar(hpBar, (float) Math.ceil(value), valueMax, context.getString(R.string.HP_default), ContextCompat.getColor(context, R.color.hpColor), R.drawable.ic_header_heart);
+        setValueBar(hpBar, (float) Math.ceil(value), valueMax);
     }
 
-    public void setXpBarData(float value, int valueMax) {
+    private void setXpBarData(float value, int valueMax) {
         if (valueMax == 0) {
             valueMax = cachedMaxExp;
         } else {
             cachedMaxExp = valueMax;
         }
-        setValueBar(xpBar, (float) Math.floor(value), valueMax, context.getString(R.string.XP_default), ContextCompat.getColor(context, R.color.xpColor), R.drawable.ic_header_exp);
+        setValueBar(xpBar, (float) Math.floor(value), valueMax);
     }
 
-    public void setMpBarData(float value, int valueMax) {
+    private void setMpBarData(float value, int valueMax) {
         if (valueMax == 0) {
             valueMax = cachedMaxMana;
         } else {
             cachedMaxMana = valueMax;
         }
-        setValueBar(mpBar, (float) Math.floor(value), valueMax, context.getString(R.string.MP_default), ContextCompat.getColor(context, R.color.mpColor), R.drawable.ic_header_magic);
+        setValueBar(mpBar, (float) Math.floor(value), valueMax);
     }
 
     @Subscribe
@@ -209,8 +199,17 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
     }
 
     public void valueBarLabelsToBlack() {
-        hpBar.setPartyMembers(true);
-        mpBar.setPartyMembers(true);
-        xpBar.setPartyMembers(true);
+        hpBar.setLightBackground(true);
+        xpBar.setLightBackground(true);
+        mpBar.setLightBackground(true);
+    }
+
+    public static void setHpBarData(ValueBar valueBar, Stats stats) {
+        Integer maxHP = stats.getMaxHealth();
+        if (maxHP == null || maxHP == 0) {
+            maxHP = 50;
+        }
+
+        setValueBar(valueBar, (float) Math.ceil(stats.getHp().floatValue()), maxHP);
     }
 }
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 19fc36549..5265fb457 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
@@ -17,17 +17,16 @@ import android.widget.FrameLayout;
 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.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.data.UserRepository;
 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.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.interactors.BuyRewardUseCase;
 import com.habitrpg.android.habitica.interactors.ChecklistCheckUseCase;
 import com.habitrpg.android.habitica.interactors.DailyCheckUseCase;
@@ -36,9 +35,11 @@ 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.models.LeaveChallengeBody;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
 import com.habitrpg.android.habitica.models.social.Challenge;
 import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.User;
+import com.habitrpg.android.habitica.modules.AppModule;
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeDetailDialogHolder;
 import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeTasksRecyclerViewFragment;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
@@ -54,6 +55,7 @@ import java.util.ArrayList;
 import java.util.Map;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -75,6 +77,11 @@ public class ChallengeDetailActivity extends BaseActivity {
     public ApiClient apiClient;
     @Inject
     SocialRepository socialRepository;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
+    @Inject
+    UserRepository userRepository;
 
     @BindView(R.id.floating_menu_wrapper)
     FrameLayout floatingMenuWrapper;
@@ -106,6 +113,7 @@ public class ChallengeDetailActivity extends BaseActivity {
 
     @Nullable
     private Challenge challenge;
+    private User user;
 
     @Override
     protected int getLayoutResId() {
@@ -136,6 +144,8 @@ public class ChallengeDetailActivity extends BaseActivity {
 
         ObservableList<Task> fullList = new ObservableArrayList<>();
 
+        userRepository.getUser(userId).first().subscribe(user -> ChallengeDetailActivity.this.user = user, throwable -> {});
+
         if (challengeId != null) {
 
             apiClient.getChallengeTasks(challengeId)
@@ -215,7 +225,7 @@ public class ChallengeDetailActivity extends BaseActivity {
                     }, Throwable::printStackTrace);
         }
 
-        ChallengeTasksRecyclerViewFragment fragment = ChallengeTasksRecyclerViewFragment.newInstance(HabiticaApplication.User, fullList);
+        ChallengeTasksRecyclerViewFragment fragment = ChallengeTasksRecyclerViewFragment.newInstance(user, fullList);
 
         if (getSupportFragmentManager().getFragments() == null) {
             getSupportFragmentManager().beginTransaction().add(R.id.fragment_container, fragment).commitAllowingStateLoss();
@@ -264,7 +274,7 @@ public class ChallengeDetailActivity extends BaseActivity {
                                 challenge.user_id = null;
                                 challenge.async().save();
 
-                                HabiticaApplication.User.resetChallengeList();
+                                user.resetChallengeList();
                                 finish();
 
                             }, throwable -> {
@@ -345,7 +355,7 @@ public class ChallengeDetailActivity extends BaseActivity {
         void onShowMore() {
 
             ChallengeDetailDialogHolder.showDialog(ChallengeDetailActivity.this, ChallengeDetailActivity.this.apiClient,
-                    HabiticaApplication.User, challenge,
+                    user, challenge,
                     challenge1 -> {
 
                     },
@@ -357,14 +367,14 @@ public class ChallengeDetailActivity extends BaseActivity {
     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 -> {
+                dailyCheckUseCase.observable(new DailyCheckUseCase.RequestValues(user, event.Task, !event.Task.getCompleted()))
+                        .subscribe(this::onTaskDataReceived, 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 -> {
+                todoCheckUseCase.observable(new TodoCheckUseCase.RequestValues(user, event.Task, !event.Task.getCompleted()))
+                        .subscribe(this::onTaskDataReceived, error -> {
                         });
             }
             break;
@@ -380,14 +390,14 @@ public class ChallengeDetailActivity extends BaseActivity {
 
     @Subscribe
     public void onEvent(HabitScoreEvent event) {
-        habitScoreUseCase.observable(new HabitScoreUseCase.RequestValues(event.habit, event.Up))
-                .subscribe(res -> onTaskDataReceived(res, event.habit), error -> {
+        habitScoreUseCase.observable(new HabitScoreUseCase.RequestValues(user, event.habit, event.Up))
+                .subscribe(this::onTaskDataReceived, error -> {
                 });
     }
 
     @Subscribe
     public void onEvent(final BuyRewardCommand event) {
-        if (HabiticaApplication.User.getStats().getGp() < event.Reward.getValue()) {
+        if (user.getStats().getGp() < event.Reward.getValue()) {
             showSnackbar(this, floatingMenuWrapper, getString(R.string.no_gold), UiUtils.SnackbarDisplayType.FAILURE);
             return;
         }
@@ -395,26 +405,19 @@ public class ChallengeDetailActivity extends BaseActivity {
 
         if (event.Reward.specialTag == null || !event.Reward.specialTag.equals("item")) {
 
-            buyRewardUseCase.observable(new BuyRewardUseCase.RequestValues(event.Reward))
-                    .subscribe(res -> onTaskDataReceived(res, event.Reward), error -> {});
+            buyRewardUseCase.observable(new BuyRewardUseCase.RequestValues(user, event.Reward))
+                    .subscribe(res -> showSnackbar(this, floatingMenuWrapper, getString(R.string.notification_purchase, event.Reward.getText()), UiUtils.SnackbarDisplayType.NORMAL), 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 -> {});
+    public void onTaskDataReceived(TaskScoringResult data) {
+        if (user != null) {
+            notifyUserUseCase.observable(new NotifyUserUseCase.RequestValues(this, floatingMenuWrapper,
+                    user, data.experienceDelta, data.healthDelta, data.goldDelta, data.manaDelta, data.hasLeveledUp));
         }
-    }
 
+        displayItemDropUseCase.observable(new DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
+                .subscribe(aVoid -> {}, throwable -> {});
+    }
 }
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 4fce52b3d..ae24f1aad 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,5 +1,6 @@
 package com.habitrpg.android.habitica.ui.activities;
 
+import android.annotation.SuppressLint;
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -8,7 +9,6 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
-import android.databinding.DataBindingUtil;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -22,7 +22,6 @@ 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.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
@@ -39,19 +38,12 @@ import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.api.MaintenanceApiService;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.habitrpg.android.habitica.callbacks.ItemsCallback;
-import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
-import com.habitrpg.android.habitica.callbacks.TaskUpdateCallback;
-import com.habitrpg.android.habitica.callbacks.UnlockCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.data.TagRepository;
 import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.databinding.ValueBarBinding;
-import com.habitrpg.android.habitica.events.ContentReloadedEvent;
 import com.habitrpg.android.habitica.events.DisplayFragmentEvent;
 import com.habitrpg.android.habitica.events.DisplayTutorialEvent;
 import com.habitrpg.android.habitica.events.HabitScoreEvent;
@@ -61,25 +53,21 @@ import com.habitrpg.android.habitica.events.ReloadContentEvent;
 import com.habitrpg.android.habitica.events.SelectClassEvent;
 import com.habitrpg.android.habitica.events.ShareEvent;
 import com.habitrpg.android.habitica.events.TaskRemovedEvent;
-import com.habitrpg.android.habitica.events.ToggledEditTagsEvent;
 import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
 import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
 import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
 import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
-import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
 import com.habitrpg.android.habitica.events.commands.EquipCommand;
 import com.habitrpg.android.habitica.events.commands.FeedCommand;
 import com.habitrpg.android.habitica.events.commands.HatchingCommand;
 import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
 import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
 import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
-import com.habitrpg.android.habitica.events.commands.SellItemCommand;
 import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
 import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
 import com.habitrpg.android.habitica.helpers.LanguageHelper;
-import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
@@ -94,13 +82,13 @@ import com.habitrpg.android.habitica.interactors.TodoCheckUseCase;
 import com.habitrpg.android.habitica.models.TutorialStep;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.responses.MaintenanceResponse;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
 import com.habitrpg.android.habitica.models.shops.Shop;
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Preferences;
 import com.habitrpg.android.habitica.models.user.SpecialItems;
 import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
@@ -109,6 +97,7 @@ import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
+import com.habitrpg.android.habitica.ui.views.ValueBar;
 import com.habitrpg.android.habitica.userpicture.BitmapUtils;
 import com.habitrpg.android.habitica.widget.AvatarStatsWidgetProvider;
 import com.habitrpg.android.habitica.widget.DailiesWidgetProvider;
@@ -139,7 +128,6 @@ import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 
 import butterknife.BindView;
-import retrofit2.adapter.rxjava.HttpException;
 import rx.Observable;
 import rx.functions.Action1;
 
@@ -148,8 +136,7 @@ import static com.habitrpg.android.habitica.interactors.NotifyUserUseCase.MIN_LE
 import static com.habitrpg.android.habitica.ui.helpers.UiUtils.SnackbarDisplayType;
 import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
 
-public class MainActivity extends BaseActivity implements Action1<Throwable>, HabitRPGUserCallback.OnUserReceived,
-        TaskScoringCallback.OnTaskScored, TutorialView.OnTutorialReaction {
+public class MainActivity extends BaseActivity implements Action1<Throwable>, TutorialView.OnTutorialReaction {
 
     public static final int SELECT_CLASS_RESULT = 11;
     public static final int GEM_PURCHASE_REQUEST = 111;
@@ -234,9 +221,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     private AvatarWithBarsViewModel avatarInHeader;
     private AlertDialog faintDialog;
     private AvatarView sideAvatarView;
-    private Date lastSync;
     private TutorialView activeTutorialView;
-    private boolean isloadingContent;
 
 
     @Override
@@ -244,6 +229,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         return R.layout.activity_main;
     }
 
+    @SuppressLint("ObsoleteSdkInt")
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -313,11 +299,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         super.onResume();
 
         //resync, if last sync was more than 10 minutes ago
-        if (this.lastSync == null || (new Date().getTime() - this.lastSync.getTime()) > 180000) {
-            if (this.apiClient != null && this.apiClient.hasAuthenticationKeys()) {
-                retrieveUser();
-                this.checkMaintenance();
-            }
+        if (this.apiClient != null && this.apiClient.hasAuthenticationKeys()) {
+            retrieveUser();
+            this.checkMaintenance();
         }
 
         if (this.sharedPreferences.getLong("lastReminderSchedule", 0) < new Date().getTime() - 86400000) {
@@ -334,7 +318,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         //Recreate the fragment as a result.
         if (activeFragment != null && activeFragment.tabLayout == null) {
             activeFragment = null;
-            drawer.setSelectionAtPosition(this.sharedPreferences.getInt("lastActivePosition", 1));
+            if (drawer != null) {
+                drawer.setSelectionAtPosition(this.sharedPreferences.getInt("lastActivePosition", 1));
+            }
         }
 
         if (isAlwaysFinishActivitiesOptionEnabled()) {
@@ -373,8 +359,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
 
     private void saveLoginInformation() {
-        HabiticaApplication.User = user;
-
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         SharedPreferences.Editor editor = prefs.edit();
         boolean ans = editor.putString(getString(R.string.SP_username), user.getAuthentication().getLocalAuthentication().getUsername())
@@ -386,6 +370,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         }
     }
 
+    @SuppressLint("ObsoleteSdkInt")
     public void displayFragment(BaseMainFragment fragment) {
         if (this.activeFragment != null && fragment.getClass() == this.activeFragment.getClass()) {
             return;
@@ -425,10 +410,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             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));
-                userRepository.updateUser(user, updateData)
-                        .subscribe(this::onUserReceived, throwable -> {
+                userRepository.updateUser(user, "preferences.timezoneOffset", String.valueOf(offset))
+                        .subscribe(user1 -> {}, throwable -> {
                         });
             }
             runOnUiThread(() -> {
@@ -438,7 +421,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                 if (activeFragment != null) {
                     activeFragment.updateUserData(user);
                 } else {
-                    drawer.setSelectionAtPosition(1);
+                    if (drawer != null) {
+                        drawer.setSelectionAtPosition(1);
+                    }
                 }
             });
 
@@ -511,7 +496,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                     .withBadgeStyle(badgeStyle);
         }
 
-        this.drawer.updateItemAtPosition(newInboxItem, this.drawer.getPosition(MainDrawerBuilder.SIDEBAR_INBOX));
+        if (this.drawer != null) {
+            this.drawer.updateItemAtPosition(newInboxItem, this.drawer.getPosition(MainDrawerBuilder.SIDEBAR_INBOX));
+        }
     }
 
     private void updateUserAvatars() {
@@ -522,7 +509,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     private void updateHeader() {
         updateUserAvatars();
-        setTranslatedFragmentTitle(activeFragment);
+        if (activeFragment != null) {
+            setTranslatedFragmentTitle(activeFragment);
+        }
 
         if (drawer != null) {
             android.support.v7.app.ActionBarDrawerToggle actionBarDrawerToggle = drawer.getActionBarDrawerToggle();
@@ -533,19 +522,21 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     }
 
     public void updateSidebar() {
-        final IProfile profile = accountHeader.getProfiles().get(0);
-        if (user.getAuthentication() != null) {
-            if (user.getAuthentication().getLocalAuthentication() != null) {
-                profile.withEmail(user.getAuthentication().getLocalAuthentication().getEmail());
+        if (accountHeader != null) {
+            final IProfile profile = accountHeader.getProfiles().get(0);
+            if (user.getAuthentication() != null) {
+                if (user.getAuthentication().getLocalAuthentication() != null) {
+                    profile.withEmail(user.getAuthentication().getLocalAuthentication().getEmail());
+                }
             }
-        }
-        profile.withName(user.getProfile().getName());
-        sideAvatarView.setUser(user);
-        sideAvatarView.onAvatarImageReady(avatarImage -> {
-            profile.withIcon(avatarImage);
+            profile.withName(user.getProfile().getName());
+            sideAvatarView.setUser(user);
+            sideAvatarView.onAvatarImageReady(avatarImage -> {
+                profile.withIcon(avatarImage);
+                accountHeader.updateProfile(profile);
+            });
             accountHeader.updateProfile(profile);
-        });
-        accountHeader.updateProfile(profile);
+        }
 
         if (user.getPreferences() == null || user.getFlags() == null) {
             return;
@@ -557,49 +548,46 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             hasSpecialItems = specialItems.hasSpecialItems();
         }
 
-        IDrawerItem item = drawer.getDrawerItem(MainDrawerBuilder.SIDEBAR_SKILLS);
-        if (((user.getPreferences() != null && user.getPreferences().getDisableClasses())
-                || (user.getFlags() != null && !user.getFlags().getClassSelected()))
-                && !hasSpecialItems) {
-            if (item != null) {
-                drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS);
-            }
-        } else {
-            IDrawerItem newItem;
-            if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS && !hasSpecialItems) {
-                newItem = new PrimaryDrawerItem()
-                        .withName(this.getString(R.string.sidebar_skills))
-                        .withEnabled(false)
-                        .withBadge(this.getString(R.string.unlock_lvl_11))
-                        .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
+        if (drawer != null) {
+            IDrawerItem item = drawer.getDrawerItem(MainDrawerBuilder.SIDEBAR_SKILLS);
+            if (((user.getPreferences() != null && user.getPreferences().getDisableClasses())
+                    || (user.getFlags() != null && !user.getFlags().getClassSelected()))
+                    && !hasSpecialItems) {
+                if (item != null) {
+                    drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS);
+                }
             } else {
-                newItem = new PrimaryDrawerItem()
-                        .withName(this.getString(R.string.sidebar_skills))
-                        .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
-            }
-            if (item == null) {
-                drawer.addItemAtPosition(newItem, 1);
-            } else {
-                drawer.updateItem(newItem);
+                IDrawerItem newItem;
+                if (user.getStats().getLvl() < MIN_LEVEL_FOR_SKILLS && !hasSpecialItems) {
+                    newItem = new PrimaryDrawerItem()
+                            .withName(this.getString(R.string.sidebar_skills))
+                            .withEnabled(false)
+                            .withBadge(this.getString(R.string.unlock_lvl_11))
+                            .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
+                } else {
+                    newItem = new PrimaryDrawerItem()
+                            .withName(this.getString(R.string.sidebar_skills))
+                            .withIdentifier(MainDrawerBuilder.SIDEBAR_SKILLS);
+                }
+                if (item == null) {
+                    drawer.addItemAtPosition(newItem, 1);
+                } else {
+                    drawer.updateItem(newItem);
 
+                }
             }
         }
     }
 
-    @Override
-    public void onUserReceived(User user) {
-        this.user = user;
-        this.lastSync = new Date();
-        MainActivity.this.setUserData(false);
-    }
-
-    public void setActiveFragment(BaseMainFragment fragment) {
+    public void setActiveFragment(@Nullable BaseMainFragment fragment) {
         this.activeFragment = fragment;
         setTranslatedFragmentTitle(fragment);
-        this.drawer.setSelectionAtPosition(this.activeFragment.fragmentSidebarPosition, false);
+        if (this.drawer != null && this.activeFragment != null) {
+            this.drawer.setSelectionAtPosition(this.activeFragment.fragmentSidebarPosition, false);
+        }
     }
 
-    private void setTranslatedFragmentTitle(BaseMainFragment fragment) {
+    private void setTranslatedFragmentTitle(@Nullable BaseMainFragment fragment) {
         if (getSupportActionBar() == null) {
             return;
         }
@@ -616,9 +604,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         }
         if (drawer != null && drawer.isDrawerOpen()) {
             drawer.closeDrawer();
-        } else if (drawer != null && drawer.getDrawerLayout().isDrawerOpen(GravityCompat.END)) {
-            drawer.getDrawerLayout().closeDrawer(GravityCompat.END);
-            EventBus.getDefault().post(new ToggledEditTagsEvent(false));
         } else {
             super.onBackPressed();
             if (this.activeFragment != null) {
@@ -653,14 +638,14 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     @Subscribe
     public void onEvent(UpdateUserCommand event) {
         userRepository.updateUser(user, event.updateData)
-                .subscribe(this::onUserReceived, throwable -> {
+                .subscribe(user1 -> {}, throwable -> {
                 });
     }
 
     @Subscribe
     public void onEvent(EquipCommand event) {
         this.apiClient.equipItem(event.type, event.key)
-                .subscribe(new ItemsCallback(this, this.user), throwable -> {
+                .subscribe(items -> {}, throwable -> {
                 });
     }
 
@@ -669,13 +654,15 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         this.user.setBalance(this.user.getBalance() - event.balanceDiff);
         this.setUserData(false);
         apiClient.unlockPath(event.path)
-                .subscribe(new UnlockCallback(this, this.user), throwable -> {
+                .subscribe(unlockResponse -> {}, throwable -> {
                 });
     }
 
     @Subscribe
     public void onEvent(OpenMenuItemCommand event) {
-        drawer.setSelection(event.identifier);
+        if (drawer != null) {
+            drawer.setSelection(event.identifier);
+        }
     }
 
     @Subscribe
@@ -696,9 +683,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             observable
                     .doOnNext(aVoid -> showSnackbar(this, floatingMenuWrapper, getString(R.string.successful_purchase, event.item.text), SnackbarDisplayType.NORMAL))
                     .subscribe(buyResponse -> userRepository.retrieveUser(false)
-                            .subscribe(new HabitRPGUserCallback(this), throwable -> {
+                            .subscribe(user1 -> {}, throwable -> {
                             }), throwable -> {
-                        HttpException error = (HttpException) throwable;
+                        retrofit2.HttpException error = (retrofit2.HttpException) throwable;
                         if (error.code() == 401 && event.item.getCurrency().equals("gems")) {
                             openGemPurchaseFragment(null);
                         }
@@ -770,8 +757,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                             }
                     );
         } else {
-            buyRewardUseCase.observable(new BuyRewardUseCase.RequestValues(event.Reward))
-                    .subscribe(res -> onTaskDataReceived(res, event.Reward), error -> {
+            buyRewardUseCase.observable(new BuyRewardUseCase.RequestValues(user, event.Reward))
+                    .subscribe(res -> showSnackbar(this, floatingMenuWrapper, getString(R.string.notification_purchase, event.Reward.getText()), SnackbarDisplayType.NORMAL), error -> {
                     });
         }
 
@@ -783,30 +770,25 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         avatarInHeader.updateData(user);
     }
 
-    @Subscribe
-    public void onEvent(final DeleteTaskCommand cmd) {
-        taskRepository.deleteTask(cmd.TaskIdToDelete)
-                .subscribe(aVoid -> EventBus.getDefault().post(new TaskRemovedEvent(cmd.TaskIdToDelete)), throwable -> {});
-    }
-
     @Subscribe
     public void openMysteryItem(OpenMysteryItemEvent event) {
         apiClient.openMysteryItem()
                 .subscribe(mysteryItem -> userRepository.retrieveUser(false)
-                        .subscribe(new HabitRPGUserCallback(user1 -> {
+                        .subscribe(user1 -> {
                             OpenedMysteryItemEvent openedEvent = new OpenedMysteryItemEvent();
                             openedEvent.numberLeft = user1.getPurchased().getPlan().mysteryItems.size();
                             openedEvent.mysteryItem = mysteryItem;
                             EventBus.getDefault().post(openedEvent);
-                            MainActivity.this.onUserReceived(user1);
-                        }), throwable -> {
+                        }, throwable -> {
                         }), throwable -> {
                 });
     }
 
     @Subscribe
     public void openGemPurchaseFragment(@Nullable OpenGemPurchaseFragmentCommand cmd) {
-        drawer.setSelection(MainDrawerBuilder.SIDEBAR_PURCHASE);
+        if (drawer != null) {
+            drawer.setSelection(MainDrawerBuilder.SIDEBAR_PURCHASE);
+        }
     }
 
     @Subscribe
@@ -823,25 +805,14 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         this.displayFragment(event.fragment);
     }
 
-    @Subscribe
-    public void onEvent(SellItemCommand event) {
-        this.apiClient.sellItem(event.item.getType(), event.item.getKey())
-                .subscribe(habitRPGUser -> {
-                    user.setItems(habitRPGUser.getItems());
-                    user.setStats(habitRPGUser.getStats());
-                    setUserData(false);
-                }, throwable -> {
-                });
-    }
-
     @Subscribe
     public void onEvent(final HatchingCommand event) {
         if (event.usingEgg == null || event.usingHatchingPotion == null) {
             return;
         }
         this.apiClient.hatchPet(event.usingEgg.getKey(), event.usingHatchingPotion.getKey())
-                .subscribe(new ItemsCallback(user1 -> {
-                    FrameLayout petWrapper = (FrameLayout) getLayoutInflater().inflate(R.layout.pet_imageview, null);
+                .subscribe(items -> {
+                    FrameLayout petWrapper = (FrameLayout) View.inflate(this, R.layout.pet_imageview, null);
                     SimpleDraweeView petImageView = (SimpleDraweeView) petWrapper.findViewById(R.id.pet_imageview);
 
                     DataBindingUtils.loadImage(petImageView, "Pet-" + event.usingEgg.getKey() + "-" + event.usingHatchingPotion.getKey());
@@ -864,7 +835,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                             })
                             .create();
                     dialog.show();
-                }, this.user), throwable -> {
+                }, throwable -> {
                 });
     }
 
@@ -881,7 +852,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                     MainActivity.this.setUserData(false);
                     showSnackbar(MainActivity.this, floatingMenuWrapper, getString(R.string.notification_pet_fed, pet.getColorText(), pet.getAnimalText()), SnackbarDisplayType.NORMAL);
                     if (feedResponse.value == -1) {
-                        FrameLayout mountWrapper = (FrameLayout) getLayoutInflater().inflate(R.layout.pet_imageview, null);
+                        FrameLayout mountWrapper = (FrameLayout) View.inflate(this, R.layout.pet_imageview, null);
                         SimpleDraweeView mountImageView = (SimpleDraweeView) mountWrapper.findViewById(R.id.pet_imageview);
 
                         DataBindingUtils.loadImage(mountImageView, "Mount_Icon_" + event.usingPet.getKey());
@@ -890,9 +861,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                         AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
                                 .setTitle(getString(R.string.hatched_pet_title, colorName, animalName))
                                 .setView(mountWrapper)
-                                .setPositiveButton(R.string.close, (hatchingDialog, which) -> {
-                                    hatchingDialog.dismiss();
-                                })
+                                .setPositiveButton(R.string.close, (hatchingDialog, which) -> hatchingDialog.dismiss())
                                 .setNeutralButton(R.string.share, (hatchingDialog, which) -> {
                                     ShareEvent event1 = new ShareEvent();
                                     event1.sharedMessage = getString(R.string.share_raised, colorName, animalName) + " https://habitica.com/social/raise-pet";
@@ -915,44 +884,19 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Subscribe
     public void reloadContent(ReloadContentEvent event) {
-        if (!this.isloadingContent) {
-            this.isloadingContent = true;
-            this.apiClient.getContent()
-                    .subscribe(contentResult -> {
-                        isloadingContent = false;
-                        ContentReloadedEvent event1 = new ContentReloadedEvent();
-                        EventBus.getDefault().post(event1);
-                    }, throwable -> {
-                    });
-        }
+        this.inventoryRepository.retrieveContent()
+                .subscribe(contentResult -> {}, throwable -> {});
     }
 
-    @Override
-    public void onTaskDataReceived(TaskDirectionData data, Task task) {
-
-        if (task.type.equals("reward")) {
-
-            showSnackbar(this, floatingMenuWrapper, getString(R.string.notification_purchase, task.getText()), SnackbarDisplayType.NORMAL);
-
-        } else {
-
-            if (user != null) {
-                notifyUserUseCase.observable(new NotifyUserUseCase.RequestValues(this, floatingMenuWrapper, this::retrieveUser,
-                        user, data.getExp(), data.getHp(), data.getGp(), data.getMp(), data.getLvl()))
-                        .subscribe(aVoid -> {
-                            user.getStats().hp = data.getHp();
-                            user.getStats().exp = data.getExp();
-                            user.getStats().mp = data.getMp();
-                            user.getStats().gp = data.getGp();
-                            user.getStats().lvl = data.getLvl();
-                            setUserData(true);
-                        }, throwable -> {});
-            }
-
-            displayItemDropUseCase.observable(new DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
+    public void displayTaskScoringResponse(TaskScoringResult data) {
+        if (user != null) {
+            notifyUserUseCase.observable(new NotifyUserUseCase.RequestValues(this, floatingMenuWrapper,
+                    user, data.experienceDelta, data.healthDelta, data.goldDelta, data.manaDelta, data.hasLeveledUp))
                     .subscribe(aVoid -> {}, throwable -> {});
         }
 
+        displayItemDropUseCase.observable(new DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
+                .subscribe(aVoid -> {}, throwable -> {});
     }
 
 
@@ -964,13 +908,11 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
         if (this.faintDialog == null) {
 
-            View customView = getLayoutInflater().inflate(R.layout.dialog_faint, null);
+            View customView = View.inflate(this, R.layout.dialog_faint, null);
             if (customView != null) {
-                View hpBarView = customView.findViewById(R.id.hpBar);
+                ValueBar hpBarView = (ValueBar) customView.findViewById(R.id.hpBar);
 
-                ValueBarBinding hpBar = DataBindingUtil.bind(hpBarView);
-                hpBar.setPartyMembers(true);
-                AvatarWithBarsViewModel.setHpBarData(hpBar, user.getStats(), this);
+                hpBarView.setLightBackground(true);
 
                 AvatarView dialogAvatarView = (AvatarView) customView.findViewById(R.id.avatarView);
                 dialogAvatarView.setUser(user);
@@ -982,7 +924,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                     .setPositiveButton(R.string.faint_button, (dialog, which) -> {
                         faintDialog = null;
                         userRepository.revive(user)
-                                .subscribe(this::onUserReceived, throwable -> {
+                                .subscribe(user1 -> {}, throwable -> {
                                 });
                     })
                     .create();
@@ -1010,7 +952,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     protected void retrieveUser() {
         if (this.userRepository != null) {
             this.userRepository.retrieveUser(true)
-                    .subscribe(this::onUserReceived, throwable -> {
+                    .subscribe(user1 -> {}, throwable -> {
 
                     });
         }
@@ -1060,7 +1002,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         Map<String, Object> updateData = new HashMap<>();
         updateData.put(path, true);
         userRepository.updateUser(user,  updateData)
-                .subscribe(this::onUserReceived, throwable -> {
+                .subscribe(user1 -> {}, throwable -> {
                 });
         this.overlayLayout.removeView(this.activeTutorialView);
         this.removeActiveTutorialView();
@@ -1114,14 +1056,14 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     public void onEvent(TaskCheckedCommand event) {
         switch (event.Task.type) {
             case Task.TYPE_DAILY: {
-                dailyCheckUseCase.observable(new DailyCheckUseCase.RequestValues(event.Task, !event.Task.getCompleted()))
-                        .subscribe(new TaskScoringCallback(taskRepository, inventoryRepository, this, event.Task.getId()), error -> {
+                dailyCheckUseCase.observable(new DailyCheckUseCase.RequestValues(user, event.Task, !event.Task.getCompleted()))
+                        .subscribe(this::displayTaskScoringResponse, error -> {
                         });
             }
             break;
             case Task.TYPE_TODO: {
-                todoCheckUseCase.observable(new TodoCheckUseCase.RequestValues(event.Task, !event.Task.getCompleted()))
-                        .subscribe(new TaskScoringCallback(taskRepository, inventoryRepository, this, event.Task.getId()), error -> {
+                todoCheckUseCase.observable(new TodoCheckUseCase.RequestValues(user, event.Task, !event.Task.getCompleted()))
+                        .subscribe(this::displayTaskScoringResponse, error -> {
                         });
             }
             break;
@@ -1131,14 +1073,14 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     @Subscribe
     public void onEvent(ChecklistCheckedCommand event) {
         checklistCheckUseCase.observable(new ChecklistCheckUseCase.RequestValues(event.task.getId(), event.item.getId()))
-                .subscribe(new TaskUpdateCallback(), error -> {
+                .subscribe(task -> {}, error -> {
                 });
     }
 
     @Subscribe
     public void onEvent(HabitScoreEvent event) {
-        habitScoreUseCase.observable(new HabitScoreUseCase.RequestValues(event.habit, event.Up))
-                .subscribe(new TaskScoringCallback(taskRepository, inventoryRepository, this, event.habit.getId()), error -> {
+        habitScoreUseCase.observable(new HabitScoreUseCase.RequestValues(user, event.habit, event.Up))
+                .subscribe(this::displayTaskScoringResponse, error -> {
                 });
     }
 
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 05c5dcea4..06850b5c0 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
@@ -20,7 +20,6 @@ import android.widget.Button;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.habitrpg.android.habitica.callbacks.ItemsCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.TaskRepository;
@@ -159,7 +158,7 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
     @Subscribe
     public void onEvent(EquipCommand event) {
         this.apiClient.equipItem(event.type, event.key)
-                .subscribe(new ItemsCallback(this, this.user), throwable -> {
+                .subscribe(items -> {}, throwable -> {
                 });
     }
 
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 85df942ac..0753a7c17 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
@@ -39,10 +39,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.TagRepository;
 import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.events.TaskSaveEvent;
-import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
 import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
-import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.RemindersManager;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.models.Tag;
@@ -61,8 +58,6 @@ import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
 import net.pherth.android.emoji_library.EmojiEditText;
 import net.pherth.android.emoji_library.EmojiPopup;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -79,9 +74,7 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import io.realm.Realm;
 import io.realm.RealmList;
-import io.realm.RealmObject;
 import rx.Observable;
 
 public class TaskFormActivity extends BaseActivity implements AdapterView.OnItemSelectedListener {
@@ -257,10 +250,8 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
                     finish();
                     dismissKeyboard();
 
-                    EventBus.getDefault().post(new DeleteTaskCommand(taskId));
-                }).setNegativeButton(getString(R.string.no), (dialog, which) -> {
-                    dialog.dismiss();
-                }).show());
+                    taskRepository.deleteTask(taskId).subscribe(aVoid -> {}, throwable -> {});
+                }).setNegativeButton(getString(R.string.no), (dialog, which) -> dialog.dismiss()).show());
 
         ArrayAdapter<CharSequence> difficultyAdapter = ArrayAdapter.createFromResource(this,
                 R.array.task_difficulties, android.R.layout.simple_spinner_item);
@@ -649,8 +640,8 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             fillTagCheckboxes();
         }
 
-        for (TaskTag tt : task.getTags()) {
-            selectedTags.add(tt.getTag());
+        for (Tag tag : task.getTags()) {
+            selectedTags.add(tag);
         }
 
         float priority = task.getPriority();
@@ -730,8 +721,8 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
     }
 
     private void fillTagCheckboxes() {
-        for (TaskTag tt : task.getTags()) {
-            int position = tags.indexOf(tt.getTag());
+        for (Tag tag : task.getTags()) {
+            int position = tags.indexOf(tag);
             if (tagCheckBoxList.size() > position && position >= 0) {
                 tagCheckBoxList.get(position).setChecked(true);
             }
@@ -763,13 +754,8 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             }
 
 
-            RealmList<TaskTag> taskTags = new RealmList<>();
-            for (Tag tag : selectedTags) {
-                TaskTag tt = new TaskTag();
-                tt.setTag(tag);
-                tt.setTask(task);
-                taskTags.add(tt);
-            }
+            RealmList<Tag> taskTags = new RealmList<>();
+            taskTags.addAll(selectedTags);
             task.setTags(taskTags);
 
             task.notes = MarkdownParser.parseCompiled(taskNotes.getText());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
index 433e2d8ba..47fd04f98 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.ui.adapter.inventory;
 import android.content.Context;
 import android.content.res.Resources;
 import android.databinding.DataBindingUtil;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,7 +16,6 @@ import com.habitrpg.android.habitica.events.ReloadContentEvent;
 import com.habitrpg.android.habitica.events.commands.FeedCommand;
 import com.habitrpg.android.habitica.events.commands.HatchingCommand;
 import com.habitrpg.android.habitica.events.commands.InvitePartyToQuestCommand;
-import com.habitrpg.android.habitica.events.commands.SellItemCommand;
 import com.habitrpg.android.habitica.models.inventory.Egg;
 import com.habitrpg.android.habitica.models.inventory.Food;
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
@@ -32,22 +32,29 @@ import org.greenrobot.eventbus.EventBus;
 import java.util.HashMap;
 import java.util.List;
 
-public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapter.ItemViewHolder> {
+import io.realm.OrderedRealmCollection;
+import io.realm.RealmRecyclerViewAdapter;
+import rx.Observable;
+import rx.subjects.PublishSubject;
+
+public class ItemRecyclerAdapter extends RealmRecyclerViewAdapter<Item, ItemRecyclerAdapter.ItemViewHolder> {
 
     public Boolean isHatching;
     public Boolean isFeeding;
-    public Boolean showShopAd;
-    public String shopIdentifier;
     public Item hatchingItem;
     public Pet feedingPet;
     public ItemRecyclerFragment fragment;
     public HashMap<String, Integer> ownedPets;
     public Context context;
-    private List<Item> itemList;
 
-    public void setItemList(List<Item> itemList) {
-        this.itemList = itemList;
-        this.notifyDataSetChanged();
+    private PublishSubject<Item> sellItemEvents = PublishSubject.create();
+
+    public ItemRecyclerAdapter(@Nullable OrderedRealmCollection<Item> data, boolean autoUpdate) {
+        super(data, autoUpdate);
+    }
+
+    public Observable<Item> getSellItemEvents() {
+        return sellItemEvents.asObservable();
     }
 
     @Override
@@ -61,16 +68,14 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
 
     @Override
     public void onBindViewHolder(ItemViewHolder holder, int position) {
-        holder.bind(this.itemList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return itemList == null ? 0 : itemList.size();
+        if (getData() != null) {
+            holder.bind(getData().get(position));
+        }
     }
 
     public void openedMysteryItem(int numberLeft) {
-        int itemPos = 0;
+        // TODO: Fix this
+        /*int itemPos = 0;
         for (Object obj : itemList) {
             if (obj.getClass().equals(SpecialItem.class)) {
                 SpecialItem item = (SpecialItem) obj;
@@ -81,7 +86,7 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
             }
             itemPos++;
         }
-        notifyItemChanged(itemPos);
+        notifyItemChanged(itemPos);*/
     }
 
     class ItemViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
@@ -163,19 +168,7 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
                 }
                 menu.setSelectionRunnable(index -> {
                     if (!((item instanceof QuestContent) || (item instanceof SpecialItem)) && index == 0) {
-                        SellItemCommand event = new SellItemCommand();
-                        event.item = item;
-                        EventBus.getDefault().post(event);
-                        if (item.getOwned() > 1) {
-                            item.setOwned(item.getOwned() - 1);
-                            notifyItemChanged(getAdapterPosition());
-                        } else {
-                            if (getAdapterPosition() >= 0) {
-                                itemList.remove(getAdapterPosition());
-                            }
-                            notifyItemRemoved(getAdapterPosition());
-                        }
-
+                        sellItemEvents.onNext(item);
                         return;
                     }
                     if (item instanceof Egg) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
index 2b695ccd1..64da9d8a3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.adapter.social;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.databinding.DataBindingUtil;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -11,13 +10,13 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
 import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
 import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
+import com.habitrpg.android.habitica.ui.views.ValueBar;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -76,7 +75,8 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
         @BindView(R.id.class_background_layout)
         View classBackground;
 
-        ValueBarBinding hpBar;
+        @BindView(R.id.hpBar)
+        ValueBar hpBar;
 
         Resources resources;
 
@@ -85,10 +85,7 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
 
             ButterKnife.bind(this, itemView);
 
-            View hpBarView = itemView.findViewById(R.id.hpBar);
-
-            hpBar = DataBindingUtil.bind(hpBarView);
-            hpBar.setPartyMembers(true);
+            hpBar.setLightBackground(true);
 
             resources = itemView.getResources();
         }
@@ -98,7 +95,7 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
 
             avatarView.setUser(user);
 
-            AvatarWithBarsViewModel.setHpBarData(hpBar, user.getStats(), ctx);
+            AvatarWithBarsViewModel.setHpBarData(hpBar, user.getStats());
 
             lvl.setText(context.getString(R.string.user_level, user.getStats().getLvl()));
 
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 b26088921..f26d782e2 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
@@ -16,8 +16,8 @@ public class DailiesRecyclerViewHolder extends RealmBaseTasksRecyclerViewAdapter
 
     public int dailyResetOffset;
 
-    public DailiesRecyclerViewHolder(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource, int dailyResetOffset) {
-        super(data, autoUpdate, layoutResource);
+    public DailiesRecyclerViewHolder(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource, int dailyResetOffset, TaskFilterHelper taskFilterHelper) {
+        super(data, autoUpdate, layoutResource, taskFilterHelper);
         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 32d5de1fd..998d0dad9 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
@@ -15,8 +15,8 @@ import io.realm.OrderedRealmCollection;
 public class HabitsRecyclerViewAdapter extends RealmBaseTasksRecyclerViewAdapter<HabitViewHolder> {
 
 
-    public HabitsRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource) {
-        super(data, autoUpdate, layoutResource);
+    public HabitsRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource, TaskFilterHelper taskFilterHelper) {
+        super(data, autoUpdate, layoutResource, taskFilterHelper);
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java
index 5046a8de1..2c5287da8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.java
@@ -4,25 +4,28 @@ import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Filter;
+import android.widget.Filterable;
 
+import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
 
 import io.realm.OrderedRealmCollection;
+import io.realm.RealmQuery;
 import io.realm.RealmRecyclerViewAdapter;
 
 public abstract class RealmBaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder> extends RealmRecyclerViewAdapter<Task, VH> {
 
     private final int layoutResource;
+    private final TaskFilterHelper taskFilterHelper;
+    private final OrderedRealmCollection<Task> unfilteredData;
 
-    public RealmBaseTasksRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource) {
+    public RealmBaseTasksRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource, @Nullable TaskFilterHelper taskFilterHelper) {
         super(data, autoUpdate);
-        this.layoutResource = layoutResource;
-    }
-
-    @Override
-    public VH onCreateViewHolder(ViewGroup parent, int viewType) {
-        return null;
+        this.unfilteredData = data;
+                this.layoutResource = layoutResource;
+        this.taskFilterHelper = taskFilterHelper;
     }
 
     @Override
@@ -40,4 +43,16 @@ public abstract class RealmBaseTasksRecyclerViewAdapter<VH extends BaseTaskViewH
     protected View getContentView(ViewGroup parent, int layoutResource) {
         return LayoutInflater.from(parent.getContext()).inflate(layoutResource, parent, false);
     }
+
+    public void filter() {
+        if (unfilteredData == null) {
+            return;
+        }
+
+        if (taskFilterHelper != null) {
+            RealmQuery<Task> query = taskFilterHelper.createQuery(unfilteredData);
+            updateData(query.findAllSorted("position"));
+
+        }
+    }
 }
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 b41e1b617..000b9cfc5 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
@@ -27,7 +27,7 @@ public class RewardsRecyclerViewAdapter extends RealmBaseTasksRecyclerViewAdapte
     private User user;
 
     public RewardsRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource, Context context) {
-        super(data, autoUpdate, layoutResource);
+        super(data, autoUpdate, layoutResource, null);
         this.context = context;
     }
 
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 9cbe3acee..4b106235a 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
@@ -15,8 +15,8 @@ import io.realm.OrderedRealmCollection;
 public class TodosRecyclerViewAdapter extends RealmBaseTasksRecyclerViewAdapter<TodoViewHolder> {
 
 
-    public TodosRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource) {
-        super(data, autoUpdate, layoutResource);
+    public TodosRecyclerViewAdapter(@Nullable OrderedRealmCollection<Task> data, boolean autoUpdate, int layoutResource, TaskFilterHelper taskFilterHelper) {
+        super(data, autoUpdate, layoutResource, taskFilterHelper);
     }
 
     @Override
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 06a331653..fabb83320 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
@@ -10,21 +10,22 @@ import android.widget.AdapterView;
 import android.widget.Spinner;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.databinding.FragmentAvatarOverviewBinding;
-import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 
-import java.util.HashMap;
-import java.util.Map;
+import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class AvatarOverviewFragment extends BaseMainFragment implements AdapterView.OnItemSelectedListener {
 
+    @Inject
+    UserRepository userRepository;
+
     FragmentAvatarOverviewBinding viewBinding;
 
     @BindView(R.id.avatar_size_spinner)
@@ -142,10 +143,8 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
         }
 
         if (this.user != null && !this.user.getPreferences().getSize().equals(newSize)) {
-            Map<String, Object> updateData = new HashMap<>();
-            updateData.put("preferences.size", newSize);
-            apiClient.updateUser(updateData)
-                    .subscribe(new MergeUserCallback(activity, user), throwable -> {
+            userRepository.updateUser(user, "preferences.size", newSize)
+                    .subscribe(user1 -> {}, throwable -> {
                     });
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
index b32eeb7f8..9a89ae9e7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
@@ -39,6 +39,7 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import io.realm.OrderedRealmCollection;
 
 import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
 
@@ -97,7 +98,7 @@ public class ItemRecyclerFragment extends BaseFragment {
 
         adapter = (ItemRecyclerAdapter) recyclerView.getAdapter();
         if (adapter == null) {
-            adapter = new ItemRecyclerAdapter();
+            adapter = new ItemRecyclerAdapter(null, true);
             adapter.context = this.getActivity();
             adapter.isHatching = this.isHatching;
             adapter.isFeeding = this.isFeeding;
@@ -110,6 +111,12 @@ public class ItemRecyclerFragment extends BaseFragment {
                 adapter.feedingPet = this.feedingPet;
             }
             recyclerView.setAdapter(adapter);
+
+            adapter.getSellItemEvents()
+                    .flatMap(item -> inventoryRepository.sellItem(user, item))
+                    .subscribe(item -> {
+
+            }, throwable -> {});
         }
         recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
 
@@ -169,23 +176,17 @@ public class ItemRecyclerFragment extends BaseFragment {
         outState.putString(ITEM_TYPE_KEY, this.itemType);
     }
 
-    @Subscribe
-    public void reloadedContent(ContentReloadedEvent event) {
-        this.loadItems();
-    }
-
     private void loadItems() {
         inventoryRepository.getOwnedItems(itemType).subscribe(items -> {
             if (this.itemType.equals("special")) {
                 if (user != null && user.getPurchased() != null && user.getPurchased().getPlan().isActive()) {
                     Item mysterItem = SpecialItem.makeMysteryItem(getContext());
                     mysterItem.setOwned(user.getPurchased().getPlan().mysteryItems.size());
-                    items.add(mysterItem);
                 }
             }
 
             if (items.size() > 0) {
-                adapter.setItemList(items);
+                adapter.updateData((OrderedRealmCollection<Item>) items);
             }
         }, throwable -> {});
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
index ed9ff4120..53b9be64d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
@@ -199,9 +199,4 @@ public class StableRecyclerFragment extends BaseFragment {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(items -> adapter.setItemList(items), throwable -> {});
     }
-
-    @Subscribe
-    public void reloadedContent(ContentReloadedEvent event) {
-        this.loadItems();
-    }
 }
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 1cb578ce3..b3496ba93 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
@@ -15,9 +15,7 @@ import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.commands.RefreshUserCommand;
 import com.habitrpg.android.habitica.helpers.LanguageHelper;
-import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
@@ -27,8 +25,6 @@ import com.habitrpg.android.habitica.prefs.TimePreference;
 import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -206,7 +202,6 @@ public class PreferencesFragment extends BasePreferencesFragment implements
                     this.startActivity(intent);
                     getActivity().finishAffinity();
                 }
-                EventBus.getDefault().post(new RefreshUserCommand());
 
                 break;
             }
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 67d40463a..584bd7f8a 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
@@ -145,13 +145,7 @@ public class SkillsFragment extends BaseMainFragment {
         if (activity != null) {
             UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), message.toString(), UiUtils.SnackbarDisplayType.NORMAL);
         }
-        userRepository.retrieveUser(false)
-                .subscribe(habitRPGUser -> {
-                    if (activity != null) {
-                        activity.onUserReceived(habitRPGUser);
-                    }
-                }, throwable -> {
-                });
+        userRepository.retrieveUser(false).subscribe(habitRPGUser -> {}, throwable -> {});
     }
 
     @Override
@@ -185,7 +179,7 @@ public class SkillsFragment extends BaseMainFragment {
         } else {
             observable = userRepository.useSkill(user, skill.key, skill.target);
         }
-        observable.subscribe(new SkillCallback(activity, user, skill), throwable -> removeProgressDialog());
+        observable.subscribe(skillResponse -> {}, throwable -> removeProgressDialog());
     }
 
     private void displayProgressDialog() {
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 52982417b..6ffa95655 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
@@ -151,7 +151,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(tasks, true, layoutOfType);
+                        this.recyclerAdapter = new HabitsRecyclerViewAdapter(tasks, true, layoutOfType, taskFilterHelper);
                         allowReordering();
                         break;
                     case Task.TYPE_DAILY:
@@ -160,12 +160,12 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
                         if (user != null) {
                             dailyResetOffset = user.getPreferences().getDayStart();
                         }
-                        this.recyclerAdapter = new DailiesRecyclerViewHolder(tasks, true, layoutOfType, dailyResetOffset);
+                        this.recyclerAdapter = new DailiesRecyclerViewHolder(tasks, true, layoutOfType, dailyResetOffset, taskFilterHelper);
                         allowReordering();
                         break;
                     case Task.TYPE_TODO:
                         layoutOfType = R.layout.todo_item_card;
-                        this.recyclerAdapter = new TodosRecyclerViewAdapter(tasks, true, layoutOfType);
+                        this.recyclerAdapter = new TodosRecyclerViewAdapter(tasks, true, layoutOfType, taskFilterHelper);
                         allowReordering();
                         return;
                     case Task.TYPE_REWARD:
@@ -311,6 +311,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         recyclerView.setAdapter(recyclerAdapter);
+        recyclerAdapter.filter();
     }
 
     @Override
@@ -341,16 +342,13 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
         swipeRefreshLayout.setRefreshing(true);
         userRepository.retrieveUser(true)
                 .doOnTerminate(() -> swipeRefreshLayout.setRefreshing(false))
-                .subscribe(
-                        new HabitRPGUserCallback((MainActivity)getActivity()),
-                        throwable -> {}
-                );
+                .subscribe(user1 -> {}, throwable -> {});
     }
 
     public void setActiveFilter(String activeFilter) {
         if (classType != null) {
             taskFilterHelper.setActiveFilter(classType, activeFilter);
         }
-        //recyclerAdapter.filter();
+        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 b73aad7d3..80ec4bf28 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
@@ -24,11 +24,10 @@ 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.data.TagRepository;
 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.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.models.TutorialStep;
 import com.habitrpg.android.habitica.models.tasks.Task;
@@ -59,6 +58,8 @@ public class TasksFragment extends BaseMainFragment {
     public ViewPager viewPager;
     @Inject
     public TaskFilterHelper taskFilterHelper; // This will be used for this fragment. Currently being used to help filtering
+    @Inject
+    TagRepository tagRepository;
     MenuItem refreshItem;
     FloatingActionMenu floatingMenu;
     SparseArray<TaskRecyclerViewFragment> viewFragmentsDictionary = new SparseArray<>();
@@ -164,7 +165,7 @@ public class TasksFragment extends BaseMainFragment {
     private void showFilterDialog() {
         TaskFilterDialog dialog = new TaskFilterDialog(getContext(), HabiticaBaseApplication.getComponent());
         if (user != null) {
-            //dialog.setTags();
+            dialog.setTags(user.getTags());
         }
         dialog.setActiveTags(taskFilterHelper.getTags());
         if (getActiveFragment() != null) {
@@ -176,10 +177,10 @@ public class TasksFragment extends BaseMainFragment {
         dialog.setListener((activeTaskFilter, activeTags) -> {
             int activePos = viewPager.getCurrentItem();
             if (activePos >= 1 && viewFragmentsDictionary.get(activePos-1).recyclerAdapter != null) {
-                //viewFragmentsDictionary.get(activePos-1).recyclerAdapter.filter();
+                viewFragmentsDictionary.get(activePos-1).recyclerAdapter.filter();
             }
             if (activePos < viewPager.getAdapter().getCount()-1 && viewFragmentsDictionary.get(activePos+1).recyclerAdapter != null) {
-                //viewFragmentsDictionary.get(activePos+1).recyclerAdapter.filter();
+                viewFragmentsDictionary.get(activePos+1).recyclerAdapter.filter();
             }
             if (getActiveFragment() != null) {
                 getActiveFragment().setActiveFilter(activeTaskFilter);
@@ -368,8 +369,8 @@ public class TasksFragment extends BaseMainFragment {
         }
 
         String allocationMode = "";
-        if (HabiticaApplication.User != null && HabiticaApplication.User.getPreferences() != null) {
-            allocationMode = HabiticaApplication.User.getPreferences().getAllocationMode();
+        if (user != null && user.getPreferences() != null) {
+            allocationMode = user.getPreferences().getAllocationMode();
         }
 
         Bundle bundle = new Bundle();
@@ -386,13 +387,6 @@ public class TasksFragment extends BaseMainFragment {
         }
     }
 
-    @Subscribe
-    public void onEvent(RefreshUserCommand event) {
-        if (getActiveFragment() != null) {
-            getActiveFragment().onRefresh();
-        }
-    }
-
     @Nullable
     private TaskRecyclerViewFragment getActiveFragment() {
         return viewFragmentsDictionary.get(viewPager.getCurrentItem());
@@ -405,8 +399,8 @@ public class TasksFragment extends BaseMainFragment {
         }
 
         String allocationMode = "";
-        if (HabiticaApplication.User != null && HabiticaApplication.User.getPreferences() != null) {
-            allocationMode = HabiticaApplication.User.getPreferences().getAllocationMode();
+        if (user != null && user.getPreferences() != null) {
+            allocationMode = user.getPreferences().getAllocationMode();
         }
 
         Bundle bundle = new Bundle();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.java
new file mode 100644
index 000000000..c7bc15523
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.java
@@ -0,0 +1,101 @@
+package com.habitrpg.android.habitica.ui.views;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.databinding.DataBindingUtil;
+import android.graphics.drawable.Drawable;
+import android.support.v4.content.ContextCompat;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.databinding.ValueBarBinding;
+import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+public class ValueBar extends FrameLayout {
+
+    @BindView(R.id.ic_header)
+    ImageView iconView;
+
+    @BindView(R.id.valueLabel)
+    TextView valueTextView;
+    @BindView(R.id.descriptionLabel)
+    TextView descriptionTextView;
+
+    @BindView(R.id.bar_full)
+    ViewGroup barBackground;
+    @BindView(R.id.bar)
+    View barView;
+    @BindView(R.id.empty_bar_space)
+    View barEmptySpace;
+
+
+    public ValueBar(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        inflate(context, R.layout.value_bar, this);
+        ButterKnife.bind(this);
+
+        TypedArray attributes = context.getTheme().obtainStyledAttributes(
+                attrs,
+                R.styleable.ValueBar,
+                0, 0);
+        setLightBackground(attributes.getBoolean(R.styleable.ValueBar_lightBackground, false));
+
+        int color = attributes.getColor(R.styleable.ValueBar_barForegroundColor, 0);
+        DataBindingUtils.setRoundedBackground(barView, color);
+
+        Drawable iconRes = attributes.getDrawable(R.styleable.ValueBar_barIconDrawable);
+        if (iconRes != null) {
+            iconView.setImageDrawable(iconRes);
+        }
+
+        descriptionTextView.setText(attributes.getString(R.styleable.ValueBar_description));
+    }
+
+    public void setBarWight(float percent) {
+        setLayoutWeight(barView, percent);
+        setLayoutWeight(barEmptySpace, 1.0f - percent);
+    }
+
+    public void setValueText(String valueText) {
+        valueTextView.setText(valueText);
+    }
+
+    public void setLightBackground(boolean lightBackground) {
+        int textColor;
+        if (lightBackground) {
+            textColor = ContextCompat.getColor(getContext(), R.color.md_black_1000);
+            barBackground.setBackgroundResource(R.drawable.layout_rounded_bg_light_gray);
+        } else {
+            textColor = ContextCompat.getColor(getContext(), R.color.brand_500);
+            barBackground.setBackgroundResource(R.drawable.layout_rounded_bg_brand);
+        }
+        valueTextView.setTextColor(textColor);
+        descriptionTextView.setTextColor(textColor);
+    }
+
+    public static void setLayoutWeight(View view, float weight) {
+        view.clearAnimation();
+        LinearLayout.LayoutParams layout = (LinearLayout.LayoutParams) view.getLayoutParams();
+        if (weight == 0.0f || weight == 1.0f) {
+            layout.weight = weight;
+            view.setLayoutParams(layout);
+        } else if (layout.weight != weight) {
+            DataBindingUtils.LayoutWeightAnimation anim = new DataBindingUtils.LayoutWeightAnimation(view, weight);
+            anim.setDuration(1250);
+            view.startAnimation(anim);
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
index 125946ff4..069a91d7f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskSerializer.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import com.habitrpg.android.habitica.models.Tag;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskTag;
 
@@ -22,8 +23,8 @@ public class TaskSerializer implements JsonSerializer<Task> {
         obj.addProperty("attribute", task.getAttribute());
         obj.addProperty("type", task.getType());
         JsonArray tagsList = new JsonArray();
-        for (TaskTag tag : task.getTags()) {
-            tagsList.add(tag.getTag().getId());
+        for (Tag tag : task.getTags()) {
+            tagsList.add(tag.getId());
         }
         obj.add("tags", tagsList);
         switch (task.getType()) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
index 6e94a1cdf..179678c3d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
@@ -12,43 +12,48 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.realm.Realm;
 import io.realm.RealmList;
 
-public class TaskTagDeserializer implements JsonDeserializer<List<TaskTag>> {
+public class TaskTagDeserializer implements JsonDeserializer<List<Tag>> {
     @Override
-    public List<TaskTag> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<TaskTag> taskTags = new RealmList<>();
-        List<Tag> allTags = new ArrayList<>();
+    public List<Tag> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        List<Tag> tags = new RealmList<>();
+        List<Tag> databaseTags;
         try {
+            Realm realm = Realm.getDefaultInstance();
+            databaseTags = realm.copyFromRealm(realm.where(Tag.class).findAll());
         } catch (RuntimeException e) {
             //Tests don't have a database
-            allTags = new ArrayList<>();
+            databaseTags = new ArrayList<>();
         }
 
         if (json.isJsonArray()) {
             for (JsonElement tagElement : json.getAsJsonArray()) {
-                String tagId = tagElement.getAsString();
-                TaskTag taskTag = new TaskTag();
-                for (Tag tag : allTags) {
-                    if (tag.getId().equals(tagId)) {
-                        taskTag.setTag(tag);
+                if (tagElement.isJsonObject()) {
+                    tags.add(context.deserialize(tagElement, Tag.class));
+                } else {
+                    String tagId = tagElement.getAsString();
+                    for (Tag tag : databaseTags) {
+                        if (tag.getId().equals(tagId)) {
+                            if (!alreadyContainsTag(tags, tagId)) {
+                                tags.add(tag);
+                            }
 
-                        if (!alreadyContainsTag(taskTags, tagId)) {
-                            taskTags.add(taskTag);
+                            break;
                         }
-
-                        break;
                     }
                 }
+
             }
         }
 
-        return taskTags;
+        return tags;
     }
 
-    private boolean alreadyContainsTag(List<TaskTag> list, String idToCheck) {
-        for (TaskTag t : list) {
-            if (t.getTag().getId().equals(idToCheck)) {
+    private boolean alreadyContainsTag(List<Tag> list, String idToCheck) {
+        for (Tag t : list) {
+            if (t.getId().equals(idToCheck)) {
                 return true;
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.java
index 88fabeffe..b9cd74740 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
@@ -15,6 +15,7 @@ import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.interactors.NotifyUserUseCase;
 import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
+import com.habitrpg.android.habitica.models.responses.TaskScoringResult;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 
 import javax.inject.Inject;
@@ -72,15 +73,13 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider {
         return configureRemoteViews(remoteViews, widgetId, columns, rows);
     }
 
-    protected void showToastForTaskDirection(Context context, TaskDirectionData data, String userID) {
+    protected void showToastForTaskDirection(Context context, TaskScoringResult data, String userID) {
         if (userRepository == null) {
             HabiticaApplication.getComponent().inject(this);
         }
-        userRepository.getUser(userID).subscribe(habitRPGUser -> {
-            Pair<String, UiUtils.SnackbarDisplayType> pair = NotifyUserUseCase.getNotificationAndAddStatsToUser(habitRPGUser, data.exp, data.hp, data.getGp(), data.mp);
+            Pair<String, UiUtils.SnackbarDisplayType> pair = NotifyUserUseCase.getNotificationAndAddStatsToUser(data.experienceDelta, data.healthDelta, data.goldDelta, data.manaDelta);
             Toast toast = Toast.makeText(context, pair.first, Toast.LENGTH_LONG);
             toast.show();
-        }, throwable -> {});
     }
 
     abstract public int layoutResourceId();
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 349dc5747..e5019bf9e 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
@@ -75,12 +75,8 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider {
             int[] ids = {appWidgetId};
 
             if (taskId != null) {
-                taskRepository.taskChecked(taskId, TaskDirection.up.toString().equals(direction))
+                userRepository.getUser(userId).flatMap(user -> taskRepository.taskChecked(user, taskId, TaskDirection.up.toString().equals(direction)))
                         .subscribe(taskDirectionData -> {
-                            taskRepository.getTask(taskId).subscribe(task -> {
-                                task.value = task.value + taskDirectionData.getDelta();
-                                taskRepository.saveTask(task);
-                            });
                             showToastForTaskDirection(context, taskDirectionData, userId);
                             this.onUpdate(context, mgr, ids);
                         }, throwable -> this.onUpdate(context, mgr, ids));
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 2a268e3de..30e6c0387 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
@@ -55,7 +55,7 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
             String taskId = intent.getStringExtra(TASK_ID_ITEM);
 
             if (taskId != null) {
-                taskRepository.taskChecked(taskId, true)
+                userRepository.getUser(userId).flatMap(user -> taskRepository.taskChecked(user, taskId, true))
                         .subscribe(taskDirectionData -> {
                             taskRepository.markTaskCompleted(taskId, true);
                             showToastForTaskDirection(context, taskDirectionData, userId);

From 352cd69c0f64c3604eaa13f14268db911ebbe464 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 24 Apr 2017 17:27:58 +0200
Subject: [PATCH 08/17] Improve task form

---
 .../habitica/HabiticaBaseApplication.java     |   2 +-
 .../habitica/NotificationPublisher.java       |   2 +-
 .../implementation/ContentRepositoryImpl.java |   6 +-
 .../implementation/SocialRepositoryImpl.java  |   2 +-
 .../implementation/TaskRepositoryImpl.java    |   6 +-
 .../implementation/UserRepositoryImpl.java    |   6 +-
 .../data/local/BaseLocalRepository.java       |   2 +
 .../data/local/ContentLocalRepository.java    |   7 ++
 .../local/CustomizationLocalRepository.java   |   2 +-
 .../data/local/FAQLocalRepository.java        |   2 +-
 .../data/local/InventoryLocalRepository.java  |   2 +-
 .../RealmContentLocalRepository.java          |  78 +++++++++++++
 .../RealmTaskLocalRepository.java             |   3 +-
 .../helpers/PopupNotificationsManager.java    |   2 +-
 .../habitica/helpers/QrCodeManager.java       |   2 +-
 .../helpers/ReactiveErrorHandler.java         |  11 +-
 .../habitica/helpers/TaskAlarmManager.java    |   2 +-
 .../PushNotificationManager.java              |   4 +-
 .../android/habitica/models/tasks/Task.java   |   6 +-
 .../activities/ChallengeDetailActivity.java   |   4 +-
 .../ui/activities/FullProfileActivity.java    |   4 +-
 .../habitica/ui/activities/IntroActivity.java |   2 +-
 .../habitica/ui/activities/MainActivity.java  |   8 +-
 .../ui/activities/PartyInviteActivity.java    |   4 +-
 .../ui/activities/TaskFormActivity.java       | 104 +++++++++++++++---
 .../SkillTasksRecyclerViewAdapter.java        |   2 +-
 .../ui/adapter/tasks/CheckListAdapter.java    |  33 +++---
 .../ui/adapter/tasks/RemindersAdapter.java    |   7 +-
 .../tasks/RewardsRecyclerViewAdapter.java     |   2 +-
 .../habitica/ui/fragments/BaseFragment.java   |  16 ++-
 .../ui/fragments/BaseMainFragment.java        |   2 +-
 .../ui/fragments/faq/FAQOverviewFragment.java |   4 +-
 .../AvatarCustomizationFragment.java          |   2 +-
 .../customization/AvatarOverviewFragment.java |   2 +-
 .../equipment/EquipmentDetailFragment.java    |   2 +-
 .../equipment/EquipmentOverviewFragment.java  |   2 +-
 .../inventory/items/ItemRecyclerFragment.java |   4 +-
 .../stable/PetDetailRecyclerFragment.java     |   2 +-
 .../stable/StableRecyclerFragment.java        |   2 +-
 .../preferences/AccountDetailsFragment.java   |   2 +-
 .../preferences/PreferencesFragment.java      |   4 +-
 .../ui/fragments/skills/SkillsFragment.java   |   4 +-
 .../ui/fragments/social/ChatListFragment.java |   2 +-
 .../social/GroupInformationFragment.java      |   2 +-
 .../social/InboxMessageListFragment.java      |   2 +-
 .../ui/fragments/social/TavernFragment.java   |   2 +-
 .../challenges/ChallengeListFragment.java     |   2 +-
 .../ChallengesOverviewFragment.java           |   2 +-
 .../fragments/social/party/PartyFragment.java |   2 +-
 .../tasks/TaskRecyclerViewFragment.java       |   2 +-
 .../ui/fragments/tasks/TasksFragment.java     |   2 +-
 .../ui/views/tasks/TaskFilterDialog.java      |   6 +-
 .../habitica/utils/ContentDeserializer.java   |  51 +--------
 .../widget/AvatarStatsWidgetProvider.java     |   2 +-
 .../widget/HabitButtonWidgetService.java      |   2 +-
 55 files changed, 287 insertions(+), 157 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.java

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 0ef2243fb..58a3f36ef 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -179,7 +179,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
             ApiClient apiClient = this.lazyApiHelper.get();
 
             apiClient.getContent()
-                    .subscribe(contentResult -> { }, throwable -> {});
+                    .subscribe(contentResult -> { }, ReactiveErrorHandler.handleEmptyError());
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java b/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
index ba2fa6eb5..47d4d4df4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/NotificationPublisher.java
@@ -58,7 +58,7 @@ public class NotificationPublisher extends BroadcastReceiver {
                     int id = intent.getIntExtra(NOTIFICATION_ID, 0);
                     notificationManager.notify(id, notification);
                 }
-            }, throwable -> {});
+            }, ReactiveErrorHandler.handleEmptyError());
 
         } else {
             NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.java
index b5d169f51..67c39ec50 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ContentRepositoryImpl.java
@@ -3,11 +3,12 @@ package com.habitrpg.android.habitica.data.implementation;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.ContentRepository;
 import com.habitrpg.android.habitica.data.local.BaseLocalRepository;
+import com.habitrpg.android.habitica.data.local.ContentLocalRepository;
 import com.habitrpg.android.habitica.models.ContentResult;
 
 import rx.Observable;
 
-abstract class ContentRepositoryImpl<T extends BaseLocalRepository> extends BaseRepositoryImpl<T> implements ContentRepository {
+abstract class ContentRepositoryImpl<T extends ContentLocalRepository> extends BaseRepositoryImpl<T> implements ContentRepository {
 
     public ContentRepositoryImpl(T localRepository, ApiClient apiClient) {
         super(localRepository, apiClient);
@@ -15,7 +16,8 @@ abstract class ContentRepositoryImpl<T extends BaseLocalRepository> extends Base
 
     @Override
     public Observable<ContentResult> retrieveContent() {
-        return apiClient.getContent();
+        return apiClient.getContent()
+                .doOnNext(localRepository::saveContent);
     }
 
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
index 2e43b9321..efacb14e8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
@@ -44,7 +44,7 @@ public class SocialRepositoryImpl extends BaseRepositoryImpl<SocialLocalReposito
 
     @Override
     public void markMessagesSeen(String seenGroupId) {
-        apiClient.seenMessages(seenGroupId).subscribe(aVoid -> {}, throwable -> {});
+        apiClient.seenMessages(seenGroupId).subscribe(aVoid -> {}, ReactiveErrorHandler.handleEmptyError());
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
index ba1f3a968..bff37ecec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -127,7 +127,8 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
             return Observable.empty();
         }
         lastTaskAction = now;
-        return apiClient.createItem(task)
+        return localRepository.getTaskCopy(task.getId()).first()
+                .flatMap(apiClient::createItem)
                 .doOnNext(localRepository::saveTask);
     }
 
@@ -138,7 +139,8 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
             return Observable.empty();
         }
         lastTaskAction = now;
-        return apiClient.updateTask(task.getId(), task)
+        return localRepository.getTaskCopy(task.getId()).first()
+                .flatMap(task1 -> apiClient.updateTask(task1.getId(), task1))
                 .map(task1 -> {
                     task1.position = task.position;
                     return task1;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 7007b5230..239798548 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -54,9 +54,9 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
     @Override
     public Observable<User> retrieveUser(Boolean withTasks) {
         if (this.lastSync == null || (new Date().getTime() - this.lastSync.getTime()) > 180000) {
+            lastSync = new Date();
             return apiClient.retrieveUser(withTasks)
-                    .doOnNext(localRepository::saveUser)
-                    .doOnNext(user -> lastSync = new Date());
+                    .doOnNext(localRepository::saveUser);
         } else {
             return Observable.empty();
         }
@@ -78,7 +78,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
                     return updateData;
                 })
                 .flatMap(updateData -> updateUser(user, updateData))
-                .subscribe(tutorialSteps -> {}, throwable -> {});
+                .subscribe(tutorialSteps -> {}, ReactiveErrorHandler.handleEmptyError());
     }
 
     @Override
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
index 696b942d1..fc2cf9b30 100644
--- 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
@@ -1,5 +1,7 @@
 package com.habitrpg.android.habitica.data.local;
 
+import com.habitrpg.android.habitica.models.ContentResult;
+
 import io.realm.Realm;
 
 public interface BaseLocalRepository {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.java
new file mode 100644
index 000000000..bff989203
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ContentLocalRepository.java
@@ -0,0 +1,7 @@
+package com.habitrpg.android.habitica.data.local;
+
+import com.habitrpg.android.habitica.models.ContentResult;
+
+public interface ContentLocalRepository extends BaseLocalRepository {
+    void saveContent(ContentResult contentResult);
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java
index 9bf9e7835..77edad55f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/CustomizationLocalRepository.java
@@ -7,6 +7,6 @@ import java.util.List;
 import io.realm.RealmResults;
 import rx.Observable;
 
-public interface CustomizationLocalRepository extends BaseLocalRepository {
+public interface CustomizationLocalRepository extends ContentLocalRepository {
     Observable<RealmResults<Customization>> getCustomizations(String type, String category);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java
index 0d332fd67..7c579b906 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/FAQLocalRepository.java
@@ -7,7 +7,7 @@ import java.util.List;
 import io.realm.RealmResults;
 import rx.Observable;
 
-public interface FAQLocalRepository extends BaseLocalRepository {
+public interface FAQLocalRepository extends ContentLocalRepository {
 
     Observable<RealmResults<FAQArticle>> getArticles();
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
index aa20cd193..0e5b84e4d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
@@ -12,7 +12,7 @@ import java.util.List;
 import io.realm.RealmResults;
 import rx.Observable;
 
-public interface InventoryLocalRepository extends BaseLocalRepository {
+public interface InventoryLocalRepository extends ContentLocalRepository {
     Observable<QuestContent> getQuestContent(String key);
 
     Observable<RealmResults<Equipment>> getEquipment(List<String> searchedKeys);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.java
new file mode 100644
index 000000000..6a1fd402d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.java
@@ -0,0 +1,78 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.ContentLocalRepository;
+import com.habitrpg.android.habitica.models.ContentResult;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import io.realm.Realm;
+import io.realm.RealmObject;
+
+
+class RealmContentLocalRepository extends RealmBaseLocalRepository implements ContentLocalRepository {
+
+    RealmContentLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public void saveContent(ContentResult result) {
+        realm.executeTransactionAsync(realm1 -> {
+            List<RealmObject> items = new ArrayList<>();
+            items.add(result.potion);
+            items.add(result.armoire);
+            items.addAll(result.gear.flat);
+
+            items.addAll(result.quests);
+            items.addAll(result.eggs);
+            items.addAll(result.food);
+            items.addAll(result.hatchingPotions);
+
+            for (Pet pet : result.pets.values()) {
+                pet.setAnimalGroup("pets");
+                items.add(pet);
+            }
+            for (Pet pet : result.specialPets.values()) {
+                pet.setAnimalGroup("specialPets");
+                items.add(pet);
+            }
+            for (Pet pet : result.premiumPets.values()) {
+                pet.setAnimalGroup("premiumPets");
+                items.add(pet);
+            }
+            for (Pet pet : result.questPets.values()) {
+                pet.setAnimalGroup("questPets");
+                items.add(pet);
+            }
+
+            for (Mount mount : result.mounts.values()) {
+                mount.setAnimalGroup("mounts");
+                items.add(mount);
+            }
+            for (Mount mount : result.specialMounts.values()) {
+                mount.setAnimalGroup("specialMounts");
+                items.add(mount);
+            }
+            for (Mount mount : result.premiumMounts.values()) {
+                mount.setAnimalGroup("premiumMounts");
+                items.add(mount);
+            }
+            for (Mount mount : result.questMounts.values()) {
+                mount.setAnimalGroup("questMounts");
+                items.add(mount);
+            }
+
+            items.addAll(result.spells);
+
+            items.addAll(result.appearances);
+            items.addAll(result.backgrounds);
+
+            items.addAll(result.faq);
+
+            realm1.insertOrUpdate(items);
+        });
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
index 13ad0857c..f57c99855 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
@@ -12,6 +12,7 @@ import java.util.List;
 
 import io.realm.Realm;
 import io.realm.RealmResults;
+import io.realm.Sort;
 import rx.Observable;
 
 public class RealmTaskLocalRepository extends RealmBaseLocalRepository implements TaskLocalRepository {
@@ -22,7 +23,7 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
 
     @Override
     public Observable<RealmResults<Task>> getTasks(String taskType, String userID) {
-        return realm.where(Task.class).equalTo("type", taskType).equalTo("userId", userID).findAllSorted("position").asObservable()
+        return realm.where(Task.class).equalTo("type", taskType).equalTo("userId", userID).findAllSorted("position").sort("dateCreated", Sort.DESCENDING).asObservable()
                 .filter(RealmResults::isLoaded);
     }
 
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 ef71bf6a7..c43cc806b 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
@@ -93,7 +93,7 @@ public class PopupNotificationsManager {
             if (apiClient != null) {
                 // @TODO: This should be handled somewhere else? MAybe we notifiy via event
                 apiClient.readNotificaiton(notification.getId())
-                        .subscribe(next -> {}, throwable -> {});
+                        .subscribe(next -> {}, ReactiveErrorHandler.handleEmptyError());
             }
 
             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 bc015ae3b..d69a6d946 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
@@ -71,7 +71,7 @@ public class QrCodeManager {
         avatarView.configureView(false, false, false);
         this.qrCodeWrapper = (FrameLayout) qrLayout.findViewById(R.id.qrCodeWrapper);
 
-        userRepository.getUser(userId).subscribe(avatarView::setUser, throwable -> {});
+        userRepository.getUser(userId).subscribe(avatarView::setUser, ReactiveErrorHandler.handleEmptyError());
 
         this.displayQrCode();
         this.setDownloadQr();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReactiveErrorHandler.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReactiveErrorHandler.java
index b3173f375..2d06e1d50 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReactiveErrorHandler.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/ReactiveErrorHandler.java
@@ -8,9 +8,14 @@ import rx.functions.Action1;
 public class ReactiveErrorHandler {
 
     public static Action1<Throwable> handleEmptyError() {
-        return throwable -> {
-            if (BuildConfig.DEBUG) {
-                Log.e("ObservableError", Log.getStackTraceString(throwable));
+        //Can't be turned into a lambda, because it then doesn't work for some reason.
+        return new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                throwable.printStackTrace();
+                if (BuildConfig.DEBUG) {
+                    Log.e("ObservableError", Log.getStackTraceString(throwable));
+                }
             }
         };
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
index 8cbd47bd4..6ccd6ac28 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.java
@@ -146,7 +146,7 @@ public class TaskAlarmManager {
     public void addAlarmForTaskId(String taskId) {
         taskRepository.getTask(taskId)
                 .filter(task -> Task.TYPE_DAILY.equals(task.type))
-                .subscribe(this::setAlarmsForTask, throwable -> {});
+                .subscribe(this::setAlarmsForTask, ReactiveErrorHandler.handleEmptyError());
     }
 
     public void scheduleAllSavedAlarms() {
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 f6ad14e78..1583b21ab 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
@@ -75,13 +75,13 @@ public class PushNotificationManager {
         pushDeviceData.put("type", "android");
         apiClient.addPushDevice(pushDeviceData)
 
-            .subscribe(aVoid -> {}, throwable -> {});
+            .subscribe(aVoid -> {}, ReactiveErrorHandler.handleEmptyError());
     }
 
     public void removePushDeviceUsingStoredToken() {
         apiClient.deletePushDevice(this.refreshedToken)
 
-            .subscribe(aVoid -> {}, throwable -> {});
+            .subscribe(aVoid -> {}, ReactiveErrorHandler.handleEmptyError());
     }
 
     private Boolean userHasPushDevice() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
index 6972b2367..7d13f8294 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
@@ -43,9 +43,9 @@ public class Task extends RealmObject {
 
 
     public String userId;
-    public Float priority;
+    public float priority;
     public String text, notes, attribute, type;
-    public Double value;
+    public double value;
     public RealmList<Tag> tags;
     public Date dateCreated;
     public int position;
@@ -190,7 +190,7 @@ public class Task extends RealmObject {
     public boolean containsAllTagIds(List<String> tagIdList) {
         getTags();
 
-        List<String> allTagIds = new ArrayList<String>();
+        List<String> allTagIds = new ArrayList<>();
 
         for (Tag t : tags) {
             allTagIds.add(t.getId());
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 5265fb457..a765e0c19 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
@@ -144,7 +144,7 @@ public class ChallengeDetailActivity extends BaseActivity {
 
         ObservableList<Task> fullList = new ObservableArrayList<>();
 
-        userRepository.getUser(userId).first().subscribe(user -> ChallengeDetailActivity.this.user = user, throwable -> {});
+        userRepository.getUser(userId).first().subscribe(user -> ChallengeDetailActivity.this.user = user, ReactiveErrorHandler.handleEmptyError());
 
         if (challengeId != null) {
 
@@ -418,6 +418,6 @@ public class ChallengeDetailActivity extends BaseActivity {
         }
 
         displayItemDropUseCase.observable(new DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
-                .subscribe(aVoid -> {}, throwable -> {});
+                .subscribe(aVoid -> {}, ReactiveErrorHandler.handleEmptyError());
     }
 }
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 1bfd20807..af4aa6a6c 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
@@ -338,10 +338,10 @@ public class FullProfileActivity extends BaseActivity {
 
         addAttributeRow(getString(R.string.profile_level), byLevelStat, byLevelStat, byLevelStat, byLevelStat, true, false);
 
-        loadItemDataByOutfit(user.getItems().getGear().getEquipped()).subscribe(gear -> this.gotGear(gear, user), throwable -> {});
+        loadItemDataByOutfit(user.getItems().getGear().getEquipped()).subscribe(gear -> this.gotGear(gear, user), ReactiveErrorHandler.handleEmptyError());
 
         if (user.getPreferences().getCostume()) {
-            loadItemDataByOutfit(user.getItems().getGear().getCostume()).subscribe(this::gotCostume, throwable -> {});
+            loadItemDataByOutfit(user.getItems().getGear().getCostume()).subscribe(this::gotCostume, ReactiveErrorHandler.handleEmptyError());
         } else {
             costumeCard.setVisibility(View.GONE);
         }
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 329613149..dd1fb65f6 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
@@ -58,7 +58,7 @@ public class IntroActivity extends BaseActivity implements View.OnClickListener,
         this.finishButton.setOnClickListener(this);
 
         apiClient.getContent()
-                .subscribe(contentResult -> {}, throwable -> {});
+                .subscribe(contentResult -> {}, ReactiveErrorHandler.handleEmptyError());
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             Window window = getWindow();
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 ae24f1aad..8fa182433 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
@@ -275,7 +275,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
                 .subscribe(newUser -> {
                     MainActivity.this.user = newUser;
                     MainActivity.this.setUserData(true);
-                }, throwable -> {});
+                }, ReactiveErrorHandler.handleEmptyError());
 
         EventBus.getDefault().register(this);
     }
@@ -885,18 +885,18 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
     @Subscribe
     public void reloadContent(ReloadContentEvent event) {
         this.inventoryRepository.retrieveContent()
-                .subscribe(contentResult -> {}, throwable -> {});
+                .subscribe(contentResult -> {}, ReactiveErrorHandler.handleEmptyError());
     }
 
     public void displayTaskScoringResponse(TaskScoringResult data) {
         if (user != null) {
             notifyUserUseCase.observable(new NotifyUserUseCase.RequestValues(this, floatingMenuWrapper,
                     user, data.experienceDelta, data.healthDelta, data.goldDelta, data.manaDelta, data.hasLeveledUp))
-                    .subscribe(aVoid -> {}, throwable -> {});
+                    .subscribe(aVoid -> {}, ReactiveErrorHandler.handleEmptyError());
         }
 
         displayItemDropUseCase.observable(new DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
-                .subscribe(aVoid -> {}, throwable -> {});
+                .subscribe(aVoid -> {}, ReactiveErrorHandler.handleEmptyError());
     }
 
 
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 a947ca45d..1965e8a3c 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
@@ -164,7 +164,7 @@ public class PartyInviteActivity extends BaseActivity {
             }
             userIdToInvite = uri.getPathSegments().get(2);
 
-            userRepository.getUser(userId).subscribe(this::handleUserRecieved, throwable -> {});
+            userRepository.getUser(userId).subscribe(this::handleUserRecieved, ReactiveErrorHandler.handleEmptyError());
         }
     }
 
@@ -184,6 +184,6 @@ public class PartyInviteActivity extends BaseActivity {
         inviteData.put("uuids", invites);
 
         this.socialRepository.inviteToGroup(user.getParty().getId(), inviteData)
-                .subscribe(aVoid -> {}, throwable -> {});
+                .subscribe(aVoid -> {}, ReactiveErrorHandler.handleEmptyError());
     }
 }
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 0753a7c17..e4fb5239f 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
@@ -40,6 +40,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.TagRepository;
 import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.RemindersManager;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.models.Tag;
@@ -47,7 +48,7 @@ import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
 import com.habitrpg.android.habitica.models.tasks.Days;
 import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 import com.habitrpg.android.habitica.models.tasks.Task;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
+import com.habitrpg.android.habitica.modules.AppModule;
 import com.habitrpg.android.habitica.ui.WrapContentRecyclerViewLayoutManager;
 import com.habitrpg.android.habitica.ui.adapter.tasks.CheckListAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.RemindersAdapter;
@@ -71,6 +72,7 @@ import java.util.List;
 import java.util.Locale;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.OnClick;
@@ -193,12 +195,14 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
     TaskRepository taskRepository;
     @Inject
     TagRepository tagRepository;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
 
     EmojiPopup popup;
 
     private String taskType;
     private String taskId;
-    private String userId;
     private Task task;
     private String allocationMode;
     private List<CheckBox> weekdayCheckboxes = new ArrayList<>();
@@ -225,7 +229,6 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
         Bundle bundle = intent.getExtras();
         taskType = bundle.getString(TASK_TYPE_KEY);
         taskId = bundle.getString(TASK_ID_KEY);
-        userId = bundle.getString(USER_ID_KEY);
         allocationMode = bundle.getString(ALLOCATION_MODE_KEY);
         tagCheckBoxList = new ArrayList<>();
         selectedTags = new ArrayList<>();
@@ -250,7 +253,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
                     finish();
                     dismissKeyboard();
 
-                    taskRepository.deleteTask(taskId).subscribe(aVoid -> {}, throwable -> {});
+                    taskRepository.deleteTask(taskId).subscribe(aVoid -> {}, ReactiveErrorHandler.handleEmptyError());
                 }).setNegativeButton(getString(R.string.no), (dialog, which) -> dialog.dismiss()).show());
 
         ArrayAdapter<CharSequence> difficultyAdapter = ArrayAdapter.createFromResource(this,
@@ -324,10 +327,12 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
                 this.task = task;
                 if (task != null) {
                     populate(task);
+                    populateChecklistRecyclerView();
+                    populateRemindersRecyclerView();
                 }
 
                 setTitle(task);
-            }, throwable -> {});
+            }, ReactiveErrorHandler.handleEmptyError());
 
             btnDelete.setEnabled(true);
         } else {
@@ -440,11 +445,8 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
     }
 
     private void createCheckListRecyclerView() {
-        List<ChecklistItem> checklistItems = new ArrayList<>();
-        if (task != null && task.getChecklist() != null) {
-            checklistItems = task.getChecklist();
-        }
-        checklistAdapter = new CheckListAdapter(checklistItems);
+
+        checklistAdapter = new CheckListAdapter();
 
         LinearLayoutManager llm = new LinearLayoutManager(this);
         llm.setOrientation(LinearLayoutManager.VERTICAL);
@@ -459,6 +461,14 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
         mItemTouchHelper.attachToRecyclerView(recyclerView);
     }
 
+    private void populateChecklistRecyclerView() {
+        List<ChecklistItem> checklistItems = new ArrayList<>();
+        if (task != null && task.getChecklist() != null) {
+            checklistItems = task.getChecklist();
+        }
+        checklistAdapter.setItems(checklistItems);
+    }
+
     @OnClick(R.id.add_checklist_button)
     public void addChecklistItem() {
         String checklist = newCheckListEditText.getText().toString();
@@ -473,7 +483,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             reminders = task.getReminders();
         }
 
-        remindersAdapter = new RemindersAdapter(reminders, taskType);
+        remindersAdapter = new RemindersAdapter(taskType);
 
         LinearLayoutManager llm = new LinearLayoutManager(this);
         llm.setOrientation(LinearLayoutManager.VERTICAL);
@@ -488,6 +498,15 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
         mItemTouchHelper.attachToRecyclerView(remindersRecyclerView);
     }
 
+    private void populateRemindersRecyclerView() {
+        List<RemindersItem> reminders = new ArrayList<>();
+        if (task != null && task.getReminders() != null) {
+            reminders = task.getReminders();
+        }
+
+        remindersAdapter.setReminders(reminders);
+    }
+
     private void addNewReminder(RemindersItem remindersItem) {
         remindersAdapter.addItem(remindersItem);
     }
@@ -741,16 +760,63 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
 
             if (checklistAdapter != null) {
                 if (checklistAdapter.getCheckListItems() != null) {
-                    for (ChecklistItem item : task.getChecklist()) {
-                        item.setText(checklistAdapter.checklistTexts.get(item.getId()));
+                    List<ChecklistItem> newItems = checklistAdapter.getCheckListItems();
+                    if (task.getChecklist() == null) {
+                        task.setChecklist(new RealmList<>());
                     }
+                    List<ChecklistItem> itemsToRemove = new ArrayList<>();
+                    for (ChecklistItem item : task.getChecklist()) {
+                        if (item.getId() == null) {
+                            itemsToRemove.add(item);
+                            break;
+                        }
+                        ChecklistItem newItem = null;
+                        for (ChecklistItem checkedItem : newItems) {
+                            if (item.getId().equals(checkedItem.getId())) {
+                                newItem = checkedItem;
+                                break;
+                            }
+                        }
+                        if (newItem == null) {
+                            itemsToRemove.add(item);
+                        } else {
+                            item.setText(newItem.getText());
+                            newItems.remove(newItem);
+                        }
+                    }
+                    task.getChecklist().removeAll(itemsToRemove);
+                    task.getChecklist().addAll(newItems);
                 }
             }
 
             if (remindersAdapter != null) {
                 if (remindersAdapter.getRemindersItems() != null) {
-                    task.getReminders().addAll(remindersAdapter.getRemindersItems());
-                }
+                    List<RemindersItem> newItems = remindersAdapter.getRemindersItems();
+                    if (task.getReminders() == null) {
+                        task.setReminders(new RealmList<>());
+                    }
+                    List<RemindersItem> itemsToRemove = new ArrayList<>();
+                    for (RemindersItem item : task.getReminders()) {
+                        if (item.getId() == null) {
+                            itemsToRemove.add(item);
+                            break;
+                        }
+                        RemindersItem newItem = null;
+                        for (RemindersItem checkedItem : newItems) {
+                            if (item.getId().equals(checkedItem.getId())) {
+                                newItem = checkedItem;
+                                break;
+                            }
+                        }
+                        if (newItem == null) {
+                            itemsToRemove.add(item);
+                        } else {
+                            item.setTime(newItem.getTime());
+                            newItems.remove(newItem);
+                        }
+                    }
+                    task.getReminders().removeAll(itemsToRemove);
+                    task.getReminders().addAll(newItems);                }
             }
 
 
@@ -873,7 +939,9 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             } else {
                 observable = taskRepository.updateTask(task);
             }
-            observable.subscribe(task1 -> {}, throwable -> {});
+            observable.subscribe(task1 -> {
+
+            }, ReactiveErrorHandler.handleEmptyError());
         }
     }
 
@@ -917,7 +985,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
         EditText datePickerText;
         DateFormat dateFormatter;
 
-        public DateEditTextListener(EditText dateText) {
+        DateEditTextListener(EditText dateText) {
             calendar = Calendar.getInstance();
 
             this.datePickerText = dateText;
@@ -977,7 +1045,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
 
         EmojiEditText view;
 
-        public emojiClickListener(EmojiEditText view) {
+        emojiClickListener(EmojiEditText view) {
             this.view = view;
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
index 97912d5da..7a4d44bf6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
@@ -100,7 +100,7 @@ public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter<SkillTas
                 } else {
                     notifyDataSetChanged();
                 }
-            }, throwable -> {});
+            }, ReactiveErrorHandler.handleEmptyError());
         } else {
             if (parentAdapter != null) {
                 parentAdapter.notifyDataSetChanged();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
index 70f99cbfe..f56c48e11 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java
@@ -17,27 +17,21 @@ import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder;
 import net.pherth.android.emoji_library.EmojiEditText;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-/**
- * Created by franzejr on 15/11/15.
- */
 public class CheckListAdapter extends RecyclerView.Adapter<CheckListAdapter.ItemViewHolder>
         implements ItemTouchHelperAdapter {
 
     private final List<ChecklistItem> items = new ArrayList<>();
-    public final Map<String, String> checklistTexts = new HashMap<>();
 
-    public CheckListAdapter(List<ChecklistItem> checklistItems) {
-        items.addAll(checklistItems);
-        for (ChecklistItem item : checklistItems) {
-            checklistTexts.put(item.getId(), item.getText());
-        }
+    public CheckListAdapter() {
+    }
+
+    public void setItems(List<ChecklistItem> items) {
+        this.items.addAll(items);
     }
 
     @Override
@@ -83,16 +77,16 @@ public class CheckListAdapter extends RecyclerView.Adapter<CheckListAdapter.Item
         notifyItemMoved(fromPosition, toPosition);
     }
 
-    public class ItemViewHolder extends RecyclerView.ViewHolder implements
+    class ItemViewHolder extends RecyclerView.ViewHolder implements
             ItemTouchHelperViewHolder, Button.OnClickListener {
 
-        public ChecklistTextWatcher textWatcher;
+        ChecklistTextWatcher textWatcher;
         @BindView(R.id.item_edittext)
         EmojiEditText checkListTextView;
         @BindView(R.id.delete_item_button)
         Button deleteButton;
 
-        public ItemViewHolder(View itemView) {
+        ItemViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
             deleteButton.setOnClickListener(this);
@@ -129,12 +123,19 @@ public class CheckListAdapter extends RecyclerView.Adapter<CheckListAdapter.Item
 
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
-                checklistTexts.put(id, checkListTextView.getText().toString());
             }
 
             @Override
             public void afterTextChanged(Editable s) {
-
+                if (id == null) {
+                    return;
+                }
+                for (ChecklistItem item : items) {
+                    if (id.equals(item.getId())) {
+                        item.setText(checkListTextView.getText().toString());
+                        break;
+                    }
+                }
             }
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
index 577189063..789101bc9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
@@ -33,12 +33,15 @@ public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.Item
     private final String taskType;
     private RemindersManager remindersManager;
 
-    public RemindersAdapter(List<RemindersItem> remindersInc, String taskType) {
-        this.reminders.addAll(remindersInc);
+    public RemindersAdapter(String taskType) {
         this.remindersManager = new RemindersManager(taskType);
         this.taskType = taskType;
     }
 
+    public void setReminders(List<RemindersItem> reminders) {
+        this.reminders.addAll(reminders);
+    }
+
     @Override
     public ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.reminder_item, parent, false);
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 000b9cfc5..b2b6c2b95 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
@@ -76,7 +76,7 @@ public class RewardsRecyclerViewAdapter extends RealmBaseTasksRecyclerViewAdapte
                             }
                             subscriber.onNext(buyableItems);
                             subscriber.onCompleted();
-                        }, throwable -> {}));
+                        }, ReactiveErrorHandler.handleEmptyError()));
                     })
                     .subscribe(items -> {
                         notifyDataSetChanged();
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 2dfd6ad7f..7b617cc72 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
@@ -28,6 +28,7 @@ import javax.inject.Inject;
 
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
+import rx.subscriptions.CompositeSubscription;
 
 public abstract class BaseFragment extends DialogFragment {
 
@@ -41,6 +42,8 @@ public abstract class BaseFragment extends DialogFragment {
     protected boolean tutorialCanBeDeferred = true;
     public List<String> tutorialTexts;
 
+    CompositeSubscription compositeSubscription;
+
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
         super.setUserVisibleHint(isVisibleToUser);
@@ -58,7 +61,7 @@ public abstract class BaseFragment extends DialogFragment {
                         event.canBeDeferred = tutorialCanBeDeferred;
                         EventBus.getDefault().post(event);
                     }
-                }, throwable -> {});
+                }, ReactiveErrorHandler.handleEmptyError());
             }
 
             String displayedClassName = this.getDisplayedClassName();
@@ -74,6 +77,7 @@ public abstract class BaseFragment extends DialogFragment {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         injectFragment(HabiticaBaseApplication.getComponent());
+        compositeSubscription = new CompositeSubscription();
         super.onCreate(savedInstanceState);
     }
 
@@ -118,9 +122,15 @@ public abstract class BaseFragment extends DialogFragment {
         refWatcher.watch(this);
     }
 
+    @Override
+    public void onDestroy() {
+        if (compositeSubscription != null && !compositeSubscription.isUnsubscribed()) {
+            compositeSubscription.unsubscribe();
+        }
+        super.onDestroy();
+    }
+
     public String getDisplayedClassName() {
         return this.getClass().getSimpleName();
     }
-
-
 }
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 6195a0536..09557adb5 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
@@ -85,7 +85,7 @@ public abstract class BaseMainFragment extends BaseFragment {
         if (savedInstanceState != null && savedInstanceState.containsKey("userId")) {
             String userId = savedInstanceState.getString("userId");
             if (userId != null) {
-                userRepository.getUser(userId).subscribe(habitRPGUser -> user = habitRPGUser, throwable -> {});
+                userRepository.getUser(userId).subscribe(habitRPGUser -> user = habitRPGUser, ReactiveErrorHandler.handleEmptyError());
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
index d00ba6c50..c90370c17 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
@@ -40,7 +40,7 @@ public class FAQOverviewFragment extends BaseMainFragment {
 
         unbinder = ButterKnife.bind(this, view);
         adapter = new FAQOverviewRecyclerAdapter();
-        adapter.getResetWalkthroughEvents().subscribe(aVoid -> this.userRepository.resetTutorial(user), throwable -> {});
+        adapter.getResetWalkthroughEvents().subscribe(aVoid -> this.userRepository.resetTutorial(user), ReactiveErrorHandler.handleEmptyError());
         adapter.activity = activity;
         recyclerView.setLayoutManager(new LinearLayoutManager(activity));
         recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
@@ -59,7 +59,7 @@ public class FAQOverviewFragment extends BaseMainFragment {
         if (user == null || adapter == null) {
             return;
         }
-        faqRepository.getArticles().subscribe(adapter::setArticles, throwable -> {});
+        faqRepository.getArticles().subscribe(adapter::setArticles, ReactiveErrorHandler.handleEmptyError());
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
index 0b26e78b4..5e8d6e33a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
@@ -87,7 +87,7 @@ public class AvatarCustomizationFragment extends BaseMainFragment {
         if (user == null || adapter == null) {
             return;
         }
-        customizationRepository.getCustomizations(type, category).subscribe(adapter::setCustomizationList, throwable -> {});
+        customizationRepository.getCustomizations(type, category).subscribe(adapter::setCustomizationList, ReactiveErrorHandler.handleEmptyError());
     }
 
     private void setGridSpanCount(int width) {
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 fabb83320..7c04c451d 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
@@ -65,7 +65,7 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
 
         if (apiClient != null) {
             apiClient.getContent()
-                    .subscribe(contentResult -> {}, throwable -> {});
+                    .subscribe(contentResult -> {}, ReactiveErrorHandler.handleEmptyError());
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
index 77c932665..4467b8392 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
@@ -66,6 +66,6 @@ public class EquipmentDetailFragment extends BaseMainFragment {
         if (user == null || adapter == null) {
             return;
         }
-        inventoryRepository.getOwnedEquipment(type).subscribe(adapter::setGearList, throwable -> {});
+        inventoryRepository.getOwnedEquipment(type).subscribe(adapter::setGearList, ReactiveErrorHandler.handleEmptyError());
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
index feb0ac268..b215dd0ce 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
@@ -134,7 +134,7 @@ public class EquipmentOverviewFragment extends BaseMainFragment {
                 }
 
                 this.viewBinding.setEquipmentNames(this.nameMapping);
-            }, throwable -> {});
+            }, ReactiveErrorHandler.handleEmptyError());
         } else {
             this.viewBinding.setEquipmentNames(this.nameMapping);
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
index 9a89ae9e7..5fed19ef1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
@@ -116,7 +116,7 @@ public class ItemRecyclerFragment extends BaseFragment {
                     .flatMap(item -> inventoryRepository.sellItem(user, item))
                     .subscribe(item -> {
 
-            }, throwable -> {});
+            }, ReactiveErrorHandler.handleEmptyError());
         }
         recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
 
@@ -188,7 +188,7 @@ public class ItemRecyclerFragment extends BaseFragment {
             if (items.size() > 0) {
                 adapter.updateData((OrderedRealmCollection<Item>) items);
             }
-        }, throwable -> {});
+        }, ReactiveErrorHandler.handleEmptyError());
     }
 
     @OnClick(R.id.openMarketButton)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
index a7ee16f43..8302bf9b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
@@ -112,7 +112,7 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
                 adapter.setOwnedMapping(user.getItems().getPets());
                 adapter.setOwnedMountsMapping(user.getItems().getMounts());
             }
-        }, throwable -> {});
+        }, ReactiveErrorHandler.handleEmptyError());
     }
 
     @Subscribe
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
index 53b9be64d..35f8d7909 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
@@ -197,6 +197,6 @@ public class StableRecyclerFragment extends BaseFragment {
         })
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(items -> adapter.setItemList(items), throwable -> {});
+                .subscribe(items -> adapter.setItemList(items), ReactiveErrorHandler.handleEmptyError());
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
index 07b610da1..350db5ed6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
@@ -42,7 +42,7 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
 
         String userID = getPreferenceManager().getSharedPreferences().getString(getContext().getString(R.string.SP_userID), null);
         if (userID != null) {
-            userRepository.getUser(userID).subscribe(this::setUser, throwable -> {});
+            userRepository.getUser(userID).subscribe(this::setUser, ReactiveErrorHandler.handleEmptyError());
         }
     }
 
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 b3496ba93..f85674d89 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
@@ -57,7 +57,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
 
         String userID = getPreferenceManager().getSharedPreferences().getString(context.getString(R.string.SP_userID), null);
         if (userID != null) {
-            userRepository.getUser(userID).subscribe(PreferencesFragment.this::setUser, throwable -> {});
+            userRepository.getUser(userID).subscribe(PreferencesFragment.this::setUser, ReactiveErrorHandler.handleEmptyError());
         }
     }
 
@@ -126,7 +126,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
             }
             return true;
         } else if (preference.getKey().equals("reload_content")) {
-            apiClient.getContent().subscribe(contentResult -> {}, throwable -> {});
+            apiClient.getContent().subscribe(contentResult -> {}, ReactiveErrorHandler.handleEmptyError());
         }
         return super.onPreferenceTreeClick(preference);
     }
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 584bd7f8a..f8394cc68 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
@@ -94,7 +94,7 @@ public class SkillsFragment extends BaseMainFragment {
 
         Observable.concat(userRepository.getSkills(user).flatMap(Observable::from), userRepository.getSpecialItems(user).flatMap(Observable::from))
                 .toList()
-                .subscribe(skills -> adapter.setSkillList(skills), throwable -> {});
+                .subscribe(skills -> adapter.setSkillList(skills), ReactiveErrorHandler.handleEmptyError());
     }
 
     @Override
@@ -145,7 +145,7 @@ public class SkillsFragment extends BaseMainFragment {
         if (activity != null) {
             UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), message.toString(), UiUtils.SnackbarDisplayType.NORMAL);
         }
-        userRepository.retrieveUser(false).subscribe(habitRPGUser -> {}, throwable -> {});
+        userRepository.retrieveUser(false).subscribe(habitRPGUser -> {}, ReactiveErrorHandler.handleEmptyError());
     }
 
     @Override
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 3bc609dbd..b75ff1d8e 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
@@ -91,7 +91,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
             if (savedInstanceState.containsKey("userId")) {
                 this.userId = savedInstanceState.getString("userId");
                 if (this.userId != null) {
-                    userRepository.getUser(userId).subscribe(habitRPGUser -> this.user = habitRPGUser, throwable -> {});
+                    userRepository.getUser(userId).subscribe(habitRPGUser -> this.user = habitRPGUser, ReactiveErrorHandler.handleEmptyError());
                 }
             }
 
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 22fbd7d54..58fd938d6 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
@@ -356,7 +356,7 @@ public class GroupInformationFragment extends BaseFragment {
     public void onPartyInviteRejected() {
         if (user != null) {
             apiClient.rejectGroupInvite(user.getInvitations().getParty().getId())
-                    .subscribe(aVoid -> viewBinding.setInvitation(null), throwable -> {});
+                    .subscribe(aVoid -> viewBinding.setInvitation(null), ReactiveErrorHandler.handleEmptyError());
         }
     }
 }
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 068236a3a..3aa50a03c 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
@@ -87,7 +87,7 @@ public class InboxMessageListFragment extends BaseMainFragment
     private void refreshUserInbox () {
         this.swipeRefreshLayout.setRefreshing(true);
         this.userRepository.retrieveUser(true)
-                .subscribe(this::onUserReceived, throwable -> {});
+                .subscribe(this::onUserReceived, ReactiveErrorHandler.handleEmptyError());
     }
 
     @Override
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 a70823595..1debc6d44 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
@@ -73,7 +73,7 @@ public class TavernFragment extends BaseMainFragment {
                                 if (questInfoFragment != null) {
                                     questInfoFragment.setQuestContent(content);
                                 }
-                            }, throwable -> {});
+                            }, ReactiveErrorHandler.handleEmptyError());
                         }
                     }, throwable -> {
                     });
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 9bcb7bb92..0aa31d4f8 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
@@ -181,7 +181,7 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
 
             // load online challenges & save to database
             onRefresh();
-        }, throwable -> {});
+        }, ReactiveErrorHandler.handleEmptyError());
     }
 
     private void setChallengeEntries(List<Challenge> challenges) {
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 a731120ef..a0bd410bf 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
@@ -159,7 +159,7 @@ public class ChallengesOverviewFragment extends BaseMainFragment {
                 userChallengesFragment.onRefresh();
                 availableChallengesFragment.onRefresh();
             });
-        }, throwable -> {});
+        }, ReactiveErrorHandler.handleEmptyError());
     }
 
     @Subscribe
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 6a51b4587..0b5ae3916 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
@@ -136,7 +136,7 @@ public class PartyFragment extends BaseMainFragment {
                 if (groupInformationFragment != null) {
                     groupInformationFragment.setQuestContent(content);
                 }
-            }, throwable -> {});
+            }, ReactiveErrorHandler.handleEmptyError());
         }
 
     }
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 6ffa95655..bf1aa7759 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
@@ -342,7 +342,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
         swipeRefreshLayout.setRefreshing(true);
         userRepository.retrieveUser(true)
                 .doOnTerminate(() -> swipeRefreshLayout.setRefreshing(false))
-                .subscribe(user1 -> {}, throwable -> {});
+                .subscribe(user1 -> {}, ReactiveErrorHandler.handleEmptyError());
     }
 
     public void setActiveFilter(String activeFilter) {
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 80ec4bf28..73e284486 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
@@ -341,7 +341,7 @@ public class TasksFragment extends BaseMainFragment {
                     }
                 }
             }
-        }, throwable -> {});
+        }, ReactiveErrorHandler.handleEmptyError());
     }
     // endregion
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
index de1f13c68..7ff50f5ec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.java
@@ -213,9 +213,9 @@ public class TaskFilterDialog extends AlertDialog implements RadioGroup.OnChecke
         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 -> {});
+        repository.updateTags(editedTags.values()).subscribe(tag -> editedTags.remove(tag.getId()), ReactiveErrorHandler.handleEmptyError());
+        repository.createTags(createdTags.values()).subscribe(tag -> createdTags.remove(tag.getId()), ReactiveErrorHandler.handleEmptyError());
+        repository.deleteTags(deletedTags).subscribe(tags1 -> deletedTags.clear(), ReactiveErrorHandler.handleEmptyError());
     }
 
     private void createTagEditViews() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
index 2eb5501fc..4a08be6ed 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
@@ -41,7 +41,6 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
 
     @Override
     public ContentResult deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<RealmObject> items = new ArrayList<>();
 
         ContentResult result = new ContentResult();
         JsonObject object = json.getAsJsonObject();
@@ -50,9 +49,7 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
         result.armoire = context.deserialize(object.get("armoire"), Equipment.class);
         result.gear = context.deserialize(object.get("gear"), ContentGear.class);
 
-        items.add(result.potion);
-        items.add(result.armoire);
-        items.addAll(result.gear.flat);
+
 
         result.quests = context.deserialize(object.get("quests"), new TypeToken<List<QuestContent>>() {
         }.getType());
@@ -63,11 +60,6 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
         result.hatchingPotions = context.deserialize(object.get("hatchingPotions"), new TypeToken<List<HatchingPotion>>() {
         }.getType());
 
-        items.addAll(result.quests);
-        items.addAll(result.eggs);
-        items.addAll(result.food);
-        items.addAll(result.hatchingPotions);
-
         result.pets = context.deserialize(object.get("pets"), new TypeToken<Map<String, Pet>>() {
         }.getType());
         result.specialPets = context.deserialize(object.get("specialPets"), new TypeToken<Map<String, Pet>>() {
@@ -115,40 +107,6 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
             }
         }
 
-        for (Pet pet : result.pets.values()) {
-            pet.setAnimalGroup("pets");
-            items.add(pet);
-        }
-        for (Pet pet : result.specialPets.values()) {
-            pet.setAnimalGroup("specialPets");
-            items.add(pet);
-        }
-        for (Pet pet : result.premiumPets.values()) {
-            pet.setAnimalGroup("premiumPets");
-            items.add(pet);
-        }
-        for (Pet pet : result.questPets.values()) {
-            pet.setAnimalGroup("questPets");
-            items.add(pet);
-        }
-
-        for (Mount mount : result.mounts.values()) {
-            mount.setAnimalGroup("mounts");
-            items.add(mount);
-        }
-        for (Mount mount : result.specialMounts.values()) {
-            mount.setAnimalGroup("specialMounts");
-            items.add(mount);
-        }
-        for (Mount mount : result.premiumMounts.values()) {
-            mount.setAnimalGroup("premiumMounts");
-            items.add(mount);
-        }
-        for (Mount mount : result.questMounts.values()) {
-            mount.setAnimalGroup("questMounts");
-            items.add(mount);
-        }
-
         result.spells = context.deserialize(object.get("spells"), new TypeToken<List<Skill>>() {
         }.getType());
 
@@ -171,13 +129,6 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
         result.faq = context.deserialize(object.get("faq"), new TypeToken<List<FAQArticle>>() {
         }.getType());
 
-        items.addAll(result.spells);
-
-        items.addAll(result.appearances);
-        items.addAll(result.backgrounds);
-
-        items.addAll(result.faq);
-
         return result;
     }
 
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 9d4b886d7..478198694 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
@@ -50,7 +50,7 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
         this.appWidgetManager = appWidgetManager;
         this.context = context;
 
-        userRepository.getUser(userId).subscribe(this::updateData, throwable -> {});
+        userRepository.getUser(userId).subscribe(this::updateData, ReactiveErrorHandler.handleEmptyError());
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
index 154a68787..a2d3b35a6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.java
@@ -53,7 +53,7 @@ public class HabitButtonWidgetService extends Service {
         makeTaskMapping();
 
         for (String taskid : this.taskMapping.keySet()) {
-            taskRepository.getTask(taskid).subscribe(this::updateData, throwable -> {});
+            taskRepository.getTask(taskid).subscribe(this::updateData, ReactiveErrorHandler.handleEmptyError());
         }
 
         stopSelf();

From 6c4cf8e5a5c9c3fb338954c6ef33afb105b1049d Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 25 Apr 2017 13:20:25 +0200
Subject: [PATCH 09/17] Fix equipping  gear

---
 .../layout/fragment_equipment_overview.xml    |   6 +-
 .../habitica/data/InventoryRepository.java    |   3 +
 .../android/habitica/data/UserRepository.java |   1 +
 .../data/implementation/ApiClientImpl.java    |  34 +++--
 .../InventoryRepositoryImpl.java              |  18 +++
 .../implementation/UserRepositoryImpl.java    |   7 +-
 .../RealmContentLocalRepository.java          |  67 ++------
 .../RealmCustomizationLocalRepository.java    |   2 +-
 .../RealmFAQLocalRepository.java              |   2 +-
 .../RealmInventoryLocalRepository.java        |   9 +-
 .../RealmTaskLocalRepository.java             |   4 +-
 .../RealmUserLocalRepository.java             |   4 +-
 .../android/habitica/models/ContentGear.java  |   4 +-
 .../habitica/models/ContentResult.java        |  26 ++--
 .../habitica/models/inventory/Equipment.java  |   1 -
 .../android/habitica/models/user/Gear.java    |   6 +-
 .../android/habitica/models/user/Items.java   |  50 +++---
 .../android/habitica/models/user/Outfit.java  |  10 ++
 .../android/habitica/models/user/User.java    |   3 +-
 .../activities/ChallengeDetailActivity.java   |   1 +
 .../habitica/ui/activities/MainActivity.java  |  16 +-
 .../EquipmentRecyclerViewAdapter.java         |  33 ++--
 .../inventory/ItemRecyclerAdapter.java        |   5 +-
 .../habitica/ui/fragments/BaseFragment.java   |   2 +-
 .../customization/AvatarOverviewFragment.java |   1 +
 .../equipment/EquipmentDetailFragment.java    |  21 ++-
 .../inventory/items/ItemRecyclerFragment.java |   3 +-
 .../inventory/items/ItemsFragment.java        |   4 +-
 .../stable/MountDetailRecyclerFragment.java   |   3 -
 .../stable/PetDetailRecyclerFragment.java     |   6 -
 .../stable/StableRecyclerFragment.java        |  10 +-
 .../preferences/PreferencesFragment.java      |   1 +
 .../tasks/TaskRecyclerViewFragment.java       |   2 +-
 .../ui/fragments/tasks/TasksFragment.java     |   1 +
 .../habitica/utils/ContentDeserializer.java   |  78 ++++++----
 .../utils/CustomizationDeserializer.java      |  32 ++--
 .../habitica/utils/EggListDeserializer.java   |  13 +-
 ...er.java => EquipmentListDeserializer.java} | 144 ++++++++++--------
 .../utils/FAQArticleListDeserilializer.java   |   4 +-
 .../habitica/utils/FoodListDeserializer.java  |  13 +-
 .../utils/HatchingPotionListDeserializer.java |  13 +-
 .../habitica/utils/MountListDeserializer.java |  50 ++++--
 .../habitica/utils/MountMapDeserializer.java  |  49 ++++++
 .../habitica/utils/PetListDeserializer.java   |  56 +++++--
 .../habitica/utils/PetMapDeserializer.java    |  47 ++++++
 .../habitica/utils/QuestListDeserializer.java |  12 +-
 .../habitica/utils/SkillDeserializer.java     |   2 +
 .../habitica/utils/TaskTagDeserializer.java   |   3 +-
 48 files changed, 539 insertions(+), 343 deletions(-)
 rename Habitica/src/main/java/com/habitrpg/android/habitica/utils/{ItemDataListDeserializer.java => EquipmentListDeserializer.java} (74%)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java

diff --git a/Habitica/res/layout/fragment_equipment_overview.xml b/Habitica/res/layout/fragment_equipment_overview.xml
index 6fb40cd70..f3f45bae4 100644
--- a/Habitica/res/layout/fragment_equipment_overview.xml
+++ b/Habitica/res/layout/fragment_equipment_overview.xml
@@ -28,13 +28,13 @@
         android:scrollbarSize="3dp"
         android:scrollbarThumbVertical="@color/md_grey_500"
         android:scrollbars="vertical"
-        android:paddingTop="@dimen/row_padding"
-        android:paddingBottom="?attr/actionBarSize">
+        android:paddingTop="@dimen/row_padding">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="?attr/actionBarSize">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
index 80d277db9..c29654f3e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
@@ -7,6 +7,7 @@ import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
@@ -47,4 +48,6 @@ public interface InventoryRepository extends ContentRepository {
 
     Observable<User> sellItem(User user, String type, String key);
     Observable<User> sellItem(User user, Item item);
+
+    Observable<Items> equipGear(User user, String equipment, boolean asCostume);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
index ff33e4a73..a31604ff0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
@@ -19,6 +19,7 @@ public interface UserRepository extends BaseRepository {
     Observable<User> updateUser(User user, String key, Object value);
 
     Observable<User> retrieveUser(Boolean withTasks);
+    Observable<User> retrieveUser(Boolean withTasks, Boolean forced);
 
     Observable<User> revive(User user);
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index e86f79202..ad65720ac 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -59,7 +59,6 @@ import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
 import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.Purchases;
@@ -77,9 +76,11 @@ import com.habitrpg.android.habitica.utils.FeedResponseDeserializer;
 import com.habitrpg.android.habitica.utils.FoodListDeserializer;
 import com.habitrpg.android.habitica.utils.GroupSerialization;
 import com.habitrpg.android.habitica.utils.HatchingPotionListDeserializer;
-import com.habitrpg.android.habitica.utils.ItemDataListDeserializer;
+import com.habitrpg.android.habitica.utils.EquipmentListDeserializer;
 import com.habitrpg.android.habitica.utils.MountListDeserializer;
+import com.habitrpg.android.habitica.utils.MountMapDeserializer;
 import com.habitrpg.android.habitica.utils.PetListDeserializer;
+import com.habitrpg.android.habitica.utils.PetMapDeserializer;
 import com.habitrpg.android.habitica.utils.PurchasedDeserializer;
 import com.habitrpg.android.habitica.utils.QuestListDeserializer;
 import com.habitrpg.android.habitica.utils.RemindersItemSerializer;
@@ -210,26 +211,31 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
         }.getType();
         Type skillListType = new TypeToken<List<Skill>>() {
         }.getType();
-        Type customizationListType = new TypeToken<List<Customization>>() {
+        Type customizationListType = new TypeToken<RealmList<Customization>>() {
         }.getType();
         Type tutorialStepListType = new TypeToken<RealmList<TutorialStep>>() {
         }.getType();
-        Type faqArticleListType = new TypeToken<List<FAQArticle>>() {
+        Type faqArticleListType = new TypeToken<RealmList<FAQArticle>>() {
         }.getType();
-        Type itemDataListType = new TypeToken<List<Equipment>>() {
+        Type itemDataListType = new TypeToken<RealmList<Equipment>>() {
         }.getType();
-        Type eggListType = new TypeToken<List<Egg>>() {
+        Type eggListType = new TypeToken<RealmList<Egg>>() {
         }.getType();
-        Type foodListType = new TypeToken<List<Food>>() {
+        Type foodListType = new TypeToken<RealmList<Food>>() {
         }.getType();
-        Type hatchingPotionListType = new TypeToken<List<HatchingPotion>>() {
+        Type hatchingPotionListType = new TypeToken<RealmList<HatchingPotion>>() {
         }.getType();
-        Type questContentListType = new TypeToken<List<QuestContent>>() {
+        Type questContentListType = new TypeToken<RealmList<QuestContent>>() {
         }.getType();
-        Type petListType = new TypeToken<Map<String, Pet>>() {
+        Type petMapType = new TypeToken<Map<String, Pet>>() {
         }.getType();
-        Type mountListType = new TypeToken<Map<String, Mount>>() {
+        Type mountMapType = new TypeToken<Map<String, Mount>>() {
         }.getType();
+        Type petListType = new TypeToken<RealmList<Pet>>() {
+        }.getType();
+        Type mountListType = new TypeToken<RealmList<Mount>>() {
+        }.getType();
+
 
         //Exclusion strategy needed for DBFlow https://github.com/Raizlabs/DBFlow/issues/121
         Gson gson = new GsonBuilder()
@@ -258,13 +264,15 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
                 .registerTypeAdapter(faqArticleListType, new FAQArticleListDeserilializer())
                 .registerTypeAdapter(Group.class, new GroupSerialization())
                 .registerTypeAdapter(Date.class, new DateDeserializer())
-                .registerTypeAdapter(itemDataListType, new ItemDataListDeserializer())
+                .registerTypeAdapter(itemDataListType, new EquipmentListDeserializer())
                 .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(petMapType, new PetMapDeserializer())
+                .registerTypeAdapter(mountMapType, new MountMapDeserializer())
                 .registerTypeAdapter(ChatMessage.class, new ChatMessageDeserializer())
                 .registerTypeAdapter(Task.class, new TaskSerializer())
                 .registerTypeAdapter(ContentResult.class, new ContentDeserializer())
@@ -362,7 +370,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
                         sortedTasks.addAll(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getTodos()));
                         sortedTasks.addAll(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getRewards()));
 
-                        Realm.getDefaultInstance().executeTransactionAsync(realm -> realm.copyToRealmOrUpdate(sortedTasks));
+                        Realm.getDefaultInstance().executeTransactionAsync(realm -> realm.insertOrUpdate(sortedTasks));
 
                         return habitRPGUser;
                     });
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
index 591a3b37e..1786b5fbb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
@@ -8,6 +8,8 @@ import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.user.Outfit;
 import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
@@ -124,4 +126,20 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
                     return user;
                 });
     }
+
+    @Override
+    public Observable<Items> equipGear(User user, String key, boolean asCostume) {
+        return apiClient.equipItem(asCostume ? "costume" : "equipped", key)
+                .doOnNext(items -> {
+                    if (user == null) {
+                        return;
+                    }
+                    localRepository.executeTransaction(realm -> {
+                        Outfit newOutfit = asCostume ? items.getGear().getCostume() : items.getGear().getEquipped();
+                        Outfit oldOutfit = asCostume ? user.getItems().getGear().getCostume() : user.getItems().getGear().getEquipped();
+                        oldOutfit.updateWith(newOutfit);
+                        user.setBalance(user.getBalance());
+                    });
+                });
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 239798548..54552e646 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -53,7 +53,12 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
 
     @Override
     public Observable<User> retrieveUser(Boolean withTasks) {
-        if (this.lastSync == null || (new Date().getTime() - this.lastSync.getTime()) > 180000) {
+        return retrieveUser(withTasks, false);
+    }
+
+    @Override
+    public Observable<User> retrieveUser(Boolean withTasks, Boolean forced) {
+        if (forced || this.lastSync == null || (new Date().getTime() - this.lastSync.getTime()) > 180000) {
             lastSync = new Date();
             return apiClient.retrieveUser(withTasks)
                     .doOnNext(localRepository::saveUser);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.java
index 6a1fd402d..b79dae40e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmContentLocalRepository.java
@@ -2,14 +2,8 @@ package com.habitrpg.android.habitica.data.local.implementation;
 
 import com.habitrpg.android.habitica.data.local.ContentLocalRepository;
 import com.habitrpg.android.habitica.models.ContentResult;
-import com.habitrpg.android.habitica.models.inventory.Mount;
-import com.habitrpg.android.habitica.models.inventory.Pet;
-
-import java.util.ArrayList;
-import java.util.List;
 
 import io.realm.Realm;
-import io.realm.RealmObject;
 
 
 class RealmContentLocalRepository extends RealmBaseLocalRepository implements ContentLocalRepository {
@@ -21,58 +15,23 @@ class RealmContentLocalRepository extends RealmBaseLocalRepository implements Co
     @Override
     public void saveContent(ContentResult result) {
         realm.executeTransactionAsync(realm1 -> {
-            List<RealmObject> items = new ArrayList<>();
-            items.add(result.potion);
-            items.add(result.armoire);
-            items.addAll(result.gear.flat);
+            realm1.insertOrUpdate(result.potion);
+            realm1.insertOrUpdate(result.armoire);
+            realm1.insertOrUpdate(result.gear.flat);
 
-            items.addAll(result.quests);
-            items.addAll(result.eggs);
-            items.addAll(result.food);
-            items.addAll(result.hatchingPotions);
+            realm1.insertOrUpdate(result.quests);
+            realm1.insertOrUpdate(result.eggs);
+            realm1.insertOrUpdate(result.food);
+            realm1.insertOrUpdate(result.hatchingPotions);
 
-            for (Pet pet : result.pets.values()) {
-                pet.setAnimalGroup("pets");
-                items.add(pet);
-            }
-            for (Pet pet : result.specialPets.values()) {
-                pet.setAnimalGroup("specialPets");
-                items.add(pet);
-            }
-            for (Pet pet : result.premiumPets.values()) {
-                pet.setAnimalGroup("premiumPets");
-                items.add(pet);
-            }
-            for (Pet pet : result.questPets.values()) {
-                pet.setAnimalGroup("questPets");
-                items.add(pet);
-            }
 
-            for (Mount mount : result.mounts.values()) {
-                mount.setAnimalGroup("mounts");
-                items.add(mount);
-            }
-            for (Mount mount : result.specialMounts.values()) {
-                mount.setAnimalGroup("specialMounts");
-                items.add(mount);
-            }
-            for (Mount mount : result.premiumMounts.values()) {
-                mount.setAnimalGroup("premiumMounts");
-                items.add(mount);
-            }
-            for (Mount mount : result.questMounts.values()) {
-                mount.setAnimalGroup("questMounts");
-                items.add(mount);
-            }
+            realm1.insertOrUpdate(result.pets);
+            realm1.insertOrUpdate(result.mounts);
 
-            items.addAll(result.spells);
-
-            items.addAll(result.appearances);
-            items.addAll(result.backgrounds);
-
-            items.addAll(result.faq);
-
-            realm1.insertOrUpdate(items);
+            realm1.insertOrUpdate(result.spells);
+            realm1.insertOrUpdate(result.appearances);
+            realm1.insertOrUpdate(result.backgrounds);
+            realm1.insertOrUpdate(result.faq);
         });
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.java
index 8086d537b..b159a203a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmCustomizationLocalRepository.java
@@ -8,7 +8,7 @@ import io.realm.RealmResults;
 import rx.Observable;
 
 
-public class RealmCustomizationLocalRepository extends RealmBaseLocalRepository implements CustomizationLocalRepository {
+public class RealmCustomizationLocalRepository extends RealmContentLocalRepository implements CustomizationLocalRepository {
 
     public RealmCustomizationLocalRepository(Realm realm) {
         super(realm);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.java
index 4e2106065..b16133262 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmFAQLocalRepository.java
@@ -7,7 +7,7 @@ import io.realm.Realm;
 import io.realm.RealmResults;
 import rx.Observable;
 
-public class RealmFAQLocalRepository extends RealmBaseLocalRepository implements FAQLocalRepository {
+public class RealmFAQLocalRepository extends RealmContentLocalRepository implements FAQLocalRepository {
 
     public RealmFAQLocalRepository(Realm realm) {
         super(realm);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
index 191fdb7a1..d14298831 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
@@ -19,7 +19,7 @@ import io.realm.RealmResults;
 import rx.Observable;
 
 
-public class RealmInventoryLocalRepository extends RealmBaseLocalRepository implements InventoryLocalRepository {
+public class RealmInventoryLocalRepository extends RealmContentLocalRepository implements InventoryLocalRepository {
     public RealmInventoryLocalRepository(Realm realm) {
         super(realm);
     }
@@ -35,7 +35,7 @@ public class RealmInventoryLocalRepository extends RealmBaseLocalRepository impl
     @Override
     public Observable<RealmResults<Equipment>> getEquipment(List<String> searchedKeys) {
         return realm.where(Equipment.class)
-                .in("key", (String[]) searchedKeys.toArray())
+                .in("key", searchedKeys.toArray(new String[0]))
                 .findAll()
                 .asObservable()
                 .filter(RealmResults::isLoaded);
@@ -81,7 +81,10 @@ public class RealmInventoryLocalRepository extends RealmBaseLocalRepository impl
             case "quests":
                 itemClass = QuestContent.class;
         }
-        return realm.where(itemClass).findAllAsync().asObservable()
+        if (itemClass == null) {
+            return Observable.empty();
+        }
+        return realm.where(itemClass).greaterThan("owned", 0).findAllAsync().asObservable()
                 .filter(RealmResults::isLoaded);
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
index f57c99855..eb17c40b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
@@ -35,12 +35,12 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
 
     @Override
     public void saveTasks(TasksOrder tasksOrder, TaskList tasks) {
-        realm.executeTransaction(realm1 -> realm1.copyToRealmOrUpdate(tasks.tasks.values()));
+        realm.executeTransaction(realm1 -> realm1.insertOrUpdate(tasks.tasks.values()));
     }
 
     @Override
     public void saveTask(Task task) {
-        realm.executeTransaction(realm1 -> realm1.copyToRealmOrUpdate(task));
+        realm.executeTransaction(realm1 -> realm1.insertOrUpdate(task));
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
index 2007a5e26..02906879b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
@@ -29,7 +29,7 @@ public class RealmUserLocalRepository extends RealmBaseLocalRepository implement
 
     @Override
     public void saveUser(User user) {
-        realm.executeTransaction(realm1 -> realm1.copyToRealmOrUpdate(user));
+        realm.executeTransaction(realm1 -> realm1.insertOrUpdate(user));
     }
 
     @Override
@@ -69,7 +69,7 @@ public class RealmUserLocalRepository extends RealmBaseLocalRepository implement
             }
         }
         return realm.where(Skill.class)
-                .in("key", (String[]) ownedItems.toArray())
+                .in("key", ownedItems.toArray(new String[0]))
                 .findAll()
                 .asObservable()
                 .filter(RealmResults::isLoaded);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
index ae11caebc..99d4ad8f0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentGear.java
@@ -4,8 +4,10 @@ import com.habitrpg.android.habitica.models.inventory.Equipment;
 
 import java.util.List;
 
+import io.realm.RealmList;
+
 public class ContentGear {
 
-    public List<Equipment> flat;
+    public RealmList<Equipment> flat;
 
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
index bf5ca464c..665c828e2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/ContentResult.java
@@ -12,6 +12,8 @@ import com.habitrpg.android.habitica.models.inventory.QuestContent;
 import java.util.HashMap;
 import java.util.List;
 
+import io.realm.RealmList;
+
 /**
  * Created by Negue on 15.07.2015.
  */
@@ -23,26 +25,20 @@ public class ContentResult {
 
     public ContentGear gear;
 
-    public List<QuestContent> quests;
-    public List<Egg> eggs;
-    public List<Food> food;
-    public List<HatchingPotion> hatchingPotions;
+    public RealmList<QuestContent> quests;
+    public RealmList<Egg> eggs;
+    public RealmList<Food> food;
+    public RealmList<HatchingPotion> hatchingPotions;
 
-    public HashMap<String, Pet> pets;
-    public HashMap<String, Pet> specialPets;
-    public HashMap<String, Pet> premiumPets;
-    public HashMap<String, Pet> questPets;
+    public RealmList<Pet> pets;
 
-    public HashMap<String, Mount> mounts;
-    public HashMap<String, Mount> specialMounts;
-    public HashMap<String, Mount> premiumMounts;
-    public HashMap<String, Mount> questMounts;
+    public RealmList<Mount> mounts;
 
     public List<Skill> spells;
 
-    public List<Customization> appearances;
-    public List<Customization> backgrounds;
+    public RealmList<Customization> appearances;
+    public RealmList<Customization> backgrounds;
 
-    public List<FAQArticle> faq;
+    public RealmList<FAQArticle> faq;
 }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.java
index 498dade2d..0d0fb1533 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Equipment.java
@@ -6,7 +6,6 @@ import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
 
 public class Equipment extends RealmObject {
-    public static final String UNIQUE_IDENTIFIER = "key";
 
     public double value;
     public String type;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
index 0ae56d393..1b2b66fcc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
@@ -1,14 +1,16 @@
 package com.habitrpg.android.habitica.models.user;
 
+import com.habitrpg.android.habitica.models.inventory.Equipment;
+
 import java.util.HashMap;
 
+import io.realm.RealmList;
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
 
 public class Gear extends RealmObject {
 
-    @Ignore
-    public HashMap<String, Boolean> owned;
+    public RealmList<Equipment> owned;
     Items items;
     private Outfit equipped;
     private Outfit costume;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
index 7ec112556..442a5e2cb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
@@ -1,26 +1,28 @@
 package com.habitrpg.android.habitica.models.user;
 
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.QuestContent;
+
 import java.util.Date;
 import java.util.HashMap;
 
+import io.realm.RealmList;
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
 
 public class Items extends RealmObject {
 
-    @Ignore
-    public HashMap<String, Integer> eggs;
-    @Ignore
-    public HashMap<String, Integer> food;
-    @Ignore
-    public HashMap<String, Integer> hatchingPotions;
-    @Ignore
-    public HashMap<String, Integer> quests;
+    public RealmList<Egg> eggs;
+    public RealmList<Food> food;
+    public RealmList<HatchingPotion> hatchingPotions;
+    public RealmList<QuestContent> quests;
     User user;
-    @Ignore
-    HashMap<String, Integer> pets;
-    @Ignore
-    HashMap<String, Boolean> mounts;
+    RealmList<Pet> pets;
+    RealmList<Mount> mounts;
     private String currentMount;
     private String currentPet;
     private int lastDrop_count;
@@ -88,51 +90,51 @@ public class Items extends RealmObject {
         this.special = specialItems;
     }
 
-    public HashMap<String, Integer> getEggs() {
+    public RealmList<Egg> getEggs() {
         return eggs;
     }
 
-    public void setEggs(HashMap<String, Integer> eggs) {
+    public void setEggs(RealmList<Egg> eggs) {
         this.eggs = eggs;
     }
 
-    public HashMap<String, Integer> getFood() {
+    public RealmList<Food> getFood() {
         return food;
     }
 
-    public void setFood(HashMap<String, Integer> food) {
+    public void setFood(RealmList<Food> food) {
         this.food = food;
     }
 
-    public HashMap<String, Integer> getHatchingPotions() {
+    public RealmList<HatchingPotion> getHatchingPotions() {
         return hatchingPotions;
     }
 
-    public void setHatchingPotions(HashMap<String, Integer> hatchingPotions) {
+    public void setHatchingPotions(RealmList<HatchingPotion> hatchingPotions) {
         this.hatchingPotions = hatchingPotions;
     }
 
-    public HashMap<String, Integer> getQuests() {
+    public RealmList<QuestContent> getQuests() {
         return quests;
     }
 
-    public void setQuests(HashMap<String, Integer> quests) {
+    public void setQuests(RealmList<QuestContent> quests) {
         this.quests = quests;
     }
 
-    public HashMap<String, Integer> getPets() {
+    public RealmList<Pet> getPets() {
         return pets;
     }
 
-    public void setPets(HashMap<String, Integer> pets) {
+    public void setPets(RealmList<Pet> pets) {
         this.pets = pets;
     }
 
-    public HashMap<String, Boolean> getMounts() {
+    public RealmList<Mount> getMounts() {
         return mounts;
     }
 
-    public void setMounts(HashMap<String, Boolean> mounts) {
+    public void setMounts(RealmList<Mount> mounts) {
         this.mounts = mounts;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
index fb8e938ec..181f288e2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
@@ -81,4 +81,14 @@ public class Outfit extends RealmObject {
     public boolean isAvailable(String outfit) {
         return !TextUtils.isEmpty(outfit) && !outfit.endsWith("base_0");
     }
+
+    public void updateWith(Outfit newOutfit) {
+        this.setArmor(newOutfit.getArmor());
+        this.setBack(newOutfit.getBack());
+        this.setBody(newOutfit.getBody());
+        this.setEyeWear(newOutfit.getEyeWear());
+        this.setHead(newOutfit.getHead());
+        this.setHeadAccessory(newOutfit.getHeadAccessory());
+        this.setShield(newOutfit.getShield());
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
index ab47368eb..e29e1f5d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
@@ -7,6 +7,7 @@ import com.google.gson.annotations.SerializedName;
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.models.PushDevice;
 import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.invitations.Invitations;
 import com.habitrpg.android.habitica.models.social.Challenge;
 import com.habitrpg.android.habitica.models.social.UserParty;
@@ -392,7 +393,7 @@ public class User extends RealmObject {
         return getNullableMapSize(items.getMounts());
     }
 
-    private int getNullableMapSize(Map map) {
+    private int getNullableMapSize(RealmList map) {
         int mapSize = 0;
 
         if (map != null) {
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 a765e0c19..2d39ee932 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
@@ -27,6 +27,7 @@ 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.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.interactors.BuyRewardUseCase;
 import com.habitrpg.android.habitica.interactors.ChecklistCheckUseCase;
 import com.habitrpg.android.habitica.interactors.DailyCheckUseCase;
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 8fa182433..8e8f9ce37 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
@@ -68,6 +68,7 @@ import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
 import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
 import com.habitrpg.android.habitica.helpers.LanguageHelper;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
@@ -304,6 +305,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
             this.checkMaintenance();
         }
 
+        reloadContent(null);
+
         if (this.sharedPreferences.getLong("lastReminderSchedule", 0) < new Date().getTime() - 86400000) {
             try {
                 taskAlarmManager.scheduleAllSavedAlarms();
@@ -642,13 +645,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
                 });
     }
 
-    @Subscribe
-    public void onEvent(EquipCommand event) {
-        this.apiClient.equipItem(event.type, event.key)
-                .subscribe(items -> {}, throwable -> {
-                });
-    }
-
     @Subscribe
     public void onEvent(UnlockPathCommand event) {
         this.user.setBalance(this.user.getBalance() - event.balanceDiff);
@@ -847,8 +843,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
         final Pet pet = event.usingPet;
         this.apiClient.feedPet(event.usingPet.getKey(), event.usingFood.getKey())
                 .subscribe(feedResponse -> {
-                    MainActivity.this.user.getItems().getPets().put(pet.getKey(), feedResponse.value);
-                    MainActivity.this.user.getItems().getFood().put(event.usingFood.getKey(), event.usingFood.getOwned() - 1);
                     MainActivity.this.setUserData(false);
                     showSnackbar(MainActivity.this, floatingMenuWrapper, getString(R.string.notification_pet_fed, pet.getColorText(), pet.getAnimalText()), SnackbarDisplayType.NORMAL);
                     if (feedResponse.value == -1) {
@@ -952,9 +946,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
     protected void retrieveUser() {
         if (this.userRepository != null) {
             this.userRepository.retrieveUser(true)
-                    .subscribe(user1 -> {}, throwable -> {
-
-                    });
+                    .subscribe(user1 -> {}, ReactiveErrorHandler.handleEmptyError());
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
index 7b5fb5057..0052cc9bf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/EquipmentRecyclerViewAdapter.java
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.adapter.inventory;
 
 import android.content.Context;
 import android.net.Uri;
+import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -20,17 +21,21 @@ import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.realm.OrderedRealmCollection;
+import io.realm.RealmRecyclerViewAdapter;
+import rx.Observable;
+import rx.subjects.PublishSubject;
 
-public class EquipmentRecyclerViewAdapter extends RecyclerView.Adapter<EquipmentRecyclerViewAdapter.GearViewHolder> {
+public class EquipmentRecyclerViewAdapter extends RealmRecyclerViewAdapter<Equipment, EquipmentRecyclerViewAdapter.GearViewHolder> {
 
     public String equippedGear;
     public Boolean isCostume;
     public String type;
-    private List<Equipment> gearList;
 
-    public void setGearList(List<Equipment> gearList) {
-        this.gearList = gearList;
-        this.notifyDataSetChanged();
+    private PublishSubject<String> equipEvents = PublishSubject.create();
+
+    public EquipmentRecyclerViewAdapter(@Nullable OrderedRealmCollection<Equipment> data, boolean autoUpdate) {
+        super(data, autoUpdate);
     }
 
     @Override
@@ -44,12 +49,13 @@ public class EquipmentRecyclerViewAdapter extends RecyclerView.Adapter<Equipment
 
     @Override
     public void onBindViewHolder(GearViewHolder holder, int position) {
-        holder.bind(gearList.get(position));
+        if (getData() != null) {
+            holder.bind(getData().get(position));
+        }
     }
 
-    @Override
-    public int getItemCount() {
-        return gearList == null ? 0 : gearList.size();
+    public Observable<String> getEquipEvents() {
+        return equipEvents.asObservable();
     }
 
     class GearViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
@@ -101,14 +107,7 @@ public class EquipmentRecyclerViewAdapter extends RecyclerView.Adapter<Equipment
 
         @Override
         public void onClick(View v) {
-            EquipCommand command = new EquipCommand();
-            command.key = this.gear.key;
-            if (isCostume) {
-                command.type = "costume";
-            } else {
-                command.type = "equipped";
-            }
-            EventBus.getDefault().post(command);
+            equipEvents.onNext(this.gear.key);
             if (this.gear.key.equals(equippedGear)) {
                 equippedGear = type + "_base_0";
             } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
index 47fd04f98..7d99d4231 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
@@ -33,6 +33,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import io.realm.OrderedRealmCollection;
+import io.realm.RealmList;
 import io.realm.RealmRecyclerViewAdapter;
 import rx.Observable;
 import rx.subjects.PublishSubject;
@@ -44,7 +45,7 @@ public class ItemRecyclerAdapter extends RealmRecyclerViewAdapter<Item, ItemRecy
     public Item hatchingItem;
     public Pet feedingPet;
     public ItemRecyclerFragment fragment;
-    public HashMap<String, Integer> ownedPets;
+    public RealmList<Pet> ownedPets;
     public Context context;
 
     private PublishSubject<Item> sellItemEvents = PublishSubject.create();
@@ -112,7 +113,7 @@ public class ItemRecyclerAdapter extends RealmRecyclerViewAdapter<Item, ItemRecy
             } else {
                 petKey = hatchingItem.getKey() + "-" + item.getKey();
             }
-            return ownedPets != null && ownedPets.containsKey(petKey) && ownedPets.get(petKey) > 0;
+            return ownedPets != null;
         }
 
         public void bind(Item item) {
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 7b617cc72..d44f942c4 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
@@ -49,7 +49,7 @@ public abstract class BaseFragment extends DialogFragment {
         super.setUserVisibleHint(isVisibleToUser);
         if (isVisibleToUser) {
             if (this.tutorialStepIdentifier != null && tutorialRepository != null) {
-                tutorialRepository.getTutorialStep(this.tutorialStepIdentifier).subscribe(step -> {
+                tutorialRepository.getTutorialStep(this.tutorialStepIdentifier).first().subscribe(step -> {
                     if (step != null && step.shouldDisplay()) {
                         DisplayTutorialEvent event = new DisplayTutorialEvent();
                         event.step = step;
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 7c04c451d..9d2b8446f 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
@@ -13,6 +13,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.databinding.FragmentAvatarOverviewBinding;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
index 4467b8392..548f3f9ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
@@ -43,17 +43,21 @@ public class EquipmentDetailFragment extends BaseMainFragment {
 
         unbinder = ButterKnife.bind(this, v);
 
-        this.adapter = new EquipmentRecyclerViewAdapter();
+
+        this.adapter = new EquipmentRecyclerViewAdapter(null, true);
         this.adapter.equippedGear = this.equippedGear;
         this.adapter.isCostume = this.isCostume;
         this.adapter.type = this.type;
+        this.adapter.getEquipEvents()
+                .flatMap(key -> inventoryRepository.equipGear(user, key, isCostume))
+                .subscribe(items -> {}, ReactiveErrorHandler.handleEmptyError());
+
+
+        this.recyclerView.setAdapter(this.adapter);
         this.recyclerView.setLayoutManager(new LinearLayoutManager(activity));
         this.recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
 
-        this.recyclerView.setAdapter(this.adapter);
-
-        this.loadGear();
-
+        inventoryRepository.getOwnedEquipment(type).first().subscribe(this.adapter::updateData, ReactiveErrorHandler.handleEmptyError());
         return v;
     }
 
@@ -61,11 +65,4 @@ public class EquipmentDetailFragment extends BaseMainFragment {
     public void injectFragment(AppComponent component) {
         component.inject(this);
     }
-
-    private void loadGear() {
-        if (user == null || adapter == null) {
-            return;
-        }
-        inventoryRepository.getOwnedEquipment(type).subscribe(adapter::setGearList, ReactiveErrorHandler.handleEmptyError());
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
index 5fed19ef1..94355c6db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
@@ -40,6 +40,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import io.realm.OrderedRealmCollection;
+import io.realm.RealmList;
 
 import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
 
@@ -68,7 +69,7 @@ public class ItemRecyclerFragment extends BaseFragment {
     public Boolean isFeeding;
     public Item hatchingItem;
     public Pet feedingPet;
-    public HashMap<String, Integer> ownedPets;
+    public RealmList<Pet> ownedPets;
     @Nullable
     public User user;
     LinearLayoutManager layoutManager = null;
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 0471434e3..24e997893 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
@@ -137,7 +137,9 @@ public class ItemsFragment extends BaseMainFragment {
             }
             fragment.isHatching = true;
             fragment.isFeeding = false;
-            fragment.ownedPets = this.user.getItems().getPets();
+            if (this.user != null) {
+                fragment.ownedPets = this.user.getItems().getPets();
+            }
             fragment.show(getFragmentManager(), "hatchingDialog");
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
index 2cf24b9c5..2abc7ef91 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
@@ -103,9 +103,6 @@ public class MountDetailRecyclerFragment extends BaseMainFragment {
         inventoryRepository.getMounts().subscribe(mounts -> {
             adapter.setItemList(mounts);
             animals = mounts;
-            if (user != null) {
-                adapter.setOwnedMapping(user.getItems().getMounts());
-            }
         });
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
index 8302bf9b0..90cfdf88d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
@@ -108,10 +108,6 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
         inventoryRepository.getPets(animalType, animalGroup).subscribe(pets -> {
             adapter.setItemList(pets);
             animals = pets;
-            if (user != null) {
-                adapter.setOwnedMapping(user.getItems().getPets());
-                adapter.setOwnedMountsMapping(user.getItems().getMounts());
-            }
         }, ReactiveErrorHandler.handleEmptyError());
     }
 
@@ -131,8 +127,6 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
     @Override
     public void updateUserData(User user) {
         super.updateUserData(user);
-        adapter.setOwnedMapping(user.getItems().getPets());
-        adapter.setOwnedMountsMapping(user.getItems().getMounts());
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
index 35f8d7909..3dfe88325 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
@@ -169,10 +169,7 @@ public class StableRecyclerFragment extends BaseFragment {
                 if (user != null && user.getItems() != null) {
                     switch (itemType) {
                         case "pets":
-                            if (user.getItems().getPets() != null
-                                    && user.getItems().getPets().containsKey(animal.getKey())
-                                    && user.getItems().getPets().get(animal.getKey()) != null
-                                    && user.getItems().getPets().get(animal.getKey()) > 0) {
+                            if (user.getItems().getPets() != null) {
                                 if (lastAnimal.getNumberOwned() == 0) {
                                     lastAnimal.setColor(animal.getColor());
                                 }
@@ -180,10 +177,7 @@ public class StableRecyclerFragment extends BaseFragment {
                             }
                             break;
                         case "mounts":
-                            if (user.getItems().getMounts() != null
-                                    && user.getItems().getMounts().containsKey(animal.getKey())
-                                    && user.getItems().getMounts().get(animal.getKey()) != null
-                                    && user.getItems().getMounts().get(animal.getKey())) {
+                            if (user.getItems().getMounts() != null) {
                                 if (lastAnimal.getNumberOwned() == 0) {
                                     lastAnimal.setColor(animal.getColor());
                                 }
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 f85674d89..f738d68f2 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
@@ -16,6 +16,7 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.helpers.LanguageHelper;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.SoundManager;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import com.habitrpg.android.habitica.helpers.notifications.PushNotificationManager;
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 bf1aa7759..7a72c6b56 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
@@ -340,7 +340,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     @Override
     public void onRefresh() {
         swipeRefreshLayout.setRefreshing(true);
-        userRepository.retrieveUser(true)
+        userRepository.retrieveUser(true, true)
                 .doOnTerminate(() -> swipeRefreshLayout.setRefreshing(false))
                 .subscribe(user1 -> {}, ReactiveErrorHandler.handleEmptyError());
     }
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 73e284486..225478fcf 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
@@ -28,6 +28,7 @@ import com.habitrpg.android.habitica.data.TagRepository;
 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.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
 import com.habitrpg.android.habitica.models.TutorialStep;
 import com.habitrpg.android.habitica.models.tasks.Task;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
index 4a08be6ed..4621dc14e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
@@ -27,11 +27,13 @@ import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.inject.Inject;
 
+import io.realm.RealmList;
 import io.realm.RealmObject;
 
 public class ContentDeserializer implements JsonDeserializer<ContentResult> {
@@ -49,64 +51,74 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
         result.armoire = context.deserialize(object.get("armoire"), Equipment.class);
         result.gear = context.deserialize(object.get("gear"), ContentGear.class);
 
-
-
-        result.quests = context.deserialize(object.get("quests"), new TypeToken<List<QuestContent>>() {
+        result.quests = context.deserialize(object.get("quests"), new TypeToken<RealmList<QuestContent>>() {
         }.getType());
-        result.eggs = context.deserialize(object.get("eggs"), new TypeToken<List<Egg>>() {
+        result.eggs = context.deserialize(object.get("eggs"), new TypeToken<RealmList<Egg>>() {
         }.getType());
-        result.food = context.deserialize(object.get("food"), new TypeToken<List<Food>>() {
+        result.food = context.deserialize(object.get("food"), new TypeToken<RealmList<Food>>() {
         }.getType());
-        result.hatchingPotions = context.deserialize(object.get("hatchingPotions"), new TypeToken<List<HatchingPotion>>() {
+        result.hatchingPotions = context.deserialize(object.get("hatchingPotions"), new TypeToken<RealmList<HatchingPotion>>() {
         }.getType());
 
-        result.pets = context.deserialize(object.get("pets"), new TypeToken<Map<String, Pet>>() {
+        Map<String, Pet> pets = context.deserialize(object.get("pets"), new TypeToken<Map<String, Pet>>() {
         }.getType());
-        result.specialPets = context.deserialize(object.get("specialPets"), new TypeToken<Map<String, Pet>>() {
+        Map<String, Pet> specialPets = context.deserialize(object.get("specialPets"), new TypeToken<Map<String, Pet>>() {
         }.getType());
-        result.premiumPets = context.deserialize(object.get("premiumPets"), new TypeToken<Map<String, Pet>>() {
+        Map<String, Pet> premiumPets = context.deserialize(object.get("premiumPets"), new TypeToken<Map<String, Pet>>() {
         }.getType());
-        result.questPets = context.deserialize(object.get("questPets"), new TypeToken<Map<String, Pet>>() {
+        Map<String, Pet> questPets = context.deserialize(object.get("questPets"), new TypeToken<Map<String, Pet>>() {
         }.getType());
-        result.mounts = context.deserialize(object.get("mounts"), new TypeToken<Map<String, Mount>>() {
+        Map<String, Mount> mounts = context.deserialize(object.get("mounts"), new TypeToken<Map<String, Mount>>() {
         }.getType());
-        result.specialMounts = context.deserialize(object.get("specialMounts"), new TypeToken<Map<String, Mount>>() {
+        Map<String, Mount> specialMounts = context.deserialize(object.get("specialMounts"), new TypeToken<Map<String, Mount>>() {
         }.getType());
-        result.premiumMounts = context.deserialize(object.get("premiumMounts"), new TypeToken<Map<String, Mount>>() {
+        Map<String, Mount> premiumMounts = context.deserialize(object.get("premiumMounts"), new TypeToken<Map<String, Mount>>() {
         }.getType());
-        result.questMounts = context.deserialize(object.get("questMounts"), new TypeToken<Map<String, Mount>>() {
+        Map<String, Mount> questMounts = context.deserialize(object.get("questMounts"), new TypeToken<Map<String, Mount>>() {
         }.getType());
 
         for (Egg egg : result.eggs) {
             for (HatchingPotion potion : result.hatchingPotions) {
                 String key = egg.getKey() + "-" + potion.getKey();
-                if (result.pets.containsKey(key)) {
-                    result.pets.put(key, this.populatePet(result.pets.get(key), egg, potion));
+                if (pets.containsKey(key)) {
+                    pets.put(key, this.populatePet(pets.get(key), egg, potion));
                 }
-                if (result.specialPets.containsKey(key)) {
-                    result.specialPets.put(key, this.populatePet(result.specialPets.get(key), egg, potion));
+                if (specialPets.containsKey(key)) {
+                    specialPets.put(key, this.populatePet(specialPets.get(key), egg, potion));
                 }
-                if (result.premiumPets.containsKey(key)) {
-                    result.premiumPets.put(key, this.populatePet(result.premiumPets.get(key), egg, potion));
+                if (premiumPets.containsKey(key)) {
+                    premiumPets.put(key, this.populatePet(premiumPets.get(key), egg, potion));
                 }
-                if (result.questPets.containsKey(key)) {
-                    result.questPets.put(key, this.populatePet(result.questPets.get(key), egg, potion));
+                if (questPets.containsKey(key)) {
+                    questPets.put(key, this.populatePet(questPets.get(key), egg, potion));
                 }
-                if (result.mounts.containsKey(key)) {
-                    result.mounts.put(key, this.popupateMount(result.mounts.get(key), egg, potion));
+                if (mounts.containsKey(key)) {
+                    mounts.put(key, this.popupateMount(mounts.get(key), egg, potion));
                 }
-                if (result.specialMounts.containsKey(key)) {
-                    result.specialMounts.put(key, this.popupateMount(result.specialMounts.get(key), egg, potion));
+                if (specialMounts.containsKey(key)) {
+                    specialMounts.put(key, this.popupateMount(specialMounts.get(key), egg, potion));
                 }
-                if (result.premiumMounts.containsKey(key)) {
-                    result.premiumMounts.put(key, this.popupateMount(result.premiumMounts.get(key), egg, potion));
+                if (premiumMounts.containsKey(key)) {
+                    premiumMounts.put(key, this.popupateMount(premiumMounts.get(key), egg, potion));
                 }
-                if (result.questMounts.containsKey(key)) {
-                    result.questMounts.put(key, this.popupateMount(result.questMounts.get(key), egg, potion));
+                if (questMounts.containsKey(key)) {
+                    questMounts.put(key, this.popupateMount(questMounts.get(key), egg, potion));
                 }
             }
         }
 
+        result.pets = new RealmList<>();
+        result.pets.addAll(pets.values());
+        result.pets.addAll(specialPets.values());
+        result.pets.addAll(premiumPets.values());
+        result.pets.addAll(questPets.values());
+
+        result.mounts = new RealmList<>();
+        result.mounts.addAll(mounts.values());
+        result.mounts.addAll(specialMounts.values());
+        result.mounts.addAll(premiumMounts.values());
+        result.mounts.addAll(questMounts.values());
+
         result.spells = context.deserialize(object.get("spells"), new TypeToken<List<Skill>>() {
         }.getType());
 
@@ -121,12 +133,12 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
             }
         }*/
 
-        result.appearances = context.deserialize(object.get("appearances"), new TypeToken<List<Customization>>() {
+        result.appearances = context.deserialize(object.get("appearances"), new TypeToken<RealmList<Customization>>() {
         }.getType());
-        result.backgrounds = context.deserialize(object.get("backgrounds"), new TypeToken<List<Customization>>() {
+        result.backgrounds = context.deserialize(object.get("backgrounds"), new TypeToken<RealmList<Customization>>() {
         }.getType());
 
-        result.faq = context.deserialize(object.get("faq"), new TypeToken<List<FAQArticle>>() {
+        result.faq = context.deserialize(object.get("faq"), new TypeToken<RealmList<FAQArticle>>() {
         }.getType());
 
         return result;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
index aebb52929..74de8f90e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/CustomizationDeserializer.java
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.utils;
 
 import android.annotation.SuppressLint;
+import android.support.annotation.Nullable;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
@@ -8,8 +9,6 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.habitrpg.android.habitica.models.inventory.Customization;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
@@ -18,17 +17,19 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.Realm;
+import io.realm.RealmList;
+
 public class CustomizationDeserializer implements JsonDeserializer<List<Customization>> {
 
     @Override
     public List<Customization> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         JsonObject object = json.getAsJsonObject();
-        List<Customization> customizations = new ArrayList<Customization>();
-
+        RealmList<Customization> customizations = new RealmList<>();
+        Realm realm = Realm.getDefaultInstance();
 
         if (object.has("shirt")) {
-            // TODO: fix this
-            List<Customization> existingCustomizations = new ArrayList<>();
+            List<Customization> existingCustomizations = realm.copyFromRealm(realm.where(Customization.class).findAll());
 
             for (Customization customization : existingCustomizations) {
                 if (object.has(customization.getType())) {
@@ -59,9 +60,7 @@ public class CustomizationDeserializer implements JsonDeserializer<List<Customiz
                 }
             }
         } else {
-
-            // TODO: fix this
-            List<Customization> existingCustomizations = new ArrayList<>();
+            List<Customization> existingCustomizations = realm.copyFromRealm(realm.where(Customization.class).findAll());
 
             for (Customization customization : existingCustomizations) {
                 if (object.has(customization.getCustomizationSet())) {
@@ -80,11 +79,12 @@ public class CustomizationDeserializer implements JsonDeserializer<List<Customiz
             }
         }
 
+        realm.close();
+
         return customizations;
     }
 
-    private Customization parseCustomization(Customization existingCustomizaion, String type, String category, String key, JsonObject entry) {
-        JsonObject obj = entry;
+    private Customization parseCustomization(@Nullable Customization existingCustomizaion, String type, @Nullable String category, String key, JsonObject entry) {
         Customization customization = existingCustomizaion;
         if (customization == null) {
             customization = new Customization();
@@ -94,12 +94,12 @@ public class CustomizationDeserializer implements JsonDeserializer<List<Customiz
                 customization.setCategory(category);
             }
         }
-        if (obj.has("price")) {
-            customization.setPrice(obj.get("price").getAsInt());
+        if (entry.has("price")) {
+            customization.setPrice(entry.get("price").getAsInt());
         }
 
-        if (obj.has("set")) {
-            JsonObject setInfo = obj.get("set").getAsJsonObject();
+        if (entry.has("set")) {
+            JsonObject setInfo = entry.get("set").getAsJsonObject();
             customization.setCustomizationSet(setInfo.get("key").getAsString());
             if (setInfo.has("setPrice")) {
                 customization.setSetPrice(setInfo.get("setPrice").getAsInt());
@@ -123,7 +123,7 @@ public class CustomizationDeserializer implements JsonDeserializer<List<Customiz
         return customization;
     }
 
-    private Customization parseBackground(Customization existingCustomization, String setName, String key, JsonObject entry) {
+    private Customization parseBackground(@Nullable Customization existingCustomization, String setName, String key, JsonObject entry) {
         Customization customization = existingCustomization;
 
         if (customization == null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
index 1fc30cfce..79e2136c0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EggListDeserializer.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.habitrpg.android.habitica.models.inventory.Egg;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
@@ -13,15 +14,19 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.Realm;
+import io.realm.RealmList;
+
 public class EggListDeserializer implements JsonDeserializer<List<Egg>> {
     @Override
     public List<Egg> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<Egg> vals = new ArrayList<>();
+        RealmList<Egg> vals = new RealmList<>();
         if (json.isJsonObject()) {
             JsonObject object = json.getAsJsonObject();
 
-            // TODO: fix this
-            List<Egg> existingItems = new ArrayList<>();
+            Realm realm = Realm.getDefaultInstance();
+            List<Egg> existingItems = realm.copyFromRealm(realm.where(Egg.class).findAll());
+            realm.close();
 
             for (Egg item : existingItems) {
                 if (object.has(item.getKey())) {
@@ -59,7 +64,7 @@ public class EggListDeserializer implements JsonDeserializer<List<Egg>> {
             }
         } else {
             for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((Egg) context.deserialize(item.getAsJsonObject(), Egg.class));
+                vals.add(context.deserialize(item.getAsJsonObject(), Egg.class));
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
similarity index 74%
rename from Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
rename to Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
index 787b8513b..e57a3107c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ItemDataListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/EquipmentListDeserializer.java
@@ -1,67 +1,77 @@
-package com.habitrpg.android.habitica.utils;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.habitrpg.android.habitica.models.inventory.Equipment;
-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<Equipment>> {
-    @Override
-    public List<Equipment> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<Equipment> vals = new ArrayList<>();
-        if (json.isJsonObject()) {
-            JsonObject object = json.getAsJsonObject();
-
-            // TODO: fix this
-            List<Equipment> existingItems = new ArrayList<>();
-
-            for (Equipment item : existingItems) {
-                if (object.has(item.key)) {
-                    JsonElement itemObject = object.get(item.key);
-
-                    if (itemObject.isJsonObject()) {
-                        Equipment parsedItem = context.deserialize(itemObject.getAsJsonObject(), Equipment.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()) {
-                Equipment item;
-                if (entry.getValue().isJsonObject()) {
-                    item = context.deserialize(entry.getValue(), Equipment.class);
-                } else {
-                    item = new Equipment();
-                    item.key = entry.getKey();
-                }
-                vals.add(item);
-            }
-        } else {
-            for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((Equipment) context.deserialize(item.getAsJsonObject(), Equipment.class));
-            }
-        }
-
-        return vals;
-    }
-}
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Equipment;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import io.realm.Realm;
+import io.realm.RealmList;
+
+public class EquipmentListDeserializer implements JsonDeserializer<List<Equipment>> {
+    @Override
+    public List<Equipment> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        RealmList<Equipment> vals = new RealmList<>();
+        if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+
+            Realm realm = Realm.getDefaultInstance();
+            List<Equipment> existingItems = realm.copyFromRealm(realm.where(Equipment.class).findAll());
+            realm.close();
+
+            for (Equipment item : existingItems) {
+                if (object.has(item.key)) {
+                    JsonElement itemObject = object.get(item.key);
+
+                    if (itemObject.isJsonObject()) {
+                        Equipment parsedItem = context.deserialize(itemObject.getAsJsonObject(), Equipment.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;
+                    } else {
+                        item.setOwned(itemObject.getAsBoolean());
+                    }
+                    vals.add(item);
+                    object.remove(item.key);
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                Equipment item;
+                if (entry.getValue().isJsonObject()) {
+                    item = context.deserialize(entry.getValue(), Equipment.class);
+                } else {
+                    item = new Equipment();
+                    item.key = entry.getKey();
+                    if (entry.getValue().isJsonNull()) {
+                        item.setOwned(false);
+                    } else {
+                        item.setOwned(entry.getValue().getAsBoolean());
+                    }
+                }
+                vals.add(item);
+            }
+        } else {
+            for (JsonElement item : json.getAsJsonArray()) {
+                vals.add(context.deserialize(item.getAsJsonObject(), Equipment.class));
+            }
+        }
+
+        return vals;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
index c77ec2eb1..9eb19925f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FAQArticleListDeserilializer.java
@@ -11,6 +11,8 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.realm.RealmList;
+
 /**
  * Created by viirus on 22/01/16.
  */
@@ -19,7 +21,7 @@ public class FAQArticleListDeserilializer implements JsonDeserializer<List<FAQAr
 
     @Override
     public List<FAQArticle> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<FAQArticle> vals = new ArrayList<>();
+        RealmList<FAQArticle> vals = new RealmList<>();
         int position = 0;
         for (JsonElement e : json.getAsJsonObject().get("questions").getAsJsonArray()) {
             JsonObject obj = e.getAsJsonObject();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
index 3bc78502e..7b92fcfd1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/FoodListDeserializer.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.habitrpg.android.habitica.models.inventory.Food;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
@@ -13,15 +14,19 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.Realm;
+import io.realm.RealmList;
+
 public class FoodListDeserializer implements JsonDeserializer<List<Food>> {
     @Override
     public List<Food> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<Food> vals = new ArrayList<>();
+        RealmList<Food> vals = new RealmList<>();
         if (json.isJsonObject()) {
             JsonObject object = json.getAsJsonObject();
 
-            // TODO: fix this
-            List<Food> existingItems = new ArrayList<>();
+            Realm realm = Realm.getDefaultInstance();
+            List<Food> existingItems = realm.copyFromRealm(realm.where(Food.class).findAll());
+            realm.close();
 
             for (Food item : existingItems) {
                 if (object.has(item.getKey())) {
@@ -60,7 +65,7 @@ public class FoodListDeserializer implements JsonDeserializer<List<Food>> {
             }
         } else {
             for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((Food) context.deserialize(item.getAsJsonObject(), Food.class));
+                vals.add(context.deserialize(item.getAsJsonObject(), Food.class));
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
index 144e98059..d6a15f8b1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/HatchingPotionListDeserializer.java
@@ -6,22 +6,25 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
-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;
 
+import io.realm.Realm;
+import io.realm.RealmList;
+
 public class HatchingPotionListDeserializer implements JsonDeserializer<List<HatchingPotion>> {
     @Override
     public List<HatchingPotion> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<HatchingPotion> vals = new ArrayList<>();
+        RealmList<HatchingPotion> vals = new RealmList<>();
         if (json.isJsonObject()) {
             JsonObject object = json.getAsJsonObject();
 
-            // TODO: fix this
-            List<HatchingPotion> existingItems = new ArrayList<>();
+            Realm realm = Realm.getDefaultInstance();
+            List<HatchingPotion> existingItems = realm.copyFromRealm(realm.where(HatchingPotion.class).findAll());
+            realm.close();
 
             for (HatchingPotion item : existingItems) {
                 if (object.has(item.getKey())) {
@@ -59,7 +62,7 @@ public class HatchingPotionListDeserializer implements JsonDeserializer<List<Hat
             }
         } else {
             for (JsonElement item : json.getAsJsonArray()) {
-                vals.add((HatchingPotion) context.deserialize(item.getAsJsonObject(), HatchingPotion.class));
+                vals.add(context.deserialize(item.getAsJsonObject(), HatchingPotion.class));
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
index bf38073cc..a6b5cf6d6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
@@ -3,23 +3,53 @@ package com.habitrpg.android.habitica.utils;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 
 import java.lang.reflect.Type;
-import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
-public class MountListDeserializer implements JsonDeserializer<HashMap<String, Mount>> {
+import io.realm.Realm;
+import io.realm.RealmList;
+
+public class MountListDeserializer implements JsonDeserializer<RealmList<Mount>> {
+
     @Override
-    public HashMap<String, Mount> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        HashMap<String, Mount> vals = new HashMap<>();
-        for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-            Mount pet = new Mount();
-            pet.setKey(entry.getKey());
-            pet.setAnimal(entry.getKey().split("-")[0]);
-            pet.setColor(entry.getKey().split("-")[1]);
-            vals.put(entry.getKey(), pet);
+    public RealmList<Mount> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        RealmList<Mount> vals = new RealmList<>();
+        if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+
+            Realm realm = Realm.getDefaultInstance();
+            List<Mount> existingItems = realm.copyFromRealm(realm.where(Mount.class).findAll());
+            realm.close();
+
+            for (Mount item : existingItems) {
+                if (object.has(item.getKey())) {
+                    JsonElement itemObject = object.get(item.getKey());
+                    item.setOwned(itemObject.getAsBoolean());
+                    vals.add(item);
+                    object.remove(item.getKey());
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                Mount mount;
+                mount = new Mount();
+                mount.setKey(entry.getKey());
+                if (entry.getValue().isJsonNull()) {
+                    mount.setOwned(false);
+                } else {
+                    mount.setOwned(entry.getValue().getAsBoolean());
+                }
+                vals.add(mount);
+            }
+        } else {
+            for (JsonElement item : json.getAsJsonArray()) {
+                vals.add(context.deserialize(item.getAsJsonObject(), Mount.class));
+            }
         }
 
         return vals;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java
new file mode 100644
index 000000000..a1a432303
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java
@@ -0,0 +1,49 @@
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.realm.Realm;
+import io.realm.RealmList;
+
+public class MountMapDeserializer implements JsonDeserializer<HashMap<String, Mount>> {
+    @Override
+    public HashMap<String, Mount> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        HashMap<String, Mount> vals = new HashMap<>();
+        if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+
+            Realm realm = Realm.getDefaultInstance();
+            List<Pet> existingItems = realm.copyFromRealm(realm.where(Pet.class).findAll());
+            realm.close();
+
+            for (Pet mount : existingItems) {
+                if (object.has(mount.getKey())) {
+                    object.remove(mount.getKey());
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                Mount mount;
+                mount = new Mount();
+                mount.setKey(entry.getKey());
+                mount.setKey(entry.getKey());
+                mount.setAnimal(entry.getKey().split("-")[0]);
+                mount.setColor(entry.getKey().split("-")[1]);
+                vals.put(mount.getKey(), mount);
+            }
+        }
+
+        return vals;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
index 920c86654..5171bec45 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
@@ -3,25 +3,61 @@ package com.habitrpg.android.habitica.utils;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
-public class PetListDeserializer implements JsonDeserializer<HashMap<String, Pet>> {
+import io.realm.Realm;
+import io.realm.RealmList;
+
+public class PetListDeserializer implements JsonDeserializer<RealmList<Pet>> {
     @Override
-    public HashMap<String, Pet> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        HashMap<String, Pet> vals = new HashMap<>();
-        for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-            Pet pet = new Pet();
-            pet.setKey(entry.getKey());
-            pet.setAnimal(entry.getKey().split("-")[0]);
-            pet.setColor(entry.getKey().split("-")[1]);
-            vals.put(entry.getKey(), pet);
+    public RealmList<Pet> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        RealmList<Pet> vals = new RealmList<>();
+        if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+
+            Realm realm = Realm.getDefaultInstance();
+            List<Pet> existingItems = realm.copyFromRealm(realm.where(Pet.class).findAll());
+            realm.close();
+
+            for (Pet item : existingItems) {
+                if (object.has(item.getKey())) {
+                    JsonElement itemObject = object.get(item.getKey());
+                    item.setTrained(itemObject.getAsInt());
+                    vals.add(item);
+                    object.remove(item.getKey());
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                Pet pet;
+                if (entry.getValue().isJsonObject()) {
+                    pet = context.deserialize(entry.getValue(), Food.class);
+                } else {
+                    pet = new Pet();
+                    pet.setKey(entry.getKey());
+                    if (entry.getValue().isJsonNull()) {
+                        pet.setTrained(0);
+                    } else {
+                        pet.setTrained(entry.getValue().getAsInt());
+                    }
+                }
+                vals.add(pet);
+            }
+        } else {
+            for (JsonElement item : json.getAsJsonArray()) {
+                vals.add(context.deserialize(item.getAsJsonObject(), Food.class));
+            }
         }
 
         return vals;
     }
-}
+}
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java
new file mode 100644
index 000000000..65e34e18f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java
@@ -0,0 +1,47 @@
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import io.realm.Realm;
+
+public class PetMapDeserializer implements JsonDeserializer<HashMap<String, Pet>> {
+    @Override
+    public HashMap<String, Pet> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        HashMap<String, Pet> vals = new HashMap<>();
+        if (json.isJsonObject()) {
+            JsonObject object = json.getAsJsonObject();
+
+            Realm realm = Realm.getDefaultInstance();
+            List<Mount> existingItems = realm.copyFromRealm(realm.where(Mount.class).findAll());
+            realm.close();
+
+            for (Mount mount : existingItems) {
+                if (object.has(mount.getKey())) {
+                    object.remove(mount.getKey());
+                }
+            }
+
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                Pet pet;
+                pet = new Pet();
+                pet.setKey(entry.getKey());
+                pet.setAnimal(entry.getKey().split("-")[0]);
+                pet.setColor(entry.getKey().split("-")[1]);
+                vals.put(pet.getKey(), pet);
+            }
+        }
+
+        return vals;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
index 278082f52..4004403cd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestListDeserializer.java
@@ -5,6 +5,7 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
 import com.raizlabs.android.dbflow.runtime.TransactionManager;
 import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
@@ -16,15 +17,19 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.Realm;
+import io.realm.RealmList;
+
 public class QuestListDeserializer implements JsonDeserializer<List<QuestContent>> {
     @Override
     public List<QuestContent> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<QuestContent> vals = new ArrayList<>();
+        RealmList<QuestContent> vals = new RealmList<>();
         if (json.isJsonObject()) {
             JsonObject object = json.getAsJsonObject();
 
-            // TODO: fix this
-            List<QuestContent> existingItems = new ArrayList<>();
+            Realm realm = Realm.getDefaultInstance();
+            List<QuestContent> existingItems = realm.copyFromRealm(realm.where(QuestContent.class).findAll());
+            realm.close();
 
             for (QuestContent item : existingItems) {
                 if (object.has(item.getKey())) {
@@ -64,7 +69,6 @@ public class QuestListDeserializer implements JsonDeserializer<List<QuestContent
                 }
                 vals.add(item);
             }
-            //TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(vals)));
         } else {
             for (JsonElement item : json.getAsJsonArray()) {
                 vals.add(context.deserialize(item.getAsJsonObject(), QuestContent.class));
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
index f977565fb..78e5a48f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/SkillDeserializer.java
@@ -12,6 +12,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.RealmList;
+
 /**
  * Created by viirus on 25/11/15.
  */
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
index 179678c3d..8b87fe350 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/TaskTagDeserializer.java
@@ -18,11 +18,12 @@ import io.realm.RealmList;
 public class TaskTagDeserializer implements JsonDeserializer<List<Tag>> {
     @Override
     public List<Tag> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-        List<Tag> tags = new RealmList<>();
+        RealmList<Tag> tags = new RealmList<>();
         List<Tag> databaseTags;
         try {
             Realm realm = Realm.getDefaultInstance();
             databaseTags = realm.copyFromRealm(realm.where(Tag.class).findAll());
+            realm.close();
         } catch (RuntimeException e) {
             //Tests don't have a database
             databaseTags = new ArrayList<>();

From 2746d2e9c22ed2c4304587551e256572005dce3c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 25 Apr 2017 16:14:43 +0200
Subject: [PATCH 10/17] Fix Skills

---
 Habitica/res/layout/fragment_items.xml        |  3 +-
 .../callbacks/HabitRPGUserCallback.java       | 32 --------
 .../habitica/callbacks/SkillCallback.java     | 43 ----------
 .../callbacks/TaskScoringCallback.java        | 43 ----------
 .../android/habitica/data/BaseRepository.java |  1 +
 .../data/implementation/ApiClientImpl.java    |  2 +
 .../InventoryRepositoryImpl.java              |  9 +-
 .../implementation/UserRepositoryImpl.java    | 23 ++++--
 .../data/local/BaseLocalRepository.java       |  5 ++
 .../DbFlowSocialLocalRepository.java          |  6 ++
 .../RealmBaseLocalRepository.java             |  6 ++
 .../RealmUserLocalRepository.java             | 11 ++-
 .../habitica/events/SkillUsedEvent.java       | 20 -----
 .../models/invitations/Invitations.java       | 12 +++
 .../models/responses/SkillResponse.java       |  4 +
 .../habitica/models/user/Authentication.java  | 12 +++
 .../android/habitica/models/user/Buffs.java   | 13 ++-
 .../habitica/models/user/ContributorInfo.java | 12 +++
 .../android/habitica/models/user/Flags.java   | 11 +++
 .../android/habitica/models/user/Gear.java    | 18 ++++
 .../android/habitica/models/user/Hair.java    | 12 +++
 .../android/habitica/models/user/Inbox.java   | 11 +++
 .../android/habitica/models/user/Items.java   | 16 ++++
 .../android/habitica/models/user/Outfit.java  | 12 +++
 .../habitica/models/user/Preferences.java     | 18 ++++
 .../android/habitica/models/user/Profile.java | 12 +++
 .../habitica/models/user/Purchases.java       | 12 +++
 .../habitica/models/user/SpecialItems.java    | 12 +++
 .../android/habitica/models/user/Stats.java   | 18 ++++
 .../models/user/SubscriptionPlan.java         |  8 +-
 .../user/SubscriptionPlanConsecutive.java     | 12 +++
 .../models/user/SuppressedModals.java         | 19 +++--
 .../habitica/models/user/Training.java        | 12 +++
 .../android/habitica/models/user/User.java    | 58 +++++++++++++
 .../LocalNotificationActionReceiver.java      |  6 +-
 .../activities/ChallengeDetailActivity.java   |  7 ++
 .../ui/activities/FullProfileActivity.java    |  6 ++
 .../activities/HabitButtonWidgetActivity.java |  6 ++
 .../habitica/ui/activities/LoginActivity.java |  4 +-
 .../habitica/ui/activities/MainActivity.java  |  4 +
 .../habitica/ui/activities/SetupActivity.java | 12 ++-
 .../ui/activities/SkillTasksActivity.java     |  6 ++
 .../ui/activities/TaskFormActivity.java       |  7 +-
 .../habitica/ui/fragments/BaseFragment.java   |  2 +-
 .../ui/fragments/BaseMainFragment.java        |  6 ++
 .../ui/fragments/faq/FAQOverviewFragment.java |  7 ++
 .../AvatarCustomizationFragment.java          |  6 ++
 .../customization/AvatarOverviewFragment.java |  6 ++
 .../equipment/EquipmentDetailFragment.java    |  6 ++
 .../equipment/EquipmentOverviewFragment.java  |  6 ++
 .../inventory/items/ItemRecyclerFragment.java |  8 +-
 .../stable/MountDetailRecyclerFragment.java   |  6 ++
 .../stable/PetDetailRecyclerFragment.java     |  6 ++
 .../stable/StableRecyclerFragment.java        |  6 ++
 .../preferences/AccountDetailsFragment.java   |  6 ++
 .../preferences/PreferencesFragment.java      |  6 ++
 .../ui/fragments/skills/SkillsFragment.java   | 38 +++++----
 .../ui/fragments/social/ChatListFragment.java |  7 ++
 .../social/GroupInformationFragment.java      |  6 ++
 .../ui/fragments/social/GuildFragment.java    |  6 ++
 .../social/GuildsOverviewFragment.java        |  6 ++
 .../ui/fragments/social/InboxFragment.java    | 10 ++-
 .../social/InboxMessageListFragment.java      | 11 ++-
 .../social/PublicGuildsFragment.java          |  6 ++
 .../ui/fragments/social/TavernFragment.java   |  6 ++
 .../challenges/ChallengeListFragment.java     |  6 ++
 .../ChallengesOverviewFragment.java           |  6 ++
 .../fragments/social/party/PartyFragment.java |  6 ++
 .../tasks/TaskRecyclerViewFragment.java       |  9 +-
 .../ui/fragments/tasks/TasksFragment.java     |  6 ++
 .../habitica/utils/UserDeserializer.java      | 82 +++++++++++++++++++
 71 files changed, 664 insertions(+), 200 deletions(-)
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.java

diff --git a/Habitica/res/layout/fragment_items.xml b/Habitica/res/layout/fragment_items.xml
index 9a8622913..af58a500a 100644
--- a/Habitica/res/layout/fragment_items.xml
+++ b/Habitica/res/layout/fragment_items.xml
@@ -24,7 +24,8 @@
             android:layout_weight="1"
             android:scrollbarSize="3dp"
             android:scrollbarThumbVertical="@color/md_grey_500"
-            android:scrollbars="vertical" />
+            android:scrollbars="vertical"
+            android:paddingBottom="?attr/actionBarSize" />
 
         <TextView
                 android:layout_width="match_parent"
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
deleted file mode 100644
index da14cb931..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import android.support.annotation.Nullable;
-
-import com.habitrpg.android.habitica.models.user.User;
-
-import rx.functions.Action1;
-
-/**
- * r
- * Created by magicmicky on 18/02/15.
- */
-public class HabitRPGUserCallback implements Action1<User> {
-
-    @Nullable
-    public final OnUserReceived callBack;
-
-    public HabitRPGUserCallback(@Nullable OnUserReceived callback) {
-        this.callBack = callback;
-    }
-
-    @Override
-    public void call(User user) {
-        if (callBack != null) {
-            callBack.onUserReceived(user);
-        }
-    }
-
-    public interface OnUserReceived {
-        void onUserReceived(User user);
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
deleted file mode 100644
index 17e183172..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/SkillCallback.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import android.support.annotation.Nullable;
-
-import com.habitrpg.android.habitica.events.SkillUsedEvent;
-import com.habitrpg.android.habitica.models.Skill;
-import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.user.User;
-import com.habitrpg.android.habitica.models.user.Stats;
-
-import org.greenrobot.eventbus.EventBus;
-
-import rx.functions.Action1;
-
-/**
- * Created by viirus on 28/11/15.
- */
-public class SkillCallback implements Action1<SkillResponse> {
-
-    private Skill usedSkill;
-    private User user;
-    @Nullable
-    private HabitRPGUserCallback.OnUserReceived callBack;
-
-    public SkillCallback(@Nullable HabitRPGUserCallback.OnUserReceived callback, @Nullable User user, Skill usedSkill) {
-        this.usedSkill = usedSkill;
-        this.user = user;
-        this.callBack = callback;
-    }
-
-    @Override
-    public void call(SkillResponse skillResponse) {
-        Double xp = this.user.getStats().getExp();
-        Double hp = this.user.getStats().getHp();
-        Double gold = this.user.getStats().getGp();
-
-        if (callBack != null) {
-            callBack.onUserReceived(this.user);
-        }
-        Stats stats = skillResponse.user.getStats();
-        EventBus.getDefault().post(new SkillUsedEvent(this.usedSkill, stats.getMp(), stats.getExp() - xp, stats.getHp() - hp, stats.getGp() - gold));
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java b/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
deleted file mode 100644
index 7298186d5..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.habitrpg.android.habitica.callbacks;
-
-import com.habitrpg.android.habitica.data.InventoryRepository;
-import com.habitrpg.android.habitica.data.TaskRepository;
-import com.habitrpg.android.habitica.models.responses.TaskDirectionData;
-import com.habitrpg.android.habitica.models.tasks.Task;
-
-import java.util.Locale;
-
-import rx.functions.Action1;
-
-/**
- * Created by magicmicky on 18/02/15.
- */
-public class TaskScoringCallback implements Action1<TaskDirectionData> {
-    private final OnTaskScored mCallback;
-    private final String taskId;
-    private final TaskRepository taskRepository;
-    private final InventoryRepository inventoryRepository;
-
-    public TaskScoringCallback(TaskRepository taskRepository, InventoryRepository inventoryRepository, OnTaskScored callback, String taskId) {
-        this.mCallback = callback;
-        this.taskId = taskId;
-        this.taskRepository = taskRepository;
-        this.inventoryRepository = inventoryRepository;
-    }
-
-    @Override
-    public void call(TaskDirectionData taskDirectionData) {
-        taskRepository.getTask(taskId).first().subscribe(task -> mCallback.onTaskDataReceived(taskDirectionData, task));
-        if (taskDirectionData.get_tmp() != null) {
-            if (taskDirectionData.get_tmp().getDrop() != null) {
-                String type = taskDirectionData.get_tmp().getDrop().getType();
-                String key = taskDirectionData.get_tmp().getDrop().getKey();
-                inventoryRepository.changeOwnedCount(type.toLowerCase(Locale.US), key, 1);
-            }
-        }
-    }
-
-    public interface OnTaskScored {
-        void onTaskDataReceived(TaskDirectionData data, Task task);
-    }
-}
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
index fb8ad2e60..911a667b5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/BaseRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/BaseRepository.java
@@ -2,4 +2,5 @@ package com.habitrpg.android.habitica.data;
 
 public interface BaseRepository {
 
+    void close();
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index ad65720ac..149524c6a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -89,6 +89,7 @@ import com.habitrpg.android.habitica.utils.TaskListDeserializer;
 import com.habitrpg.android.habitica.utils.TaskSerializer;
 import com.habitrpg.android.habitica.utils.TaskTagDeserializer;
 import com.habitrpg.android.habitica.utils.TutorialStepListDeserializer;
+import com.habitrpg.android.habitica.utils.UserDeserializer;
 import com.raizlabs.android.dbflow.structure.ModelAdapter;
 
 import java.io.IOException;
@@ -278,6 +279,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
                 .registerTypeAdapter(ContentResult.class, new ContentDeserializer())
                 .registerTypeAdapter(FeedResponse.class, new FeedResponseDeserializer())
                 .registerTypeAdapter(Challenge.class, new ChallengeDeserializer())
+                .registerTypeAdapter(User.class, new UserDeserializer())
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
                 .create();
         return GsonConverterFactory.create(gson);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
index 1786b5fbb..af56554a5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
@@ -10,6 +10,7 @@ import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.Outfit;
+import com.habitrpg.android.habitica.models.user.Stats;
 import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
@@ -118,8 +119,12 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
                 .map(user1 -> {
                     localRepository.executeTransaction(realm -> {
                         if (user != null) {
-                            user.setItems(user1.getItems());
-                            user.setStats(user1.getStats());
+                            user1.getItems().setUserId(user.getId());
+                            Items items = realm.copyToRealmOrUpdate(user1.getItems());
+                            user1.getStats().setUserId(user.getId());
+                            Stats stats = realm.copyToRealmOrUpdate(user1.getStats());
+                            user.setItems(items);
+                            user.setStats(stats);
                             item.setOwned(item.getOwned()-1);
                         }
                     });
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 54552e646..575ebe2e0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -31,7 +31,8 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
         return localRepository.getUser(userID)
                 .flatMap(habitRPGUser -> {
                     if (habitRPGUser == null || !habitRPGUser.isValid()) {
-                        return retrieveUser(true);
+                        return retrieveUser(true)
+                                .flatMap(user -> localRepository.getUser(user.getId()));
                     } else {
                         return Observable.just(habitRPGUser);
                     }
@@ -117,7 +118,14 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
 
     @Override
     public Observable<SkillResponse> useSkill(User user, String key, String target) {
-        return apiClient.useSkill(key, target).doOnNext(skillResponse -> {
+        return apiClient.useSkill(key, target)
+                .map(response -> {
+                    response.hpDiff = response.user.getStats().getHp() - user.getStats().getHp();
+                    response.expDiff = response.user.getStats().getExp() - user.getStats().getExp();
+                    response.goldDiff = response.user.getStats().getGp() - user.getStats().getGp();
+                    return response;
+                })
+                .doOnNext(skillResponse -> {
             if (user != null) {
                 mergeUser(user, skillResponse.user);
             }
@@ -125,20 +133,21 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
     }
 
     private User mergeUser(User oldUser, User newUser) {
+        User copiedUser = localRepository.getUnmanagedCopy(oldUser);
         if (newUser.getItems() != null) {
-            oldUser.setItems(newUser.getItems());
+            copiedUser.setItems(newUser.getItems());
         }
         if (newUser.getPreferences() != null) {
-            oldUser.setPreferences(newUser.getPreferences());
+            copiedUser.setPreferences(newUser.getPreferences());
         }
         if (newUser.getFlags() != null) {
-            oldUser.setFlags(newUser.getFlags());
+            copiedUser.setFlags(newUser.getFlags());
         }
         if (newUser.getStats() != null) {
-            oldUser.getStats().merge(newUser.getStats());
+            copiedUser.getStats().merge(newUser.getStats());
         }
 
-        localRepository.saveUser(oldUser);
+        localRepository.saveUser(copiedUser);
         return oldUser;
     }
 }
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
index fc2cf9b30..303e0a05e 100644
--- 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
@@ -1,12 +1,17 @@
 package com.habitrpg.android.habitica.data.local;
 
 import com.habitrpg.android.habitica.models.ContentResult;
+import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.user.User;
 
 import io.realm.Realm;
+import io.realm.RealmObject;
 
 public interface BaseLocalRepository {
 
     void close();
 
     void executeTransaction(Realm.Transaction transaction);
+
+    <T extends RealmObject> T getUnmanagedCopy(T object);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
index e8c4cb404..ea4162c8e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
@@ -8,6 +8,7 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 import java.util.List;
 
 import io.realm.Realm;
+import io.realm.RealmObject;
 import rx.Observable;
 
 
@@ -22,6 +23,11 @@ public class DbFlowSocialLocalRepository implements SocialLocalRepository {
 
     }
 
+    @Override
+    public <T extends RealmObject> T getUnmanagedCopy(T object) {
+        return null;
+    }
+
     @Override
     public Observable<Challenge> getChallenge(String challengeId) {
         return Observable.defer(() -> Observable.just(new Select().from(Challenge.class).where(Condition.column("id").eq(challengeId)).querySingle()));
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
index 888a1eb43..b465e85e3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
@@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.data.local.implementation;
 import com.habitrpg.android.habitica.data.local.BaseLocalRepository;
 
 import io.realm.Realm;
+import io.realm.RealmObject;
 
 abstract class RealmBaseLocalRepository implements BaseLocalRepository {
 
@@ -21,4 +22,9 @@ abstract class RealmBaseLocalRepository implements BaseLocalRepository {
     public void executeTransaction(Realm.Transaction transaction) {
         realm.executeTransaction(transaction);
     }
+
+    @Override
+    public <T extends RealmObject> T getUnmanagedCopy(T object) {
+        return realm.copyFromRealm(object);
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
index 02906879b..4185bcb12 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
@@ -42,9 +42,11 @@ public class RealmUserLocalRepository extends RealmBaseLocalRepository implement
     public Observable<RealmResults<Skill>> getSkills(User user) {
         return realm.where(Skill.class)
                 .equalTo("habitClass", user.getStats().getHabitClass())
-                .equalTo("lvl", user.getStats().lvl)
-                .findAll().asObservable()
-                .filter(RealmResults::isLoaded);
+                .lessThanOrEqualTo("lvl", user.getStats().lvl)
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded)
+                .map(skills -> skills);
     }
 
     @Override
@@ -72,6 +74,7 @@ public class RealmUserLocalRepository extends RealmBaseLocalRepository implement
                 .in("key", ownedItems.toArray(new String[0]))
                 .findAll()
                 .asObservable()
-                .filter(RealmResults::isLoaded);
+                .filter(RealmResults::isLoaded)
+                .map(skills -> skills);
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java
deleted file mode 100644
index 0b96967b3..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/SkillUsedEvent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.habitrpg.android.habitica.events;
-
-import com.habitrpg.android.habitica.models.Skill;
-
-/**
- * Created by viirus on 28/11/15.
- */
-public class SkillUsedEvent {
-
-    public Skill usedSkill;
-    public Double newMana, xp, hp, gold;
-
-    public SkillUsedEvent(Skill usedSkill, Double newMana, Double xp, Double hp, Double gold) {
-        this.usedSkill = usedSkill;
-        this.newMana = newMana;
-        this.xp = xp;
-        this.hp = hp;
-        this.gold = gold;
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
index 0ba1d653e..3d3a5a9cb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/invitations/Invitations.java
@@ -6,9 +6,13 @@ import java.util.List;
 
 import io.realm.RealmList;
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Invitations extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     User user;
     private PartyInvite party;
     private RealmList<GuildInvite> guilds;
@@ -40,4 +44,12 @@ public class Invitations extends RealmObject {
     public void setGuilds(RealmList<GuildInvite> guilds) {
         this.guilds = guilds;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
index 70f06ffd4..8b3cd4c47 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/responses/SkillResponse.java
@@ -11,4 +11,8 @@ public class SkillResponse {
     public List<User> partyMembers;
     public Task task;
 
+    public double expDiff;
+    public double hpDiff;
+    public double goldDiff;
+
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
index 97bc0ed68..fa09b449c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Authentication.java
@@ -4,9 +4,13 @@ import com.google.gson.annotations.SerializedName;
 import com.habitrpg.android.habitica.models.auth.LocalAuthentication;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Authentication extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     @SerializedName("local")
     public LocalAuthentication localAuthentication;
     User user;
@@ -18,4 +22,12 @@ public class Authentication extends RealmObject {
     public void setLocalAuthentication(LocalAuthentication LocalAuthentication) {
         this.localAuthentication = LocalAuthentication;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
index 0e471431f..fa54a785d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Buffs.java
@@ -4,10 +4,13 @@ import com.google.gson.annotations.SerializedName;
 import com.habitrpg.android.habitica.HabitDatabase;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Buffs extends RealmObject {
 
-    Stats stats;
+    @PrimaryKey
+    private String userId;
+
     public Float con, str, per;
     @SerializedName("int")
     public Float _int;    private Boolean snowball;
@@ -95,4 +98,12 @@ public class Buffs extends RealmObject {
     public Float getPer() {
         return per;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
index f601b0149..d69695935 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/ContributorInfo.java
@@ -6,6 +6,7 @@ import com.habitrpg.android.habitica.R;
 import java.util.HashMap;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class ContributorInfo extends RealmObject {
 
@@ -25,6 +26,9 @@ public class ContributorInfo extends RealmObject {
         CONTRIBUTOR_COLOR_DICT.put(9, R.color.contributor_staff);
     }
 
+    @PrimaryKey
+    private String userId;
+
     public User user;
     private boolean admin;
     private String contributions;
@@ -78,4 +82,12 @@ public class ContributorInfo extends RealmObject {
         int rColor = android.R.color.white;
         return rColor;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
index f3c5150f4..5e4ba0338 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Flags.java
@@ -6,9 +6,13 @@ import java.util.List;
 
 import io.realm.RealmList;
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Flags extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     User user;
     RealmList<TutorialStep> tutorial;
     private boolean showTour, dropsEnabled, itemsEnabled, newStuff, classSelected, rebirthEnabled, welcomed, armoireEnabled, armoireOpened, armoireEmpty;
@@ -101,4 +105,11 @@ public class Flags extends RealmObject {
         this.armoireEmpty = armoireEmpty;
     }
 
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
index 1b2b66fcc..e0069fea8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Gear.java
@@ -7,9 +7,13 @@ import java.util.HashMap;
 import io.realm.RealmList;
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
 
 public class Gear extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     public RealmList<Equipment> owned;
     Items items;
     private Outfit equipped;
@@ -30,4 +34,18 @@ public class Gear extends RealmObject {
     public void setEquipped(Outfit equipped) {
         this.equipped = equipped;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+        if (costume != null && !costume.isManaged()) {
+            costume.setUserId(userId+"costume");
+        }
+        if (equipped != null && !equipped.isManaged()) {
+            equipped.setUserId(userId+"equipped");
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
index 438ed0537..09478d356 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Hair.java
@@ -1,9 +1,13 @@
 package com.habitrpg.android.habitica.models.user;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Hair extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     public Preferences preferences;
     private int mustache, beard, bangs, base, flower;
     private String color;
@@ -71,4 +75,12 @@ public class Hair extends RealmObject {
     public boolean isAvailable(int hairId) {
         return hairId > 0;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
index c756e3a00..8162fade3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
@@ -10,9 +10,13 @@ import java.util.Map;
 
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
 
 public class Inbox extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     User user;
     private Boolean optOut;
     @Ignore
@@ -77,4 +81,11 @@ public class Inbox extends RealmObject {
         this.newMessages = newMessages;
     }
 
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
index 442a5e2cb..4ea5ee38e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Items.java
@@ -13,9 +13,12 @@ import java.util.HashMap;
 import io.realm.RealmList;
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
 
 public class Items extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
     public RealmList<Egg> eggs;
     public RealmList<Food> food;
     public RealmList<HatchingPotion> hatchingPotions;
@@ -138,4 +141,17 @@ public class Items extends RealmObject {
         this.mounts = mounts;
     }
 
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+        if (gear != null && !gear.isManaged()) {
+            gear.setUserId(userId);
+        }
+        if (special != null && !special.isManaged()) {
+            special.setUserId(userId);
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
index 181f288e2..cf6300ea8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Outfit.java
@@ -5,9 +5,13 @@ import android.text.TextUtils;
 import com.google.gson.annotations.SerializedName;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Outfit extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     Gear gear;
     String armor, back, body, head, shield, weapon;
     @SerializedName("eyewear")
@@ -91,4 +95,12 @@ public class Outfit extends RealmObject {
         this.setHeadAccessory(newOutfit.getHeadAccessory());
         this.setShield(newOutfit.getShield());
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
index cadb092f1..55d84cceb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Preferences.java
@@ -2,9 +2,13 @@ package com.habitrpg.android.habitica.models.user;
 
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Preferences extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     public Hair hair;
     SuppressedModals suppressModals;
     User user;
@@ -205,4 +209,18 @@ public class Preferences extends RealmObject {
     public void setDailyDueDefaultView(boolean dailyDueDefaultView) {
         this.dailyDueDefaultView = dailyDueDefaultView;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+        if (hair != null && !hair.isManaged()) {
+            hair.setUserId(userId);
+        }
+        if (suppressModals != null && !suppressModals.isManaged()) {
+            suppressModals.setUserId(userId);
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
index ee05b41bd..c8a4d3b99 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Profile.java
@@ -1,9 +1,13 @@
 package com.habitrpg.android.habitica.models.user;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Profile extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     User user;
     private String name;
     private String blurb, imageUrl;
@@ -45,4 +49,12 @@ public class Profile extends RealmObject {
     public void setImageUrl(String imageUrl) {
         this.imageUrl = imageUrl;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
index 77cd710a4..d13912173 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
@@ -6,9 +6,13 @@ import java.util.List;
 
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
 
 public class Purchases extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     @Ignore
     public List<Customization> customizations;
     User user;
@@ -29,4 +33,12 @@ public class Purchases extends RealmObject {
     public void setPlan(SubscriptionPlan plan) {
         this.plan = plan;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
index a44c1c027..339f5b970 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SpecialItems.java
@@ -2,9 +2,13 @@ package com.habitrpg.android.habitica.models.user;
 
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class SpecialItems extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     Items items;
     int seafoam, shinySeed, snowball, spookySparkles;
 
@@ -43,4 +47,12 @@ public class SpecialItems extends RealmObject {
     public Boolean hasSpecialItems() {
         return seafoam > 0 || shinySeed > 0 || snowball > 0 || spookySparkles > 0;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
index 5531996b5..0a9d96ddd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Stats.java
@@ -7,10 +7,14 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.models.HabitRpgClass;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 
 public class Stats extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     User user;
     public Float con, str, per;
     @SerializedName("int")
@@ -162,4 +166,18 @@ public class Stats extends RealmObject {
     public void setHabitClass(HabitRpgClass habitRpgClass) {
         habitClass = habitRpgClass.toString();
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+        if (buffs != null && !buffs.isManaged()) {
+            buffs.setUserId(userId);
+        }
+        if (training != null && !training.isManaged()) {
+            training.setUserId(userId);
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
index 685f989bb..0ba87e3e5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
@@ -20,7 +20,7 @@ public class SubscriptionPlan extends RealmObject {
     public static String PLANID_BASIC12MONTH = "basic_12mo";
 
     @PrimaryKey
-    public String customerId;
+    private String customerId;
     public Date dateCreated;
     public Date dateUpdated;
     @Nullable
@@ -50,4 +50,10 @@ public class SubscriptionPlan extends RealmObject {
     }
 
 
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+        if (consecutive != null && !consecutive.isManaged()) {
+            consecutive.setCustomerId(customerId);
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
index 6d0d8d54c..2bade8afe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlanConsecutive.java
@@ -1,9 +1,13 @@
 package com.habitrpg.android.habitica.models.user;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class SubscriptionPlanConsecutive extends RealmObject {
 
+    @PrimaryKey
+    private String customerId;
+
     SubscriptionPlan subscriptionPlan;
     private int trinkets;
     private int gemCapExtra;
@@ -41,4 +45,12 @@ public class SubscriptionPlanConsecutive extends RealmObject {
     public void setCount(int count) {
         this.count = count;
     }
+
+    public String getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(String customerId) {
+        this.customerId = customerId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
index d82580043..77b40827b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SuppressedModals.java
@@ -1,16 +1,13 @@
 package com.habitrpg.android.habitica.models.user;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
-
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class SuppressedModals extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     Preferences preferences;
     private Boolean streak, raisePet, hatchPet, levelUp;
 
@@ -45,4 +42,12 @@ public class SuppressedModals extends RealmObject {
     public void setLevelUp(Boolean levelUp) {
         this.levelUp = levelUp;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.java
index bca988b14..1e7154f48 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Training.java
@@ -3,9 +3,13 @@ package com.habitrpg.android.habitica.models.user;
 import com.google.gson.annotations.SerializedName;
 
 import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
 public class Training extends RealmObject {
 
+    @PrimaryKey
+    private String userId;
+
     Stats stats;
     public Float con, str, per;
     @SerializedName("int")
@@ -52,5 +56,13 @@ public class Training extends RealmObject {
         this.per = stats.per != null ? stats.per : this.per;
         this._int = stats._int != null ? stats._int : this._int;
     }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
 }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
index e29e1f5d7..900c2c468 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
@@ -85,6 +85,33 @@ public class User extends RealmObject {
 
     public void setId(String id) {
         this.id = id;
+        if (stats != null && !stats.isManaged()) {
+            stats.setUserId(id);
+        }
+        if (inbox != null && !inbox.isManaged()) {
+            inbox.setUserId(id);
+        }
+        if (preferences != null && !preferences.isManaged()) {
+            preferences.setUserId(id);
+        }
+        if (profile != null && !profile.isManaged()) {
+            profile.setUserId(id);
+        }
+        if (items != null && !items.isManaged()) {
+            items.setUserId(id);
+        }
+        if (authentication != null && !authentication.isManaged()) {
+            authentication.setUserId(id);
+        }
+        if (flags != null && !flags.isManaged()) {
+            flags.setUserId(id);
+        }
+        if (contributor != null && !contributor.isManaged()) {
+            contributor.setUserId(id);
+        }
+        if (invitations != null && !invitations.isManaged()) {
+            invitations.setUserId(id);
+        }
     }
 
     public Stats getStats() {
@@ -93,6 +120,9 @@ public class User extends RealmObject {
 
     public void setStats(Stats stats) {
         this.stats = stats;
+        if (stats != null && id != null && !stats.isManaged()) {
+            stats.setUserId(id);
+        }
     }
 
     public Inbox getInbox() {
@@ -101,6 +131,9 @@ public class User extends RealmObject {
 
     public void setInbox(Inbox inbox) {
         this.inbox = inbox;
+        if (inbox != null && id != null && !inbox.isManaged()) {
+            inbox.setUserId(id);
+        }
     }
 
     public Profile getProfile() {
@@ -109,6 +142,9 @@ public class User extends RealmObject {
 
     public void setProfile(Profile profile) {
         this.profile = profile;
+        if (profile != null && id != null && !profile.isManaged()) {
+            profile.setUserId(id);
+        }
     }
 
     public ContributorInfo getContributor() {
@@ -117,6 +153,9 @@ public class User extends RealmObject {
 
     public void setContributor(ContributorInfo contributor) {
         this.contributor = contributor;
+        if (contributor != null && id != null && !contributor.isManaged()) {
+            contributor.setUserId(id);
+        }
     }
 
     public Invitations getInvitations() {
@@ -125,6 +164,9 @@ public class User extends RealmObject {
 
     public void setInvitations(Invitations invitations) {
         this.invitations = invitations;
+        if (invitations != null && id != null && !invitations.isManaged()) {
+            invitations.setUserId(id);
+        }
     }
 
     public UserParty getParty() {
@@ -141,6 +183,9 @@ public class User extends RealmObject {
 
     public void setItems(Items items) {
         this.items = items;
+        if (items != null && id != null && !items.isManaged()) {
+            items.setUserId(id);
+        }
     }
 
     public double getBalance() {
@@ -157,6 +202,9 @@ public class User extends RealmObject {
 
     public void setAuthentication(Authentication authentication) {
         this.authentication = authentication;
+        if (authentication != null && id != null) {
+            authentication.setUserId(id);
+        }
     }
 
     public Purchases getPurchased() {
@@ -165,6 +213,9 @@ public class User extends RealmObject {
 
     public void setPurchased(Purchases purchased) {
         this.purchased = purchased;
+        if (purchased != null && id != null) {
+            purchased.setUserId(id);
+        }
     }
 
     public Flags getFlags() {
@@ -173,6 +224,9 @@ public class User extends RealmObject {
 
     public void setFlags(Flags flags) {
         this.flags = flags;
+        if (flags != null && id != null) {
+            flags.setUserId(id);
+        }
     }
 
     public TasksOrder getTasksOrder() {
@@ -406,4 +460,8 @@ public class User extends RealmObject {
     public RealmList<Tag> getTags() {
         return tags;
     }
+
+    public void setTags(RealmList<Tag> tags) {
+        this.tags = tags;
+    }
 }
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 6860943c4..56a09a12c 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
@@ -9,7 +9,6 @@ import android.os.Bundle;
 
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.models.user.User;
 
@@ -18,7 +17,7 @@ import javax.inject.Inject;
 /**
  * Created by keithholliday on 6/30/16.
  */
-public class LocalNotificationActionReceiver extends BroadcastReceiver implements HabitRPGUserCallback.OnUserReceived {
+public class LocalNotificationActionReceiver extends BroadcastReceiver {
     @Inject
     public ApiClient apiClient;
 
@@ -38,11 +37,10 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver implement
         this.context = context;
 
         this.apiClient.getUser()
-                .subscribe(new HabitRPGUserCallback(this), throwable -> {
+                .subscribe(this::onUserReceived, throwable -> {
                 });
     }
 
-    @Override
     public void onUserReceived(User user) {
         this.user = user;
         this.handleLocalNotificationAction(action);
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 2d39ee932..276d6bb1b 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
@@ -245,6 +245,13 @@ public class ChallengeDetailActivity extends BaseActivity {
         }
     }
 
+    @Override
+    protected void onDestroy() {
+        socialRepository.close();
+        userRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     protected void injectActivity(AppComponent component) {
         component.inject(this);
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 af4aa6a6c..22f4df671 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
@@ -145,6 +145,12 @@ public class FullProfileActivity extends BaseActivity {
         attributesCardView.setOnClickListener(view -> toggleAttributeDetails());
     }
 
+    @Override
+    protected void onDestroy() {
+        inventoryRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
index ea1cfe389..69b14356f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.java
@@ -70,6 +70,12 @@ public class HabitButtonWidgetActivity extends BaseActivity implements TaskClick
         recyclerView.setAdapter(new SkillTasksRecyclerViewAdapter(taskRepository, Task.TYPE_HABIT, this, userId));
     }
 
+    @Override
+    protected void onDestroy() {
+        taskRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void taskSelected(String taskId) {
         finishWithSelection(taskId);
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 98409608a..2f9511bc3 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
@@ -52,7 +52,6 @@ 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.data.ApiClient;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
@@ -86,7 +85,7 @@ import rx.schedulers.Schedulers;
  * @author Mickael Goubin
  */
 public class LoginActivity extends BaseActivity
-        implements Action1<UserAuthResponse>, HabitRPGUserCallback.OnUserReceived {
+        implements Action1<UserAuthResponse> {
     static final int REQUEST_CODE_PICK_ACCOUNT = 1000;
     private final static String TAG_ADDRESS = "address";
     private final static String TAG_USERID = "user";
@@ -415,7 +414,6 @@ public class LoginActivity extends BaseActivity
         }
     }
 
-    @Override
     public void onUserReceived(User user) {
         try {
             saveTokens(mTmpApiToken, mTmpUserToken);
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 8e8f9ce37..ec34f9cba 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
@@ -630,6 +630,10 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
     @Override
     public void onDestroy() {
         EventBus.getDefault().unregister(this);
+        taskRepository.close();
+        userRepository.close();
+        tagRepository.close();
+        inventoryRepository.close();
         super.onDestroy();
     }
 
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 06850b5c0..5ebe050ad 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
@@ -19,7 +19,6 @@ import android.widget.Button;
 
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.TaskRepository;
@@ -51,7 +50,7 @@ import butterknife.BindView;
 import butterknife.OnClick;
 import rx.Observable;
 
-public class SetupActivity extends BaseActivity implements ViewPager.OnPageChangeListener, HabitRPGUserCallback.OnUserReceived {
+public class SetupActivity extends BaseActivity implements ViewPager.OnPageChangeListener {
 
     @Inject
     public ApiClient apiClient;
@@ -139,6 +138,13 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
         EventBus.getDefault().unregister(this);
     }
 
+    @Override
+    protected void onDestroy() {
+        userRepository.close();
+        taskRepository.close();
+        super.onDestroy();
+    }
+
     private void setupViewpager() {
         android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
 
@@ -175,7 +181,6 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
             this.taskRepository.createTasks(newTasks)
                     .subscribe(tasks -> onUserReceived(user), throwable -> {
                     });
-            //this.apiHelper.apiService.batchOperation(operations, new HabitRPGUserCallback(this));
         }
         this.pager.setCurrentItem(this.pager.getCurrentItem() + 1);
     }
@@ -221,7 +226,6 @@ public class SetupActivity extends BaseActivity implements ViewPager.OnPageChang
 
     }
 
-    @Override
     public void onUserReceived(User user) {
         if (completedSetup) {
             this.startMainActivity();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
index 5ad14e310..9f46a4150 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
@@ -47,6 +47,12 @@ public class SkillTasksActivity extends BaseActivity implements TaskClickActivit
         loadTaskLists();
     }
 
+    @Override
+    protected void onDestroy() {
+        taskRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     protected void injectActivity(AppComponent component) {
         component.inject(this);
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 e4fb5239f..e41e731cc 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
@@ -420,7 +420,12 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
                 );
     }
 
-
+    @Override
+    protected void onDestroy() {
+        taskRepository.close();
+        tagRepository.close();
+        super.onDestroy();
+    }
 
     @Override
     protected void injectActivity(AppComponent component) {
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 d44f942c4..7296e20ae 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
@@ -50,7 +50,7 @@ public abstract class BaseFragment extends DialogFragment {
         if (isVisibleToUser) {
             if (this.tutorialStepIdentifier != null && tutorialRepository != null) {
                 tutorialRepository.getTutorialStep(this.tutorialStepIdentifier).first().subscribe(step -> {
-                    if (step != null && step.shouldDisplay()) {
+                    if (step != null && step.isValid() && step.isManaged() && step.shouldDisplay()) {
                         DisplayTutorialEvent event = new DisplayTutorialEvent();
                         event.step = step;
                         if (tutorialText != null) {
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 09557adb5..840efb2cd 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
@@ -122,6 +122,12 @@ public abstract class BaseMainFragment extends BaseFragment {
         return null;
     }
 
+    @Override
+    public void onDestroy() {
+        userRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         if (user != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
index c90370c17..01e8fbd64 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
@@ -50,6 +50,13 @@ public class FAQOverviewFragment extends BaseMainFragment {
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        userRepository.close();
+        faqRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
index 5e8d6e33a..b5f56af16 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
@@ -78,6 +78,12 @@ public class AvatarCustomizationFragment extends BaseMainFragment {
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        customizationRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
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 9d2b8446f..fb2ef09cd 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
@@ -103,6 +103,12 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        userRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
index 548f3f9ea..eb48ce57f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java
@@ -61,6 +61,12 @@ public class EquipmentDetailFragment extends BaseMainFragment {
         return v;
     }
 
+    @Override
+    public void onDestroy() {
+        inventoryRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
index b215dd0ce..46d5e97da 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
@@ -142,6 +142,12 @@ public class EquipmentOverviewFragment extends BaseMainFragment {
         return v;
     }
 
+    @Override
+    public void onDestroy() {
+        inventoryRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
index 94355c6db..df8cf1451 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
@@ -148,6 +148,12 @@ public class ItemRecyclerFragment extends BaseFragment {
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        inventoryRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
@@ -178,7 +184,7 @@ public class ItemRecyclerFragment extends BaseFragment {
     }
 
     private void loadItems() {
-        inventoryRepository.getOwnedItems(itemType).subscribe(items -> {
+        inventoryRepository.getOwnedItems(itemType).first().subscribe(items -> {
             if (this.itemType.equals("special")) {
                 if (user != null && user.getPurchased() != null && user.getPurchased().getPlan().isActive()) {
                     Item mysterItem = SpecialItem.makeMysteryItem(getContext());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
index 2abc7ef91..d33eb409b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
@@ -68,6 +68,12 @@ public class MountDetailRecyclerFragment extends BaseMainFragment {
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        inventoryRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
index 90cfdf88d..9bf25a893 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
@@ -74,6 +74,12 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        inventoryRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
index 3dfe88325..31581ebcf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
@@ -100,6 +100,12 @@ public class StableRecyclerFragment extends BaseFragment {
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        inventoryRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
index 350db5ed6..6fd10674a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
@@ -46,6 +46,12 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
         }
     }
 
+    @Override
+    public void onDestroy() {
+        userRepository.close();
+        super.onDestroy();
+    }
+
     public void setUser(User user) {
         this.user = user;
     }
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 f738d68f2..fbef2757f 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
@@ -62,6 +62,12 @@ public class PreferencesFragment extends BasePreferencesFragment implements
         }
     }
 
+    @Override
+    public void onDestroy() {
+        userRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     protected void setupPreferences() {
         timePreference = (TimePreference) findPreference("reminder_time");
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 f8394cc68..52e988940 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
@@ -12,10 +12,8 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.SkillCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.UserRepository;
-import com.habitrpg.android.habitica.events.SkillUsedEvent;
 import com.habitrpg.android.habitica.events.commands.UseSkillCommand;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.Skill;
@@ -50,7 +48,7 @@ public class SkillsFragment extends BaseMainFragment {
     private Skill selectedSkill;
     private ProgressDialog progressDialog;
 
-    static public Double round(Double value, int n) {
+    static public Double round(double value, int n) {
         return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n));
     }
 
@@ -70,6 +68,12 @@ public class SkillsFragment extends BaseMainFragment {
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        userRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
@@ -92,7 +96,7 @@ public class SkillsFragment extends BaseMainFragment {
 
         adapter.mana = this.user.getStats().getMp();
 
-        Observable.concat(userRepository.getSkills(user).flatMap(Observable::from), userRepository.getSpecialItems(user).flatMap(Observable::from))
+        Observable.concat(userRepository.getSkills(user).first().flatMap(Observable::from), userRepository.getSpecialItems(user).first().flatMap(Observable::from))
                 .toList()
                 .subscribe(skills -> adapter.setSkillList(skills), ReactiveErrorHandler.handleEmptyError());
     }
@@ -121,26 +125,24 @@ public class SkillsFragment extends BaseMainFragment {
         }
     }
 
-    @Subscribe
-    public void onEvent(SkillUsedEvent event) {
+    public void displaySkillResult(Skill usedSkill, SkillResponse response) {
         removeProgressDialog();
-        Skill skill = event.usedSkill;
-        adapter.setMana(event.newMana);
+        adapter.setMana(response.user.getStats().mp);
         StringBuilder message = new StringBuilder();
-        if (skill.isSpecialItem) {
-            message.append(getContext().getString(R.string.used_skill_without_mana, skill.text));
+        if (usedSkill.isSpecialItem) {
+            message.append(getContext().getString(R.string.used_skill_without_mana, usedSkill.text));
         } else {
-            message.append(getContext().getString(R.string.used_skill, skill.text, skill.mana));
+            message.append(getContext().getString(R.string.used_skill, usedSkill.text, usedSkill.mana));
         }
 
-        if (event.xp != 0) {
-            message.append(" + ").append(round(event.xp, 2)).append(" XP");
+        if (response.expDiff != 0) {
+            message.append(" + ").append(round(response.expDiff, 2)).append(" XP");
         }
-        if (event.hp != 0) {
-            message.append(" + ").append(round(event.hp, 2)).append(" HP");
+        if (response.hpDiff != 0) {
+            message.append(" + ").append(round(response.hpDiff, 2)).append(" HP");
         }
-        if (event.gold != 0) {
-            message.append(" + ").append(round(event.gold, 2)).append(" GP");
+        if (response.goldDiff != 0) {
+            message.append(" + ").append(round(response.goldDiff, 2)).append(" GP");
         }
         if (activity != null) {
             UiUtils.showSnackbar(activity, activity.getFloatingMenuWrapper(), message.toString(), UiUtils.SnackbarDisplayType.NORMAL);
@@ -179,7 +181,7 @@ public class SkillsFragment extends BaseMainFragment {
         } else {
             observable = userRepository.useSkill(user, skill.key, skill.target);
         }
-        observable.subscribe(skillResponse -> {}, throwable -> removeProgressDialog());
+        observable.subscribe(skillResponse -> this.displaySkillResult(skill, skillResponse), throwable -> removeProgressDialog());
     }
 
     private void displayProgressDialog() {
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 b75ff1d8e..ea50a3b4f 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
@@ -103,6 +103,13 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        socialRepository.close();
+        userRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
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 58fd938d6..9ad4dc0f6 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
@@ -121,6 +121,12 @@ public class GroupInformationFragment extends BaseFragment {
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        userRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
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 52285fc2c..f6e9ecf80 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
@@ -63,6 +63,12 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
         return v;
     }
 
+    @Override
+    public void onDestroy() {
+        socialRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
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 e22d0c678..26952736c 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
@@ -61,6 +61,12 @@ public class GuildsOverviewFragment extends BaseMainFragment implements View.OnC
         return v;
     }
 
+    @Override
+    public void onDestroy() {
+        socialRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
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 72127bfb5..2126035b9 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
@@ -18,7 +18,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
@@ -38,7 +37,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class InboxFragment extends BaseMainFragment
-        implements SwipeRefreshLayout.OnRefreshListener, View.OnClickListener, HabitRPGUserCallback.OnUserReceived {
+        implements SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
 
     @Inject
     UserRepository userRepository;
@@ -78,6 +77,12 @@ public class InboxFragment extends BaseMainFragment
         return v;
     }
 
+    @Override
+    public void onDestroy() {
+        userRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if (this.activity != null) {
@@ -186,7 +191,6 @@ public class InboxFragment extends BaseMainFragment
         }
     }
 
-    @Override
     public void onUserReceived(User user) {
         this.user = user;
         this.messages = user.getInbox().getMessages();
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 3aa50a03c..efcab746f 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
@@ -9,7 +9,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
@@ -37,7 +36,7 @@ import butterknife.ButterKnife;
  * Created by keithholliday on 6/20/16.
  */
 public class InboxMessageListFragment extends BaseMainFragment
-        implements SwipeRefreshLayout.OnRefreshListener, HabitRPGUserCallback.OnUserReceived {
+        implements SwipeRefreshLayout.OnRefreshListener {
 
     @Inject
     SocialRepository socialRepository;
@@ -79,6 +78,13 @@ public class InboxMessageListFragment extends BaseMainFragment
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        socialRepository.close();
+        userRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
@@ -117,7 +123,6 @@ public class InboxMessageListFragment extends BaseMainFragment
         }
     }
 
-    @Override
     public void onUserReceived(User user) {
         this.user = user;
         this.setMessages(user.getInbox().getMessages(), this.chatRoomUser, this.replyToUserUUID);
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 6918df866..6f623c3a8 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
@@ -75,6 +75,12 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
         this.fetchGuilds();
     }
 
+    @Override
+    public void onDestroy() {
+        socialRepository.close();
+        super.onDestroy();
+    }
+
     private void fetchGuilds() {
         if (this.socialRepository != null) {
             this.socialRepository.getGroups("publicGuilds")
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 1debc6d44..5d4c1468c 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
@@ -50,6 +50,12 @@ public class TavernFragment extends BaseMainFragment {
         return v;
     }
 
+    @Override
+    public void onDestroy() {
+        socialRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
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 0aa31d4f8..8a1cf9c5a 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
@@ -113,6 +113,12 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
                 });
     }
 
+    @Override
+    public void onDestroy() {
+        socialRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
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 a0bd410bf..53a6438d3 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
@@ -75,6 +75,12 @@ public class ChallengesOverviewFragment extends BaseMainFragment {
         return v;
     }
 
+    @Override
+    public void onDestroy() {
+        socialRepository.close();
+        super.onDestroy();
+    }
+
     private void subscribeGetChallenges() {
         this.socialRepository.getUserChallenges()
                 .subscribe(challenges -> getUserChallengesObservable.onNext(challenges),
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 0b5ae3916..4c5a26a29 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
@@ -96,6 +96,12 @@ public class PartyFragment extends BaseMainFragment {
         return v;
     }
 
+    @Override
+    public void onDestroy() {
+        socialRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
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 7a72c6b56..644f1cb35 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
@@ -15,7 +15,6 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.InventoryRepository;
@@ -302,6 +301,14 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
         return view;
     }
 
+    @Override
+    public void onDestroy() {
+        userRepository.close();
+        inventoryRepository.close();
+        taskRepository.close();
+        super.onDestroy();
+    }
+
     @Override
     public void injectFragment(AppComponent component) {
         component.inject(this);
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 225478fcf..041a76821 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
@@ -123,6 +123,12 @@ public class TasksFragment extends BaseMainFragment {
         return v;
     }
 
+    @Override
+    public void onDestroy() {
+        tagRepository.close();
+        super.onDestroy();
+    }
+
     private boolean onFloatingMenuLongClicked(View view) {
         int currentType = viewPager.getCurrentItem();
         TaskRecyclerViewFragment currentFragment = viewFragmentsDictionary.get(currentType);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.java
new file mode 100644
index 000000000..e947ff49c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.java
@@ -0,0 +1,82 @@
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.reflect.TypeToken;
+import com.habitrpg.android.habitica.models.Tag;
+import com.habitrpg.android.habitica.models.invitations.Invitations;
+import com.habitrpg.android.habitica.models.social.UserParty;
+import com.habitrpg.android.habitica.models.tasks.TasksOrder;
+import com.habitrpg.android.habitica.models.user.Authentication;
+import com.habitrpg.android.habitica.models.user.ContributorInfo;
+import com.habitrpg.android.habitica.models.user.Flags;
+import com.habitrpg.android.habitica.models.user.Inbox;
+import com.habitrpg.android.habitica.models.user.Items;
+import com.habitrpg.android.habitica.models.user.Preferences;
+import com.habitrpg.android.habitica.models.user.Profile;
+import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.models.user.User;
+
+import java.lang.reflect.Type;
+import java.util.List;
+
+import io.realm.RealmList;
+
+public class UserDeserializer implements JsonDeserializer<User> {
+    @Override
+    public User deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        User user = new User();
+        JsonObject obj = json.getAsJsonObject();
+        if (obj.has("balance")) {
+            user.setBalance(obj.get("balance").getAsDouble());
+        }
+        if (obj.has("stats")) {
+            user.setStats(context.deserialize(obj.get("stats"), Stats.class));
+        }
+        if (obj.has("inbox")) {
+            user.setInbox(context.deserialize(obj.get("inbox"), Inbox.class));
+        }
+        if (obj.has("preferences")) {
+            user.setPreferences(context.deserialize(obj.get("preferences"), Preferences.class));
+        }
+        if (obj.has("profile")) {
+            user.setProfile(context.deserialize(obj.get("profile"), Profile.class));
+        }
+        if (obj.has("party")) {
+            user.setParty(context.deserialize(obj.get("party"), UserParty.class));
+        }
+        if (obj.has("items")) {
+            user.setItems(context.deserialize(obj.get("items"), Items.class));
+        }
+        if (obj.has("auth")) {
+            user.setAuthentication(context.deserialize(obj.get("auth"), Authentication.class));
+        }
+        if (obj.has("flags")) {
+            user.setFlags(context.deserialize(obj.get("flags"), Flags.class));
+        }
+        if (obj.has("contributor")) {
+            user.setContributor(context.deserialize(obj.get("contributor"), ContributorInfo.class));
+        }
+        if (obj.has("invitations")) {
+            user.setInvitations(context.deserialize(obj.get("invitations"), Invitations.class));
+        }
+        if (obj.has("tags")) {
+            user.setTags(context.deserialize(obj.get("tags"), new TypeToken<RealmList<Tag>>() {
+            }.getType()));
+        }
+        if (obj.has("tasksOrder")) {
+            user.setTasksOrder(context.deserialize(obj.get("tasksOrder"), TasksOrder.class));
+        }
+        if (obj.has("challenges")) {
+            user.setChallenges(context.deserialize(obj.get("challenges"), new TypeToken<List<String>>() {
+            }.getType()));
+        }
+
+        user.setId(obj.get("_id").getAsString());
+
+        return user;
+    }
+}
\ No newline at end of file

From 6d5f8658e55a4cc66b454d6cc5e0c1dd6f2049c0 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 25 Apr 2017 20:45:21 +0200
Subject: [PATCH 11/17] Fix Stable display

---
 .../habitica/data/InventoryRepository.java    |  2 +
 .../InventoryRepositoryImpl.java              |  5 ++
 .../data/local/InventoryLocalRepository.java  |  2 +
 .../RealmInventoryLocalRepository.java        | 26 ++++--
 .../android/habitica/models/Skill.java        |  1 -
 .../habitica/models/inventory/Animal.java     |  8 +-
 .../habitica/models/inventory/Mount.java      | 28 +++++--
 .../habitica/models/inventory/Pet.java        | 26 ++++--
 .../ui/adapter/SkillsRecyclerViewAdapter.java |  2 +-
 .../inventory/MountDetailRecyclerAdapter.java | 44 +++-------
 .../inventory/PetDetailRecyclerAdapter.java   | 82 +++++++------------
 .../inventory/StableRecyclerAdapter.java      |  2 +-
 .../stable/MountDetailRecyclerFragment.java   | 13 +--
 .../stable/PetDetailRecyclerFragment.java     | 16 +---
 .../stable/StableRecyclerFragment.java        | 25 ++----
 .../ui/fragments/skills/SkillsFragment.java   |  4 +-
 .../habitica/utils/ContentDeserializer.java   | 47 ++++-------
 .../habitica/utils/MountListDeserializer.java |  5 +-
 .../habitica/utils/MountMapDeserializer.java  |  6 +-
 .../habitica/utils/PetListDeserializer.java   | 17 ++--
 .../habitica/utils/PetMapDeserializer.java    |  9 +-
 21 files changed, 173 insertions(+), 197 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
index c29654f3e..efcebeaa3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
@@ -50,4 +50,6 @@ public interface InventoryRepository extends ContentRepository {
     Observable<User> sellItem(User user, Item item);
 
     Observable<Items> equipGear(User user, String equipment, boolean asCostume);
+
+    Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
index af56554a5..70b9232c0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
@@ -147,4 +147,9 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
                     });
                 });
     }
+
+    @Override
+    public Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup) {
+        return localRepository.getOwnedMounts(animalType, animalGroup);
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
index 0e5b84e4d..8dc9bbcb0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
@@ -39,4 +39,6 @@ public interface InventoryLocalRepository extends ContentLocalRepository {
     void changeOwnedCount(String type, String key, int amountToAdd);
 
     Observable<Item> getItem(String type, String key);
+
+    Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
index d14298831..5bdf61127 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
@@ -16,6 +16,7 @@ import java.util.List;
 import io.realm.Realm;
 import io.realm.RealmObject;
 import io.realm.RealmResults;
+import io.realm.Sort;
 import rx.Observable;
 
 
@@ -104,7 +105,8 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
 
     @Override
     public Observable<RealmResults<Mount>> getMounts() {
-        return realm.where(Mount.class).findAll()
+        return realm.where(Mount.class)
+                .findAllSorted("animalGroup", Sort.ASCENDING, "animal", Sort.ASCENDING)
                 .asObservable()
                 .filter(RealmResults::isLoaded);
     }
@@ -112,8 +114,8 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
     @Override
     public Observable<RealmResults<Mount>> getMounts(String type, String group) {
         return realm.where(Mount.class)
-                .equalTo("group", group)
-                .equalTo("type", type)
+                .equalTo("animalGroup", group)
+                .equalTo("animal", type)
                 .findAll()
                 .asObservable()
                 .filter(RealmResults::isLoaded);
@@ -121,7 +123,8 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
 
     @Override
     public Observable<RealmResults<Pet>> getPets() {
-        return realm.where(Pet.class).findAll()
+        return realm.where(Pet.class)
+                .findAllSorted("animalGroup", Sort.ASCENDING, "animal", Sort.ASCENDING)
                 .asObservable()
                 .filter(RealmResults::isLoaded);
     }
@@ -129,8 +132,8 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
     @Override
     public Observable<RealmResults<Pet>> getPets(String type, String group) {
         return realm.where(Pet.class)
-                .equalTo("group", group)
-                .equalTo("type", type)
+                .equalTo("animalGroup", group)
+                .equalTo("animal", type)
                 .findAll()
                 .asObservable()
                 .filter(RealmResults::isLoaded);
@@ -165,4 +168,15 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
                 .filter(realmObject -> realmObject.isLoaded())
                 .cast(Item.class);
     }
+
+    @Override
+    public Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup) {
+        return realm.where(Mount.class)
+                .equalTo("animalGroup", animalGroup)
+                .equalTo("animal", animalType)
+                .equalTo("owned", true)
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
index 3672dfee4..9e8459d31 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/Skill.java
@@ -11,5 +11,4 @@ public class Skill extends RealmObject {
     public String key;
     public String text, notes, target, habitClass;
     public Integer mana, lvl;
-    public boolean isSpecialItem;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
index fae915784..0a1e4c055 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Animal.java
@@ -30,13 +30,13 @@ public interface Animal {
 
     public void setColorText(String colorText);
 
-    public Boolean getPremium();
+    public boolean getPremium();
 
-    public void setPremium(Boolean premium);
+    public void setPremium(boolean premium);
 
-    public Boolean getLimited();
+    public boolean getLimited();
 
-    public void setLimited(Boolean limited);
+    public void setLimited(boolean limited);
 
     public Integer getNumberOwned();
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
index c2531d1d1..b2b439b1a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
@@ -1,15 +1,18 @@
 package com.habitrpg.android.habitica.models.inventory;
 
 import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
 import io.realm.annotations.PrimaryKey;
 
 public class Mount extends RealmObject implements Animal {
 
-    Boolean owned;
+    boolean owned;
     @PrimaryKey
     String key;
     String animal, color, animalGroup, animalText, colorText;
-    Boolean premium, limited;
+    boolean premium, limited;
+
+    @Ignore
     Integer numberOwned;
 
     public String getKey() {
@@ -21,6 +24,9 @@ public class Mount extends RealmObject implements Animal {
     }
 
     public String getAnimal() {
+        if (animal == null) {
+            return key.split("-")[0];
+        }
         return animal;
     }
 
@@ -29,6 +35,9 @@ public class Mount extends RealmObject implements Animal {
     }
 
     public String getColor() {
+        if (color == null) {
+            return key.split("-")[1];
+        }
         return color;
     }
 
@@ -37,6 +46,9 @@ public class Mount extends RealmObject implements Animal {
     }
 
     public String getAnimalGroup() {
+        if (animalGroup == null) {
+            return "";
+        }
         return animalGroup;
     }
 
@@ -66,19 +78,19 @@ public class Mount extends RealmObject implements Animal {
         this.colorText = colorText;
     }
 
-    public Boolean getPremium() {
+    public boolean getPremium() {
         return premium;
     }
 
-    public void setPremium(Boolean premium) {
+    public void setPremium(boolean premium) {
         this.premium = premium;
     }
 
-    public Boolean getLimited() {
+    public boolean getLimited() {
         return limited;
     }
 
-    public void setLimited(Boolean limited) {
+    public void setLimited(boolean limited) {
         this.limited = limited;
     }
 
@@ -93,11 +105,11 @@ public class Mount extends RealmObject implements Animal {
         this.numberOwned = numberOwned;
     }
 
-    public Boolean getOwned() {
+    public boolean getOwned() {
         return owned;
     }
 
-    public void setOwned(Boolean owned) {
+    public void setOwned(boolean owned) {
         this.owned = owned;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
index 1c047d036..f4f73f8ea 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Pet.java
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.models.inventory;
 
 
 import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
 import io.realm.annotations.PrimaryKey;
 
 public class Pet extends RealmObject implements Animal{
@@ -10,9 +11,10 @@ public class Pet extends RealmObject implements Animal{
     @PrimaryKey
     String key;
     String animal, color, animalGroup, animalText, colorText;
-    Boolean premium, limited;
+    boolean premium, limited;
 
-    Integer numberOwned;
+    @Ignore
+    private Integer numberOwned;
 
     public String getKey() {
         return key;
@@ -23,6 +25,9 @@ public class Pet extends RealmObject implements Animal{
     }
 
     public String getAnimal() {
+        if (animal == null) {
+            return getKey().split("-")[0];
+        }
         return animal;
     }
 
@@ -31,6 +36,9 @@ public class Pet extends RealmObject implements Animal{
     }
 
     public String getColor() {
+        if (color == null) {
+            return getKey().split("-")[1];
+        }
         return color;
     }
 
@@ -39,6 +47,9 @@ public class Pet extends RealmObject implements Animal{
     }
 
     public String getAnimalGroup() {
+        if (animalGroup == null) {
+            return "";
+        }
         return animalGroup;
     }
 
@@ -68,19 +79,19 @@ public class Pet extends RealmObject implements Animal{
         this.colorText = colorText;
     }
 
-    public Boolean getPremium() {
+    public boolean getPremium() {
         return premium;
     }
 
-    public void setPremium(Boolean premium) {
+    public void setPremium(boolean premium) {
         this.premium = premium;
     }
 
-    public Boolean getLimited() {
+    public boolean getLimited() {
         return limited;
     }
 
-    public void setLimited(Boolean limited) {
+    public void setLimited(boolean limited) {
         this.limited = limited;
     }
 
@@ -95,6 +106,9 @@ public class Pet extends RealmObject implements Animal{
         this.numberOwned = numberOwned;
     }
     public Integer getTrained() {
+        if (trained == null) {
+            return 0;
+        }
         return trained;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
index df039508f..5fa998ea8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
@@ -90,7 +90,7 @@ public class SkillsRecyclerViewAdapter extends RecyclerView.Adapter<SkillsRecycl
             skillNameTextView.setText(skill.text);
             skillNotesTextView.setText(skill.notes);
 
-            if (skill.isSpecialItem) {
+            if ("special".equals(skill.habitClass)) {
                 priceButton.setText(R.string.skill_transformation_use);
 
                 priceButton.setCompoundDrawables(null, null, null, null);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
index 2b8b1e7e2..4fe5b4d72 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.adapter.inventory;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -19,27 +20,18 @@ import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
 
 import org.greenrobot.eventbus.EventBus;
 
-import java.util.HashMap;
-import java.util.List;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.realm.OrderedRealmCollection;
+import io.realm.RealmRecyclerViewAdapter;
 
-public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetailRecyclerAdapter.MountViewHolder> {
+public class MountDetailRecyclerAdapter extends RealmRecyclerViewAdapter<Mount, MountDetailRecyclerAdapter.MountViewHolder> {
 
     public String itemType;
     public Context context;
-    private List<Mount> itemList;
-    private HashMap<String, Boolean> ownedMapping;
 
-    public void setItemList(List<Mount> itemList) {
-        this.itemList = itemList;
-        this.notifyDataSetChanged();
-    }
-
-    public void setOwnedMapping(HashMap<String, Boolean> map) {
-        this.ownedMapping = map;
-        this.notifyDataSetChanged();
+    public MountDetailRecyclerAdapter(@Nullable OrderedRealmCollection<Mount> data, boolean autoUpdate) {
+        super(data, autoUpdate);
     }
 
     @Override
@@ -53,12 +45,9 @@ public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetail
 
     @Override
     public void onBindViewHolder(MountViewHolder holder, int position) {
-        holder.bind(this.itemList.get(position));
-    }
-
-    @Override
-    public int getItemCount() {
-        return itemList == null ? 0 : itemList.size();
+        if (getData() != null) {
+            holder.bind(this.getData().get(position));
+        }
     }
 
     class MountViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
@@ -78,7 +67,7 @@ public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetail
 
         Resources resources;
 
-        public MountViewHolder(View itemView) {
+        MountViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
 
@@ -87,21 +76,12 @@ public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetail
             itemView.setOnClickListener(this);
         }
 
-        Boolean isOwned() {
-            if (ownedMapping != null && animal != null) {
-                if (ownedMapping.containsKey(animal.getKey()) && ownedMapping.get(animal.getKey())) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         public void bind(Mount item) {
             animal = item;
             titleView.setText(item.getColorText());
             ownedTextView.setVisibility(View.GONE);
             this.imageView.setAlpha(1.0f);
-            if (this.isOwned()) {
+            if (this.animal.getOwned()) {
                 DataBindingUtils.loadImage(this.imageView, "Mount_Icon_" + itemType + "-" + item.getColor());
             } else {
                 DataBindingUtils.loadImage(this.imageView, "PixelPaw");
@@ -111,7 +91,7 @@ public class MountDetailRecyclerAdapter extends RecyclerView.Adapter<MountDetail
 
         @Override
         public void onClick(View v) {
-            if (!this.isOwned()) {
+            if (!this.animal.getOwned()) {
                 return;
             }
             BottomSheetMenu menu = new BottomSheetMenu(context);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
index ebc7eec24..cfdcf2bb9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.adapter.inventory;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.support.annotation.Nullable;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -14,6 +15,7 @@ import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.EquipCommand;
 import com.habitrpg.android.habitica.events.commands.FeedCommand;
+import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
@@ -21,34 +23,22 @@ import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
 
 import org.greenrobot.eventbus.EventBus;
 
-import java.util.HashMap;
-import java.util.List;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.realm.OrderedRealmCollection;
+import io.realm.RealmRecyclerViewAdapter;
+import io.realm.RealmResults;
 
-public class PetDetailRecyclerAdapter extends RecyclerView.Adapter<PetDetailRecyclerAdapter.PetViewHolder> {
+public class PetDetailRecyclerAdapter extends RealmRecyclerViewAdapter<Pet, PetDetailRecyclerAdapter.PetViewHolder> {
 
     public String itemType;
     public Context context;
-    private List<Pet> itemList;
-    private HashMap<String, Integer> ownedMapping;
-    private HashMap<String, Boolean> ownedMountMapping;
+    private RealmResults<Mount> ownedMounts;
 
-    public void setItemList(List<Pet> itemList) {
-        this.itemList = itemList;
-        this.notifyDataSetChanged();
+    public PetDetailRecyclerAdapter(@Nullable OrderedRealmCollection<Pet> data, boolean autoUpdate) {
+        super(data, autoUpdate);
     }
 
-    public void setOwnedMapping(HashMap<String, Integer> map) {
-        this.ownedMapping = map;
-        this.notifyDataSetChanged();
-    }
-
-    public void setOwnedMountsMapping(HashMap<String, Boolean> map) {
-        this.ownedMountMapping = map;
-        this.notifyDataSetChanged();
-    }
 
     @Override
     public PetViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
@@ -61,12 +51,14 @@ public class PetDetailRecyclerAdapter extends RecyclerView.Adapter<PetDetailRecy
 
     @Override
     public void onBindViewHolder(PetViewHolder holder, int position) {
-        holder.bind(this.itemList.get(position));
+        if (getData() != null) {
+            holder.bind(this.getData().get(position));
+        }
     }
 
-    @Override
-    public int getItemCount() {
-        return itemList == null ? 0 : itemList.size();
+    public void setOwnedMounts(RealmResults<Mount> ownedMounts) {
+        this.ownedMounts = ownedMounts;
+        notifyDataSetChanged();
     }
 
     class PetViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
@@ -95,46 +87,21 @@ public class PetDetailRecyclerAdapter extends RecyclerView.Adapter<PetDetailRecy
             itemView.setOnClickListener(this);
         }
 
-        public int getOwnedStatus() {
-            if (ownedMapping != null && animal != null) {
-                if (ownedMapping.containsKey(animal.getKey())) {
-                    return ownedMapping.get(animal.getKey());
-                }
-            }
-            return 0;
-        }
-
-        public boolean isOwned() {
-            return this.getOwnedStatus() > 0;
-        }
-
-        public Boolean isMountOwned() {
-            if (animal.getAnimalGroup().equals("specialPets")) {
-                return false;
-            }
-            if (ownedMountMapping != null && animal != null) {
-                if (ownedMountMapping.get(animal.getKey()) != null) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
         public void bind(Pet item) {
             this.animal = item;
             this.titleView.setText(item.getColorText());
             this.trainedProgressbar.setVisibility(animal.getAnimalGroup().equals("specialPets") ? View.GONE : View.VISIBLE);
             this.imageView.setAlpha(1.0f);
-            if (this.getOwnedStatus() > 0) {
+            if (this.animal.getTrained() > 0) {
                 if (this.isMountOwned()) {
                     this.trainedProgressbar.setVisibility(View.GONE);
                 } else {
-                    this.trainedProgressbar.setProgress(ownedMapping.get(item.getKey()));
+                    this.trainedProgressbar.setProgress(this.animal.getTrained());
                 }
                 DataBindingUtils.loadImage(this.imageView, "Pet-" + itemType + "-" + item.getColor());
             } else {
                 this.trainedProgressbar.setVisibility(View.GONE);
-                if (this.getOwnedStatus() == 0) {
+                if (this.animal.getTrained() == 0) {
                     DataBindingUtils.loadImage(this.imageView, "PixelPaw");
                 } else {
                     DataBindingUtils.loadImage(this.imageView, "Pet-" + itemType + "-" + item.getColor());
@@ -167,5 +134,18 @@ public class PetDetailRecyclerAdapter extends RecyclerView.Adapter<PetDetailRecy
             });
             menu.show();
         }
+
+        private boolean isOwned() {
+            return this.animal.getTrained() > 0;
+        }
+
+        public boolean isMountOwned() {
+            for (Mount ownedMount : ownedMounts) {
+                if (ownedMount.getKey().equals(animal.getKey())) {
+                    return true;
+                }
+            }
+            return false;
+        }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java
index 02a782fa3..ebeb9010d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java
@@ -105,7 +105,7 @@ public class StableRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.Vie
             ownedTextView.setVisibility(View.VISIBLE);
             this.imageView.setAlpha(1.0f);
             if (animal.getNumberOwned() > 0) {
-                this.ownedTextView.setText(animal.getNumberOwned().toString());
+                this.ownedTextView.setText(String.valueOf(animal.getNumberOwned()));
                 if (itemType.equals("pets")) {
                     DataBindingUtils.loadImage(this.imageView, "Pet-" + item.getKey());
                 } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
index d33eb409b..24c6d044c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.InventoryRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.ui.adapter.inventory.MountDetailRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -30,13 +31,12 @@ public class MountDetailRecyclerFragment extends BaseMainFragment {
     public MountDetailRecyclerAdapter adapter;
     public String animalType;
     public String animalGroup;
-    public List<Mount> animals;
     GridLayoutManager layoutManager = null;
 
     private View view;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         this.usesTabLayout = false;
         super.onCreateView(inflater, container, savedInstanceState);
         if (view == null) {
@@ -44,15 +44,13 @@ public class MountDetailRecyclerFragment extends BaseMainFragment {
 
             recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
 
-            android.support.v4.app.FragmentActivity context = getActivity();
-
             layoutManager = new GridLayoutManager(getActivity(), 2);
             recyclerView.setLayoutManager(layoutManager);
             recyclerView.addItemDecoration(new MarginDecoration(getActivity()));
 
             adapter = (MountDetailRecyclerAdapter) recyclerView.getAdapter();
             if (adapter == null) {
-                adapter = new MountDetailRecyclerAdapter();
+                adapter = new MountDetailRecyclerAdapter(null, true);
                 adapter.context = this.getActivity();
                 adapter.itemType = this.animalType;
                 recyclerView.setAdapter(adapter);
@@ -106,10 +104,7 @@ public class MountDetailRecyclerFragment extends BaseMainFragment {
     }
 
     private void loadItems() {
-        inventoryRepository.getMounts().subscribe(mounts -> {
-            adapter.setItemList(mounts);
-            animals = mounts;
-        });
+        inventoryRepository.getMounts(animalType, animalGroup).first().subscribe(adapter::updateData, ReactiveErrorHandler.handleEmptyError());
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
index 9bf25a893..67b321a7b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
@@ -13,7 +13,6 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.events.commands.FeedCommand;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
-import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.adapter.inventory.PetDetailRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -22,8 +21,6 @@ import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
 
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.List;
-
 import javax.inject.Inject;
 
 public class PetDetailRecyclerFragment extends BaseMainFragment {
@@ -36,13 +33,12 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
     public PetDetailRecyclerAdapter adapter;
     public String animalType;
     public String animalGroup;
-    public List<Pet> animals;
     GridLayoutManager layoutManager = null;
 
     private View view;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         this.usesTabLayout = false;
         super.onCreateView(inflater, container, savedInstanceState);
         if (view == null) {
@@ -50,15 +46,13 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
 
             recyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
 
-            android.support.v4.app.FragmentActivity context = getActivity();
-
             layoutManager = new GridLayoutManager(getActivity(), 2);
             recyclerView.setLayoutManager(layoutManager);
             recyclerView.addItemDecoration(new MarginDecoration(getActivity()));
 
             adapter = (PetDetailRecyclerAdapter) recyclerView.getAdapter();
             if (adapter == null) {
-                adapter = new PetDetailRecyclerAdapter();
+                adapter = new PetDetailRecyclerAdapter(null, true);
                 adapter.context = this.getActivity();
                 adapter.itemType = this.animalType;
                 recyclerView.setAdapter(adapter);
@@ -111,10 +105,8 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
     }
 
     private void loadItems() {
-        inventoryRepository.getPets(animalType, animalGroup).subscribe(pets -> {
-            adapter.setItemList(pets);
-            animals = pets;
-        }, ReactiveErrorHandler.handleEmptyError());
+        inventoryRepository.getPets(animalType, animalGroup).first().subscribe(adapter::updateData, ReactiveErrorHandler.handleEmptyError());
+        inventoryRepository.getOwnedMounts(animalType, animalGroup).subscribe(adapter::setOwnedMounts, ReactiveErrorHandler.handleEmptyError());
     }
 
     @Subscribe
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
index 31581ebcf..88babf3e9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
@@ -15,6 +15,8 @@ import com.habitrpg.android.habitica.events.ContentReloadedEvent;
 import com.habitrpg.android.habitica.events.ReloadContentEvent;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.inventory.Animal;
+import com.habitrpg.android.habitica.models.inventory.Mount;
+import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.adapter.inventory.StableRecyclerAdapter;
@@ -141,16 +143,14 @@ public class StableRecyclerFragment extends BaseFragment {
         Observable<? extends Animal> observable;
 
         if ("pets".equals(itemType)) {
-            observable = inventoryRepository.getPets().flatMap(Observable::from);
+            observable = inventoryRepository.getPets().first().flatMap(Observable::from);
         } else {
-            observable = inventoryRepository.getMounts().flatMap(Observable::from);
+            observable = inventoryRepository.getMounts().first().flatMap(Observable::from);
         }
 
         observable.toList().flatMap(unsortedAnimals -> {
             List<Object> items = new ArrayList<>();
             if (unsortedAnimals.size() == 0) {
-                ReloadContentEvent event = new ReloadContentEvent();
-                EventBus.getDefault().post(event);
                 return Observable.just(items);
             }
             String lastSectionTitle = "";
@@ -175,18 +175,14 @@ public class StableRecyclerFragment extends BaseFragment {
                 if (user != null && user.getItems() != null) {
                     switch (itemType) {
                         case "pets":
-                            if (user.getItems().getPets() != null) {
-                                if (lastAnimal.getNumberOwned() == 0) {
-                                    lastAnimal.setColor(animal.getColor());
-                                }
+                            Pet pet = (Pet) animal;
+                            if (pet.getTrained() > 0) {
                                 lastAnimal.setNumberOwned(lastAnimal.getNumberOwned() + 1);
                             }
                             break;
                         case "mounts":
-                            if (user.getItems().getMounts() != null) {
-                                if (lastAnimal.getNumberOwned() == 0) {
-                                    lastAnimal.setColor(animal.getColor());
-                                }
+                            Mount mount = (Mount) animal;
+                            if (mount.getOwned()) {
                                 lastAnimal.setNumberOwned(lastAnimal.getNumberOwned() + 1);
                             }
                             break;
@@ -194,9 +190,6 @@ public class StableRecyclerFragment extends BaseFragment {
                 }
             }
             return Observable.just(items);
-        })
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(items -> adapter.setItemList(items), ReactiveErrorHandler.handleEmptyError());
+        }).subscribe(items -> adapter.setItemList(items), ReactiveErrorHandler.handleEmptyError());
     }
 }
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 52e988940..d041aedbc 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
@@ -112,7 +112,7 @@ public class SkillsFragment extends BaseMainFragment {
     public void onEvent(UseSkillCommand command) {
         Skill skill = command.skill;
 
-        if (skill.isSpecialItem) {
+        if ("special".equals(skill.habitClass)) {
             selectedSkill = skill;
             Intent intent = new Intent(activity, SkillMemberActivity.class);
             startActivityForResult(intent, MEMBER_SELECTION_ACTIVITY);
@@ -129,7 +129,7 @@ public class SkillsFragment extends BaseMainFragment {
         removeProgressDialog();
         adapter.setMana(response.user.getStats().mp);
         StringBuilder message = new StringBuilder();
-        if (usedSkill.isSpecialItem) {
+        if ("special".equals(usedSkill.habitClass)) {
             message.append(getContext().getString(R.string.used_skill_without_mana, usedSkill.text));
         } else {
             message.append(getContext().getString(R.string.used_skill, usedSkill.text, usedSkill.mana));
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
index 4621dc14e..902f53633 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ContentDeserializer.java
@@ -19,22 +19,14 @@ import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
-import com.raizlabs.android.dbflow.runtime.TransactionManager;
-import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
-import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
-import com.raizlabs.android.dbflow.sql.language.Select;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.inject.Inject;
 
 import io.realm.RealmList;
-import io.realm.RealmObject;
 
 public class ContentDeserializer implements JsonDeserializer<ContentResult> {
 
@@ -81,31 +73,37 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
             for (HatchingPotion potion : result.hatchingPotions) {
                 String key = egg.getKey() + "-" + potion.getKey();
                 if (pets.containsKey(key)) {
-                    pets.put(key, this.populatePet(pets.get(key), egg, potion));
+                    pets.put(key, this.populatePet(pets.get(key), egg, potion, "pets"));
                 }
                 if (specialPets.containsKey(key)) {
-                    specialPets.put(key, this.populatePet(specialPets.get(key), egg, potion));
+                    specialPets.put(key, this.populatePet(specialPets.get(key), egg, potion, "specialPets"));
                 }
                 if (premiumPets.containsKey(key)) {
-                    premiumPets.put(key, this.populatePet(premiumPets.get(key), egg, potion));
+                    premiumPets.put(key, this.populatePet(premiumPets.get(key), egg, potion, "premiumPets"));
                 }
                 if (questPets.containsKey(key)) {
-                    questPets.put(key, this.populatePet(questPets.get(key), egg, potion));
+                    questPets.put(key, this.populatePet(questPets.get(key), egg, potion, "questPets"));
                 }
                 if (mounts.containsKey(key)) {
-                    mounts.put(key, this.popupateMount(mounts.get(key), egg, potion));
+                    mounts.put(key, this.populateMount(mounts.get(key), egg, potion, "mounts"));
                 }
                 if (specialMounts.containsKey(key)) {
-                    specialMounts.put(key, this.popupateMount(specialMounts.get(key), egg, potion));
+                    specialMounts.put(key, this.populateMount(specialMounts.get(key), egg, potion, "specialMounts"));
                 }
                 if (premiumMounts.containsKey(key)) {
-                    premiumMounts.put(key, this.popupateMount(premiumMounts.get(key), egg, potion));
+                    premiumMounts.put(key, this.populateMount(premiumMounts.get(key), egg, potion, "premiumMounts"));
                 }
                 if (questMounts.containsKey(key)) {
-                    questMounts.put(key, this.popupateMount(questMounts.get(key), egg, potion));
+                    questMounts.put(key, this.populateMount(questMounts.get(key), egg, potion, "questMounts"));
                 }
             }
         }
+        for (Pet pet : specialPets.values()) {
+            pet.setAnimalGroup("specialMounts");
+        }
+        for (Mount mount : specialMounts.values()) {
+            mount.setAnimalGroup("specialMounts");
+        }
 
         result.pets = new RealmList<>();
         result.pets.addAll(pets.values());
@@ -122,17 +120,6 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
         result.spells = context.deserialize(object.get("spells"), new TypeToken<List<Skill>>() {
         }.getType());
 
-        List<String> spellKeys = new ArrayList<>();
-        for (Skill skill : result.spells) {
-            spellKeys.add(skill.key);
-        }
-        /*List<Skill> oldSkills = new Select().from(Skill.class).queryList();
-        for (Skill skill : oldSkills) {
-            if (!spellKeys.contains(skill.key)) {
-                skill.delete();
-            }
-        }*/
-
         result.appearances = context.deserialize(object.get("appearances"), new TypeToken<RealmList<Customization>>() {
         }.getType());
         result.backgrounds = context.deserialize(object.get("backgrounds"), new TypeToken<RealmList<Customization>>() {
@@ -144,19 +131,21 @@ public class ContentDeserializer implements JsonDeserializer<ContentResult> {
         return result;
     }
 
-    private Mount popupateMount(Mount mount, Egg egg, HatchingPotion potion) {
+    private Mount populateMount(Mount mount, Egg egg, HatchingPotion potion, String group) {
         mount.setAnimalText(egg.getMountText());
         mount.setColorText(potion.getText());
         mount.setLimited(potion.getLimited());
         mount.setPremium(potion.getPremium());
+        mount.setAnimalGroup(group);
         return mount;
     }
 
-    private Pet populatePet(Pet pet, Egg egg, HatchingPotion potion) {
+    private Pet populatePet(Pet pet, Egg egg, HatchingPotion potion, String group) {
         pet.setAnimalText(egg.getText());
         pet.setColorText(potion.getText());
         pet.setLimited(potion.getLimited());
         pet.setPremium(potion.getPremium());
+        pet.setAnimalGroup(group);
         return pet;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
index a6b5cf6d6..7a692ba92 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountListDeserializer.java
@@ -36,9 +36,10 @@ public class MountListDeserializer implements JsonDeserializer<RealmList<Mount>>
             }
 
             for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-                Mount mount;
-                mount = new Mount();
+                Mount mount = new Mount();
                 mount.setKey(entry.getKey());
+                mount.setAnimal(entry.getKey().split("-")[0]);
+                mount.setColor(entry.getKey().split("-")[1]);
                 if (entry.getValue().isJsonNull()) {
                     mount.setOwned(false);
                 } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java
index a1a432303..5083a7842 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/MountMapDeserializer.java
@@ -24,11 +24,12 @@ public class MountMapDeserializer implements JsonDeserializer<HashMap<String, Mo
             JsonObject object = json.getAsJsonObject();
 
             Realm realm = Realm.getDefaultInstance();
-            List<Pet> existingItems = realm.copyFromRealm(realm.where(Pet.class).findAll());
+            List<Mount> existingItems = realm.copyFromRealm(realm.where(Mount.class).findAll());
             realm.close();
 
-            for (Pet mount : existingItems) {
+            for (Mount mount : existingItems) {
                 if (object.has(mount.getKey())) {
+                    vals.put(mount.getKey(), mount);
                     object.remove(mount.getKey());
                 }
             }
@@ -37,7 +38,6 @@ public class MountMapDeserializer implements JsonDeserializer<HashMap<String, Mo
                 Mount mount;
                 mount = new Mount();
                 mount.setKey(entry.getKey());
-                mount.setKey(entry.getKey());
                 mount.setAnimal(entry.getKey().split("-")[0]);
                 mount.setColor(entry.getKey().split("-")[1]);
                 vals.put(mount.getKey(), mount);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
index 5171bec45..c788da0d0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetListDeserializer.java
@@ -38,17 +38,14 @@ public class PetListDeserializer implements JsonDeserializer<RealmList<Pet>> {
             }
 
             for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
-                Pet pet;
-                if (entry.getValue().isJsonObject()) {
-                    pet = context.deserialize(entry.getValue(), Food.class);
+                Pet pet = new Pet();
+                pet.setKey(entry.getKey());
+                pet.setAnimal(entry.getKey().split("-")[0]);
+                pet.setColor(entry.getKey().split("-")[1]);
+                if (entry.getValue().isJsonNull()) {
+                    pet.setTrained(0);
                 } else {
-                    pet = new Pet();
-                    pet.setKey(entry.getKey());
-                    if (entry.getValue().isJsonNull()) {
-                        pet.setTrained(0);
-                    } else {
-                        pet.setTrained(entry.getValue().getAsInt());
-                    }
+                    pet.setTrained(entry.getValue().getAsInt());
                 }
                 vals.add(pet);
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java
index 65e34e18f..5429b13ad 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PetMapDeserializer.java
@@ -23,12 +23,13 @@ public class PetMapDeserializer implements JsonDeserializer<HashMap<String, Pet>
             JsonObject object = json.getAsJsonObject();
 
             Realm realm = Realm.getDefaultInstance();
-            List<Mount> existingItems = realm.copyFromRealm(realm.where(Mount.class).findAll());
+            List<Pet> existingItems = realm.copyFromRealm(realm.where(Pet.class).findAll());
             realm.close();
 
-            for (Mount mount : existingItems) {
-                if (object.has(mount.getKey())) {
-                    object.remove(mount.getKey());
+            for (Pet pet : existingItems) {
+                if (object.has(pet.getKey())) {
+                    vals.put(pet.getKey(), pet);
+                    object.remove(pet.getKey());
                 }
             }
 

From a893206a58c7df5f12efd57a659722bd12837121 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 26 Apr 2017 20:04:05 +0200
Subject: [PATCH 12/17] Fix item interactions

---
 Habitica/res/layout/fragment_group_info.xml   | 32 ++++-----
 Habitica/res/values/strings.xml               |  2 +
 .../habitica/data/InventoryRepository.java    | 18 ++++-
 .../data/implementation/ApiClientImpl.java    |  5 ++
 .../InventoryRepositoryImpl.java              | 66 +++++++++++++++++--
 .../implementation/UserRepositoryImpl.java    | 10 +--
 .../data/local/InventoryLocalRepository.java  |  8 ++-
 .../RealmInventoryLocalRepository.java        | 57 ++++++++++++----
 .../RealmUserLocalRepository.java             |  2 +-
 .../habitica/models/inventory/Food.java       |  2 +-
 .../models/inventory/QuestCollect.java        | 22 ++-----
 .../models/inventory/QuestContent.java        | 26 +++++---
 .../habitica/ui/AvatarWithBarsViewModel.java  | 21 ++----
 .../habitica/ui/activities/MainActivity.java  |  5 +-
 .../inventory/ItemRecyclerAdapter.java        | 24 +++++--
 .../inventory/MountDetailRecyclerAdapter.java | 21 +++---
 .../inventory/PetDetailRecyclerAdapter.java   | 11 ++--
 .../QuestCollectRecyclerViewAdapter.java      | 10 ++-
 .../habitica/ui/fragments/BaseFragment.java   |  2 +-
 .../inventory/items/ItemRecyclerFragment.java | 16 +++--
 .../inventory/items/ItemsFragment.java        | 15 -----
 .../stable/MountDetailRecyclerFragment.java   |  3 +
 .../stable/PetDetailRecyclerFragment.java     |  3 +
 .../social/GroupInformationFragment.java      | 22 +++++--
 .../android/habitica/ui/views/ValueBar.java   | 20 +++---
 .../utils/QuestCollectDeserializer.java       | 31 +++++++++
 26 files changed, 302 insertions(+), 152 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.java

diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index c144d565b..3201fb5c3 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <layout xmlns:bind="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/tools">
 
     <data>
         <import type="com.habitrpg.android.habitica.models.social.Group" />
@@ -44,7 +45,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="?android:actionBarSize">
 
             <android.support.v7.widget.CardView
                     android:layout_width="match_parent"
@@ -282,25 +284,23 @@
                         style="?android:buttonBarStyle"
                         android:visibility="@{group.quest.active? View.VISIBLE : View.GONE}">
 
-                        <include
+                        <com.habitrpg.android.habitica.ui.views.ValueBar
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
                             android:id="@+id/bossHpBar"
                             layout="@layout/value_bar"
-                            bind:barForegroundColor="@{@color/hpColor}"
-                            bind:description='@{String.format("%.0f",Math.ceil(group.quest.getProgress().hp))+" / "+String.format("%.0f",Math.ceil(quest.boss.hp))}'
-                            bind:icon="@drawable/ic_header_heart"
-                            bind:partyMembers="@{true}"
-                            bind:text='@{"Boss Health"}'
-                            bind:weightToShow="@{(float)(group.quest.getProgress().hp / quest.boss.hp)}" />
+                            app:barForegroundColor="@color/hpColor"
+                            app:description="@string/boss_health"
+                            app:barIconDrawable="@drawable/ic_header_heart" />
 
-                        <include
+                        <com.habitrpg.android.habitica.ui.views.ValueBar
+                            android:layout_height="wrap_content"
+                            android:layout_width="match_parent"
                             android:id="@+id/bossRageBar"
                             layout="@layout/value_bar"
-                            bind:barForegroundColor="@{@color/mpColor}"
-                            bind:description='@{String.format("%.0f",Math.ceil(group.quest.getProgress().rage))+" / "+String.format("%.0f",Math.ceil(quest.boss.rage_value))}'
-                            bind:icon="@drawable/ic_header_magic"
-                            bind:partyMembers="@{true}"
-                            bind:text='@{"Rage"}'
-                            bind:weightToShow="@{(float)(group.quest.getProgress().rage / quest.boss.rage_value)}" />
+                            app:barForegroundColor="@color/mpColor"
+                            app:description="@string/boss_rage"
+                            app:barIconDrawable="@drawable/ic_header_magic" />
 
                         <android.support.v7.widget.RecyclerView
                             android:id="@+id/collectionStats"
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index d5822b482..a1b437615 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -569,4 +569,6 @@
     <string name="reload_content">Reload Content</string>
     <string name="dailyDueDefaultView">Set Dailies default to ‘due’ tab</string>
     <string name="dailyDueDefaultViewDescription">With this option set, the Dailies tasks will default to ‘due’ instead of ‘all’</string>
+    <string name="boss_health">Boss Health</string>
+    <string name="boss_rage">Boss Rage</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
index efcebeaa3..73d73d244 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
@@ -2,11 +2,16 @@ package com.habitrpg.android.habitica.data;
 
 import android.support.annotation.Nullable;
 
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
 import com.habitrpg.android.habitica.models.inventory.Item;
 import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.responses.FeedResponse;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.User;
 
@@ -39,9 +44,15 @@ public interface InventoryRepository extends ContentRepository {
     Observable<RealmResults<Mount>> getMounts();
     Observable<RealmResults<Mount>> getMounts(String type, String group);
 
+    Observable<RealmResults<Mount>> getOwnedMounts();
+    Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup);
+
     Observable<RealmResults<Pet>> getPets();
     Observable<RealmResults<Pet>> getPets(String type, String group);
 
+    Observable<RealmResults<Pet>> getOwnedPets();
+    Observable<RealmResults<Pet>> getOwnedPets(String type, String group);
+
     void updateOwnedEquipment(User user);
 
     void changeOwnedCount(String type, String key, int amountToAdd);
@@ -50,6 +61,11 @@ public interface InventoryRepository extends ContentRepository {
     Observable<User> sellItem(User user, Item item);
 
     Observable<Items> equipGear(User user, String equipment, boolean asCostume);
+    Observable<Items> equip(User user, String type, String key);
 
-    Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup);
+    Observable<FeedResponse> feedPet(Pet pet, Food food);
+
+    Observable<Items> hatchPet(Egg egg, HatchingPotion hatchingPotion);
+
+    Observable<Quest> inviteToQuest(QuestContent quest);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index 149524c6a..c454df99d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -42,6 +42,7 @@ import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.Quest;
+import com.habitrpg.android.habitica.models.inventory.QuestCollect;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
 import com.habitrpg.android.habitica.models.responses.BuyResponse;
 import com.habitrpg.android.habitica.models.responses.FeedResponse;
@@ -82,6 +83,7 @@ import com.habitrpg.android.habitica.utils.MountMapDeserializer;
 import com.habitrpg.android.habitica.utils.PetListDeserializer;
 import com.habitrpg.android.habitica.utils.PetMapDeserializer;
 import com.habitrpg.android.habitica.utils.PurchasedDeserializer;
+import com.habitrpg.android.habitica.utils.QuestCollectDeserializer;
 import com.habitrpg.android.habitica.utils.QuestListDeserializer;
 import com.habitrpg.android.habitica.utils.RemindersItemSerializer;
 import com.habitrpg.android.habitica.utils.SkillDeserializer;
@@ -237,6 +239,8 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
         Type mountListType = new TypeToken<RealmList<Mount>>() {
         }.getType();
 
+        Type questCollectListType = new TypeToken<RealmList<QuestCollect>>() {
+        }.getType();
 
         //Exclusion strategy needed for DBFlow https://github.com/Raizlabs/DBFlow/issues/121
         Gson gson = new GsonBuilder()
@@ -280,6 +284,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
                 .registerTypeAdapter(FeedResponse.class, new FeedResponseDeserializer())
                 .registerTypeAdapter(Challenge.class, new ChallengeDeserializer())
                 .registerTypeAdapter(User.class, new UserDeserializer())
+                .registerTypeAdapter(questCollectListType, new QuestCollectDeserializer())
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
                 .create();
         return GsonConverterFactory.create(gson);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
index 70b9232c0..bf6b61b41 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
@@ -3,11 +3,16 @@ package com.habitrpg.android.habitica.data.implementation;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.InventoryRepository;
 import com.habitrpg.android.habitica.data.local.InventoryLocalRepository;
+import com.habitrpg.android.habitica.models.inventory.Egg;
+import com.habitrpg.android.habitica.models.inventory.Food;
+import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
 import com.habitrpg.android.habitica.models.inventory.Item;
 import com.habitrpg.android.habitica.models.inventory.Equipment;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.responses.FeedResponse;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.Outfit;
 import com.habitrpg.android.habitica.models.user.Stats;
@@ -87,6 +92,16 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
         return localRepository.getMounts(type, group);
     }
 
+    @Override
+    public Observable<RealmResults<Mount>> getOwnedMounts() {
+        return localRepository.getOwnedMounts();
+    }
+
+    @Override
+    public Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup) {
+        return localRepository.getOwnedMounts(animalType, animalGroup);
+    }
+
     @Override
     public Observable<RealmResults<Pet>> getPets() {
         return localRepository.getPets();
@@ -97,6 +112,16 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
         return localRepository.getPets(type, group);
     }
 
+    @Override
+    public Observable<RealmResults<Pet>> getOwnedPets() {
+        return localRepository.getOwnedPets();
+    }
+
+    @Override
+    public Observable<RealmResults<Pet>> getOwnedPets(String type, String group) {
+        return localRepository.getOwnedPets(type, group);
+    }
+
     @Override
     public void updateOwnedEquipment(User user) {
         localRepository.updateOwnedEquipment(user);
@@ -134,22 +159,51 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
 
     @Override
     public Observable<Items> equipGear(User user, String key, boolean asCostume) {
-        return apiClient.equipItem(asCostume ? "costume" : "equipped", key)
+        return equip(user, asCostume ? "costume" : "equipped", key);
+    }
+
+    @Override
+    public Observable<Items> equip(User user, String type, String key) {
+        return apiClient.equipItem(type, key)
                 .doOnNext(items -> {
                     if (user == null) {
                         return;
                     }
                     localRepository.executeTransaction(realm -> {
-                        Outfit newOutfit = asCostume ? items.getGear().getCostume() : items.getGear().getEquipped();
-                        Outfit oldOutfit = asCostume ? user.getItems().getGear().getCostume() : user.getItems().getGear().getEquipped();
-                        oldOutfit.updateWith(newOutfit);
+                        Outfit newEquipped = items.getGear().getEquipped();
+                        Outfit oldEquipped = user.getItems().getGear().getEquipped();
+                        Outfit newCostume = items.getGear().getCostume();
+                        Outfit oldCostume = user.getItems().getGear().getCostume();
+                        oldEquipped.updateWith(newEquipped);
+                        oldCostume.updateWith(newCostume);
+                        user.getItems().setCurrentMount(items.getCurrentMount());
+                        user.getItems().setCurrentPet(items.getCurrentPet());
                         user.setBalance(user.getBalance());
                     });
                 });
     }
 
     @Override
-    public Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup) {
-        return localRepository.getOwnedMounts(animalType, animalGroup);
+    public Observable<FeedResponse> feedPet(Pet pet, Food food) {
+        return apiClient.feedPet(pet.getKey(), food.getKey())
+                .doOnNext(feedResponse -> {
+                    localRepository.changeOwnedCount(food, -1);
+                    localRepository.executeTransaction(realm -> pet.setTrained(feedResponse.value));
+                });
+    }
+
+    @Override
+    public Observable<Items> hatchPet(Egg egg, HatchingPotion hatchingPotion) {
+        return apiClient.hatchPet(egg.getKey(), hatchingPotion.getKey())
+                .doOnNext(items -> {
+                    localRepository.changeOwnedCount(egg, -1);
+                    localRepository.changeOwnedCount(hatchingPotion, -1);
+                });
+    }
+
+    @Override
+    public Observable<Quest> inviteToQuest(QuestContent quest) {
+        return apiClient.inviteToQuest("party", quest.getKey())
+                .doOnNext(quest1 -> localRepository.changeOwnedCount(quest, -1));
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 575ebe2e0..9b4156e94 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -28,15 +28,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
 
     @Override
     public Observable<User> getUser(String userID) {
-        return localRepository.getUser(userID)
-                .flatMap(habitRPGUser -> {
-                    if (habitRPGUser == null || !habitRPGUser.isValid()) {
-                        return retrieveUser(true)
-                                .flatMap(user -> localRepository.getUser(user.getId()));
-                    } else {
-                        return Observable.just(habitRPGUser);
-                    }
-                });
+        return localRepository.getUser(userID);
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
index 8dc9bbcb0..080a80aa4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/InventoryLocalRepository.java
@@ -31,14 +31,20 @@ public interface InventoryLocalRepository extends ContentLocalRepository {
     Observable<RealmResults<Mount>> getMounts();
     Observable<RealmResults<Mount>> getMounts(String type, String group);
 
+    Observable<RealmResults<Mount>> getOwnedMounts();
+    Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup);
+
     Observable<RealmResults<Pet>> getPets();
     Observable<RealmResults<Pet>> getPets(String type, String group);
 
+    Observable<RealmResults<Pet>> getOwnedPets();
+    Observable<RealmResults<Pet>> getOwnedPets(String type, String group);
+
     void updateOwnedEquipment(User user);
 
     void changeOwnedCount(String type, String key, int amountToAdd);
+    void changeOwnedCount(Item item, Integer amountToAdd);
 
     Observable<Item> getItem(String type, String key);
 
-    Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
index 5bdf61127..a27ad4012 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
@@ -121,6 +121,26 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
                 .filter(RealmResults::isLoaded);
     }
 
+    @Override
+    public Observable<RealmResults<Mount>> getOwnedMounts() {
+        return realm.where(Mount.class)
+                .equalTo("owned", true)
+                .findAllSorted("animalGroup", Sort.ASCENDING, "animal", Sort.ASCENDING)
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup) {
+        return realm.where(Mount.class)
+                .equalTo("animalGroup", animalGroup)
+                .equalTo("animal", animalType)
+                .equalTo("owned", true)
+                .findAllSorted("animal")
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
     @Override
     public Observable<RealmResults<Pet>> getPets() {
         return realm.where(Pet.class)
@@ -139,6 +159,26 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
                 .filter(RealmResults::isLoaded);
     }
 
+    @Override
+    public Observable<RealmResults<Pet>> getOwnedPets() {
+        return realm.where(Pet.class)
+                .greaterThan("trained", 0)
+                .findAllSorted("animalGroup", Sort.ASCENDING, "animal", Sort.ASCENDING)
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Pet>> getOwnedPets(String type, String group) {
+        return realm.where(Pet.class)
+                .equalTo("animalGroup", group)
+                .equalTo("animal", type)
+                .greaterThan("trained", 0)
+                .findAllSorted("animal")
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
     @Override
     public void updateOwnedEquipment(User user) {
 
@@ -146,6 +186,12 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
 
     @Override
     public void changeOwnedCount(String type, String key, int amountToAdd) {
+        this.getItem(type, key).first().subscribe(item -> changeOwnedCount(item, amountToAdd));
+    }
+
+    @Override
+    public void changeOwnedCount(Item item, Integer amountToAdd) {
+        realm.executeTransaction(realm1 -> item.setOwned(item.getOwned()+amountToAdd));
     }
 
     @Override
@@ -168,15 +214,4 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
                 .filter(realmObject -> realmObject.isLoaded())
                 .cast(Item.class);
     }
-
-    @Override
-    public Observable<RealmResults<Mount>> getOwnedMounts(String animalType, String animalGroup) {
-        return realm.where(Mount.class)
-                .equalTo("animalGroup", animalGroup)
-                .equalTo("animal", animalType)
-                .equalTo("owned", true)
-                .findAll()
-                .asObservable()
-                .filter(RealmResults::isLoaded);
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
index 4185bcb12..96b3715b8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
@@ -23,7 +23,7 @@ public class RealmUserLocalRepository extends RealmBaseLocalRepository implement
     @Override
     public Observable<User> getUser(String userID) {
         return realm.where(User.class).equalTo("id", userID).findFirstAsync().asObservable()
-                .filter(realmObject -> realmObject.isLoaded())
+                .filter(realmObject -> realmObject.isLoaded() && realmObject.isValid())
                 .cast(User.class);
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
index d38725b83..c7b89aa14 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Food.java
@@ -47,7 +47,7 @@ public class Food extends RealmObject implements Item {
 
     @Override
     public void setOwned(int size) {
-
+        owned = size;
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java
index 678d5f252..8ff399709 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestCollect.java
@@ -1,23 +1,13 @@
 package com.habitrpg.android.habitica.models.inventory;
 
-import com.habitrpg.android.habitica.HabitDatabase;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class QuestCollect extends BaseModel {
-    @Column
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
+public class QuestCollect extends RealmObject {
+
+    @PrimaryKey
     public String key;
-
-    @Column
-    public String quest_key;
-    @Column
     public String text;
-    @Column
     public int count;
-    @Column
-    @PrimaryKey(autoincrement = true)
-    long id;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
index a85531844..2f5f33a5c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/QuestContent.java
@@ -1,8 +1,11 @@
 package com.habitrpg.android.habitica.models.inventory;
 
+import android.support.annotation.Nullable;
+
 import java.util.Collection;
 import java.util.HashMap;
 
+import io.realm.RealmList;
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
 import io.realm.annotations.PrimaryKey;
@@ -12,15 +15,14 @@ public class QuestContent extends RealmObject implements Item {
     @PrimaryKey
     String key;
     String text, notes;
-    Integer value, owned;
+    int value, owned;
     public String previous;
     public int lvl;
     public boolean canBuy;
     public String category;
     public QuestBoss boss;
 
-    @Ignore
-    HashMap<String, QuestCollect> collect;
+    RealmList<QuestCollect> collect;
 
     public String getPrevious() {
         return previous;
@@ -62,15 +64,11 @@ public class QuestContent extends RealmObject implements Item {
         this.boss = boss;
     }
 
-    public Collection<QuestCollect> getCollectCollection() {
-        return getCollect().values();
-    }
-
-    public HashMap<String, QuestCollect> getCollect() {
+    public RealmList<QuestCollect> getCollect() {
         return collect;
     }
 
-    public void setCollect(HashMap<String, QuestCollect> collect) {
+    public void setCollect(RealmList<QuestCollect> collect) {
         this.collect = collect;
     }
 
@@ -123,4 +121,14 @@ public class QuestContent extends RealmObject implements Item {
     public void setKey(String key) {
         this.key = key;
     }
+
+    @Nullable
+    public QuestCollect getCollectWithKey(String key) {
+        for (QuestCollect collect : this.collect) {
+            if (collect.key.equals(key)) {
+                return collect;
+            }
+        }
+        return null;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
index e73e3a630..d30c2ed5c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java
@@ -4,19 +4,17 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.content.res.ResourcesCompat;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.events.BoughtGemsEvent;
 import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
 import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
-import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Stats;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
 import com.habitrpg.android.habitica.ui.views.ValueBar;
 
@@ -78,15 +76,6 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
         avatarView.setOnClickListener(this);
     }
 
-    // Layout_Weight don't accepts 0.7/0.3 to have 70% filled instead it shows the 30% , so I had to switch the values
-    // but on a 1.0/0.0 which switches to 0.0/1.0 it shows the blank part full size...
-    private static void setValueBar(ValueBar valueBar, float value, float valueMax) {
-        double percent = Math.min(1, value / valueMax);
-
-        valueBar.setBarWight((float) percent);
-        valueBar.setValueText((int) value + "/" + (int) valueMax);
-    }
-
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     public void updateData(User user) {
         userObject = user;
@@ -152,7 +141,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
         } else {
             cachedMaxHealth = valueMax;
         }
-        setValueBar(hpBar, (float) Math.ceil(value), valueMax);
+        hpBar.set(Math.ceil(value), valueMax);
     }
 
     private void setXpBarData(float value, int valueMax) {
@@ -161,7 +150,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
         } else {
             cachedMaxExp = valueMax;
         }
-        setValueBar(xpBar, (float) Math.floor(value), valueMax);
+        xpBar.set(Math.floor(value), valueMax);
     }
 
     private void setMpBarData(float value, int valueMax) {
@@ -170,7 +159,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
         } else {
             cachedMaxMana = valueMax;
         }
-        setValueBar(mpBar, (float) Math.floor(value), valueMax);
+        mpBar.set(Math.floor(value), valueMax);
     }
 
     @Subscribe
@@ -210,6 +199,6 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
             maxHP = 50;
         }
 
-        setValueBar(valueBar, (float) Math.ceil(stats.getHp().floatValue()), maxHP);
+        valueBar.set((float) Math.ceil(stats.getHp().floatValue()), maxHP);
     }
 }
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 ec34f9cba..d4fe26cff 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
@@ -810,7 +810,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
         if (event.usingEgg == null || event.usingHatchingPotion == null) {
             return;
         }
-        this.apiClient.hatchPet(event.usingEgg.getKey(), event.usingHatchingPotion.getKey())
+        this.inventoryRepository.hatchPet(event.usingEgg, event.usingHatchingPotion)
                 .subscribe(items -> {
                     FrameLayout petWrapper = (FrameLayout) View.inflate(this, R.layout.pet_imageview, null);
                     SimpleDraweeView petImageView = (SimpleDraweeView) petWrapper.findViewById(R.id.pet_imageview);
@@ -845,9 +845,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
             return;
         }
         final Pet pet = event.usingPet;
-        this.apiClient.feedPet(event.usingPet.getKey(), event.usingFood.getKey())
+        this.inventoryRepository.feedPet(event.usingPet, event.usingFood)
                 .subscribe(feedResponse -> {
-                    MainActivity.this.setUserData(false);
                     showSnackbar(MainActivity.this, floatingMenuWrapper, getString(R.string.notification_pet_fed, pet.getColorText(), pet.getAnimalText()), SnackbarDisplayType.NORMAL);
                     if (feedResponse.value == -1) {
                         FrameLayout mountWrapper = (FrameLayout) View.inflate(this, R.layout.pet_imageview, null);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
index 7d99d4231..539c2beba 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
@@ -21,6 +21,7 @@ import com.habitrpg.android.habitica.models.inventory.Food;
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
 import com.habitrpg.android.habitica.models.inventory.Item;
 import com.habitrpg.android.habitica.models.inventory.Pet;
+import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
 import com.habitrpg.android.habitica.models.inventory.SpecialItem;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
@@ -35,7 +36,9 @@ import java.util.List;
 import io.realm.OrderedRealmCollection;
 import io.realm.RealmList;
 import io.realm.RealmRecyclerViewAdapter;
+import io.realm.RealmResults;
 import rx.Observable;
+import rx.Subscription;
 import rx.subjects.PublishSubject;
 
 public class ItemRecyclerAdapter extends RealmRecyclerViewAdapter<Item, ItemRecyclerAdapter.ItemViewHolder> {
@@ -45,10 +48,11 @@ public class ItemRecyclerAdapter extends RealmRecyclerViewAdapter<Item, ItemRecy
     public Item hatchingItem;
     public Pet feedingPet;
     public ItemRecyclerFragment fragment;
-    public RealmList<Pet> ownedPets;
+    private RealmResults<Pet> ownedPets;
     public Context context;
 
     private PublishSubject<Item> sellItemEvents = PublishSubject.create();
+    private PublishSubject<QuestContent> questInvitationEvents = PublishSubject.create();
 
     public ItemRecyclerAdapter(@Nullable OrderedRealmCollection<Item> data, boolean autoUpdate) {
         super(data, autoUpdate);
@@ -90,13 +94,21 @@ public class ItemRecyclerAdapter extends RealmRecyclerViewAdapter<Item, ItemRecy
         notifyItemChanged(itemPos);*/
     }
 
+    public void setOwnedPets(RealmResults<Pet> pets) {
+        ownedPets = pets;
+    }
+
+    public Observable<QuestContent> getQuestInvitationEvents() {
+        return questInvitationEvents.asObservable();
+    }
+
     class ItemViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
         Item item;
 
         Resources resources;
         ItemItemBinding binding;
 
-        public ItemViewHolder(View itemView) {
+        ItemViewHolder(View itemView) {
             super(itemView);
 
             resources = itemView.getResources();
@@ -106,14 +118,14 @@ public class ItemRecyclerAdapter extends RealmRecyclerViewAdapter<Item, ItemRecy
             itemView.setOnClickListener(this);
         }
 
-        public Boolean isPetOwned() {
+        Boolean isPetOwned() {
             String petKey;
             if (item instanceof Egg) {
                 petKey = item.getKey() + "-" + hatchingItem.getKey();
             } else {
                 petKey = hatchingItem.getKey() + "-" + item.getKey();
             }
-            return ownedPets != null;
+            return ownedPets != null && ownedPets.where().equalTo("key", petKey).count() > 0;
         }
 
         public void bind(Item item) {
@@ -185,9 +197,7 @@ public class ItemRecyclerAdapter extends RealmRecyclerViewAdapter<Item, ItemRecy
                         event.usingHatchingPotion = (HatchingPotion) item;
                         EventBus.getDefault().post(event);
                     } else if (item instanceof QuestContent) {
-                        InvitePartyToQuestCommand event = new InvitePartyToQuestCommand();
-                        event.questKey = item.getKey();
-                        EventBus.getDefault().post(event);
+                        questInvitationEvents.onNext((QuestContent) item);
                     } else if (item instanceof SpecialItem) {
                         EventBus.getDefault().post(new OpenMysteryItemEvent());
                     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
index 4fe5b4d72..9a5fe1ce5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/MountDetailRecyclerAdapter.java
@@ -12,28 +12,34 @@ import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.commands.EquipCommand;
 import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
 
-import org.greenrobot.eventbus.EventBus;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import io.realm.OrderedRealmCollection;
 import io.realm.RealmRecyclerViewAdapter;
+import rx.Observable;
+import rx.subjects.PublishSubject;
 
 public class MountDetailRecyclerAdapter extends RealmRecyclerViewAdapter<Mount, MountDetailRecyclerAdapter.MountViewHolder> {
 
     public String itemType;
     public Context context;
 
+    private PublishSubject<String> equipEvents = PublishSubject.create();
+
     public MountDetailRecyclerAdapter(@Nullable OrderedRealmCollection<Mount> data, boolean autoUpdate) {
         super(data, autoUpdate);
     }
 
+
+    public Observable<String> getEquipEvents() {
+        return equipEvents.asObservable();
+    }
+
     @Override
     public MountViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 
@@ -96,14 +102,7 @@ public class MountDetailRecyclerAdapter extends RealmRecyclerViewAdapter<Mount,
             }
             BottomSheetMenu menu = new BottomSheetMenu(context);
             menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.use_animal)));
-            menu.setSelectionRunnable(index -> {
-                if (index == 0) {
-                    EquipCommand event = new EquipCommand();
-                    event.type = "mount";
-                    event.key = animal.getKey();
-                    EventBus.getDefault().post(event);
-                }
-            });
+            menu.setSelectionRunnable(index -> equipEvents.onNext(animal.getKey()));
             menu.show();
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
index cfdcf2bb9..39732d8a6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.java
@@ -28,17 +28,23 @@ import butterknife.ButterKnife;
 import io.realm.OrderedRealmCollection;
 import io.realm.RealmRecyclerViewAdapter;
 import io.realm.RealmResults;
+import rx.Observable;
+import rx.subjects.PublishSubject;
 
 public class PetDetailRecyclerAdapter extends RealmRecyclerViewAdapter<Pet, PetDetailRecyclerAdapter.PetViewHolder> {
 
     public String itemType;
     public Context context;
     private RealmResults<Mount> ownedMounts;
+    private PublishSubject<String> equipEvents = PublishSubject.create();
 
     public PetDetailRecyclerAdapter(@Nullable OrderedRealmCollection<Pet> data, boolean autoUpdate) {
         super(data, autoUpdate);
     }
 
+    public Observable<String> getEquipEvents() {
+        return equipEvents.asObservable();
+    }
 
     @Override
     public PetViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
@@ -122,10 +128,7 @@ public class PetDetailRecyclerAdapter extends RealmRecyclerViewAdapter<Pet, PetD
             }
             menu.setSelectionRunnable(index -> {
                 if (index == 0) {
-                    EquipCommand event = new EquipCommand();
-                    event.type = "pet";
-                    event.key = animal.getKey();
-                    EventBus.getDefault().post(event);
+                    equipEvents.onNext(animal.getKey());
                 } else if (index == 1) {
                     FeedCommand event = new FeedCommand();
                     event.usingPet = animal;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
index 8e3bbaa30..9908889f5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/QuestCollectRecyclerViewAdapter.java
@@ -9,6 +9,7 @@ import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.models.inventory.QuestCollect;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
 import com.habitrpg.android.habitica.models.inventory.QuestProgress;
 
@@ -75,9 +76,12 @@ public class QuestCollectRecyclerViewAdapter extends RecyclerView.Adapter<QuestC
 
         public void bind(String key) {
             image.setImageURI(Uri.parse("https://habitica-assets.s3.amazonaws.com/mobileApp/images/" + "quest_" + quest.getKey() + "_" + key + ".png"));
-            if (quest.getCollect().get(key) != null) {
-                name.setText(quest.getCollect().get(key).text);
-                count.setText(progress.collect.get(key) + " / " + quest.getCollect().get(key).count);
+            if (quest != null) {
+                QuestCollect collect = quest.getCollectWithKey(key);
+                if (collect != null) {
+                    name.setText(collect.text);
+                    count.setText(progress.collect.get(key) + " / " + collect.count);
+                }
             }
         }
     }
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 7296e20ae..b29ae253f 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
@@ -42,7 +42,7 @@ public abstract class BaseFragment extends DialogFragment {
     protected boolean tutorialCanBeDeferred = true;
     public List<String> tutorialTexts;
 
-    CompositeSubscription compositeSubscription;
+    protected CompositeSubscription compositeSubscription;
 
     @Override
     public void setUserVisibleHint(boolean isVisibleToUser) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
index df8cf1451..7ec6bda2b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java
@@ -69,7 +69,6 @@ public class ItemRecyclerFragment extends BaseFragment {
     public Boolean isFeeding;
     public Item hatchingItem;
     public Pet feedingPet;
-    public RealmList<Pet> ownedPets;
     @Nullable
     public User user;
     LinearLayoutManager layoutManager = null;
@@ -104,7 +103,6 @@ public class ItemRecyclerFragment extends BaseFragment {
             adapter.isHatching = this.isHatching;
             adapter.isFeeding = this.isFeeding;
             adapter.fragment = this;
-            adapter.ownedPets = this.ownedPets;
             if (this.hatchingItem != null) {
                 adapter.hatchingItem = this.hatchingItem;
             }
@@ -113,11 +111,17 @@ public class ItemRecyclerFragment extends BaseFragment {
             }
             recyclerView.setAdapter(adapter);
 
-            adapter.getSellItemEvents()
+            compositeSubscription.add(adapter.getSellItemEvents()
                     .flatMap(item -> inventoryRepository.sellItem(user, item))
-                    .subscribe(item -> {
+                    .subscribe(item -> {}, ReactiveErrorHandler.handleEmptyError()));
 
-            }, ReactiveErrorHandler.handleEmptyError());
+            compositeSubscription.add(adapter.getQuestInvitationEvents()
+                    .flatMap(quest -> inventoryRepository.inviteToQuest(quest))
+                            .subscribe(group -> {
+                                OpenMenuItemCommand event1 = new OpenMenuItemCommand();
+                                event1.identifier = MainDrawerBuilder.SIDEBAR_PARTY;
+                                EventBus.getDefault().post(event1);
+                            }, throwable -> {}));
         }
         recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST));
 
@@ -196,6 +200,8 @@ public class ItemRecyclerFragment extends BaseFragment {
                 adapter.updateData((OrderedRealmCollection<Item>) items);
             }
         }, ReactiveErrorHandler.handleEmptyError());
+
+        compositeSubscription.add(inventoryRepository.getOwnedPets().subscribe(adapter::setOwnedPets, ReactiveErrorHandler.handleEmptyError()));
     }
 
     @OnClick(R.id.openMarketButton)
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 24e997893..9c2a9a7f5 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
@@ -112,18 +112,6 @@ public class ItemsFragment extends BaseMainFragment {
         }
     }
 
-    @Subscribe
-    public void onEvent(InvitePartyToQuestCommand event) {
-        this.apiClient.inviteToQuest("party", event.questKey)
-
-                .subscribe(group -> {
-                    OpenMenuItemCommand event1 = new OpenMenuItemCommand();
-                    event1.identifier = MainDrawerBuilder.SIDEBAR_PARTY;
-                    EventBus.getDefault().post(event1);
-                }, throwable -> {
-                });
-    }
-
     @Subscribe
     public void showHatchingDialog(HatchingCommand event) {
         if (event.usingEgg == null || event.usingHatchingPotion == null) {
@@ -137,9 +125,6 @@ public class ItemsFragment extends BaseMainFragment {
             }
             fragment.isHatching = true;
             fragment.isFeeding = false;
-            if (this.user != null) {
-                fragment.ownedPets = this.user.getItems().getPets();
-            }
             fragment.show(getFragmentManager(), "hatchingDialog");
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
index 24c6d044c..d347425a0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
@@ -56,6 +56,9 @@ public class MountDetailRecyclerFragment extends BaseMainFragment {
                 recyclerView.setAdapter(adapter);
                 this.loadItems();
 
+                compositeSubscription.add(adapter.getEquipEvents()
+                        .flatMap(key -> inventoryRepository.equip(user, "mount", key))
+                        .subscribe(items -> {}, ReactiveErrorHandler.handleEmptyError()));
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
index 67b321a7b..a9db777c2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
@@ -58,6 +58,9 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
                 recyclerView.setAdapter(adapter);
                 this.loadItems();
 
+                compositeSubscription.add(adapter.getEquipEvents()
+                        .flatMap(key -> inventoryRepository.equip(user, "pet", key))
+                        .subscribe(items -> {}, ReactiveErrorHandler.handleEmptyError()));
             }
         }
 
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 9ad4dc0f6..04a53bfd7 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
@@ -20,7 +20,6 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.databinding.FragmentGroupInfoBinding;
-import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.helpers.QrCodeManager;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
@@ -28,6 +27,7 @@ import com.habitrpg.android.habitica.models.social.Group;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.adapter.social.QuestCollectRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
+import com.habitrpg.android.habitica.ui.views.ValueBar;
 
 import javax.inject.Inject;
 
@@ -65,8 +65,8 @@ public class GroupInformationFragment extends BaseFragment {
     @Nullable
     private User user;
     private QuestContent quest;
-    private ValueBarBinding bossHpBar;
-    private ValueBarBinding bossRageBar;
+    private ValueBar bossHpBar;
+    private ValueBar bossRageBar;
 
     private QuestCollectRecyclerViewAdapter questCollectViewAdapter;
 
@@ -106,8 +106,8 @@ public class GroupInformationFragment extends BaseFragment {
 
         collectionStats.setLayoutManager(new LinearLayoutManager(getContext()));
         collectionStats.setAdapter(questCollectViewAdapter);
-        bossHpBar = DataBindingUtil.bind(view.findViewById(R.id.bossHpBar));
-        bossRageBar = DataBindingUtil.bind(view.findViewById(R.id.bossRageBar));
+        bossHpBar = (ValueBar) view.findViewById(R.id.bossHpBar);
+        bossRageBar = (ValueBar) view.findViewById(R.id.bossRageBar);
 
         if (this.group == null) {
             QrCodeManager qrCodeManager = new QrCodeManager(userRepository, this.getContext());
@@ -181,8 +181,16 @@ public class GroupInformationFragment extends BaseFragment {
             }
         }
 
-        bossHpBar.valueBarLayout.setVisibility((quest.boss != null && quest.boss.hp > 0) ? View.VISIBLE : View.GONE);
-        bossRageBar.valueBarLayout.setVisibility((quest.boss != null && quest.boss.rage_value > 0) ? View.VISIBLE : View.GONE);
+        boolean showHpBar = (quest.boss != null && quest.boss.hp > 0);
+        bossHpBar.setVisibility(showHpBar ? View.VISIBLE : View.GONE);
+        if (showHpBar) {
+            bossHpBar.set(group.quest.getProgress().hp, quest.boss.hp);
+        }
+        boolean showRageBar = (quest.boss != null && quest.boss.rage_value > 0);
+        bossRageBar.setVisibility(showRageBar ? View.VISIBLE : View.GONE);
+        if (showRageBar) {
+            bossHpBar.set(group.quest.getProgress().rage, quest.boss.rage_value);
+        }
 
         if (group.quest.members == null) {
             viewBinding.setHideParticipantCard(true);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.java
index c7bc15523..9a71c6a40 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/ValueBar.java
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.databinding.DataBindingUtil;
 import android.graphics.drawable.Drawable;
 import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
@@ -13,13 +12,9 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 
-import javax.inject.Inject;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
@@ -64,7 +59,7 @@ public class ValueBar extends FrameLayout {
         descriptionTextView.setText(attributes.getString(R.styleable.ValueBar_description));
     }
 
-    public void setBarWight(float percent) {
+    public void setBarWeight(double percent) {
         setLayoutWeight(barView, percent);
         setLayoutWeight(barEmptySpace, 1.0f - percent);
     }
@@ -86,16 +81,23 @@ public class ValueBar extends FrameLayout {
         descriptionTextView.setTextColor(textColor);
     }
 
-    public static void setLayoutWeight(View view, float weight) {
+    public static void setLayoutWeight(View view, double weight) {
         view.clearAnimation();
         LinearLayout.LayoutParams layout = (LinearLayout.LayoutParams) view.getLayoutParams();
         if (weight == 0.0f || weight == 1.0f) {
-            layout.weight = weight;
+            layout.weight = (float) weight;
             view.setLayoutParams(layout);
         } else if (layout.weight != weight) {
-            DataBindingUtils.LayoutWeightAnimation anim = new DataBindingUtils.LayoutWeightAnimation(view, weight);
+            DataBindingUtils.LayoutWeightAnimation anim = new DataBindingUtils.LayoutWeightAnimation(view, (float) weight);
             anim.setDuration(1250);
             view.startAnimation(anim);
         }
     }
+
+    public void set(double value, double valueMax) {
+        double percent = Math.min(1, value / valueMax);
+
+        this.setBarWeight(percent);
+        this.setValueText((int) value + "/" + (int) valueMax);
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.java
new file mode 100644
index 000000000..7a3789e53
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/QuestCollectDeserializer.java
@@ -0,0 +1,31 @@
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.inventory.QuestCollect;
+
+import java.lang.reflect.Type;
+import java.util.Map;
+
+import io.realm.RealmList;
+
+public class QuestCollectDeserializer implements JsonDeserializer<RealmList<QuestCollect>> {
+    @Override
+    public RealmList<QuestCollect> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        RealmList<QuestCollect> items = new RealmList<>();
+
+        for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+            QuestCollect questCollect = new QuestCollect();
+            questCollect.key = entry.getKey();
+            JsonObject jsonObject = entry.getValue().getAsJsonObject();
+            questCollect.count = jsonObject.get("count").getAsInt();
+            questCollect.text = jsonObject.get("text").getAsString();
+            items.add(questCollect);
+        }
+
+        return items;
+    }
+}

From 5f806aac93eab96aa7edaa3d72fabed0d956f78c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 26 Apr 2017 20:18:36 +0200
Subject: [PATCH 13/17] fix faq

---
 .../android/habitica/ui/fragments/AboutFragment.java         | 2 +-
 .../android/habitica/ui/fragments/BaseMainFragment.java      | 5 ++++-
 .../habitica/ui/fragments/faq/FAQOverviewFragment.java       | 4 ----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java
index fda5a1c7c..d9dcf3112 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AboutFragment.java
@@ -107,7 +107,7 @@ public class AboutFragment extends Fragment {
         String bodyOfEmail = "Device: " + device +
                 " \nAndroid Version: " + version +
                 " \nAppVersion: " + getString(R.string.version_info, versionName, versionCode) +
-                " \nHabitRPGUser ID: " + userId +
+                " \nUser ID: " + userId +
                 " \nDetails: ";
 
         Intent emailIntent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts(
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java
index 840efb2cd..486cb63e8 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
@@ -23,6 +23,7 @@ public abstract class BaseMainFragment extends BaseFragment {
     @Inject
     public ApiClient apiClient;
     @Inject
+    protected
     UserRepository userRepository;
     @Nullable
     public MainActivity activity;
@@ -124,7 +125,9 @@ public abstract class BaseMainFragment extends BaseFragment {
 
     @Override
     public void onDestroy() {
-        userRepository.close();
+        if (userRepository != null) {
+            userRepository.close();
+        }
         super.onDestroy();
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
index 01e8fbd64..31506dc24 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
@@ -10,7 +10,6 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.FAQRepository;
-import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.ui.adapter.FAQOverviewRecyclerAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -22,8 +21,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class FAQOverviewFragment extends BaseMainFragment {
-    @Inject
-    UserRepository userRepository;
     @Inject
     FAQRepository faqRepository;
 
@@ -52,7 +49,6 @@ public class FAQOverviewFragment extends BaseMainFragment {
 
     @Override
     public void onDestroy() {
-        userRepository.close();
         faqRepository.close();
         super.onDestroy();
     }

From 7086d30cc6f9b517ca0e9455473c324daf5df95a Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 27 Apr 2017 19:39:07 +0200
Subject: [PATCH 14/17] start moving social data to realm

---
 Habitica/res/layout-w320dp/party_member.xml   |  9 ++-
 Habitica/res/layout/activity_full_profile.xml | 22 +-----
 Habitica/res/layout/party_member.xml          |  9 ++-
 .../habitica/data/SocialRepository.java       |  7 +-
 .../android/habitica/data/UserRepository.java |  6 ++
 .../data/implementation/ApiClientImpl.java    |  5 +-
 .../implementation/SocialRepositoryImpl.java  | 11 ++-
 .../implementation/UserRepositoryImpl.java    | 15 ++++
 .../data/local/SocialLocalRepository.java     |  6 +-
 .../DbFlowSocialLocalRepository.java          | 49 ------------
 .../RealmSocialLocalRepository.java           | 46 ++++++++++++
 .../habitica/models/social/Backer.java        |  5 +-
 .../habitica/models/social/Challenge.java     | 44 +----------
 .../habitica/models/social/ChatMessage.java   | 17 +++--
 .../habitica/models/social/Contributor.java   | 11 ---
 .../android/habitica/models/social/Group.java | 19 ++---
 .../android/habitica/models/user/Inbox.java   |  8 +-
 .../android/habitica/models/user/User.java    |  1 +
 .../habitica/modules/RepositoryModule.java    |  6 +-
 .../activities/ChallengeDetailActivity.java   |  1 -
 .../ui/activities/ClassSelectionActivity.java | 19 ++---
 .../ui/activities/FullProfileActivity.java    | 38 +++++-----
 .../habitica/ui/activities/MainActivity.java  | 31 +-------
 .../CustomizationRecyclerViewAdapter.java     | 19 +++--
 .../inventory/ItemRecyclerAdapter.java        | 13 ----
 .../PartyMemberRecyclerViewAdapter.java       |  2 -
 .../AvatarCustomizationFragment.java          | 10 +++
 .../equipment/EquipmentOverviewFragment.java  |  7 +-
 .../stable/StableRecyclerFragment.java        |  7 --
 .../ui/fragments/social/InboxFragment.java    | 74 +++++++++----------
 .../social/InboxMessageListFragment.java      | 58 +++++----------
 .../ChallengeDetailDialogHolder.java          |  2 -
 .../challenges/ChallengeListFragment.java     |  5 +-
 .../fragments/social/party/PartyFragment.java |  4 +-
 .../utils/ChatMessageDeserializer.java        |  9 ++-
 .../utils/ChatMessageListDeserializer.java    | 31 ++++++++
 .../habitica/utils/UserDeserializer.java      |  4 +
 37 files changed, 280 insertions(+), 350 deletions(-)
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.java
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageListDeserializer.java

diff --git a/Habitica/res/layout-w320dp/party_member.xml b/Habitica/res/layout-w320dp/party_member.xml
index 6209dfbc8..7d5a4471b 100644
--- a/Habitica/res/layout-w320dp/party_member.xml
+++ b/Habitica/res/layout-w320dp/party_member.xml
@@ -79,9 +79,14 @@
             </LinearLayout>
 
 
-            <include
+            <com.habitrpg.android.habitica.ui.views.ValueBar
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:id="@+id/hpBar"
-                layout="@layout/value_bar" />
+                app:barForegroundColor="@color/hpColor"
+                app:description="@string/HP_default"
+                app:barIconDrawable="@drawable/ic_header_heart"
+                app:lightBackground="true"/>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index 15a515208..278a267e8 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -156,7 +156,7 @@
                     android:id="@+id/profile_blurb"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-		    android:textIsSelectable="true"
+                    android:textIsSelectable="true"
                     android:text="Blurb" />
 
                 <com.facebook.drawee.view.SimpleDraweeView
@@ -224,13 +224,6 @@
                     android:layout_height="wrap_content"
                     android:text="@string/battle_gear"
                     android:textStyle="bold" />
-
-                <ProgressBar
-                    android:id="@+id/avatar_equip_progress"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:indeterminate="true" />
-
                 <TableLayout
                     android:id="@+id/equipment_table"
                     android:layout_width="match_parent"
@@ -258,13 +251,6 @@
                     android:layout_height="wrap_content"
                     android:text="@string/costume"
                     android:textStyle="bold" />
-
-                <ProgressBar
-                    android:id="@+id/avatar_costume_progress"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:indeterminate="true" />
-
                 <TableLayout
                     android:id="@+id/costume_table"
                     android:layout_width="match_parent"
@@ -340,12 +326,6 @@
                     </TableRow>
 
                 </TableLayout>
-
-                <ProgressBar
-                    android:id="@+id/avatar_attributes_progress"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:indeterminate="true" />
             </LinearLayout>
         </android.support.v7.widget.CardView>
 
diff --git a/Habitica/res/layout/party_member.xml b/Habitica/res/layout/party_member.xml
index d6c7c8021..63939baaa 100644
--- a/Habitica/res/layout/party_member.xml
+++ b/Habitica/res/layout/party_member.xml
@@ -80,9 +80,14 @@
             </LinearLayout>
 
 
-            <include
+            <com.habitrpg.android.habitica.ui.views.ValueBar
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:id="@+id/hpBar"
-                layout="@layout/value_bar" />
+                app:barForegroundColor="@color/hpColor"
+                app:description="@string/HP_default"
+                app:barIconDrawable="@drawable/ic_header_heart"
+                app:lightBackground="true"/>
         </LinearLayout>
 
     </LinearLayout>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
index 7b72da3a9..d680c90ca 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/SocialRepository.java
@@ -10,6 +10,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface SocialRepository extends BaseRepository {
@@ -53,6 +54,8 @@ public interface SocialRepository extends BaseRepository {
 
     Observable<Challenge> getChallenge(String challengeId);
 
-    Observable<List<Challenge>> getChallenges();
-    Observable<List<Challenge>> getUserChallenges(String id);
+    Observable<RealmResults<Challenge>> getChallenges();
+    Observable<RealmResults<Challenge>> getUserChallenges(String id);
+
+    Observable<Void> markPrivateMessagesRead(User user);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
index a31604ff0..38962f7dd 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
@@ -34,4 +34,10 @@ public interface UserRepository extends BaseRepository {
     Observable<SkillResponse> useSkill(@Nullable User user, String key, String target, String taskId);
 
     Observable<SkillResponse> useSkill(@Nullable User user, String key, String target);
+
+    Observable<User> changeClass();
+
+    Observable<User> disableClasses();
+
+    Observable<User> changeClass(String selectedClass);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index c454df99d..0ac8ab995 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -67,6 +67,7 @@ import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.utils.BooleanAsIntAdapter;
 import com.habitrpg.android.habitica.utils.ChallengeDeserializer;
 import com.habitrpg.android.habitica.utils.ChatMessageDeserializer;
+import com.habitrpg.android.habitica.utils.ChatMessageListDeserializer;
 import com.habitrpg.android.habitica.utils.ChecklistItemSerializer;
 import com.habitrpg.android.habitica.utils.ContentDeserializer;
 import com.habitrpg.android.habitica.utils.CustomizationDeserializer;
@@ -238,9 +239,10 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
         }.getType();
         Type mountListType = new TypeToken<RealmList<Mount>>() {
         }.getType();
-
         Type questCollectListType = new TypeToken<RealmList<QuestCollect>>() {
         }.getType();
+        Type chatMessageListType = new TypeToken<RealmList<ChatMessage>>() {
+        }.getType();
 
         //Exclusion strategy needed for DBFlow https://github.com/Raizlabs/DBFlow/issues/121
         Gson gson = new GsonBuilder()
@@ -285,6 +287,7 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
                 .registerTypeAdapter(Challenge.class, new ChallengeDeserializer())
                 .registerTypeAdapter(User.class, new UserDeserializer())
                 .registerTypeAdapter(questCollectListType, new QuestCollectDeserializer())
+                .registerTypeAdapter(chatMessageListType, new ChatMessageListDeserializer())
                 .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
                 .create();
         return GsonConverterFactory.create(gson);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
index efacb14e8..b1bd0b241 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.java
@@ -15,6 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.RealmResults;
 import rx.Observable;
 import rx.schedulers.Schedulers;
 
@@ -148,12 +149,18 @@ public class SocialRepositoryImpl extends BaseRepositoryImpl<SocialLocalReposito
     }
 
     @Override
-    public Observable<List<Challenge>> getChallenges() {
+    public Observable<RealmResults<Challenge>> getChallenges() {
         return localRepository.getChallenges();
     }
 
     @Override
-    public Observable<List<Challenge>> getUserChallenges(String userId) {
+    public Observable<RealmResults<Challenge>> getUserChallenges(String userId) {
         return localRepository.getUserChallenges(userId);
     }
+
+    @Override
+    public Observable<Void> markPrivateMessagesRead(User user) {
+        return apiClient.markPrivateMessagesRead()
+                .doOnNext(aVoid -> localRepository.executeTransaction(realm -> user.getInbox().setNewMessages(0)));
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 9b4156e94..679f74fa9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -124,6 +124,21 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
         });
     }
 
+    @Override
+    public Observable<User> changeClass() {
+        return apiClient.changeClass();
+    }
+
+    @Override
+    public Observable<User> disableClasses() {
+        return apiClient.disableClasses();
+    }
+
+    @Override
+    public Observable<User> changeClass(String selectedClass) {
+        return changeClass(selectedClass);
+    }
+
     private User mergeUser(User oldUser, User newUser) {
         User copiedUser = localRepository.getUnmanagedCopy(oldUser);
         if (newUser.getItems() != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java
index 7faf9391c..adce34aec 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/SocialLocalRepository.java
@@ -1,15 +1,17 @@
 package com.habitrpg.android.habitica.data.local;
 
 import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
 
 import java.util.List;
 
+import io.realm.RealmResults;
 import rx.Observable;
 
 public interface SocialLocalRepository extends BaseLocalRepository {
     Observable<Challenge> getChallenge(String challengeId);
 
-    Observable<List<Challenge>> getChallenges();
+    Observable<RealmResults<Challenge>> getChallenges();
 
-    Observable<List<Challenge>> getUserChallenges(String userId);
+    Observable<RealmResults<Challenge>> getUserChallenges(String userId);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
deleted file mode 100644
index ea4162c8e..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowSocialLocalRepository.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.habitrpg.android.habitica.data.local.implementation;
-
-import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
-import com.habitrpg.android.habitica.models.social.Challenge;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import java.util.List;
-
-import io.realm.Realm;
-import io.realm.RealmObject;
-import rx.Observable;
-
-
-public class DbFlowSocialLocalRepository implements SocialLocalRepository {
-    @Override
-    public void close() {
-
-    }
-
-    @Override
-    public void executeTransaction(Realm.Transaction transaction) {
-
-    }
-
-    @Override
-    public <T extends RealmObject> T getUnmanagedCopy(T object) {
-        return null;
-    }
-
-    @Override
-    public Observable<Challenge> getChallenge(String challengeId) {
-        return Observable.defer(() -> Observable.just(new Select().from(Challenge.class).where(Condition.column("id").eq(challengeId)).querySingle()));
-    }
-
-    @Override
-    public Observable<List<Challenge>> getChallenges() {
-        return Observable.defer(() -> Observable.just(new Select().from(Challenge.class).where(Condition.column("name").isNotNull()).queryList()));
-    }
-
-    @Override
-    public Observable<List<Challenge>> getUserChallenges(String userId) {
-        return Observable.defer(() -> Observable.just(new Select()
-                .from(Challenge.class)
-                .where(Condition.column("name").isNotNull())
-                .and(Condition.column("userId").is(userId))
-                .queryList()));
-    }
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.java
new file mode 100644
index 000000000..22941907f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmSocialLocalRepository.java
@@ -0,0 +1,46 @@
+package com.habitrpg.android.habitica.data.local.implementation;
+
+import com.habitrpg.android.habitica.data.local.SocialLocalRepository;
+import com.habitrpg.android.habitica.models.social.Challenge;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+
+import io.realm.Realm;
+import io.realm.RealmResults;
+import rx.Observable;
+
+
+public class RealmSocialLocalRepository extends RealmBaseLocalRepository implements SocialLocalRepository {
+
+    public RealmSocialLocalRepository(Realm realm) {
+        super(realm);
+    }
+
+    @Override
+    public Observable<Challenge> getChallenge(String challengeId) {
+        return realm.where(Challenge.class)
+                .equalTo("id", challengeId)
+                .findFirstAsync()
+                .asObservable()
+                .filter(realmObject -> realmObject.isLoaded())
+                .cast(Challenge.class);
+    }
+
+    @Override
+    public Observable<RealmResults<Challenge>> getChallenges() {
+        return realm.where(Challenge.class)
+                .isNotNull("name")
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+
+    @Override
+    public Observable<RealmResults<Challenge>> getUserChallenges(String userId) {
+        return realm.where(Challenge.class)
+                .isNotNull("name")
+                .equalTo("userId", userId)
+                .findAll()
+                .asObservable()
+                .filter(RealmResults::isLoaded);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
index e8fef79b6..8caac9a46 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Backer.java
@@ -1,7 +1,8 @@
 package com.habitrpg.android.habitica.models.social;
 
-public class Backer {
-    public int level;
+import io.realm.RealmObject;
 
+public class Backer extends RealmObject {
+    public int level;
     public String npc;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
index b24357bf8..85849f8cf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
@@ -1,71 +1,35 @@
 package com.habitrpg.android.habitica.models.social;
 
-import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.models.user.User;
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.NotNull;
-import com.raizlabs.android.dbflow.annotation.PrimaryKey;
-import com.raizlabs.android.dbflow.annotation.Table;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.util.HashMap;
 
-@Table(databaseName = HabitDatabase.NAME)
-public class Challenge extends BaseModel {
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
+
+public class Challenge extends RealmObject {
 
     public static final String TASK_ORDER_HABITS = "habits";
     public static final String TASK_ORDER_TODOS = "todos";
     public static final String TASK_ORDER_DAILYS = "dailys";
     public static final String TASK_ORDER_REWARDS = "rewards";
 
-    @NotNull
     @PrimaryKey
-    @Column
     public String id;
-
-    @Column
     public String name;
-
-    @Column
     public String shortName;
-
-    @Column
     public String description;
-
-    @Column
     public String leaderName;
-
-    @Column
     public String leaderId;
-
-    @Column
     public String groupName;
-
-    @Column
     public String groupId;
-
-    @Column
     public int prize;
-
-    @Column
     public boolean official;
-
-    @Column
     public int memberCount;
-
-    @Column
     public String user_id;
-
-    @Column
     public String todoList;
-
-    @Column
     public String habitList;
-
-    @Column
     public String dailyList;
-
-    @Column
     public String rewardList;
 
     public Group group;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java
index f1d3880a6..3c84fccae 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/ChatMessage.java
@@ -8,27 +8,30 @@ import com.habitrpg.android.habitica.models.user.ContributorInfo;
 import java.util.Date;
 import java.util.HashMap;
 
+import io.realm.RealmObject;
+import io.realm.annotations.Ignore;
+import io.realm.annotations.PrimaryKey;
 
-/**
- * Created by Negue on 22.08.2015.
- */
-public class ChatMessage {
+public class ChatMessage extends RealmObject {
 
+    @PrimaryKey
     public String id;
 
     public String text;
 
+    @Ignore
     public CharSequence parsedText;
 
     public Long timestamp;
 
+    @Ignore
     public HashMap<String, Boolean> likes;
 
     public int flagCount;
 
     public String uuid;
 
-    public Contributor contributor;
+    public ContributorInfo contributor;
 
     public Backer backer;
 
@@ -41,8 +44,8 @@ public class ChatMessage {
 
 
         if (contributor != null) {
-            if (ContributorInfo.CONTRIBUTOR_COLOR_DICT.containsKey(contributor.level)) {
-                rColor = ContributorInfo.CONTRIBUTOR_COLOR_DICT.get(contributor.level);
+            if (ContributorInfo.CONTRIBUTOR_COLOR_DICT.containsKey(contributor.getLevel())) {
+                rColor = ContributorInfo.CONTRIBUTOR_COLOR_DICT.get(contributor.getLevel());
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java
deleted file mode 100644
index 59b54ef3d..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Contributor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.habitrpg.android.habitica.models.social;
-
-public class Contributor {
-    public boolean admin;
-
-    public String contributions;
-
-    public int level;
-
-    public String text;
-}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
index 6e185c26b..c53544414 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Group.java
@@ -3,16 +3,15 @@ package com.habitrpg.android.habitica.models.social;
 import com.google.gson.annotations.SerializedName;
 import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.user.User;
-import com.raizlabs.android.dbflow.structure.BaseModel;
 
-import java.util.List;
+import io.realm.RealmList;
+import io.realm.RealmObject;
+import io.realm.annotations.PrimaryKey;
 
-/**
- * Created by Negue on 16.09.2015.
- */
-public class Group extends BaseModel {
+public class Group extends RealmObject {
 
     @SerializedName("_id")
+    @PrimaryKey
     public String id;
 
     public double balance;
@@ -27,7 +26,7 @@ public class Group extends BaseModel {
 
     public int memberCount;
 
-    public Boolean isMember;
+    public boolean isMember;
 
     public String type;
 
@@ -37,16 +36,14 @@ public class Group extends BaseModel {
 
     public String privacy;
 
-    public List<ChatMessage> chat;
+    public RealmList<ChatMessage> chat;
 
-    public List<User> members;
+    public RealmList<User> members;
 
     public int challengeCount;
 
     public String leaderMessage;
 
-    // TODO Challenges
-
 
     @Override
     public boolean equals(Object o) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
index 8162fade3..54a67b4d8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Inbox.java
@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import io.realm.RealmList;
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
 import io.realm.annotations.PrimaryKey;
@@ -19,8 +20,7 @@ public class Inbox extends RealmObject {
 
     User user;
     private Boolean optOut;
-    @Ignore
-    private Map<String, ChatMessage> messages;
+    private RealmList<ChatMessage> messages;
     @Ignore
     private List<Object> blocks = new ArrayList<>();
     private Integer newMessages;
@@ -42,14 +42,14 @@ public class Inbox extends RealmObject {
     /**
      * @return The messages
      */
-    public Map<String, ChatMessage> getMessages() {
+    public RealmList<ChatMessage> getMessages() {
         return messages;
     }
 
     /**
      * @param messages The messages
      */
-    public void setMessages(Map<String, ChatMessage> messages) {
+    public void setMessages(RealmList<ChatMessage> messages) {
         this.messages = messages;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
index 900c2c468..fc03caa67 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
@@ -50,6 +50,7 @@ public class User extends RealmObject {
 
     @Ignore
     private List<PushDevice> pushDevices;
+
     private Purchases purchased;
 
     @Ignore
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
index 5ed9ddcea..2de06c2f7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
@@ -30,7 +30,7 @@ import com.habitrpg.android.habitica.data.local.TagLocalRepository;
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
 import com.habitrpg.android.habitica.data.local.TutorialLocalRepository;
 import com.habitrpg.android.habitica.data.local.UserLocalRepository;
-import com.habitrpg.android.habitica.data.local.implementation.DbFlowSocialLocalRepository;
+import com.habitrpg.android.habitica.data.local.implementation.RealmSocialLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.RealmCustomizationLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.RealmFAQLocalRepository;
 import com.habitrpg.android.habitica.data.local.implementation.RealmInventoryLocalRepository;
@@ -90,8 +90,8 @@ public class RepositoryModule {
     }
 
     @Provides
-    SocialLocalRepository providesSocialLocalRepository() {
-        return new DbFlowSocialLocalRepository();
+    SocialLocalRepository providesSocialLocalRepository(Realm realm) {
+        return new RealmSocialLocalRepository(realm);
     }
 
     @Provides
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 276d6bb1b..c074022eb 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
@@ -280,7 +280,6 @@ public class ChallengeDetailActivity extends BaseActivity {
                     showRemoveTasksDialog(keepTasks -> this.apiClient.leaveChallenge(challenge.id, new LeaveChallengeBody(keepTasks))
                             .subscribe(aVoid -> {
                                 challenge.user_id = null;
-                                challenge.async().save();
 
                                 user.resetChallengeList();
                                 finish();
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 bb90f02a2..736ba11d7 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
@@ -8,6 +8,7 @@ import android.support.v7.app.AlertDialog;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.models.user.Gear;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.models.user.Hair;
@@ -39,7 +40,7 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<User
     AvatarView warriorAvatarView;
 
     @Inject
-    ApiClient apiClient;
+    UserRepository userRepository;
 
     ProgressDialog progressDialog;
 
@@ -102,10 +103,8 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<User
         warriorAvatarView.setUser(warrior);
 
         if (!isInitialSelection) {
-            apiClient.changeClass()
-                    .subscribe(user -> {
-                        classWasUnset = true;
-                    }, throwable -> {
+            userRepository.changeClass()
+                    .subscribe(user -> classWasUnset = true, throwable -> {
                     });
         }
     }
@@ -203,19 +202,13 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<User
     private void optOutOfClasses() {
         shouldFinish = true;
         this.displayProgressDialog();
-        apiClient.disableClasses()
-
-                .subscribe(this, throwable -> {
-                });
+        userRepository.disableClasses().subscribe(this, throwable -> {});
     }
 
     private void selectClass(String selectedClass) {
         shouldFinish = true;
         this.displayProgressDialog();
-        apiClient.changeClass(selectedClass)
-
-                .subscribe(this, throwable -> {
-                });
+        userRepository.changeClass(selectedClass).subscribe(this, throwable -> {});
     }
 
     private void displayProgressDialog() {
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 22f4df671..c301b53ee 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
@@ -86,12 +86,6 @@ public class FullProfileActivity extends BaseActivity {
     TableLayout equipmentTableLayout;
     @BindView(R.id.costume_table)
     TableLayout costumeTableLayout;
-    @BindView(R.id.avatar_attributes_progress)
-    ProgressBar attributesProgress;
-    @BindView(R.id.avatar_equip_progress)
-    ProgressBar equipmentProgress;
-    @BindView(R.id.avatar_costume_progress)
-    ProgressBar costumeProgress;
     @BindView(R.id.profile_costume_card)
     CardView costumeCard;
     @BindView(R.id.avatar_with_bars)
@@ -172,8 +166,7 @@ public class FullProfileActivity extends BaseActivity {
 
     private void showSendMessageToUserDialog() {
         LayoutInflater factory = LayoutInflater.from(this);
-        final View newMessageView = factory.inflate(
-                R.layout.profile_new_message_dialog, null);
+        final View newMessageView = factory.inflate(R.layout.profile_new_message_dialog, null);
 
         EmojiEditText emojiEditText = (EmojiEditText) newMessageView.findViewById(R.id.edit_new_message_text);
 
@@ -247,7 +240,6 @@ public class FullProfileActivity extends BaseActivity {
 
         // Load the members achievements now
         apiClient.getMemberAchievements(this.userId)
-
                 .subscribe(this::fillAchievements,
                         throwable -> {
                         });
@@ -299,9 +291,15 @@ public class FullProfileActivity extends BaseActivity {
     }
 
     private String getFloorValueString(float val, boolean roundDown) {
-        return roundDown
-                ? ((int) Math.floor(val)) + ""
-                : (val == 0.0 ? "0" : val + "");
+        if (roundDown) {
+            return String.valueOf(Math.floor(val));
+        } else {
+            if (val == 0.0) {
+                return "0";
+            } else {
+                return String.valueOf(val);
+            }
+        }
     }
 
     private float getFloorValue(float val, boolean roundDown) {
@@ -311,7 +309,7 @@ public class FullProfileActivity extends BaseActivity {
     }
 
     private TableRow addEquipmentRow(TableLayout table, String gearKey, String text, String stats) {
-        TableRow gearRow = (TableRow) getLayoutInflater().inflate(R.layout.profile_gear_tablerow, table);
+        TableRow gearRow = (TableRow) getLayoutInflater().inflate(R.layout.profile_gear_tablerow, table, false);
 
         SimpleDraweeView draweeView = (SimpleDraweeView) gearRow.findViewById(R.id.gear_drawee);
 
@@ -336,6 +334,8 @@ public class FullProfileActivity extends BaseActivity {
             valueTextView.setVisibility(View.GONE);
         }
 
+        table.addView(gearRow);
+
         return gearRow;
     }
 
@@ -381,11 +381,7 @@ public class FullProfileActivity extends BaseActivity {
             }
         }
 
-        stopAndHideProgress(equipmentProgress);
-        equipmentTableLayout.setVisibility(View.VISIBLE);
-
-        stopAndHideProgress(attributesProgress);
-        attributesTableLayout.setVisibility(View.VISIBLE);
+        addNormalAddBuffAttributes(user.getStats());
     }
 
     public void gotCostume(List<Equipment> obj) {
@@ -393,8 +389,6 @@ public class FullProfileActivity extends BaseActivity {
         for (Equipment i : obj) {
             addEquipmentRow(costumeTableLayout, i.getKey(), i.getText(), "");
         }
-
-        stopAndHideProgress(costumeProgress);
     }
 
     private void addNormalAddBuffAttributes(Stats stats) {
@@ -408,7 +402,7 @@ public class FullProfileActivity extends BaseActivity {
     }
 
     private TableRow addAttributeRow(String label, float strVal, float intVal, float conVal, float perVal, boolean roundDown, boolean isSummary) {
-        TableRow tableRow = (TableRow) getLayoutInflater().inflate(R.layout.profile_attributetablerow, attributesTableLayout);
+        TableRow tableRow = (TableRow) getLayoutInflater().inflate(R.layout.profile_attributetablerow, attributesTableLayout, false);
         TextView keyTextView = (TextView) tableRow.findViewById(R.id.tv_attribute_type);
         keyTextView.setText(label);
 
@@ -440,6 +434,8 @@ public class FullProfileActivity extends BaseActivity {
             tableRow.setVisibility(attributeDetailsHidden ? View.GONE : View.VISIBLE);
         }
 
+        attributesTableLayout.addView(tableRow);
+
         return tableRow;
     }
 
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 d4fe26cff..495c4ee89 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
@@ -49,7 +49,6 @@ import com.habitrpg.android.habitica.events.DisplayTutorialEvent;
 import com.habitrpg.android.habitica.events.HabitScoreEvent;
 import com.habitrpg.android.habitica.events.OpenMysteryItemEvent;
 import com.habitrpg.android.habitica.events.OpenedMysteryItemEvent;
-import com.habitrpg.android.habitica.events.ReloadContentEvent;
 import com.habitrpg.android.habitica.events.SelectClassEvent;
 import com.habitrpg.android.habitica.events.ShareEvent;
 import com.habitrpg.android.habitica.events.TaskRemovedEvent;
@@ -57,7 +56,6 @@ import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
 import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
 import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
 import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
-import com.habitrpg.android.habitica.events.commands.EquipCommand;
 import com.habitrpg.android.habitica.events.commands.FeedCommand;
 import com.habitrpg.android.habitica.events.commands.HatchingCommand;
 import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
@@ -65,7 +63,6 @@ import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentComm
 import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
 import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
 import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
-import com.habitrpg.android.habitica.events.commands.UpdateUserCommand;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
 import com.habitrpg.android.habitica.helpers.LanguageHelper;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
@@ -305,7 +302,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
             this.checkMaintenance();
         }
 
-        reloadContent(null);
+        inventoryRepository.retrieveContent().subscribe(contentResult -> {}, ReactiveErrorHandler.handleEmptyError());
 
         if (this.sharedPreferences.getLong("lastReminderSchedule", 0) < new Date().getTime() - 86400000) {
             try {
@@ -642,22 +639,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
         avatarInHeader.updateData(user);
     }
 
-    @Subscribe
-    public void onEvent(UpdateUserCommand event) {
-        userRepository.updateUser(user, event.updateData)
-                .subscribe(user1 -> {}, throwable -> {
-                });
-    }
-
-    @Subscribe
-    public void onEvent(UnlockPathCommand event) {
-        this.user.setBalance(this.user.getBalance() - event.balanceDiff);
-        this.setUserData(false);
-        apiClient.unlockPath(event.path)
-                .subscribe(unlockResponse -> {}, throwable -> {
-                });
-    }
-
     @Subscribe
     public void onEvent(OpenMenuItemCommand event) {
         if (drawer != null) {
@@ -879,12 +860,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
 
     // endregion
 
-    @Subscribe
-    public void reloadContent(ReloadContentEvent event) {
-        this.inventoryRepository.retrieveContent()
-                .subscribe(contentResult -> {}, ReactiveErrorHandler.handleEmptyError());
-    }
-
     public void displayTaskScoringResponse(TaskScoringResult data) {
         if (user != null) {
             notifyUserUseCase.observable(new NotifyUserUseCase.RequestValues(this, floatingMenuWrapper,
@@ -920,9 +895,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
                     .setView(customView)
                     .setPositiveButton(R.string.faint_button, (dialog, which) -> {
                         faintDialog = null;
-                        userRepository.revive(user)
-                                .subscribe(user1 -> {}, throwable -> {
-                                });
+                        userRepository.revive(user).subscribe(user1 -> {}, throwable -> {});
                     })
                     .create();
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
index 2db9cf54d..c398d7b59 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
@@ -31,6 +31,8 @@ import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import rx.Observable;
+import rx.subjects.PublishSubject;
 
 public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -40,6 +42,8 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
     private List<Object> customizationList;
     private String activeCustomization;
 
+    private PublishSubject<Customization> selectCustomizationEvents = PublishSubject.create();
+
     public void updateOwnership(List<String> ownedCustomizations) {
         int position = 0;
         for (Object obj : customizationList) {
@@ -138,6 +142,10 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
         this.notifyDataSetChanged();
     }
 
+    public Observable<Customization> getSelectCustomizationEvents() {
+        return selectCustomizationEvents.asObservable();
+    }
+
     class CustomizationViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
         @BindView(R.id.card_view)
@@ -221,16 +229,7 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
                 return;
             }
 
-            UpdateUserCommand command = new UpdateUserCommand();
-            Map<String, Object> updateData = new HashMap<>();
-            String updatePath = "preferences." + customization.getType();
-            if (customization.getCategory() != null) {
-                updatePath = updatePath + "." + customization.getCategory();
-            }
-            updateData.put(updatePath, customization.getIdentifier());
-            command.updateData = updateData;
-
-            EventBus.getDefault().post(command);
+            selectCustomizationEvents.onNext(customization);
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
index 539c2beba..41450a944 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
@@ -12,16 +12,13 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.databinding.ItemItemBinding;
 import com.habitrpg.android.habitica.events.OpenMysteryItemEvent;
-import com.habitrpg.android.habitica.events.ReloadContentEvent;
 import com.habitrpg.android.habitica.events.commands.FeedCommand;
 import com.habitrpg.android.habitica.events.commands.HatchingCommand;
-import com.habitrpg.android.habitica.events.commands.InvitePartyToQuestCommand;
 import com.habitrpg.android.habitica.models.inventory.Egg;
 import com.habitrpg.android.habitica.models.inventory.Food;
 import com.habitrpg.android.habitica.models.inventory.HatchingPotion;
 import com.habitrpg.android.habitica.models.inventory.Item;
 import com.habitrpg.android.habitica.models.inventory.Pet;
-import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
 import com.habitrpg.android.habitica.models.inventory.SpecialItem;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
@@ -30,15 +27,10 @@ import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
 
 import org.greenrobot.eventbus.EventBus;
 
-import java.util.HashMap;
-import java.util.List;
-
 import io.realm.OrderedRealmCollection;
-import io.realm.RealmList;
 import io.realm.RealmRecyclerViewAdapter;
 import io.realm.RealmResults;
 import rx.Observable;
-import rx.Subscription;
 import rx.subjects.PublishSubject;
 
 public class ItemRecyclerAdapter extends RealmRecyclerViewAdapter<Item, ItemRecyclerAdapter.ItemViewHolder> {
@@ -132,11 +124,6 @@ public class ItemRecyclerAdapter extends RealmRecyclerViewAdapter<Item, ItemRecy
             this.item = item;
             binding.setTitle(item.getText());
 
-            if (item.getText() == null) {
-                ReloadContentEvent event = new ReloadContentEvent();
-                EventBus.getDefault().post(event);
-            }
-
             binding.setDisabled(false);
             if (item instanceof QuestContent) {
                 binding.setImageNamed("inventory_quest_scroll_" + item.getKey());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
index 64da9d8a3..e05f08bbe 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
@@ -91,8 +91,6 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
         }
 
         public void bind(User user) {
-            android.content.Context ctx = itemView.getContext();
-
             avatarView.setUser(user);
 
             AvatarWithBarsViewModel.setHpBarData(hpBar, user.getStats());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
index b5f56af16..c74f5c37f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
@@ -50,6 +50,16 @@ public class AvatarCustomizationFragment extends BaseMainFragment {
         unbinder = ButterKnife.bind(this, view);
         adapter = new CustomizationRecyclerViewAdapter();
 
+        compositeSubscription.add(adapter.getSelectCustomizationEvents()
+                .flatMap(customization -> {
+                    String updatePath = "preferences." + customization.getType();
+                    if (customization.getCategory() != null) {
+                        updatePath = updatePath + "." + customization.getCategory();
+                    }
+                    return userRepository.updateUser(user, updatePath, customization.getIdentifier());
+                })
+                .subscribe(user1 -> {}, ReactiveErrorHandler.handleEmptyError()));
+
         layoutManager = new GridLayoutManager(activity, 2);
         layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
index 46d5e97da..2eaebdb12 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
@@ -117,12 +117,7 @@ public class EquipmentOverviewFragment extends BaseMainFragment {
         costumeShieldView.setOnClickListener(v1 -> displayEquipmentDetailList("shield", user.getItems().getGear().getCostume().getShield(), true));
 
         this.costumeSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            UpdateUserCommand command = new UpdateUserCommand();
-            Map<String, Object> updateData = new HashMap<>();
-            updateData.put("preferences.costume", isChecked);
-            command.updateData = updateData;
-
-            EventBus.getDefault().post(command);
+            userRepository.updateUser(user, "preferences.costume", isChecked).subscribe(user1 -> {}, ReactiveErrorHandler.handleEmptyError());
         });
 
         if (this.nameMapping == null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
index 88babf3e9..a6438c394 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java
@@ -11,8 +11,6 @@ import android.widget.TextView;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.data.InventoryRepository;
-import com.habitrpg.android.habitica.events.ContentReloadedEvent;
-import com.habitrpg.android.habitica.events.ReloadContentEvent;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.inventory.Animal;
 import com.habitrpg.android.habitica.models.inventory.Mount;
@@ -24,9 +22,6 @@ import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
 import com.habitrpg.android.habitica.ui.helpers.MarginDecoration;
 import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,8 +30,6 @@ import javax.inject.Inject;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 public class StableRecyclerFragment extends BaseFragment {
     private static final String ITEM_TYPE_KEY = "CLASS_TYPE_KEY";
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 2126035b9..de17323be 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
@@ -19,28 +19,33 @@ import android.widget.TextView;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.data.UserRepository;
+import com.habitrpg.android.habitica.data.SocialRepository;
+import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.user.User;
+import com.habitrpg.android.habitica.modules.AppModule;
 import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.realm.Sort;
 
 public class InboxFragment extends BaseMainFragment
         implements SwipeRefreshLayout.OnRefreshListener, View.OnClickListener {
 
     @Inject
-    UserRepository userRepository;
+    SocialRepository socialRepository;
+    @Inject
+    @Named(AppModule.NAMED_USER_ID)
+    String userId;
 
     @BindView(R.id.inbox_messages)
     LinearLayout inboxMessagesListView;
@@ -48,8 +53,6 @@ public class InboxFragment extends BaseMainFragment
     @BindView(R.id.inbox_refresh_layout)
     SwipeRefreshLayout swipeRefreshLayout;
 
-    Map<String, ChatMessage> messages;
-    List<String> roomsAdded;
     private View chooseRecipientDialogView;
 
     @Override
@@ -57,29 +60,33 @@ public class InboxFragment extends BaseMainFragment
                              Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
 
-        this.apiClient.markPrivateMessagesRead()
-                .subscribe(aVoid -> {
-                }, throwable -> {
-                });
+        this.socialRepository.markPrivateMessagesRead(user)
+                .subscribe(aVoid -> {}, throwable -> {});
 
         View v = inflater.inflate(R.layout.fragment_inbox, container, false);
         unbinder = ButterKnife.bind(this, v);
 
         swipeRefreshLayout.setOnRefreshListener(this);
 
-        if (this.user != null) {
-            this.messages = this.user.getInbox().getMessages();
-            if (this.messages != null) {
-                this.setInboxMessages();
-            }
-        }
+        loadMessages();
 
         return v;
     }
 
+    private void loadMessages() {
+        if (user != null && user.isManaged()) {
+            user.getInbox().getMessages().where()
+                    .distinct("uuid")
+                    .sort("timestamp", Sort.DESCENDING)
+                    .asObservable()
+                    .first()
+                    .subscribe(this::setInboxMessages, ReactiveErrorHandler.handleEmptyError());
+        }
+    }
+
     @Override
     public void onDestroy() {
-        userRepository.close();
+        socialRepository.close();
         super.onDestroy();
     }
 
@@ -141,7 +148,7 @@ public class InboxFragment extends BaseMainFragment
                 });
     }
 
-    public void setInboxMessages() {
+    public void setInboxMessages(List<ChatMessage> messages) {
         if (this.inboxMessagesListView == null) {
             return;
         }
@@ -149,26 +156,13 @@ public class InboxFragment extends BaseMainFragment
         this.inboxMessagesListView.removeAllViewsInLayout();
 
         LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-        roomsAdded = new ArrayList<>();
-
-        if (this.messages.size() > 0) {
-            for (Object o : this.messages.entrySet()) {
-                Map.Entry pair = (Map.Entry) o;
-
-                ChatMessage message = (ChatMessage) pair.getValue();
-                if (roomsAdded.contains(message.uuid)) {
-                    TextView entry = (TextView) this.inboxMessagesListView.findViewWithTag(message.uuid);
-                    entry.setText(message.user);
-                } else {
-                    roomsAdded.add(message.uuid);
-
-                    TextView entry = (TextView) inflater.inflate(R.layout.plain_list_item, this.inboxMessagesListView, false);
-                    entry.setText(message.user);
-                    entry.setTag(message.uuid);
-                    entry.setOnClickListener(this);
-                    this.inboxMessagesListView.addView(entry);
-                }
+        if (messages.size() > 0) {
+            for (ChatMessage message : messages) {
+                TextView entry = (TextView) inflater.inflate(R.layout.plain_list_item, this.inboxMessagesListView, false);
+                entry.setText(message.user);
+                entry.setTag(message.uuid);
+                entry.setOnClickListener(this);
+                this.inboxMessagesListView.addView(entry);
             }
         } else {
             TextView tv = new TextView(getContext());
@@ -185,7 +179,7 @@ public class InboxFragment extends BaseMainFragment
 
     private void openInboxMessages(String userID, String username) {
         InboxMessageListFragment inboxMessageListFragment = new InboxMessageListFragment();
-        inboxMessageListFragment.setMessages(this.messages, username, userID);
+        inboxMessageListFragment.setReceivingUser(username, userID);
         if (this.activity != null) {
             this.activity.displayFragment(inboxMessageListFragment);
         }
@@ -193,8 +187,6 @@ public class InboxFragment extends BaseMainFragment
 
     public void onUserReceived(User user) {
         this.user = user;
-        this.messages = user.getInbox().getMessages();
-        this.setInboxMessages();
         swipeRefreshLayout.setRefreshing(false);
     }
 
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 efcab746f..a89dc10d6 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
@@ -14,7 +14,6 @@ import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.events.commands.SendNewInboxMessageCommand;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
-import com.habitrpg.android.habitica.models.social.ChatMessage;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -22,19 +21,13 @@ import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.realm.RealmResults;
+import io.realm.Sort;
 
-/**
- * Created by keithholliday on 6/20/16.
- */
 public class InboxMessageListFragment extends BaseMainFragment
         implements SwipeRefreshLayout.OnRefreshListener {
 
@@ -49,15 +42,10 @@ public class InboxMessageListFragment extends BaseMainFragment
     @BindView(R.id.recyclerView)
     RecyclerView chatRecyclerView;
 
-    List<ChatMessage> messages;
     ChatRecyclerViewAdapter chatAdapter;
     String chatRoomUser;
     String replyToUserUUID;
 
-    public InboxMessageListFragment() {
-        messages = new ArrayList<>();
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -70,14 +58,27 @@ public class InboxMessageListFragment extends BaseMainFragment
         RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this.getActivity());
         chatRecyclerView.setLayoutManager(layoutManager);
 
-        chatAdapter = new ChatRecyclerViewAdapter(messages, user, null);
+        chatAdapter = new ChatRecyclerViewAdapter(null, user, null);
         chatAdapter.setToInboxChat(this.replyToUserUUID);
         chatAdapter.setSendingUser(this.user);
         chatRecyclerView.setAdapter(chatAdapter);
 
+        loadMessages();
+
         return view;
     }
 
+    private void loadMessages() {
+        if (user != null && user.isManaged()) {
+            user.getInbox().getMessages().where()
+                    .equalTo("uuid", replyToUserUUID)
+                    .findAllSortedAsync("timestamp", Sort.DESCENDING)
+                    .asObservable()
+                    .filter(RealmResults::isLoaded)
+                    .subscribe(chatMessages -> this.chatAdapter.setMessages(chatMessages), ReactiveErrorHandler.handleEmptyError());
+        }
+    }
+
     @Override
     public void onDestroy() {
         socialRepository.close();
@@ -101,31 +102,8 @@ public class InboxMessageListFragment extends BaseMainFragment
         this.refreshUserInbox();
     }
 
-    public void setMessages(Map<String, ChatMessage> messages, String chatRoomUser, String replyToUserUUID) {
-        this.chatRoomUser = chatRoomUser;
-        this.replyToUserUUID = replyToUserUUID;
-
-        this.messages = new ArrayList<>();
-
-        for (Object o : messages.entrySet()) {
-            Map.Entry pair = (Map.Entry) o;
-            ChatMessage message = (ChatMessage) pair.getValue();
-            if (!message.uuid.equals(replyToUserUUID)) continue;
-            this.messages.add(0, message);
-        }
-
-        Collections.sort(this.messages,
-                (message1, message2) -> message2.timestamp.compareTo(message1.timestamp));
-
-        if (this.chatAdapter != null) {
-            chatAdapter.setToInboxChat(replyToUserUUID);
-            this.chatAdapter.setMessages(this.messages);
-        }
-    }
-
     public void onUserReceived(User user) {
         this.user = user;
-        this.setMessages(user.getInbox().getMessages(), this.chatRoomUser, this.replyToUserUUID);
         swipeRefreshLayout.setRefreshing(false);
     }
 
@@ -138,4 +116,8 @@ public class InboxMessageListFragment extends BaseMainFragment
     }
 
 
+    public void setReceivingUser(String chatRoomUser, String replyToUserUUID) {
+        this.chatRoomUser = chatRoomUser;
+        this.replyToUserUUID = replyToUserUUID;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
index 6957ab8a7..566a23c68 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
@@ -292,7 +292,6 @@ public class ChallengeDetailDialogHolder {
                     if (this.user != null) {
                         challenge.user_id = this.user.getId();
                     }
-                    challenge.async().save();
 
                     if (challengeJoinedAction != null) {
                         challengeJoinedAction.call(challenge);
@@ -313,7 +312,6 @@ public class ChallengeDetailDialogHolder {
                         showRemoveTasksDialog(keepTasks -> this.apiClient.leaveChallenge(challenge.id, new LeaveChallengeBody(keepTasks))
                                 .subscribe(aVoid -> {
                                     challenge.user_id = null;
-                                    challenge.async().save();
 
                                     if (this.user != null) {
                                         this.user.resetChallengeList();
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 8a1cf9c5a..bda841308 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
@@ -26,6 +26,7 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import io.realm.RealmResults;
 import rx.Observable;
 import rx.functions.Action0;
 
@@ -91,8 +92,6 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
                         } else {
                             challenge.user_id = null;
                         }
-
-                        challenge.async().save();
                     }
 
                     setRefreshingIfVisible(swipeRefreshLayout, false);
@@ -170,7 +169,7 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
     private void fetchLocalChallenges() {
         setRefreshingIfVisible(swipeRefreshLayout, true);
 
-        Observable<List<Challenge>> observable;
+        Observable<RealmResults<Challenge>> observable;
 
         if (viewUserChallengesOnly && user != null) {
             observable = socialRepository.getUserChallenges(user.getId());
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 4c5a26a29..8ee6471ab 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
@@ -22,6 +22,7 @@ import com.habitrpg.android.habitica.data.SocialRepository;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.social.Group;
 import com.habitrpg.android.habitica.models.social.UserParty;
+import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
 import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -51,6 +52,7 @@ public class PartyFragment extends BaseMainFragment {
     private GroupInformationFragment groupInformationFragment;
     private ChatListFragment chatListFragment;
     private FragmentPagerAdapter viewPagerAdapter;
+    private List<User> members;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -77,7 +79,7 @@ public class PartyFragment extends BaseMainFragment {
 
                         socialRepository.getGroupMembers(group.id, true)
                                 .subscribe(members -> {
-                                            PartyFragment.this.group.members = members;
+                                            PartyFragment.this.members = members;
                                             updateGroupUI();
                                         },
                                         throwable -> {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java
index cdac4a682..a8b41dfc6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageDeserializer.java
@@ -8,7 +8,7 @@ import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 import com.habitrpg.android.habitica.models.social.Backer;
 import com.habitrpg.android.habitica.models.social.ChatMessage;
-import com.habitrpg.android.habitica.models.social.Contributor;
+import com.habitrpg.android.habitica.models.user.ContributorInfo;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -42,10 +42,11 @@ public class ChatMessageDeserializer implements JsonDeserializer<ChatMessage> {
         if (obj.has("contributor")) {
             if (!obj.get("contributor").isJsonNull()) {
                 if (obj.get("contributor").isJsonObject()) {
-                    message.contributor = context.deserialize(obj.get("contributor"), Contributor.class);
+                    message.contributor = context.deserialize(obj.get("contributor"), ContributorInfo.class);
                 } else {
-                    Contributor contributor = new Contributor();
-                    contributor.text = obj.get("contributor").getAsString();
+                    ContributorInfo contributor = new ContributorInfo();
+                    contributor.setText(obj.get("contributor").getAsString());
+                    contributor.setUserId(message.id);
                     message.contributor = contributor;
                 }
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageListDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageListDeserializer.java
new file mode 100644
index 000000000..11403996c
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/ChatMessageListDeserializer.java
@@ -0,0 +1,31 @@
+package com.habitrpg.android.habitica.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.habitrpg.android.habitica.models.social.ChatMessage;
+
+import java.lang.reflect.Type;
+import java.util.Map;
+
+import io.realm.RealmList;
+
+public class ChatMessageListDeserializer implements JsonDeserializer<RealmList<ChatMessage>> {
+    @Override
+    public RealmList<ChatMessage> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+        RealmList<ChatMessage> messages = new RealmList<>();
+
+        if (json.isJsonArray()) {
+            for (JsonElement element : json.getAsJsonArray()) {
+                messages.add(context.deserialize(element, ChatMessage.class));
+            }
+        } else {
+            for (Map.Entry<String, JsonElement> entry : json.getAsJsonObject().entrySet()) {
+                messages.add(context.deserialize(entry.getValue(), ChatMessage.class));
+            }
+        }
+
+        return messages;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.java
index e947ff49c..e723bac62 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/UserDeserializer.java
@@ -17,6 +17,7 @@ import com.habitrpg.android.habitica.models.user.Inbox;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.Preferences;
 import com.habitrpg.android.habitica.models.user.Profile;
+import com.habitrpg.android.habitica.models.user.Purchases;
 import com.habitrpg.android.habitica.models.user.Stats;
 import com.habitrpg.android.habitica.models.user.User;
 
@@ -74,6 +75,9 @@ public class UserDeserializer implements JsonDeserializer<User> {
             user.setChallenges(context.deserialize(obj.get("challenges"), new TypeToken<List<String>>() {
             }.getType()));
         }
+        if (obj.has("purchased")) {
+            user.setPurchased(context.deserialize(obj.get("purchased"), Purchases.class));
+        }
 
         user.setId(obj.get("_id").getAsString());
 

From 3f558787860eedc21ed11f5b37caa07e3fe55d12 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 27 Apr 2017 21:05:52 +0200
Subject: [PATCH 15/17] fix buying customizations

---
 .../android/habitica/data/UserRepository.java |  6 +++
 .../implementation/UserRepositoryImpl.java    | 38 ++++++++++++++++-
 .../models/inventory/CustomizationSet.java    |  3 ++
 .../habitica/models/user/Purchases.java       |  6 +--
 .../CustomizationRecyclerViewAdapter.java     | 41 ++++++++++---------
 .../AvatarCustomizationFragment.java          |  6 +++
 .../habitica/utils/PurchasedDeserializer.java | 21 ++++------
 7 files changed, 83 insertions(+), 38 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
index 38962f7dd..32a30d3df 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.java
@@ -3,7 +3,10 @@ package com.habitrpg.android.habitica.data;
 import android.support.annotation.Nullable;
 
 import com.habitrpg.android.habitica.models.Skill;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.inventory.CustomizationSet;
 import com.habitrpg.android.habitica.models.responses.SkillResponse;
+import com.habitrpg.android.habitica.models.responses.UnlockResponse;
 import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.List;
@@ -40,4 +43,7 @@ public interface UserRepository extends BaseRepository {
     Observable<User> disableClasses();
 
     Observable<User> changeClass(String selectedClass);
+
+    Observable<UnlockResponse> unlockPath(User user, Customization customization);
+    Observable<UnlockResponse> unlockPath(User user, CustomizationSet set);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 679f74fa9..524ded4f0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -6,8 +6,10 @@ import com.habitrpg.android.habitica.data.local.UserLocalRepository;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
 import com.habitrpg.android.habitica.models.Skill;
 import com.habitrpg.android.habitica.models.TutorialStep;
+import com.habitrpg.android.habitica.models.inventory.Customization;
+import com.habitrpg.android.habitica.models.inventory.CustomizationSet;
 import com.habitrpg.android.habitica.models.responses.SkillResponse;
-import com.habitrpg.android.habitica.models.tasks.RemindersItem;
+import com.habitrpg.android.habitica.models.responses.UnlockResponse;
 import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.Date;
@@ -139,6 +141,40 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
         return changeClass(selectedClass);
     }
 
+    @Override
+    public Observable<UnlockResponse> unlockPath(User user, Customization customization) {
+        return apiClient.unlockPath(customization.getPath())
+                .doOnNext(unlockResponse -> {
+                    User copiedUser = localRepository.getUnmanagedCopy(user);
+                    copiedUser.setPreferences(unlockResponse.preferences);
+                    copiedUser.setPurchased(unlockResponse.purchased);
+                    copiedUser.setItems(unlockResponse.items);
+                    copiedUser.setBalance(copiedUser.getBalance()-customization.getPrice()/4.0);
+                    localRepository.saveUser(copiedUser);
+                });
+    }
+
+    @Override
+    public Observable<UnlockResponse> unlockPath(User user, CustomizationSet set) {
+        String path = "";
+        for (Customization customization : set.customizations) {
+            path = path + "," + customization.getPath();
+        }
+        if (path.length() == 0) {
+            return Observable.empty();
+        }
+        path = path.substring(1);
+        return apiClient.unlockPath(path)
+                .doOnNext(unlockResponse -> {
+                    User copiedUser = localRepository.getUnmanagedCopy(user);
+                    copiedUser.setPreferences(unlockResponse.preferences);
+                    copiedUser.setPurchased(unlockResponse.purchased);
+                    copiedUser.setItems(unlockResponse.items);
+                    copiedUser.setBalance(copiedUser.getBalance()-set.price/4.0);
+                    localRepository.saveUser(copiedUser);
+                });
+    }
+
     private User mergeUser(User oldUser, User newUser) {
         User copiedUser = localRepository.getUnmanagedCopy(oldUser);
         if (newUser.getItems() != null) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
index e5fe371a5..bcb82d9d5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/CustomizationSet.java
@@ -1,5 +1,7 @@
 package com.habitrpg.android.habitica.models.inventory;
 
+import java.util.List;
+
 /**
  * Created by viirus on 19/01/16.
  */
@@ -10,4 +12,5 @@ public class CustomizationSet {
     public Integer price;
     public boolean hasPurchasable;
 
+    public List<Customization> customizations;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
index d13912173..2244a1e34 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/Purchases.java
@@ -4,6 +4,7 @@ import com.habitrpg.android.habitica.models.inventory.Customization;
 
 import java.util.List;
 
+import io.realm.RealmList;
 import io.realm.RealmObject;
 import io.realm.annotations.Ignore;
 import io.realm.annotations.PrimaryKey;
@@ -13,8 +14,7 @@ public class Purchases extends RealmObject {
     @PrimaryKey
     private String userId;
 
-    @Ignore
-    public List<Customization> customizations;
+    public RealmList<Customization> customizations;
     User user;
     private SubscriptionPlan plan;
 
@@ -22,7 +22,7 @@ public class Purchases extends RealmObject {
         return customizations;
     }
 
-    public void setCustomizations(List<Customization> customizations) {
+    public void setCustomizations(RealmList<Customization> customizations) {
         this.customizations = customizations;
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
index c398d7b59..8797b299d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java
@@ -25,6 +25,8 @@ import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
 import org.greenrobot.eventbus.EventBus;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,6 +45,8 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
     private String activeCustomization;
 
     private PublishSubject<Customization> selectCustomizationEvents = PublishSubject.create();
+    private PublishSubject<Customization> unlockCustomizationEvents = PublishSubject.create();
+    private PublishSubject<CustomizationSet> unlockSetEvents = PublishSubject.create();
 
     public void updateOwnership(List<String> ownedCustomizations) {
         int position = 0;
@@ -146,6 +150,14 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
         return selectCustomizationEvents.asObservable();
     }
 
+    public Observable<Customization> getUnlockCustomizationEvents() {
+        return unlockCustomizationEvents.asObservable();
+    }
+
+    public Observable<CustomizationSet> getUnlockSetEvents() {
+        return unlockSetEvents.asObservable();
+    }
+
     class CustomizationViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
 
         @BindView(R.id.card_view)
@@ -164,7 +176,7 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
 
         Context context;
 
-        public CustomizationViewHolder(View itemView) {
+        CustomizationViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
 
@@ -211,16 +223,11 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
                                 EventBus.getDefault().post(event);
                                 return;
                             }
-                            UnlockPathCommand event = new UnlockPathCommand();
-                            event.path = customization.getPath();
-                            event.balanceDiff = customization.getPrice() / 4;
-                            EventBus.getDefault().post(event);
+                            unlockCustomizationEvents.onNext(customization);
                         })
                         .setTitle(context.getString(R.string.purchase_customization))
                         .setView(dialogContent)
-                        .setNegativeButton(R.string.reward_dialog_dismiss, (dialog1, which) -> {
-                            dialog1.dismiss();
-                        }).create();
+                        .setNegativeButton(R.string.reward_dialog_dismiss, (dialog1, which) -> dialog1.dismiss()).create();
                 dialog.show();
                 return;
             }
@@ -242,7 +249,7 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
         Context context;
         private CustomizationSet set;
 
-        public SectionViewHolder(View itemView) {
+        SectionViewHolder(View itemView) {
             super(itemView);
             context = itemView.getContext();
             ButterKnife.bind(this, itemView);
@@ -275,26 +282,20 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
                             EventBus.getDefault().post(event);
                             return;
                         }
-                        UnlockPathCommand event = new UnlockPathCommand();
-                        String path = "";
+                        set.customizations = new ArrayList<>();
                         for (Object obj : customizationList) {
-                            if (obj.getClass().equals(Customization.class)) {
+                            if (Customization.class.isAssignableFrom(obj.getClass())) {
                                 Customization customization = (Customization) obj;
                                 if (!customization.isUsable() && customization.getCustomizationSet() != null && customization.getCustomizationSet().equals(set.identifier)) {
-                                    path = path + "," + customization.getPath();
+                                    set.customizations.add(customization);
                                 }
                             }
                         }
-                        path = path.substring(1);
-                        event.path = path;
-                        event.balanceDiff = set.price / 4;
-                        EventBus.getDefault().post(event);
+                        unlockSetEvents.onNext(set);
                     })
                     .setTitle(context.getString(R.string.purchase_set_title, set.text))
                     .setView(dialogContent)
-                    .setNegativeButton(R.string.reward_dialog_dismiss, (dialog1, which) -> {
-                        dialog1.dismiss();
-                    }).create();
+                    .setNegativeButton(R.string.reward_dialog_dismiss, (dialog1, which) -> dialog1.dismiss()).create();
             dialog.show();
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
index c74f5c37f..bd5e66760 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.java
@@ -59,6 +59,12 @@ public class AvatarCustomizationFragment extends BaseMainFragment {
                     return userRepository.updateUser(user, updatePath, customization.getIdentifier());
                 })
                 .subscribe(user1 -> {}, ReactiveErrorHandler.handleEmptyError()));
+        compositeSubscription.add(adapter.getUnlockCustomizationEvents()
+                .flatMap(customization -> userRepository.unlockPath(user, customization))
+                .subscribe(unlockResponse -> {}, ReactiveErrorHandler.handleEmptyError()));
+        compositeSubscription.add(adapter.getUnlockSetEvents()
+                .flatMap(set -> userRepository.unlockPath(user, set))
+                .subscribe(unlockResponse -> {}, ReactiveErrorHandler.handleEmptyError()));
 
         layoutManager = new GridLayoutManager(activity, 2);
         layoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
index 3bb300665..c12cd6406 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/PurchasedDeserializer.java
@@ -8,10 +8,6 @@ import com.google.gson.JsonParseException;
 import com.habitrpg.android.habitica.models.inventory.Customization;
 import com.habitrpg.android.habitica.models.user.Purchases;
 import com.habitrpg.android.habitica.models.user.SubscriptionPlan;
-import com.raizlabs.android.dbflow.runtime.TransactionManager;
-import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
-import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
-import com.raizlabs.android.dbflow.sql.language.Select;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -19,22 +15,22 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Created by viirus on 14/01/16.
- */
+import io.realm.Realm;
+import io.realm.RealmList;
+
 public class PurchasedDeserializer implements JsonDeserializer<Purchases> {
 
     @Override
     public Purchases deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
         JsonObject object = json.getAsJsonObject();
-        List<Customization> customizations = new ArrayList<Customization>();
+        RealmList<Customization> customizations = new RealmList<>();
         Purchases purchases = new Purchases();
 
         List<Customization> existingCustomizations;
         try {
-
-            // TODO: fix this
-            existingCustomizations = new ArrayList<>();
+            Realm realm = Realm.getDefaultInstance();
+            existingCustomizations = realm.copyFromRealm(realm.where(Customization.class).findAll());
+            realm.close();
         } catch (RuntimeException e) {
             //Tests don't have a database
             existingCustomizations = new ArrayList<>();
@@ -72,9 +68,6 @@ public class PurchasedDeserializer implements JsonDeserializer<Purchases> {
             }
         }
 
-        // TODO: fix this
-        //TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(customizations)));
-
         purchases.customizations = customizations;
         purchases.setPlan(context.deserialize(object.get("plan"), SubscriptionPlan.class));
 

From 6b7383da128989f89538b07de0c2c7c161461d2c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 28 Apr 2017 17:46:48 +0200
Subject: [PATCH 16/17] Clear old tasks

---
 .../habitica/data/InventoryRepository.java    |   3 +
 .../android/habitica/data/TaskRepository.java |   6 +-
 .../data/implementation/ApiClientImpl.java    |  24 +---
 .../InventoryRepositoryImpl.java              |  27 ++++
 .../implementation/TaskRepositoryImpl.java    |  25 +---
 .../implementation/UserRepositoryImpl.java    |  23 ++-
 .../data/local/TaskLocalRepository.java       |   7 +-
 .../RealmTaskLocalRepository.java             |  64 ++++++---
 .../android/habitica/models/user/User.java    |   3 +
 .../habitica/ui/activities/MainActivity.java  | 134 ++----------------
 10 files changed, 114 insertions(+), 202 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
index 73d73d244..5653d5811 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/InventoryRepository.java
@@ -11,6 +11,7 @@ import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.responses.BuyResponse;
 import com.habitrpg.android.habitica.models.responses.FeedResponse;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.User;
@@ -68,4 +69,6 @@ public interface InventoryRepository extends ContentRepository {
     Observable<Items> hatchPet(Egg egg, HatchingPotion hatchingPotion);
 
     Observable<Quest> inviteToQuest(QuestContent quest);
+
+    Observable<BuyResponse> buyItem(User user, String id);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
index 81342df18..00e8a57d9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
@@ -19,6 +19,7 @@ import rx.Observable;
 public interface TaskRepository extends BaseRepository  {
     Observable<RealmResults<Task>> getTasks(String taskType, String userID);
     Observable<RealmResults<Task>> getTasks(String userId);
+    void saveTasks(TasksOrder order, TaskList tasks);
 
     Observable<TaskList> refreshTasks(TasksOrder tasksOrder);
 
@@ -35,11 +36,6 @@ public interface TaskRepository extends BaseRepository  {
 
     Observable<List<Task>> createTasks(List<Task> newTasks);
 
-    void removeOldTasks(String userID, List<Task> onlineTaskList);
-    void removeOldChecklists(List<ChecklistItem> onlineChecklistItems);
-    void removeOldTaskTags(List<TaskTag> onlineTaskTags);
-    void removeOldReminders(List<RemindersItem> onlineReminders);
-
     void markTaskCompleted(String taskId, boolean isCompleted);
 
     void saveReminder(RemindersItem remindersItem);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index 0ac8ab995..fd12d9534 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -374,35 +374,13 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
 
             userObservable = Observable.zip(userObservable, tasksObservable,
                     (habitRPGUser, tasks) -> {
-                        List<Task> sortedTasks = new ArrayList<>();
-                        sortedTasks.addAll(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getHabits()));
-                        sortedTasks.addAll(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getDailys()));
-                        sortedTasks.addAll(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getTodos()));
-                        sortedTasks.addAll(sortTasks(tasks.tasks, habitRPGUser.getTasksOrder().getRewards()));
-
-                        Realm.getDefaultInstance().executeTransactionAsync(realm -> realm.insertOrUpdate(sortedTasks));
-
+                        habitRPGUser.tasks = tasks;
                         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;
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
index bf6b61b41..148eba893 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.java
@@ -12,6 +12,7 @@ import com.habitrpg.android.habitica.models.inventory.Mount;
 import com.habitrpg.android.habitica.models.inventory.Pet;
 import com.habitrpg.android.habitica.models.inventory.Quest;
 import com.habitrpg.android.habitica.models.inventory.QuestContent;
+import com.habitrpg.android.habitica.models.responses.BuyResponse;
 import com.habitrpg.android.habitica.models.responses.FeedResponse;
 import com.habitrpg.android.habitica.models.user.Items;
 import com.habitrpg.android.habitica.models.user.Outfit;
@@ -206,4 +207,30 @@ public class InventoryRepositoryImpl extends ContentRepositoryImpl<InventoryLoca
         return apiClient.inviteToQuest("party", quest.getKey())
                 .doOnNext(quest1 -> localRepository.changeOwnedCount(quest, -1));
     }
+
+    @Override
+    public Observable<BuyResponse> buyItem(User user, String id) {
+        return apiClient.buyItem(id)
+                .doOnNext(buyResponse -> localRepository.executeTransaction(realm -> {
+                    buyResponse.items.setUserId(user.getId());
+                    if (buyResponse.items != null) {
+                        user.setItems(buyResponse.items);
+                    }
+                    if (buyResponse.hp != null) {
+                        user.getStats().setHp(buyResponse.hp);
+                    }
+                    if (buyResponse.exp != null) {
+                        user.getStats().setExp(buyResponse.exp);
+                    }
+                    if (buyResponse.mp != null) {
+                        user.getStats().setMp(buyResponse.mp);
+                    }
+                    if (buyResponse.gp != null) {
+                        user.getStats().setGp(buyResponse.gp);
+                    }
+                    if (buyResponse.lvl != null) {
+                        user.getStats().setLvl(buyResponse.lvl);
+                    }
+                }));
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
index bff37ecec..4c7bba0bc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -46,6 +46,11 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         return this.localRepository.getTasks(userId);
     }
 
+    @Override
+    public void saveTasks(TasksOrder order, TaskList tasks) {
+        localRepository.saveTasks(order, tasks);
+    }
+
     @Override
     public Observable<TaskList> refreshTasks(TasksOrder tasksOrder) {
         return this.apiClient.getTasks()
@@ -164,26 +169,6 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
         return apiClient.createTasks(newTasks);
     }
 
-    @Override
-    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
-        localRepository.removeOldTasks(userID, onlineTaskList);
-    }
-
-    @Override
-    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
-        localRepository.removeOldChecklists(onlineChecklistItems);
-    }
-
-    @Override
-    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
-        localRepository.removeOldTaskTags(onlineTaskTags);
-    }
-
-    @Override
-    public void removeOldReminders(List<RemindersItem> onlineReminders) {
-        localRepository.removeOldReminders(onlineReminders);
-    }
-
     @Override
     public void markTaskCompleted(String taskId, boolean isCompleted) {
         localRepository.markTaskCompleted(taskId, isCompleted);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 524ded4f0..8eb70212f 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -1,6 +1,7 @@
 package com.habitrpg.android.habitica.data.implementation;
 
 import com.habitrpg.android.habitica.data.ApiClient;
+import com.habitrpg.android.habitica.data.TaskRepository;
 import com.habitrpg.android.habitica.data.UserRepository;
 import com.habitrpg.android.habitica.data.local.UserLocalRepository;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
@@ -12,9 +13,13 @@ import com.habitrpg.android.habitica.models.responses.SkillResponse;
 import com.habitrpg.android.habitica.models.responses.UnlockResponse;
 import com.habitrpg.android.habitica.models.user.User;
 
+import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 
 import io.realm.RealmResults;
 import rx.Observable;
@@ -24,8 +29,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
 
     private Date lastSync;
 
-    public UserRepositoryImpl(UserLocalRepository localRepository, ApiClient apiClient) {
+    private TaskRepository taskRepository;
+
+    public UserRepositoryImpl(UserLocalRepository localRepository, ApiClient apiClient, TaskRepository taskRepository) {
         super(localRepository, apiClient);
+        this.taskRepository = taskRepository;
     }
 
     @Override
@@ -56,7 +64,18 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
         if (forced || this.lastSync == null || (new Date().getTime() - this.lastSync.getTime()) > 180000) {
             lastSync = new Date();
             return apiClient.retrieveUser(withTasks)
-                    .doOnNext(localRepository::saveUser);
+                    .doOnNext(localRepository::saveUser)
+                    .doOnNext(user -> taskRepository.saveTasks(user.getTasksOrder(), user.tasks))
+                    .flatMap(user -> {
+                        Calendar calendar = new GregorianCalendar();
+                        TimeZone timeZone = calendar.getTimeZone();
+                        long offset = -TimeUnit.MINUTES.convert(timeZone.getOffset(calendar.getTimeInMillis()), TimeUnit.MILLISECONDS);
+                        if (offset != user.getPreferences().getTimezoneOffset()) {
+                            return updateUser(user, "preferences.timezoneOffset", String.valueOf(offset));
+                        } else {
+                            return Observable.just(user);
+                        }
+                    });
         } else {
             return Observable.empty();
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
index 77c419680..a7b2350ed 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.java
@@ -17,15 +17,10 @@ public interface TaskLocalRepository extends BaseLocalRepository {
     Observable<RealmResults<Task>> getTasks(String taskType, String userID);
     Observable<RealmResults<Task>> getTasks(String userId);
 
-    void saveTasks(TasksOrder tasksOrder, TaskList tasks);
+    void saveTasks(String userId, TasksOrder tasksOrder, TaskList tasks);
 
     void saveTask(Task task);
 
-    void removeOldTasks(String userID, List<Task> onlineTaskList);
-    void removeOldChecklists(List<ChecklistItem> onlineChecklistItems);
-    void removeOldTaskTags(List<TaskTag> onlineTaskTags);
-    void removeOldReminders(List<RemindersItem> onlineReminders);
-
     void deleteTask(String taskID);
 
     Observable<Task> getTask(String taskId);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
index eb17c40b0..355f21278 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
@@ -5,10 +5,11 @@ import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
 import com.habitrpg.android.habitica.models.tasks.RemindersItem;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.tasks.TaskList;
-import com.habitrpg.android.habitica.models.tasks.TaskTag;
 import com.habitrpg.android.habitica.models.tasks.TasksOrder;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import io.realm.Realm;
 import io.realm.RealmResults;
@@ -34,8 +35,34 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
     }
 
     @Override
-    public void saveTasks(TasksOrder tasksOrder, TaskList tasks) {
-        realm.executeTransaction(realm1 -> realm1.insertOrUpdate(tasks.tasks.values()));
+    public void saveTasks(String userId, TasksOrder tasksOrder, TaskList tasks) {
+        realm.executeTransactionAsync(realm1 -> {
+
+            List<Task> sortedTasks = new ArrayList<>();
+            sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getHabits()));
+            sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getDailys()));
+            sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getTodos()));
+            sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getRewards()));
+
+            removeOldTasks(userId, sortedTasks);
+
+            realm1.insertOrUpdate(sortedTasks);
+        });
+    }
+
+    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;
     }
 
     @Override
@@ -43,25 +70,21 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
         realm.executeTransaction(realm1 -> realm1.insertOrUpdate(task));
     }
 
-    @Override
-    public void removeOldTasks(String userID, List<Task> onlineTaskList) {
-
+    private void removeOldTasks(String userID, List<Task> onlineTaskList) {
+        RealmResults<Task> localTasks = realm.where(Task.class).equalTo("userId", userID).findAll();
+        for (Task localTask : localTasks) {
+            if (!onlineTaskList.contains(localTask)) {
+                for (ChecklistItem item : localTask.checklist) {
+                    item.deleteFromRealm();
+                }
+                for (RemindersItem item : localTask.reminders) {
+                    item.deleteFromRealm();
+                }
+                localTask.deleteFromRealm();
+            }
+        }
     }
 
-    @Override
-    public void removeOldChecklists(List<ChecklistItem> onlineChecklistItems) {
-
-    }
-
-    @Override
-    public void removeOldTaskTags(List<TaskTag> onlineTaskTags) {
-
-    }
-
-    @Override
-    public void removeOldReminders(List<RemindersItem> onlineReminders) {
-
-    }
 
     @Override
     public void deleteTask(String taskID) {
@@ -70,6 +93,7 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
     }
 
     @Override
+
     public Observable<Task> getTask(String taskId) {
         return realm.where(Task.class).equalTo("id", taskId).findFirstAsync().asObservable()
                 .filter(realmObject -> realmObject.isLoaded())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
index fc03caa67..60cb09011 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.java
@@ -12,6 +12,7 @@ import com.habitrpg.android.habitica.models.invitations.Invitations;
 import com.habitrpg.android.habitica.models.social.Challenge;
 import com.habitrpg.android.habitica.models.social.UserParty;
 import com.habitrpg.android.habitica.models.tasks.Task;
+import com.habitrpg.android.habitica.models.tasks.TaskList;
 import com.habitrpg.android.habitica.models.tasks.TasksOrder;
 import com.habitrpg.android.habitica.ui.AvatarView;
 
@@ -29,6 +30,8 @@ public class User extends RealmObject {
 
     @Ignore
     List<Challenge> challengeList;
+    @Ignore
+    public TaskList tasks;
 
     @PrimaryKey
     @SerializedName("_id")
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 495c4ee89..3121357e5 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
@@ -51,8 +51,6 @@ import com.habitrpg.android.habitica.events.OpenMysteryItemEvent;
 import com.habitrpg.android.habitica.events.OpenedMysteryItemEvent;
 import com.habitrpg.android.habitica.events.SelectClassEvent;
 import com.habitrpg.android.habitica.events.ShareEvent;
-import com.habitrpg.android.habitica.events.TaskRemovedEvent;
-import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
 import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
 import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
 import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
@@ -62,7 +60,6 @@ import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
 import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
 import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
 import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
-import com.habitrpg.android.habitica.events.commands.UnlockPathCommand;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
 import com.habitrpg.android.habitica.helpers.LanguageHelper;
 import com.habitrpg.android.habitica.helpers.ReactiveErrorHandler;
@@ -85,7 +82,6 @@ import com.habitrpg.android.habitica.models.shops.Shop;
 import com.habitrpg.android.habitica.models.tasks.Task;
 import com.habitrpg.android.habitica.models.user.Preferences;
 import com.habitrpg.android.habitica.models.user.SpecialItems;
-import com.habitrpg.android.habitica.models.user.Stats;
 import com.habitrpg.android.habitica.models.user.User;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.AvatarView;
@@ -113,28 +109,23 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.io.File;
-import java.util.Calendar;
 import java.util.Date;
-import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.TimeZone;
-import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
 import butterknife.BindView;
 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;
 
-public class MainActivity extends BaseActivity implements Action1<Throwable>, TutorialView.OnTutorialReaction {
+public class MainActivity extends BaseActivity implements TutorialView.OnTutorialReaction {
 
     public static final int SELECT_CLASS_RESULT = 11;
     public static final int GEM_PURCHASE_REQUEST = 111;
@@ -322,22 +313,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
                 drawer.setSelectionAtPosition(this.sharedPreferences.getInt("lastActivePosition", 1));
             }
         }
-
-        if (isAlwaysFinishActivitiesOptionEnabled()) {
-            if (!sharedPreferences.getBoolean("showedFinishActivitiesWarning", false)) {
-                AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
-                        .setTitle(getString(R.string.warning))
-                        .setMessage(R.string.dont_keep_activities_warning)
-                        .setNeutralButton(R.string.close, (warningDialog, which) -> warningDialog.dismiss())
-                        .setPositiveButton(R.string.open_settings, (hatchingDialog, which) -> {
-                            showDeveloperOptionsScreen();
-                            hatchingDialog.dismiss();
-                        })
-                        .create();
-                dialog.show();
-                sharedPreferences.edit().putBoolean("showedFinishActivitiesWarning", true).apply();
-            }
-        }
     }
 
     @Override
@@ -405,15 +380,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
                 apiClient.setLanguageCode(preferences.getLanguage());
                 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()) {
-                userRepository.updateUser(user, "preferences.timezoneOffset", String.valueOf(offset))
-                        .subscribe(user1 -> {}, throwable -> {
-                        });
-            }
             runOnUiThread(() -> {
                 updateHeader();
                 updateSidebar();
@@ -433,44 +399,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
                 displayNewInboxMessagesBadge();
                 pushNotificationManager.setUser(user);
                 pushNotificationManager.addPushDeviceUsingStoredToken();
-
-                // Update the oldEntries
-                new Thread(() -> {
-
-                    // multiple crashes because user is null
-                    if (user != null) {
-
-                        /*taskRepository.removeOldTasks(user.getId(), allTasks);
-
-                        ArrayList<ChecklistItem> allChecklistItems = new ArrayList<>();
-                        for (Task t : allTasks) {
-                            if (t.checklist != null) {
-                                allChecklistItems.addAll(t.checklist);
-                            }
-                        }
-                        taskRepository.removeOldChecklists(allChecklistItems);
-
-                        ArrayList<TaskTag> allTaskTags = new ArrayList<>();
-                        for (Task t : allTasks) {
-                            if (t.getTags() != null) {
-                                allTaskTags.addAll(t.getTags());
-                            }
-                        }
-                        taskRepository.removeOldTaskTags(allTaskTags);
-
-                        ArrayList<RemindersItem> allReminders = new ArrayList<>();
-                        for (Task t : allTasks) {
-                            if (t.getReminders() != null) {
-                                allReminders.addAll(t.getReminders());
-                            }
-                        }
-                        taskRepository.removeOldReminders(allReminders);
-
-                        tagRepository.removeOldTags(user.getTags());*/
-
-                        inventoryRepository.updateOwnedEquipment(user);
-                    }
-                }).start();
             }
         }
     }
@@ -501,14 +429,10 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
         }
     }
 
-    private void updateUserAvatars() {
+    private void updateHeader() {
         if (avatarInHeader != null) {
             avatarInHeader.updateData(user);
         }
-    }
-
-    private void updateHeader() {
-        updateUserAvatars();
         if (activeFragment != null) {
             setTranslatedFragmentTitle(activeFragment);
         }
@@ -634,11 +558,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
         super.onDestroy();
     }
 
-    @Subscribe
-    public void onEvent(ToggledInnStateEvent evt) {
-        avatarInHeader.updateData(user);
-    }
-
     @Subscribe
     public void onEvent(OpenMenuItemCommand event) {
         if (drawer != null) {
@@ -663,9 +582,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
             }
             observable
                     .doOnNext(aVoid -> showSnackbar(this, floatingMenuWrapper, getString(R.string.successful_purchase, event.item.text), SnackbarDisplayType.NORMAL))
-                    .subscribe(buyResponse -> userRepository.retrieveUser(false)
-                            .subscribe(user1 -> {}, throwable -> {
-                            }), throwable -> {
+                    .flatMap(buyResponse -> userRepository.retrieveUser(false))
+                    .subscribe(buyResponse -> {}, throwable -> {
                         retrofit2.HttpException error = (retrofit2.HttpException) throwable;
                         if (error.code() == 401 && event.item.getCurrency().equals("gems")) {
                             openGemPurchaseFragment(null);
@@ -696,10 +614,9 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
         }
 
         if (event.Reward.specialTag != null && event.Reward.specialTag.equals("item")) {
-            apiClient.buyItem(event.Reward.getId())
+            inventoryRepository.buyItem(user, event.Reward.getId())
                     .subscribe(buyResponse -> {
                                 String snackbarMessage = getString(R.string.successful_purchase, event.Reward.getText());
-
                                 if (event.Reward.getId().equals("armoire")) {
                                     if (buyResponse.armoire.get("type").equals("gear")) {
                                         snackbarMessage = getApplicationContext().getString(R.string.armoireEquipment, buyResponse.armoire.get("dropText"));
@@ -709,46 +626,15 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
                                         snackbarMessage = getApplicationContext().getString(R.string.armoireExp);
                                     }
                                     soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop);
-                                } else if (!event.Reward.getId().equals("potion")) {
-                                    EventBus.getDefault().post(new TaskRemovedEvent(event.Reward.getId()));
                                 }
-                                if (buyResponse.items != null) {
-                                    user.setItems(buyResponse.items);
-                                }
-                                if (buyResponse.hp != null) {
-                                    user.getStats().setHp(buyResponse.hp);
-                                }
-                                if (buyResponse.exp != null) {
-                                    user.getStats().setExp(buyResponse.exp);
-                                }
-                                if (buyResponse.mp != null) {
-                                    user.getStats().setMp(buyResponse.mp);
-                                }
-                                if (buyResponse.gp != null) {
-                                    user.getStats().setGp(buyResponse.gp);
-                                }
-                                if (buyResponse.lvl != null) {
-                                    user.getStats().setLvl(buyResponse.lvl);
-                                }
-
-                                MainActivity.this.setUserData(true);
-
                                 showSnackbar(MainActivity.this, floatingMenuWrapper, snackbarMessage, SnackbarDisplayType.NORMAL);
                             }, throwable -> {
                             }
                     );
         } else {
             buyRewardUseCase.observable(new BuyRewardUseCase.RequestValues(user, event.Reward))
-                    .subscribe(res -> showSnackbar(this, floatingMenuWrapper, getString(R.string.notification_purchase, event.Reward.getText()), SnackbarDisplayType.NORMAL), error -> {
-                    });
+                    .subscribe(res -> showSnackbar(this, floatingMenuWrapper, getString(R.string.notification_purchase, event.Reward.getText()), SnackbarDisplayType.NORMAL), error -> {});
         }
-
-        //Update the users gold
-        Stats stats = user.getStats();
-        Double gp = stats.getGp() - event.Reward.getValue();
-        stats.setGp(gp);
-
-        avatarInHeader.updateData(user);
     }
 
     @Subscribe
@@ -1088,16 +974,12 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Tu
         return intent;
     }
 
-    @Override
-    public void call(Throwable throwable) {
-
-    }
 
     @Subscribe
     public void onEvent(OpenFullProfileCommand cmd) {
-        if (cmd.MemberId.equals("system"))
+        if (cmd.MemberId.equals("system")) {
             return;
-
+        }
         Bundle bundle = new Bundle();
         bundle.putString("userId", cmd.MemberId);
 

From 5033d708f00009cdf0adf31e895dada0b09a9bc3 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 28 Apr 2017 19:29:52 +0200
Subject: [PATCH 17/17] fix crashes

---
 .../android/habitica/data/TaskRepository.java        |  2 +-
 .../data/implementation/TaskRepositoryImpl.java      |  6 +++---
 .../data/implementation/UserRepositoryImpl.java      |  2 +-
 .../implementation/RealmTaskLocalRepository.java     | 12 ++++++++----
 .../implementation/RealmUserLocalRepository.java     |  3 +++
 .../android/habitica/models/social/Challenge.java    |  4 +++-
 .../habitrpg/android/habitica/models/tasks/Task.java |  9 +++++++++
 .../android/habitica/modules/RepositoryModule.java   |  4 ++--
 .../ui/activities/ChallengeDetailActivity.java       |  2 +-
 .../ui/adapter/social/ChallengesListViewAdapter.java |  2 +-
 .../challenges/ChallengeDetailDialogHolder.java      |  6 +++---
 .../social/challenges/ChallengeListFragment.java     |  4 ++--
 12 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
index 00e8a57d9..027a78206 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.java
@@ -19,7 +19,7 @@ import rx.Observable;
 public interface TaskRepository extends BaseRepository  {
     Observable<RealmResults<Task>> getTasks(String taskType, String userID);
     Observable<RealmResults<Task>> getTasks(String userId);
-    void saveTasks(TasksOrder order, TaskList tasks);
+    void saveTasks(String userId, TasksOrder order, TaskList tasks);
 
     Observable<TaskList> refreshTasks(TasksOrder tasksOrder);
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
index 4c7bba0bc..e298471b8 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.java
@@ -47,14 +47,14 @@ public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository>
     }
 
     @Override
-    public void saveTasks(TasksOrder order, TaskList tasks) {
-        localRepository.saveTasks(order, tasks);
+    public void saveTasks(String userId, TasksOrder order, TaskList tasks) {
+        localRepository.saveTasks(userId, order, tasks);
     }
 
     @Override
     public Observable<TaskList> refreshTasks(TasksOrder tasksOrder) {
         return this.apiClient.getTasks()
-                .doOnNext(res -> this.localRepository.saveTasks(tasksOrder, res));
+                .doOnNext(res -> this.localRepository.saveTasks(null, tasksOrder, res));
     }
 
     @Override
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
index 8eb70212f..c00e732b0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.java
@@ -65,7 +65,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserLocalRepository>
             lastSync = new Date();
             return apiClient.retrieveUser(withTasks)
                     .doOnNext(localRepository::saveUser)
-                    .doOnNext(user -> taskRepository.saveTasks(user.getTasksOrder(), user.tasks))
+                    .doOnNext(user -> taskRepository.saveTasks(user.getId(), user.getTasksOrder(), user.tasks))
                     .flatMap(user -> {
                         Calendar calendar = new GregorianCalendar();
                         TimeZone timeZone = calendar.getTimeZone();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
index 355f21278..df6dcae2e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.java
@@ -1,5 +1,7 @@
 package com.habitrpg.android.habitica.data.local.implementation;
 
+import android.support.annotation.Nullable;
+
 import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
 import com.habitrpg.android.habitica.models.tasks.ChecklistItem;
 import com.habitrpg.android.habitica.models.tasks.RemindersItem;
@@ -35,7 +37,7 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
     }
 
     @Override
-    public void saveTasks(String userId, TasksOrder tasksOrder, TaskList tasks) {
+    public void saveTasks(@Nullable String userId, TasksOrder tasksOrder, TaskList tasks) {
         realm.executeTransactionAsync(realm1 -> {
 
             List<Task> sortedTasks = new ArrayList<>();
@@ -44,7 +46,9 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
             sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getTodos()));
             sortedTasks.addAll(sortTasks(tasks.tasks, tasksOrder.getRewards()));
 
-            removeOldTasks(userId, sortedTasks);
+            if (userId != null) {
+                removeOldTasks(realm1, userId, sortedTasks);
+            }
 
             realm1.insertOrUpdate(sortedTasks);
         });
@@ -70,8 +74,8 @@ public class RealmTaskLocalRepository extends RealmBaseLocalRepository implement
         realm.executeTransaction(realm1 -> realm1.insertOrUpdate(task));
     }
 
-    private void removeOldTasks(String userID, List<Task> onlineTaskList) {
-        RealmResults<Task> localTasks = realm.where(Task.class).equalTo("userId", userID).findAll();
+    private void removeOldTasks(Realm realm1, String userID, List<Task> onlineTaskList) {
+        RealmResults<Task> localTasks = realm1.where(Task.class).equalTo("userId", userID).findAll();
         for (Task localTask : localTasks) {
             if (!onlineTaskList.contains(localTask)) {
                 for (ChecklistItem item : localTask.checklist) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
index 96b3715b8..f850a9599 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.java
@@ -70,6 +70,9 @@ public class RealmUserLocalRepository extends RealmBaseLocalRepository implement
                 ownedItems.add("spookySparkles");
             }
         }
+        if (ownedItems.size() == 0) {
+            return Observable.empty();
+        }
         return realm.where(Skill.class)
                 .in("key", ownedItems.toArray(new String[0]))
                 .findAll()
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
index 85849f8cf..4a1082f00 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.java
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.models.social;
 
+import com.google.gson.annotations.SerializedName;
 import com.habitrpg.android.habitica.models.user.User;
 
 import java.util.HashMap;
@@ -26,7 +27,8 @@ public class Challenge extends RealmObject {
     public int prize;
     public boolean official;
     public int memberCount;
-    public String user_id;
+    @SerializedName("user_id")
+    public String userId;
     public String todoList;
     public String habitList;
     public String dailyList;
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
index 7d13f8294..c4fffa7f2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.java
@@ -541,4 +541,13 @@ public class Task extends RealmObject {
             this.parsedNotes = this.getNotes();
         }
     }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (Task.class.isAssignableFrom(obj.getClass())) {
+            Task otherTask = (Task) obj;
+            return this.id.equals(otherTask.getId());
+        }
+        return super.equals(obj);
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
index 2de06c2f7..dde004ae5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
@@ -85,8 +85,8 @@ public class RepositoryModule {
     }
 
     @Provides
-    UserRepository providesUserRepository(UserLocalRepository localRepository, ApiClient apiClient) {
-        return new UserRepositoryImpl(localRepository, apiClient);
+    UserRepository providesUserRepository(UserLocalRepository localRepository, ApiClient apiClient, TaskRepository taskRepository) {
+        return new UserRepositoryImpl(localRepository, apiClient, taskRepository);
     }
 
     @Provides
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 c074022eb..bd7ec182d 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
@@ -279,7 +279,7 @@ public class ChallengeDetailActivity extends BaseActivity {
 
                     showRemoveTasksDialog(keepTasks -> this.apiClient.leaveChallenge(challenge.id, new LeaveChallengeBody(keepTasks))
                             .subscribe(aVoid -> {
-                                challenge.user_id = null;
+                                challenge.userId = null;
 
                                 user.resetChallengeList();
                                 finish();
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 a13976adc..dd08316f7 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
@@ -177,7 +177,7 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
             challengeDescription.setText(challenge.groupName);
 
             officialChallengeLayout.setVisibility(challenge.official ? View.VISIBLE : View.GONE);
-            boolean userIdExists = challenge.user_id != null && !challenge.user_id.isEmpty();
+            boolean userIdExists = challenge.userId != null && !challenge.userId.isEmpty();
 
             if (viewUserChallengesOnly) {
                 leaderParticipantLayout.setVisibility(View.GONE);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
index 566a23c68..f925a44eb 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeDetailDialogHolder.java
@@ -107,7 +107,7 @@ public class ChallengeDetailDialogHolder {
     }
 
     private void changeViewsByChallenge(Challenge challenge) {
-        setJoined(challenge.user_id != null && !challenge.user_id.isEmpty());
+        setJoined(challenge.userId != null && !challenge.userId.isEmpty());
 
         challengeName.setText(EmojiParser.parseEmojis(challenge.name));
         challengeDescription.setText(MarkdownParser.parseMarkdown(challenge.description));
@@ -290,7 +290,7 @@ public class ChallengeDetailDialogHolder {
         this.apiClient.joinChallenge(challenge.id)
                 .subscribe(challenge -> {
                     if (this.user != null) {
-                        challenge.user_id = this.user.getId();
+                        challenge.userId = this.user.getId();
                     }
 
                     if (challengeJoinedAction != null) {
@@ -311,7 +311,7 @@ public class ChallengeDetailDialogHolder {
 
                         showRemoveTasksDialog(keepTasks -> this.apiClient.leaveChallenge(challenge.id, new LeaveChallengeBody(keepTasks))
                                 .subscribe(aVoid -> {
-                                    challenge.user_id = null;
+                                    challenge.userId = null;
 
                                     if (this.user != null) {
                                         this.user.resetChallengeList();
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 bda841308..8bee57b57 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
@@ -87,10 +87,10 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
 
                     for (Challenge challenge : challenges) {
                         if (userChallengesHash.contains(challenge.id) && challenge.name != null && !challenge.name.isEmpty()) {
-                            challenge.user_id = this.user.getId();
+                            challenge.userId = this.user.getId();
                             userChallenges.add(challenge);
                         } else {
-                            challenge.user_id = null;
+                            challenge.userId = null;
                         }
                     }