From bf5e70f7494b448fab95e16daeb704018871bf3f Mon Sep 17 00:00:00 2001
From: AlbrechtRoehm <roehm.albrecht@gmail.com>
Date: Tue, 24 Jan 2017 11:52:51 +0100
Subject: [PATCH 01/32] Change strings in checkInReward to make them
 translatable

---
 Habitica/res/values/strings.xml                   |  2 ++
 .../helpers/PopupNotificationsManager.java        | 15 +++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 863adaf99..2df5402c6 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -473,4 +473,6 @@ To start, which parts of your life do you want to improve?</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="checkInRewardEarned">You earned a %1$s as a reward for your devotion to improving your life.</string>
+    <string name="nextPrizeUnlocks">Your next prize unlocks at %1$d Check-Ins</string>
 </resources>
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 86be64a8b..16c896344 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,5 +1,6 @@
 package com.habitrpg.android.habitica.helpers;
 
+import android.content.Context;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,12 +29,14 @@ public class PopupNotificationsManager {
     private Map<String, Boolean> seenNotifications;
     private APIHelper apiHelper;
     private static PopupNotificationsManager instance;
+	private Context context;
 
     // @TODO: A queue for displaying alert dialogues
 
     private PopupNotificationsManager(APIHelper apiHelper) {
         this.apiHelper = apiHelper;
         this.seenNotifications = new HashMap<>();
+	    context.getApplicationContext();
     }
 
     public static PopupNotificationsManager getInstance(APIHelper apiHelper) {
@@ -65,17 +68,17 @@ public class PopupNotificationsManager {
                         earnedString += ", ";
                     }
                 }
-                youEarnedMessage = "You earned a " + earnedString + " as a reward for your devotion to improving your life.";
+	            youEarnedMessage = context.getString(R.string.checkInRewardEarned,earnedString);
             }
         }
         DataBindingUtils.loadImage(imageView, imageKey);
 
-        String message = "Your next prize unlocks at " + notification.data.nextRewardAt + " Check-Ins";
-        TextView nextUnlockTextView = (TextView) view.findViewById(R.id.next_unlock_message);
-        nextUnlockTextView.setText(message);
+	    TextView youEarnedTexView = (TextView) view.findViewById(R.id.you_earned_message);
+	    youEarnedTexView.setText(youEarnedMessage);
 
-        TextView youEarnedTexView = (TextView) view.findViewById(R.id.you_earned_message);
-        youEarnedTexView.setText(youEarnedMessage);
+	    String message = context.getString(R.string.nextPrizeUnlocks,notification.data.nextRewardAt);
+	    TextView nextUnlockTextView = (TextView) view.findViewById(R.id.next_unlock_message);
+        nextUnlockTextView.setText(message);
 
         Button confirmButton = (Button) view.findViewById(R.id.confirm_button);
 

From 8d1ab454242b42bcf05dbdfa95934d955d43c888 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 10 Jan 2017 18:29:23 +0100
Subject: [PATCH 02/32] update translations

---
 Habitica/res/layout/avatar_with_bars.xml      | 34 ++++++++++---------
 Habitica/res/values-bg/strings.xml            | 24 -------------
 Habitica/res/values-de/strings.tutorial.xml   |  2 +-
 Habitica/res/values-de/strings.xml            | 29 +---------------
 Habitica/res/values-en-rGB/strings.xml        |  2 --
 Habitica/res/values-fr/strings.xml            | 29 +---------------
 Habitica/res/values-in/strings.xml            |  4 +--
 Habitica/res/values-it/strings.xml            | 28 +--------------
 Habitica/res/values-iw/strings.xml            |  4 +--
 Habitica/res/values-ko/strings.sidebar.xml    |  4 +--
 Habitica/res/values-ko/strings.tutorial.xml   | 10 +++---
 Habitica/res/values-ko/strings.xml            |  1 +
 Habitica/res/values-nl/strings.xml            | 27 ---------------
 Habitica/res/values-pl/strings.xml            |  9 +----
 Habitica/res/values-ru/strings.xml            | 29 +---------------
 Habitica/res/values/strings.xml               |  4 +--
 .../habitica/ui/AvatarWithBarsViewModel.java  |  2 +-
 17 files changed, 39 insertions(+), 203 deletions(-)

diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index a7605bd7b..f943080e2 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -1,21 +1,22 @@
 <?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:id="@+id/avatar_with_bars_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_centerHorizontal="true"
-    android:adjustViewBounds="true"
-    android:fitsSystemWindows="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">
+              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:fitsSystemWindows="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">
@@ -72,7 +73,8 @@
         android:drawablePadding="6dp"
         android:gravity="center"
         android:textSize="14sp"
-        android:textColor="@color/textColorSecondaryDark" />
+        android:textColor="@color/textColorSecondaryDark"
+        tools:text="Lvl 12 Warrior" />
         <View
             android:layout_width="0dp"
             android:layout_height="0dp"
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 711b93aae..52e11f17e 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -308,8 +308,6 @@
   <string name="world_quest">Световна мисия</string>
   <string name="inn_description">Починете в странноприемницата, за да не Ви наранят неизпълнените ежедневни задачи! (Забележка: това не Ви защитава от получаването на щети от главатари.)</string>
   <string name="empty_items" formatted="false">Нямате %s</string>
-  <string name="user_level" formatted="false">Ниво %s</string>
-  <string name="user_level_with_class" formatted="false">Ниво %1$s — %2$s</string>
   <string name="warrior">Воин</string>
   <string name="rogue">Мошеник</string>
   <string name="mage">Магьосник</string>
@@ -322,8 +320,6 @@
   <string name="opt_out_class">Отказване</string>
   <string name="opt_out_description">Не Ви се занимава с класове? Искате да изберете по-късно? Откажете се от тях — ще бъдете воин без специални умения. Можете да прочетете относно класовата система по-късно в уикито, както и да включите класовете когато пожелаете.</string>
   <string name="class_confirmation" formatted="false">Наистина ли искате да бъдете %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>
@@ -347,7 +343,6 @@
   <string name="share_raised" formatted="false">Току-що се сдобих с превоз — %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" formatted="false">Съобщение от %1$s</string>
   <string name="leaderName" formatted="false">Водач: %1$s</string>
   <string name="confirm">Потвърждаване</string>
@@ -419,23 +414,4 @@
   <string name="belongs_to_challenge">Принадлежи на предизвикателство</string>
   <string name="has_reminder">Има напомняне</string>
   <string name="has_tag">Има етикет</string>
-  <string name="byLeader" formatted="false">от %s</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">Задача</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>
 </resources>
diff --git a/Habitica/res/values-de/strings.tutorial.xml b/Habitica/res/values-de/strings.tutorial.xml
index 725092ea9..04f772dbb 100644
--- a/Habitica/res/values-de/strings.tutorial.xml
+++ b/Habitica/res/values-de/strings.tutorial.xml
@@ -4,7 +4,7 @@
   <string name="tutorial_dailies">Besiege Deine täglichen Aufgaben um Gold und Erfahrung zu erhalten. Vorsicht! Tägliche Aufgaben fügen Dir Schaden zu, wenn Du sie nicht rechtzeitig schaffst.</string>
   <string name="tutorial_todos">Erledige Deine To-Dos im echten Leben und hake diese ab, um GOLD und ERFAHRUNG zu erhalten und so Belohnungen und neue Features freizuschalten!</string>
   <string name="tutorial_rewards">Dies sind Deine Belohnungen! Erwirb Gold, indem Du reale Gewohnheiten, tägliche Aufgaben und To-Dos abschließt. Gib dieses hinterher für Belohnungen im Spiel oder selbsterstellte Belohnungen in der Realität aus!</string>
-  <string name="tutorial_equipment">Wenn Du Ausrüstung kaufst, taucht diese hier auf. Deine Kampfausrüstung beeinflusst Deine Spielerstatistiken, und Dein Kostüm (falls aktiviert) beeinflusst Dein Aussehen.</string>
+  <string name="tutorial_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>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index cb38c0253..270209af5 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -277,7 +277,7 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</string>
   <string name="quests">Quests</string>
   <string name="pets">Haustiere</string>
   <string name="mounts">Reittiere</string>
-  <string name="armoireEquipment" formatted="false">Du hast einen seltenen Ausrüstungsgegenstand im Schrank gefunden: %s! Großartig!</string>
+  <string name="armoireEquipment" formatted="false">Du hast einen seltenen Ausrüstungsgegenstand im Schrank gefunden: %s! Juhu!</string>
   <string name="armoireFood" formatted="false">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" formatted="false">Öffne den Schrank um zufällig spezielle Gegenstände, Erfahrung oder Nahrung zu erhalten! Verbleibende Ausrüstungsgegenstände: %d</string>
@@ -308,8 +308,6 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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" formatted="false">Du hast kein/e %s</string>
-  <string name="user_level" formatted="false">Lvl %s</string>
-  <string name="user_level_with_class" formatted="false">Lvl %1$s - %2$s</string>
   <string name="warrior">Krieger</string>
   <string name="rogue">Schurke</string>
   <string name="mage">Magier</string>
@@ -322,8 +320,6 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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" formatted="false">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>
@@ -347,7 +343,6 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</string>
   <string name="share_raised" formatted="false">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" formatted="false">Nachricht von %1$s</string>
   <string name="leaderName" formatted="false">Führender: %1$s</string>
   <string name="confirm">Bestätigen</string>
@@ -419,26 +414,4 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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="byLeader" formatted="false">von %s</string>
-  <string name="challenge_details">Wettbewerb Details</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="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 zu 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, die Option zu deaktivieren.</string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index f9f93d579..84e4f8ab0 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -307,8 +307,6 @@ To start, which parts of your life do you want to improve?</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" formatted="false">You don\'t have any %s</string>
-  <string name="user_level" formatted="false">LVL %s</string>
-  <string name="user_level_with_class" formatted="false">LVL %1$s - %2$s</string>
   <string name="warrior">Warrior</string>
   <string name="rogue">Rogue</string>
   <string name="mage">Mage</string>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index d3eadb02a..5d9648c5b 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -308,8 +308,6 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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" formatted="false">Vous n\'avez pas de %s</string>
-  <string name="user_level" formatted="false">NIV %s</string>
-  <string name="user_level_with_class" formatted="false">NIV %1$s - %2$s</string>
   <string name="warrior">Guerrier</string>
   <string name="rogue">Voleur</string>
   <string name="mage">Mage</string>
@@ -322,8 +320,6 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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" formatted="false">Ê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>
@@ -347,7 +343,6 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</string>
   <string name="share_raised" formatted="false">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" formatted="false">Message de %1$s</string>
   <string name="leaderName" formatted="false">Leader : %1$s</string>
   <string name="confirm">Confirmer</string>
@@ -401,7 +396,7 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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.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>
@@ -419,26 +414,4 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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="byLeader" formatted="false">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">Êtes-vous sûr·e de vouloir quitter le défi \"%s\" ?</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 partie d\'aucun défi pour l\'instant !</string>
-  <string name="join_a_challenge">Rejoignez un défi pour ajouter un ensemble de tâches à votre liste, puis rivalisez avec d\'autres personnes pour gagner des succès et même des gemmes !</string>
-  <string name="check_the_public_challenge_tab">Utilisez l\'onglet \"publique\" pour trouver les défi créés par les utilisateurs et qui vous correspondent le mieux !</string>
-  <string name="add_reminder">Ajouter un rappel</string>
-  <string name="warning">Attention</string>
-  <string name="open_settings">Ouvrir les préférences</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>
 </resources>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index 00852c7b7..9c6014742 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -285,8 +285,8 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</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" formatted="false">Kamu tidak memiliki %s</string>
-  <string name="user_level" formatted="false">LVL %s</string>
-  <string name="user_level_with_class" formatted="false">LVL %1$s - %2$s</string>
+  <string name="user_level" formatted="false">LVL %d</string>
+  <string name="user_level_with_class" formatted="false">LVL %1$d - %2$s</string>
   <string name="warrior">Prajurit</string>
   <string name="rogue">Perampok</string>
   <string name="mage">Penyihir</string>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 136822b82..e12ff9f26 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -83,7 +83,7 @@
   <string name="tags">Etichette</string>
   <string name="trivial">Triviale</string>
   <string name="easy">Facile</string>
-  <string name="medium">Media</string>
+  <string name="medium">Medio</string>
   <string name="hard">Difficile</string>
   <string name="start_date">Data di partenza</string>
   <string name="positive_habit_form">Positiva ( + )</string>
@@ -308,8 +308,6 @@ Per cominciare, quali parti della tua vita vuoi migliorare?</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" formatted="false">Non hai alcun %s</string>
-  <string name="user_level" formatted="false">LVL %s</string>
-  <string name="user_level_with_class" formatted="false">LVL %1$s - %2$s</string>
   <string name="warrior">Guerriero</string>
   <string name="rogue">Assassino</string>
   <string name="mage">Mago</string>
@@ -323,7 +321,6 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <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" formatted="false">Vuoi davvero essere un %s?</string>
-  <string name="class_changed">Ora sei un %s!</string>
   <string name="choose_class">Scegli classe</string>
   <string name="dialog_go_back">Ritorna</string>
   <string name="opt_out_confirmation">Vuoi davvero rinunciare?</string>
@@ -347,7 +344,6 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <string name="share_raised" formatted="false">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" formatted="false">Messaggio da %1$s</string>
   <string name="leaderName" formatted="false">Leader: %1$s</string>
   <string name="confirm">Conferma</string>
@@ -419,26 +415,4 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <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="byLeader" formatted="false">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="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>
 </resources>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index 69da3c49b..e559feaa5 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -287,8 +287,8 @@
   <string name="world_quest">הרפתקאה עולמית</string>
   <string name="inn_description">נוחו באכסנייה כדי למנוע ממטלות יומיות לא מושלמות לפגוע בכם במהלך הלילה! (שימו לב: לא מונע מכם להפגע מאוייבים.)</string>
   <string name="empty_items" formatted="false">אין לכם כל %s</string>
-  <string name="user_level" formatted="false">דרגה %s</string>
-  <string name="user_level_with_class" formatted="false">דרגה %1$s - %2$s</string>
+  <string name="user_level" formatted="false">דרגה %d</string>
+  <string name="user_level_with_class" formatted="false">דרגה %1$d - %2$s</string>
   <string name="warrior">לוחם</string>
   <string name="rogue">נוכל</string>
   <string name="mage">מכשף</string>
diff --git a/Habitica/res/values-ko/strings.sidebar.xml b/Habitica/res/values-ko/strings.sidebar.xml
index 0537b29c4..f7cd3c1b3 100644
--- a/Habitica/res/values-ko/strings.sidebar.xml
+++ b/Habitica/res/values-ko/strings.sidebar.xml
@@ -4,7 +4,7 @@
   <string name="sidebar.skills">스킬</string>
   <string name="sidebar.section.social">소셜</string>
   <string name="sidebar.inbox">받은 편지함</string>
-  <string name="sidebar.tavern">여관</string>
+  <string name="sidebar.tavern">주막</string>
   <string name="sidebar.party">파티</string>
   <string name="sidebar.purchaseGems">보석 구매</string>
   <string name="sidebar.guilds">길드</string>
@@ -16,5 +16,5 @@
   <string name="sidebar.news">뉴스</string>
   <string name="sidebar.settings">설정</string>
   <string name="sidebar.about">소개</string>
-  <string name="sidebar_shops">가게</string>
+  <string name="sidebar_shops">상점</string>
 </resources>
diff --git a/Habitica/res/values-ko/strings.tutorial.xml b/Habitica/res/values-ko/strings.tutorial.xml
index f51b16033..b81657b97 100644
--- a/Habitica/res/values-ko/strings.tutorial.xml
+++ b/Habitica/res/values-ko/strings.tutorial.xml
@@ -2,13 +2,13 @@
 <resources>
   <string name="tutorial_habits">좋은 습관을 달성하고 골드와 경험치를 얻으세요! 나쁜 습관은 당신의 아바타를 다치게 하니, 일상생활을 열심히 하세요!</string>
   <string name="tutorial_dailies">골드와 경험치를 위해 일일과제를 달성하세요. 주의할 점! 일일과제는 제때 끝내지 못하면 당신의 아바타를 다치게 만들어요.</string>
-  <string name="tutorial_todos">일상생활을 할일을 달성함으로써 골드와 경험치를 얻으세요. 경험치와 골드로 새로운 보상과 기능을 여세요!</string>
+  <string name="tutorial_todos">일상에서 해야 할 일을 달성하고 골드와 경험치를 얻으셔서 새로운 보상과 기능을 여세요!</string>
   <string name="tutorial_rewards">이것들은 당신의 보상들이에요! 습관, 일일과제, 해야할 일들을 일상생활에서 달성하면 골드를 모을 수 있어요. 이 골드를 게임의 보상들이나 스스로 설정한 보상을 구입하는데 사용하세요!</string>
-  <string name="tutorial_equipment">장비를 구입하면 여기에 보입니다. 전투장비는 당신의 스텟에 영향을 주고, 당신의 의상은 (기능에 따라) 아바타의 모습을 바꿔줍니다.</string>
+  <string name="tutorial_equipment">장비를 구입하면 여기에 보입니다. 전투장비는 당신의 스탯에 영향을 주고, 당신의 의상은 (활성화 했다면) 아바타의 모습을 바꿔줍니다.</string>
   <string name="tutorial_items">과제와 레벨업을 달성하면 아이템을 받을 수 있습니다. 아이템을 터치해서 사용하세요!</string>
-  <string name="tutorial_pets">일상생활의 과제들을 해결해 나아가면서, 당신은 무작위로 알이나 포션을 발견할 수 있습니다. 둘을 섞어서 알을 부화시키면 펫을 얻을 수 있어요.</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>
+  <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 803d71bc5..9e9d6fece 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -139,6 +139,7 @@
   <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>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index a4e26f350..2e53806fb 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -308,8 +308,6 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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" formatted="false">Je hebt geen %s</string>
-  <string name="user_level" formatted="false">NIV %s</string>
-  <string name="user_level_with_class" formatted="false">NIV %1$s - %2$s</string>
   <string name="warrior">Krijger</string>
   <string name="rogue">Dief</string>
   <string name="mage">Magiër</string>
@@ -322,8 +320,6 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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" formatted="false">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>
@@ -347,7 +343,6 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
   <string name="share_raised" formatted="false">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" formatted="false">Bericht van %1$s</string>
   <string name="leaderName" formatted="false">Leider: %1$s</string>
   <string name="confirm">Bevestig</string>
@@ -419,26 +414,4 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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="byLeader" formatted="false">met %s</string>
-  <string name="challenge_details">Details van de uitdaging</string>
-  <string name="challenge_leave_title">Verlaat Uitdaging</string>
-  <string name="challenge_leave_text">Weet je zeker dat je de uitdaging %s wil verlaten?</string>
-  <string name="my_challenges">Mijn uitdagingen</string>
-  <string name="public_challenges">Publiek</string>
-  <string name="challenges">Uitdagingen</string>
-  <string name="daily">Dadelijks</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 de uitdaging</string>
-  <string name="not_part_of_a_challenge">Je doet op dit moment niet mee aan een uitdaging!</string>
-  <string name="join_a_challenge">Doe mee aan een uitdaging om een zorgvuldig samengestelde set van taken aan je lijst toe te voegen en het op te nemen tegen andere Habiticanen om prestaties en zelfs edelstenen te winnen!</string>
-  <string name="check_the_public_challenge_tab">Tik op de \"Publiek\" tab om Uitdagingen, gemaakt door gebruikers, te vinden die het best bij jou passen!</string>
-  <string name="add_reminder">Voeg een 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 Ontwikkelaar optie \"Hou geen activiteiten bij\" aan hebt staan. Momenteel zorgt deze optie voor problemen met de Habitica app, dus raden we je aan dit uit te zetten.</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index fb83ce2a6..855fb3ffa 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -139,6 +139,7 @@
   <string name="members">Członkowie</string>
   <string name="habits">Nawyki</string>
   <string name="dailies">Codzienne</string>
+  <string name="todos">DoZrobienia</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>
@@ -307,8 +308,6 @@ Od czego chcesz zacząć poprawiać swoje życie?</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" formatted="false">Nie posiadasz %s</string>
-  <string name="user_level" formatted="false">poz %s</string>
-  <string name="user_level_with_class" formatted="false">poz %1$s %2$s</string>
   <string name="warrior">Wojownik</string>
   <string name="rogue">Łotrzyk</string>
   <string name="mage">Mag</string>
@@ -321,8 +320,6 @@ Od czego chcesz zacząć poprawiać swoje życie?</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" formatted="false">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>
@@ -346,7 +343,6 @@ Od czego chcesz zacząć poprawiać swoje życie?</string>
   <string name="share_raised" formatted="false">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" formatted="false">Wiadomość od %1$s</string>
   <string name="leaderName" formatted="false">Lider: %1$s</string>
   <string name="confirm">Potwierdź</string>
@@ -415,7 +411,4 @@ Od czego chcesz zacząć poprawiać swoje życie?</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>
 </resources>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 67ddfcdd0..6a7a7c6cb 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -139,7 +139,7 @@
   <string name="members">Участники</string>
   <string name="habits">Привычки</string>
   <string name="dailies">Ежедневные задания</string>
-  <string name="todos">Задания</string>
+  <string name="todos">Задачи</string>
   <string name="rewards">Награды</string>
   <string name="taskform.delete.title">Вы уверены?</string>
   <string name="taskform.delete.message">Вы уверены, что хотите удалить?</string>
@@ -308,8 +308,6 @@
   <string name="world_quest">Мировой квест</string>
   <string name="inn_description">Отдых в гостинице оградит ваши ежедневными заданиями  от нанесения вам урона ночью! (Примечание: не предотвращает получение урона от мирового босса.)</string>
   <string name="empty_items" formatted="false">У вас нет %s</string>
-  <string name="user_level" formatted="false">Ур. %s</string>
-  <string name="user_level_with_class" formatted="false">Ур. %1$s - %2$s</string>
   <string name="warrior">Воин</string>
   <string name="rogue">Разбойник</string>
   <string name="mage">Маг</string>
@@ -322,8 +320,6 @@
   <string name="opt_out_class">Отказаться</string>
   <string name="opt_out_description">Не хотите утруждать себя классами? Тогда откажитесь — и останетесь воином и ваши очки будут обрабатываться автоматически. Активировать классы можно будет позже в меню настроек.</string>
   <string name="class_confirmation" formatted="false">Вы уверены, что хотите быть %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>
@@ -347,7 +343,6 @@
   <string name="share_raised" formatted="false">Я только что получил скакуна %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" formatted="false">Сообщение от %1$s</string>
   <string name="leaderName" formatted="false">Предводитель: %1$s</string>
   <string name="confirm">Подтвердить</string>
@@ -419,26 +414,4 @@
   <string name="belongs_to_challenge">Принадлежит Испытанию</string>
   <string name="has_reminder">Есть напоминание</string>
   <string name="has_tag">Отмечено тегом</string>
-  <string name="byLeader" formatted="false">сделано %s</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">Задача</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>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 863adaf99..2113e6d5d 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -334,8 +334,8 @@ To start, which parts of your life do you want to improve?</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" formatted="false">You don\'t have any %s</string>
-    <string name="user_level" formatted="false">LVL %s</string>
-    <string name="user_level_with_class" formatted="false">LVL %1$s - %2$s</string>
+    <string name="user_level" formatted="false">Lvl %d</string>
+    <string name="user_level_with_class" formatted="false">Lvl %1$d %2$s</string>
     <string name="warrior">Warrior</string>
     <string name="rogue">Rogue</string>
     <string name="mage">Mage</string>
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 0967e1c51..16e7327e5 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
@@ -117,7 +117,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
             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));
+            lvlText.setText(context.getString(R.string.user_level_with_class, user.getStats().getLvl(), userClass.substring(0, 1).toUpperCase() + userClass.substring(1)));
             Drawable drawable;
             switch (stats.get_class()) {
                 case warrior:

From b575287f85b210ca29fa719dea497edf8a7008b5 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 10 Jan 2017 18:05:03 +0100
Subject: [PATCH 03/32] start working on subscriptions

---
 Habitica/AndroidManifest.xml                  |   2 +-
 Habitica/build.gradle                         |   8 +-
 .../res/drawable/subscription_selected.xml    |  19 ++
 .../res/drawable/subscription_unselected.xml  |   8 +
 Habitica/res/layout/activity_gem_purchase.xml |  10 +-
 Habitica/res/layout/fragment_subscription.xml | 122 ++++++++++
 .../res/layout/purchase_subscription_view.xml |  40 ++++
 Habitica/res/values/attrs.xml                 |   2 +
 Habitica/res/values/colors.xml                |   1 +
 Habitica/res/values/dimens.xml                |   4 +-
 Habitica/res/values/strings.constants.xml     |   4 +-
 Habitica/res/values/strings.xml               |  13 ++
 Habitica/res/values/styles.xml                |   7 +
 .../habitica/HabiticaBaseApplication.java     |   8 +-
 .../habitica/components/AppComponent.java     |   2 +
 .../habitica/helpers/PurchaseTypes.java       |   9 +-
 .../habitica/ui/SubscriptionOptionView.java   |  72 ++++++
 .../ui/activities/GemPurchaseActivity.java    |  81 ++++++-
 .../ui/fragments/GemsPurchaseFragment.java    |  64 +++--
 .../ui/fragments/SubscriptionFragment.java    | 219 ++++++++++++++++++
 seeds-sdk/build.gradle                        |   4 +-
 21 files changed, 639 insertions(+), 60 deletions(-)
 create mode 100644 Habitica/res/drawable/subscription_selected.xml
 create mode 100644 Habitica/res/drawable/subscription_unselected.xml
 create mode 100644 Habitica/res/layout/fragment_subscription.xml
 create mode 100644 Habitica/res/layout/purchase_subscription_view.xml
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 48932a209..d8d7ad509 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -9,7 +9,7 @@
 
     <uses-sdk
         android:minSdkVersion="15"
-        android:targetSdkVersion="24" />
+        android:targetSdkVersion="25" />
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 4feb852f5..2fb81d47f 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -93,7 +93,7 @@ dependencies {
     compile 'org.greenrobot:eventbus:3.0.0'
 
     // IAP Handling / Verification
-    compile 'org.solovyev.android:checkout:0.7.5@aar'
+    compile 'org.solovyev.android:checkout:0.9.1@aar'
 
     //Facebook
     compile('com.facebook.android:facebook-android-sdk:4.17.0') {
@@ -130,10 +130,10 @@ dependencies {
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
 
     //Push Notifications
-    compile 'com.google.firebase:firebase-core:9.4.0'
-    compile 'com.google.firebase:firebase-messaging:9.4.0'
+    compile 'com.google.firebase:firebase-core:10.0.1'
+    compile 'com.google.firebase:firebase-messaging:10.0.1'
 
-    compile 'com.google.android.gms:play-services-auth:9.4.0'
+    compile 'com.google.android.gms:play-services-auth:10.0.1'
 
     compile(project(':seeds-sdk')) {
         exclude group: 'com.google.android.gms'
diff --git a/Habitica/res/drawable/subscription_selected.xml b/Habitica/res/drawable/subscription_selected.xml
new file mode 100644
index 000000000..da78dfc66
--- /dev/null
+++ b/Habitica/res/drawable/subscription_selected.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="oval">
+            <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
+            <solid android:color="@color/brand_100" />
+            <stroke android:color="@color/transparent" android:width="5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="oval">
+            <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
+            <stroke android:color="@color/brand_100" android:width="1dp" />
+            <size android:height="16dp" android:width="16dp" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/Habitica/res/drawable/subscription_unselected.xml b/Habitica/res/drawable/subscription_unselected.xml
new file mode 100644
index 000000000..c290a3fdd
--- /dev/null
+++ b/Habitica/res/drawable/subscription_unselected.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
+    <stroke android:color="@color/brand_100" android:width="1dp" />
+    <size android:height="16dp" android:width="16dp" />
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml
index 7776fe9a0..4c0e82efc 100644
--- a/Habitica/res/layout/activity_gem_purchase.xml
+++ b/Habitica/res/layout/activity_gem_purchase.xml
@@ -19,10 +19,11 @@
                 android:elevation="0dp"
                 tools:context=".ui.activities.MainActivity">
 
-            <FrameLayout
-                    android:id="@+id/fragment_container"
+            <android.support.v4.view.ViewPager
+                    android:id="@+id/view_pager"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:background="@android:color/white"
                     app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
             <android.support.design.widget.AppBarLayout
@@ -63,7 +64,7 @@
                 </android.support.design.widget.CollapsingToolbarLayout>
 
                 <android.support.design.widget.TabLayout
-                        android:id="@+id/detail_tabs"
+                        android:id="@+id/tab_layout"
                         android:layout_width="match_parent"
                         android:layout_height="54dp"
                         android:layout_gravity="bottom"
@@ -78,8 +79,7 @@
                         app:layout_collapseMode="pin"
                         app:tabGravity="fill"
                         app:tabIndicatorColor="@android:color/white"
-                        app:tabMode="fixed"
-                        android:visibility="gone"/>
+                        app:tabMode="fixed" />
             </android.support.design.widget.AppBarLayout>
 
         </android.support.design.widget.CoordinatorLayout>
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
new file mode 100644
index 000000000..881cf9e92
--- /dev/null
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -0,0 +1,122 @@
+<?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 xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="20dp">
+
+        <TextView android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:paddingBottom="20dp"
+            android:text="@string/subscribe.title"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:textColor="@color/best_10"
+            android:drawableTop="@drawable/ic_header_heart"
+            android:textSize="14sp"
+            android:lineSpacingExtra="4dp" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <com.habitrpg.android.habitica.ui.SubscriptionOptionView
+                    android:id="@+id/subscription1month"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:recurringText="month" />
+            <com.habitrpg.android.habitica.ui.SubscriptionOptionView
+                    android:id="@+id/subscription3month"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:recurringText="3 months" />
+            <com.habitrpg.android.habitica.ui.SubscriptionOptionView
+                    android:id="@+id/subscription6month"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:recurringText="6 months" />
+            <com.habitrpg.android.habitica.ui.SubscriptionOptionView
+                    android:id="@+id/subscription12month"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:recurringText="12 months" />
+        </LinearLayout>
+
+        <Button
+                android:text="@string/subscribe"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/subscribeButton"
+                android:textColor="@color/white"
+                android:background="@drawable/rounded_purple_square"
+                android:enabled="false" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/subscribe.subtitle"
+            android:gravity="center"
+            android:textStyle="normal|bold"
+            android:textColor="@color/brand_100"
+            android:textSize="16sp"
+            android:lineSpacingExtra="4dp"
+            android:layout_marginTop="23dp"
+            android:layout_marginBottom="12dp"/>
+
+        <TextView
+            android:text="@string/subscribe.listitem1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/GemPurchaseListItem"
+            />
+        <TextView
+                android:text="@string/subscribe.listitem1.description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/GemPurchaseListItemDescription" />
+
+        <TextView
+            android:text="@string/subscribe.listitem2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/GemPurchaseListItem"
+            />
+        <TextView
+                android:text="@string/subscribe.listitem2.description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/GemPurchaseListItemDescription" />
+
+        <TextView
+            android:text="@string/subscribe.listitem3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/GemPurchaseListItem"
+            />
+        <TextView
+                android:text="@string/subscribe.listitem3.description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/GemPurchaseListItemDescription" />
+
+        <TextView
+            android:text="@string/subscribe.listitem4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/GemPurchaseListItem"
+            />
+        <TextView
+                android:text="@string/subscribe.listitem4.description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/GemPurchaseListItemDescription" />
+    </LinearLayout>
+</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/purchase_subscription_view.xml b/Habitica/res/layout/purchase_subscription_view.xml
new file mode 100644
index 000000000..3df53f8e3
--- /dev/null
+++ b/Habitica/res/layout/purchase_subscription_view.xml
@@ -0,0 +1,40 @@
+<?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="wrap_content"
+              android:background="@color/habit_inactive_gray"
+              android:gravity="center"
+        android:minHeight="80dp"
+        android:layout_marginBottom="12dp">
+
+    <FrameLayout
+            android:layout_width="50dp"
+            android:layout_height="match_parent"
+            android:background="@color/brand_700">
+        <View
+                android:id="@+id/subscriptionSelectedView"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:background="@drawable/subscription_unselected"
+                android:layout_gravity="center"/>
+            </FrameLayout>
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/priceLabel"
+            android:textColor="@color/brand_100"
+            android:gravity="center"
+            android:textSize="36sp"
+            tools:text="$ 21"
+            android:layout_marginStart="8dp"/>
+
+    <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/descriptionTextView"
+            android:textColor="@color/brand_100"
+            tools:text="recurring every month"
+            android:layout_marginStart="16dp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 1a650745c..69ce1ea97 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -14,5 +14,7 @@
 
     <declare-styleable name="MaxHeightScrollView">
         <attr name="maxHeightMultiplier" format="float" />
+    <declare-styleable name="SubscriptionOptionView">
+        <attr name="recurringText" format="string" />
     </declare-styleable>
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index da169231f..fde09fd31 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -109,4 +109,5 @@
     <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>
 </resources>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 8894adca2..a20567454 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -91,5 +91,5 @@
 
 	<dimen name="task_icon_space">12dp</dimen>
 	<dimen name="task_icon_size">18dp</dimen>
-
-</resources>
\ No newline at end of file
+	<dimen name="task_info_bar_bottom_space">-8dp</dimen>
+</resources>
diff --git a/Habitica/res/values/strings.constants.xml b/Habitica/res/values/strings.constants.xml
index 57e14d57c..1b8b6428e 100644
--- a/Habitica/res/values/strings.constants.xml
+++ b/Habitica/res/values/strings.constants.xml
@@ -18,5 +18,5 @@
 
     <string name="qr_album_name" translatable="false">habitica</string>
     <string name="qr_file_name" translatable="false"> habitrpg-qr-code.jpg</string>
-    <string name="habitica_user_count">2,000,000</string>
-</resources>
\ No newline at end of file
+    <string name="habitica_user_count" translatable="false">2,000,000</string>
+</resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 2113e6d5d..96c7c58ec 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -448,6 +448,19 @@ To start, which parts of your life do you want to improve?</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.subtitle">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" formatted="false">Recurring every %s</string>
+    <string name="subscribe">Subscribe</string>
+    <string name="subscribe.listitem1.description">Alexander the Merchant will sell you Gems at a cost of 20 gold per gem. His monthly shipments are initially capped at 25 Gems per month, but this 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">Makes completed To-Dos and task history available for longer.</string>
+    <string name="subscribe.listitem3.description">Complete your stable faster!</string>
+    <string name="subscribe.listitem4.description">Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.</string>
 
     <string name="byLeader" formatted="false">by %s</string>
     <string name="challenge_details">Challenge Details</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 36f54eea9..9049a207e 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -200,4 +200,11 @@
         <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:gravity">center_horizontal</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/subscription_description_text</item>
+    </style>
 </resources>
\ No newline at end of file
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 2655c180c..0afd18362 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -33,8 +33,8 @@ import com.squareup.leakcanary.LeakCanary;
 import org.solovyev.android.checkout.Billing;
 import org.solovyev.android.checkout.Cache;
 import org.solovyev.android.checkout.Checkout;
+import org.solovyev.android.checkout.Inventory;
 import org.solovyev.android.checkout.ProductTypes;
-import org.solovyev.android.checkout.Products;
 import org.solovyev.android.checkout.PurchaseVerifier;
 
 import java.io.File;
@@ -336,7 +336,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
         });
 
 
-        checkout = Checkout.forApplication(billing, Products.create().add(ProductTypes.IN_APP, PurchaseTypes.allTypes));
+        checkout = Checkout.forApplication(billing);
     }
 
     @NonNull
@@ -344,6 +344,10 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
         return checkout;
     }
 
+    public Billing getBilling() {
+        return billing;
+    }
+
     // endregion
 
     public static AppComponent getComponent() {
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 a6e93ed59..3fcf97f50 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
@@ -32,6 +32,7 @@ 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;
@@ -220,6 +221,7 @@ public interface AppComponent {
 
     void inject(TodosRecyclerViewAdapter todosRecyclerViewAdapter);
 
+    void inject(SubscriptionFragment subscriptionFragment);
     void inject(ChallengeTasksRecyclerViewFragment.ChallengeTasksRecyclerViewAdapter challengeTasksRecyclerViewAdapter);
 
     void inject(ChallengeTasksRecyclerViewFragment challengeTasksRecyclerViewFragment);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.java
index b7befef4b..7286f7711 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.java
@@ -11,5 +11,12 @@ public class PurchaseTypes {
     public static String Purchase42Gems = "com.habitrpg.android.habitica.iap.42gems";
     public static String Purchase84Gems = "com.habitrpg.android.habitica.iap.84gems";
 
-    public static List<String> allTypes = Arrays.asList(Purchase4Gems, Purchase21Gems, Purchase42Gems, Purchase84Gems);
+    public static List<String> allGemTypes = Arrays.asList(Purchase4Gems, Purchase21Gems, Purchase42Gems, Purchase84Gems);
+
+    public static String Subscription1Month = "com.habitrpg.android.habitica.subscription.1month";
+    public static String Subscription3Month = "com.habitrpg.android.habitica.subscription.3month";
+    public static String Subscription6Month = "com.habitrpg.android.habitica.subscription.6month";
+    public static String Subscription12Month = "com.habitrpg.android.habitica.subscription.12month";
+
+    public static List<String> allSubscriptionTypes = Arrays.asList(Subscription1Month, Subscription3Month, Subscription6Month, Subscription12Month);
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
new file mode 100644
index 000000000..5a6f29207
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
@@ -0,0 +1,72 @@
+package com.habitrpg.android.habitica.ui;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.habitrpg.android.habitica.R;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+
+public class SubscriptionOptionView extends FrameLayout {
+
+    @BindView(R.id.priceLabel)
+    TextView priceTextView;
+
+    @BindView(R.id.descriptionTextView)
+    TextView descriptionTextView;
+
+    @BindView(R.id.subscriptionSelectedView)
+    View subscriptionSelectedView;
+
+    private String sku;
+
+    public SubscriptionOptionView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        inflate(context, R.layout.purchase_subscription_view, this);
+
+        ButterKnife.bind(this);
+
+        TypedArray a = context.getTheme().obtainStyledAttributes(
+                attrs,
+                R.styleable.SubscriptionOptionView,
+                0, 0);
+
+        descriptionTextView.setText(context.getString(R.string.subscription_duration, a.getText(R.styleable.SubscriptionOptionView_recurringText)));
+
+    }
+
+    public void setOnPurchaseClickListener(Button.OnClickListener listener) {
+        this.setOnClickListener(listener);
+    }
+
+    public void setPriceText(String text) {
+        this.priceTextView.setText(text);
+    }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
+    public String getSku() {
+        return sku;
+    }
+
+    public void setIsPurchased(boolean purchased) {
+        if (purchased) {
+            subscriptionSelectedView.setBackgroundResource(R.drawable.subscription_selected);
+        } else {
+            subscriptionSelectedView.setBackgroundResource(R.drawable.subscription_unselected);
+        }
+    }
+}
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 a4e309fbf..ecca75079 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
@@ -6,6 +6,8 @@ import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
 import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment;
+import com.habitrpg.android.habitica.ui.fragments.SubscriptionFragment;
+import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
 import com.playseeds.android.sdk.Seeds;
 import com.playseeds.android.sdk.inappmessaging.InAppMessageListener;
 
@@ -14,13 +16,30 @@ import org.solovyev.android.checkout.Checkout;
 
 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.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
-public class GemPurchaseActivity extends BaseActivity implements GemsPurchaseFragment.Listener, InAppMessageListener {
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+
+public class GemPurchaseActivity extends BaseActivity implements InAppMessageListener {
 
     private ActivityCheckout checkout;
 
+    @BindView(R.id.tab_layout)
+    TabLayout tabLayout;
+
+    @BindView(R.id.view_pager)
+    ViewPager viewPager;
+
+    List<CheckoutFragment> fragments = new ArrayList<>();
+
     @Override
     protected int getLayoutResId() {
         return R.layout.activity_gem_purchase;
@@ -58,9 +77,9 @@ public class GemPurchaseActivity extends BaseActivity implements GemsPurchaseFra
             getSupportActionBar().setTitle(R.string.gem_purchase_toolbartitle);
         }
 
-        GemsPurchaseFragment firstFragment = new GemsPurchaseFragment();
-        getSupportFragmentManager().beginTransaction()
-                .add(R.id.fragment_container, firstFragment).commit();
+        viewPager.setCurrentItem(0);
+
+        setViewPagerAdapter();
     }
 
     @Override
@@ -81,11 +100,10 @@ public class GemPurchaseActivity extends BaseActivity implements GemsPurchaseFra
     }
 
     private void setupCheckout() {
-        checkout = Checkout.forActivity(this, HabiticaApplication.getInstance(this).getCheckout());
+        checkout = Checkout.forActivity(this, HabiticaApplication.getInstance(this).getBilling());
         checkout.start();
     }
 
-    @Override
     public ActivityCheckout getActivityCheckout() {
         return checkout;
     }
@@ -135,4 +153,55 @@ public class GemPurchaseActivity extends BaseActivity implements GemsPurchaseFra
             System.out.println("Exception: " + e);
         }
     }
+
+    public void setViewPagerAdapter() {
+        android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
+
+        viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
+
+            @Override
+            public Fragment getItem(int position) {
+                CheckoutFragment fragment;
+                if (position == 0) {
+                    fragment = new GemsPurchaseFragment();
+                } else {
+                    fragment = new SubscriptionFragment();
+                }
+                if (fragments.size() > position) {
+                    fragments.set(position, fragment);
+                } else {
+                    fragments.add(fragment);
+                }
+                fragment.setListener(GemPurchaseActivity.this);
+                fragment.setupCheckout();
+                return (Fragment)fragment;
+            }
+
+            @Override
+            public int getCount() {
+                return 2;
+            }
+
+            @Override
+            public CharSequence getPageTitle(int position) {
+                switch (position) {
+                    case 0:
+                        return getString(R.string.gems);
+                    case 1:
+                        return getString(R.string.subscriptions);
+                }
+                return "";
+            }
+        });
+
+        if (tabLayout != null && viewPager != null) {
+            tabLayout.setupWithViewPager(viewPager);
+        }
+    }
+
+    public interface CheckoutFragment {
+
+        void setupCheckout();
+        void setListener(GemPurchaseActivity listener);
+    }
 }
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 fc83ab8c1..68e93cf1d 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
@@ -7,8 +7,6 @@ import com.habitrpg.android.habitica.helpers.PurchaseTypes;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView;
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.playseeds.android.sdk.Seeds;
 
 import org.greenrobot.eventbus.EventBus;
 import org.solovyev.android.checkout.ActivityCheckout;
@@ -25,6 +23,7 @@ import android.content.Context;
 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;
@@ -36,7 +35,7 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 
-public class GemsPurchaseFragment extends BaseFragment {
+public class GemsPurchaseFragment extends BaseFragment implements GemPurchaseActivity.CheckoutFragment {
 
     @BindView(R.id.gems_4_view)
     GemPurchaseOptionsView gems4View;
@@ -50,19 +49,11 @@ public class GemsPurchaseFragment extends BaseFragment {
     @Inject
     CrashlyticsProxy crashlyticsProxy;
 
-    private HashMap<String, String> priceMap;
-
     private static final int GEMS_TO_ADD = 21;
     Button btnPurchaseGems;
-    private Listener listener;
+    private GemPurchaseActivity listener;
     private BillingRequests billingRequests;
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        listener = (Listener) context;
-    }
+    private Inventory inventory;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -70,8 +61,6 @@ public class GemsPurchaseFragment extends BaseFragment {
 
         super.onCreateView(inflater, container, savedInstanceState);
 
-        priceMap = new HashMap<>();
-
         return inflater.inflate(R.layout.fragment_gem_purchase, container, false);
     }
 
@@ -90,16 +79,20 @@ public class GemsPurchaseFragment extends BaseFragment {
         gems84View.setOnPurchaseClickListener(v -> purchaseGems(PurchaseTypes.Purchase84Gems));
 
         gems84View.seedsImageButton.setOnClickListener(v -> ((GemPurchaseActivity)this.getActivity()).showSeedsPromo(getString(R.string.seeds_interstitial_gems), "store"));
+    }
 
+    @Override
+    public void setupCheckout() {
         final ActivityCheckout checkout = listener.getActivityCheckout();
-
         if (checkout != null) {
             checkout.destroyPurchaseFlow();
 
+            inventory = checkout.makeInventory();
+
             checkout.createPurchaseFlow(new RequestListener<Purchase>() {
                 @Override
                 public void onSuccess(@NonNull Purchase purchase) {
-                    if (PurchaseTypes.allTypes.contains(purchase.sku)) {
+                    if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
                         billingRequests.consume(purchase.token, new RequestListener<Object>() {
                             @Override
                             public void onSuccess(@NonNull Object o) {
@@ -139,24 +132,29 @@ public class GemsPurchaseFragment extends BaseFragment {
 
                 @Override
                 public void onReady(@NonNull BillingRequests billingRequests, @NonNull String s, boolean b) {
-
-                    checkout.loadInventory().whenLoaded(products -> {
-
-                        Inventory.Product gems = products.get(ProductTypes.IN_APP);
-
-                        java.util.List<Sku> skus = gems.getSkus();
-
-                        for (Sku sku : skus) {
-                            priceMap.put(sku.id, sku.price);
-                            updateButtonLabel(sku.id, sku.price);
-                        }
-                    });
-
                 }
             });
+            inventory.load(Inventory.Request.create()
+                            .loadAllPurchases().loadSkus(ProductTypes.IN_APP, PurchaseTypes.allGemTypes),
+                    products -> {
+                        Inventory.Product gems = products.get(ProductTypes.IN_APP);
+                        if (!gems.supported) {
+                            // billing is not supported, user can't purchase anything
+                            return;
+                        }
+                        java.util.List<Sku> skus = gems.getSkus();
+                        for (Sku sku : skus) {
+                            updateButtonLabel(sku.id.code, sku.price);
+                        }
+                    });
         }
     }
 
+    @Override
+    public void setListener(GemPurchaseActivity listener) {
+        this.listener = listener;
+    }
+
     private void updateButtonLabel(String sku, String price) {
         GemPurchaseOptionsView matchingView;
         if (sku.equals(PurchaseTypes.Purchase4Gems)) {
@@ -179,7 +177,7 @@ public class GemsPurchaseFragment extends BaseFragment {
             @Override
             public void onSuccess(@NonNull Purchases purchases) {
                 for (Purchase purchase : purchases.list) {
-                    if (PurchaseTypes.allTypes.contains(purchase.sku)) {
+                    if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
                         billingRequests.consume(purchase.token, new RequestListener<Object>() {
                             @Override
                             public void onSuccess(@NonNull Object o) {
@@ -223,8 +221,4 @@ public class GemsPurchaseFragment extends BaseFragment {
         });
 
     }
-
-    public interface Listener {
-        ActivityCheckout getActivityCheckout();
-    }
 }
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
new file mode 100644
index 000000000..837b76784
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SubscriptionFragment.java
@@ -0,0 +1,219 @@
+package com.habitrpg.android.habitica.ui.fragments;
+
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.events.BoughtGemsEvent;
+import com.habitrpg.android.habitica.helpers.PurchaseTypes;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+import com.habitrpg.android.habitica.ui.SubscriptionOptionView;
+import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
+
+import org.greenrobot.eventbus.EventBus;
+import org.solovyev.android.checkout.ActivityCheckout;
+import org.solovyev.android.checkout.BillingRequests;
+import org.solovyev.android.checkout.Checkout;
+import org.solovyev.android.checkout.Inventory;
+import org.solovyev.android.checkout.ProductTypes;
+import org.solovyev.android.checkout.Purchase;
+import org.solovyev.android.checkout.Purchases;
+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.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+
+public class SubscriptionFragment extends BaseFragment implements GemPurchaseActivity.CheckoutFragment {
+
+    @Inject
+    CrashlyticsProxy crashlyticsProxy;
+
+    @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;
+
+    @Nullable
+    String selectedSubscriptionSku;
+
+    private GemPurchaseActivity listener;
+    private BillingRequests billingRequests;
+    private Inventory inventory;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        super.onCreateView(inflater, container, savedInstanceState);
+
+        return inflater.inflate(R.layout.fragment_subscription, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        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));
+    }
+
+    @Override
+    public void injectFragment(AppComponent component) {
+        component.inject(this);
+    }
+
+    @Override
+    public void setupCheckout() {
+        final ActivityCheckout checkout = listener.getActivityCheckout();
+        if (checkout != null) {
+            inventory = checkout.makeInventory();
+
+            checkout.destroyPurchaseFlow();
+
+            checkout.createPurchaseFlow(new RequestListener<Purchase>() {
+                @Override
+                public void onSuccess(@NonNull Purchase purchase) {
+                    if (PurchaseTypes.allSubscriptionTypes.contains(purchase.sku)) {
+                        billingRequests.consume(purchase.token, new RequestListener<Object>() {
+                            @Override
+                            public void onSuccess(@NonNull Object o) {
+                                if (purchase.sku.equals(PurchaseTypes.Purchase84Gems)) {
+                                    ((GemPurchaseActivity)getActivity()).showSeedsPromo(getString(R.string.seeds_interstitial_sharing), "store");
+                                }
+                            }
+
+                            @Override
+                            public void onError(int i, @NonNull Exception e) {
+                                crashlyticsProxy.fabricLogE("Purchase", "Consume", e);
+                            }
+                        });
+                    }
+                }
+
+                @Override
+                public void onError(int i, @NonNull Exception e) {
+                    crashlyticsProxy.fabricLogE("Purchase", "Error", e);
+                }
+            });
+
+
+            checkout.whenReady(new Checkout.Listener() {
+                @Override
+                public void onReady(@NonNull final BillingRequests billingRequests) {
+                    SubscriptionFragment.this.billingRequests = billingRequests;
+
+                    checkIfPendingPurchases();
+                }
+
+                @Override
+                public void onReady(@NonNull BillingRequests billingRequests, @NonNull String s, boolean b) {
+                    inventory.load(Inventory.Request.create()
+                                    .loadAllPurchases().loadSkus(ProductTypes.SUBSCRIPTION, PurchaseTypes.allSubscriptionTypes),
+                            products -> {
+                                Inventory.Product subscriptions = products.get(ProductTypes.SUBSCRIPTION);
+
+                                java.util.List<Sku> skus = subscriptions.getSkus();
+
+                                for (Sku sku : skus) {
+                                    updateButtonLabel(sku, sku.price, subscriptions);
+                                }
+                                selectSubscription(PurchaseTypes.Subscription1Month);
+                            });
+                }
+            });
+        }
+    }
+
+    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) {
+        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;
+    }
+
+    private void checkIfPendingPurchases() {
+        billingRequests.getAllPurchases(ProductTypes.SUBSCRIPTION, new RequestListener<Purchases>() {
+            @Override
+            public void onSuccess(@NonNull Purchases purchases) {
+                for (Purchase purchase : purchases.list) {
+                    if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
+                        billingRequests.consume(purchase.token, new RequestListener<Object>() {
+                            @Override
+                            public void onSuccess(@NonNull Object o) {
+                            }
+
+                            @Override
+                            public void onError(int i, @NonNull Exception e) {
+                                crashlyticsProxy.fabricLogE("Purchase", "Consume", e);
+                            }
+                        });
+                    }
+                }
+            }
+
+            @Override
+            public void onError(int i, @NonNull Exception e) {
+                crashlyticsProxy.fabricLogE("Purchase", "getAllPurchases", e);
+            }
+        });
+    }
+
+}
diff --git a/seeds-sdk/build.gradle b/seeds-sdk/build.gradle
index 18c931c5c..6fe87be4a 100755
--- a/seeds-sdk/build.gradle
+++ b/seeds-sdk/build.gradle
@@ -46,11 +46,11 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'org.glassfish:javax.json:1.0.4'
-    compile 'com.google.android.gms:play-services:9.2.0'
+    compile 'com.google.android.gms:play-services:10.0.1'
     compile 'com.google.code.gson:gson:2.4'
     compile 'com.android.support:multidex:1.0.1'
     compile 'com.loopj.android:android-async-http:1.4.9'
-    compile 'org.solovyev.android:checkout:0.7.5@aar'
+    compile 'org.solovyev.android:checkout:0.9.1@aar'
     androidTestCompile 'org.mockito:mockito-core:1.9.5'
     androidTestCompile 'com.google.dexmaker:dexmaker:1.0'
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0'

From 00214047519d1fb6076780e5436421a6cd1f4ad5 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 12 Jan 2017 11:42:36 +0100
Subject: [PATCH 04/32] display subscription status

---
 Habitica/build.gradle                         |   2 +
 Habitica/res/drawable-hdpi/ic_heart_large.png | Bin 0 -> 2559 bytes
 Habitica/res/drawable-mdpi/ic_heart_large.png | Bin 0 -> 1653 bytes
 .../res/drawable-xhdpi/ic_heart_large.png     | Bin 0 -> 3455 bytes
 .../res/drawable-xxhdpi/ic_heart_large.png    | Bin 0 -> 5283 bytes
 Habitica/res/drawable/pill_bg.xml             |   6 +
 Habitica/res/drawable/pill_bg_green.xml       |   6 +
 Habitica/res/drawable/pill_bg_purple.xml      |   6 +
 Habitica/res/drawable/pill_bg_red.xml         |   6 +
 .../res/drawable/subscription_selected.xml    |   4 +-
 Habitica/res/layout/fragment_gem_purchase.xml |   2 +-
 Habitica/res/layout/fragment_subscription.xml | 190 +++++++++++-------
 .../res/layout/purchase_subscription_view.xml |  66 ++++--
 Habitica/res/layout/subscription_details.xml  | 150 ++++++++++++++
 Habitica/res/values/attrs.xml                 |   2 +
 Habitica/res/values/colors.xml                |   3 +-
 Habitica/res/values/dimens.xml                |   5 +
 Habitica/res/values/strings.xml               |  27 ++-
 Habitica/res/values/styles.xml                |  67 +++++-
 .../habitica/HabiticaPurchaseVerifier.java    |  58 +++---
 .../habitica/ui/SubscriptionDetailsView.java  |  95 +++++++++
 .../habitica/ui/SubscriptionOptionView.java   |  34 ++++
 .../ui/fragments/SubscriptionFragment.java    |  70 ++++++-
 .../habitrpgwrapper/lib/models/Purchases.java |  17 ++
 .../lib/models/SubscriptionPlan.java          |  29 +++
 .../models/SubscriptionPlanConsecutive.java   |  41 ++++
 .../lib/utils/PurchasedDeserializer.java      |   2 +
 27 files changed, 763 insertions(+), 125 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/ic_heart_large.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_heart_large.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_heart_large.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_heart_large.png
 create mode 100644 Habitica/res/drawable/pill_bg.xml
 create mode 100644 Habitica/res/drawable/pill_bg_green.xml
 create mode 100644 Habitica/res/drawable/pill_bg_purple.xml
 create mode 100644 Habitica/res/drawable/pill_bg_red.xml
 create mode 100644 Habitica/res/layout/subscription_details.xml
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
 create mode 100644 Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
 create mode 100644 Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 2fb81d47f..74cf219ce 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -135,6 +135,8 @@ dependencies {
 
     compile 'com.google.android.gms:play-services-auth:10.0.1'
 
+    compile 'org.apmem.tools:layouts:1.10@aar'
+
     compile(project(':seeds-sdk')) {
         exclude group: 'com.google.android.gms'
         exclude group: 'com.android.support', module: 'multidex'
diff --git a/Habitica/res/drawable-hdpi/ic_heart_large.png b/Habitica/res/drawable-hdpi/ic_heart_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..87c9fa238afd5ad7a29ab3f772bf11e1d6e724f5
GIT binary patch
literal 2559
zcmV<b2>|wqP)<h;3K|Lk000e1NJLTq001@s001@!1^@s6j74hQ00001b5ch_0Itp)
z=>Px;xk*GpRA>e5S$m9B)fxZYJMZ0{nO#<3dC8iBh)~czL^Ls^X_M+7U=6gIZAjBL
z{9&53Nli?ew1PHGOl;C7jen4~e>5evfm)%BeI!+biU`C~K`Mf>yxC=u-Pw8H$La68
zyLaZ!%)K+S+u^_clG$_aIp6sn=X~dToCW4!ZU^ReU~UKIcA&ZgTD9ALukh&BO`2{0
z0-E+tEUNF)_U^sb{_574YTLGfQrUh6N^MlS{)5CT``&21sup8LimA<yFD}A(0Z>o4
zWHe|wrQzpsm3~1x@Y_jud^WAx{Ox2>n|Ml7_@RR8uF}x{5J%)G?Z8V{s$<Q2Z7HU9
z?hKcXzyEzGJfjqnz9cn_Qpsmy3;TC#yLTJDI01ud$Bsy8<i-vv^Aqw|;D@GZn1qI1
zv3u72Qro%H^uzIvwNz}%?9{Kwbd7gmP@l@3<?lza1N-&{;dsYOo40Nw?Vs_t!aE++
zC+!cEu6?hSc?K%xXLc^LB5Y(#g@G@A9`=7f1d2s>s@iHe0!@E9NC4R|DEoPy(0$cK
z)4fOp`oI9jFJDGN*@&nH3=T9m&p^eBTOP~Qo1IB1GKPU{sZ6T?`tMnfzK!?8I{5+2
z6DI+)(Lyv$dsWlJPsjfJM<M{FuYF^!vd!m}Qjf@Y4d^;TOBN%%WC=3ohLO8^g&cuc
zNJker>U9c=dB*p@oT{NQ{Sl~GVe?~EGNh2D&=Wivo7z@@<AXy_ATn<rRG|Rt`1>$V
zp9XBZf+8I%XOq$Iq|epcsgy4L3Xo1{U?IXwmqO!dnfW}fzxQwAR(Vk^BtjZuR8aHC
zkT~$NuMXh~@g|)~Dm6~Q8-NVP-h2y-wrqx$NFcm%1N1ekVIF%A_V928T@;~+->M9F
zI(mOU!pm=m9*<W>Cq6k>qm)c2nt$Hno`pg@z1Gl{ViYWpQuh1>6o=0vKDgY$(Nifz
zzqASV_3JQ>9fP_$;=5K$ClOgb2)(DLX1?_4rznlztQqruFch=}wI<Qll18Lao|>|_
zogUEV&qwUxhY|hCm!b9cR%Ya6BdhO1Y|YvRrDOxgdAB+NZJn4OqwsCFAxaY}&}o!z
z-b9uTB)NWF1FF7kDWXf4z&`siPwyH+3+6kHrvZ@z`Kwo974kqdO2zMnap5BD8#nw=
zTaL|IF@!^ilX-0AN)%3>#OTqZ=)Ut#=!xoGak<lZAhdD?P<N{CytEeYapuxxMDJeh
z{Ip0E=9RV+4KFFDKYPWdNommtx;}R=;xw-e<4*62&onS;XP`hc?0V#@+?Yf==q+*n
zZ^c{=B9PtH1#7_qgv6XCv+h*$mR`|XJODL5L5JQs=$K+6l3f1$$Ow{mt(wY4=oyjs
z2@`^xP6LCt13gKUMn`3&qtH>sM6&Y41k9V`2=~zwE?WlVa=`U5rW~ay!MhoSmNPW;
z^*P_B1a`laYzlkUe><+2NRqp70jb`!WE?;@s}K2QSkXvE!Z6^1oN#G;-2Lom+ex#o
z2xjsG$~4IuNU_@SC?#`7b`myo&szbrR?OmMSLJe`OgXylW<uMxg%Zs+2!yshkqMe^
zIX-K}6i+34=$$|Yl8F@Q{)3<_CTIueN5yxKKzKBOn0Fh{mSQR9bBoulL+_$Rh%hT~
zK{A8VnKSNZLt7Xbh2`TFZJvgarBexj^4YU6FI}q4iu$~cFc`$c(rE*Nori`!OsR()
z8r-=kV^jBM*FvtoT=?v@5#(-+A$Q~$!V4E7#N^ix^5@SZ$>8mUVv{7-&SX$x$wJ=r
zHHyj@FsCz?e#Xg&mypO90D+3ddlFBUvV{k^L4&f^VxFh>_8~+!9%E7~zkaN8YNy=r
z1!!Nm7pB2dv~EYs6x3iY8JTwP25T*=IPLoDgi`dH**D)tF_))OwKZKrG8`77F0d*)
z7wd^X>3-L@Rm{2>ZO@)e2>K9Rb|q~$Xd;Tjdm+qSOf#`fnHKt3y7VwPj&V%$2$5rH
zBMSSucNw#&gqYdH;dhb0cCA6FkRC!Gb4M3MrjVw6Q)G0<>f2ELfcN{k)2A-}c-3kt
zfi^kg6hP4=r6g&%!c3twnq!zJ8BHb;XB*}&>qNA8r*w8~o`h7#QW=YxiHXU{h;qi|
zE65)?>Sgcr<wo^0U5k1)il^~x^uV8f-+=5H2s|+tCmIX=l#%w3`)xC;u(+$faONy;
z_*7hy;2dST)V*+kCpiek48*idP8<B0O!R38(`IXnhkd)kqK0%j9!J8Xl*r=9RD;#{
z(NZzK@>+a|7@|#Aj@@K2X#03ON2!l$y`)txIr*c(%%h7XPKu5sLR0lZ?yW<<u00$I
zBgLlx7aSQx7Lln1v{X#iCti7Jm_(}=RZNF&UM_nBNPIeViUnf<g|RW-nGslSo=D^{
z%{4{un!Mu<=hbQQU$4RNsk`LF`{R7N@x(2WL1by*=`+xlVzQ18pnG_+D(=-WEyl5W
zu%%$6yT1PG-=KKzT>W(AJKEEY-g$lKTe1`(Pi%A%dTD}Dk5a<hk-<f1(YCFa(2)>8
zUc)X;i#u&ir$vsdW~MQ6^cb>iZ90j<>u;cR;)LTY+%--+#&ZASCFdC}egAz}zI{9T
zSUKy{W|yD`?D3i)c?$0u8ZAB=oLdWg7+bbJU_l+ECz~>U*=?356U^wXl1~amf+2d*
z_=6jf-mn3<aux7<$|IghGrsZK>*$uUXZo}p*ADHW$o_r)-X%cb8J(EW5C(j(e6B)|
zuH5?g6X;E{bc+RN{%?N=_)Hh1l+e=|4$>u~qLhpYubC?4(2_qhh58T>qOr-pV7eXi
z@izj+XYruN9L0NS9zKlnKmJL@`K;hVo37nO_qH=WF<C6`HXhZ#?u~CU9%D33YdXT-
zxFZuyz^3Oc@Ba(TQy<o1Q7Pfkj%%-7IQ2Cv#bhZNUMAy*m{RPLd*Bl1^E#4LF3vQF
zSnhB`E7^v5{68rF^;IZOUFOgtO`$D38Wy%W5X`wv0)jT>Q0zUFb<n#^a*!PV4dnhK
zWAS&t<4oHO*2ckuP@{b8@ql<-$xml<r#xhw?yOJDOGpHX^(5AN<DAS(i6N#L)2l^<
zb^0TeU)kTFloO{&qZ3LA?~a_95ORV4p&Vk8`yzie1)9O*i1E4Gt_$jtCP_vyli=&}
zYSwmKF=1AC^l@gr1`Ad7Kr`l!^I`7SZkp7TR^4PrOtFrplUw>Z78lR!AZ~?H!snKp
zn5%%a^^T>J4#LZ)zJJRV6NYMNC{@fBUX;F*Z#JoX1!oTCc3^G?=5}Ci2Rgk2{{#E7
V@@_4XPD}s*002ovPDHLkV1jDh{ZIe^

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_heart_large.png b/Habitica/res/drawable-mdpi/ic_heart_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d89903304ce7cf946f20ffe37cc7830279ec997
GIT binary patch
literal 1653
zcmV-*28#KKP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00001b5ch_0Itp)
z=>Px*FG)l}R9Fe^SJ`h=RT%%Bd*{wR)6$lTSZFayB$hS7g$I=fgBWFLAQEeoL>>&r
z_-YVMBS?HTMxJ;;V-pReDuzEmR6xpBZ499(P)aLH_gU|D{Jt}DhdbRV55DwE=APwS
z&hLKbTkZgJH0OZ_^MII6-E4Yot>f5VK%y%gkb6a2+x6*m{CwHeRG+iOeh56S>w))z
zZQr%~`D5pk0+L(btj;^>17v8Ilu~0w63#;tUxp0rQ*q?Tz*uAcwcNhFDsQ<T!j<nz
zAf)t#aOuSkh4k1S@%`8RetB;`4v=hV(efAnWDo~PxtaxSO+!G}0n1W)LSRTh`z$yw
z{<%1OIOiGTQSRIsHV0GhOSm6MiAu#IU01r$T!O|V&@Y786I!+WkZ5Uf3!8=KI6&D=
zO=pO;mf0>@OgRpQ^Lf;5coD|H5bR5rh*7j5&;w{6hgUa##qzleoo^BI6MB(4UW1V9
z3l_kQMbUq`3t>%1gqXfV+at%?o>H>KhmTj-AwcRia-=wr$-*ff9;&LsqStporqZy_
zpNIR;)sh`Lx04ryztP*&YN`=fyck+Ij9cf<!O3P7OC#YJ0W(OLi2#*h2&ml&9%<7m
zfnj!jU;ydPzYt&1h~Nv)!)<&LR{J@~zP>UbqM`yuJpqZwmDO}_UkMCvu-9|+GZc6H
zV^Tn6q8vZ;X17nCLUie4>aDe!8iY1(fZKBu*4eXkUwH)T>!HspgbnMvwvEy5>p*~x
zVUN)DPe&?yrW4W=aa3;If<VJ!47JnYKGNzQL2&aX1Xr#o1H&St-8Y~&)FbxlD<zNl
zR41Iy%tNHAMZ$<Z^EB+yQCJjL24$W{lrhSK-kL`{76aC-LO7A|Z%;d)F(A*9P6y;P
zq2dI0?f?|{WkfLq@`{<sK+Ba?gfg+o7WWN^4Vgp3upgqBS+od9XP|(wM+gWiD`8Vc
zIkN!6wr2&171Q0_NLDmLP>n&1fE2SzQn|<t4YA0q=w2X9q3%%aaVU2D#9lCO-}Y~*
zxiy-CELL=n>83{ErqkYX%5hRa@rp_$s%xO>Btq$%`sLR`>iW#3dwL*==aEano*y3e
zmTHvLGP1v&QZ~3obM_0`n~cT-5@==NP%ewwCzj&T_3N>4#d5?02J)S%AeU@O+d+=%
zkVob)U6t2XikoIfC!D(jFv)8f@~TZ^OcakTp5^KDI1W%a9@$M<e2rhly4<B?W7Lmo
z3Dm;*wMbAah*TsIFbcIcOV`G2!L>~Abup0>3KjY0O$<`o$k5AKmaTeNRVbuJK7-Fv
z3cg2KAMy6B&D+*FkSD0)>-xhBU@TeUv4CI@SiO?c!GL2Dh!n*PRbok?ECxm|!dEA$
zArJp_94@85N7d0NqEx@AZaF%{bH<NHPkKCW9Oofsu%M7~AJ3h>f8h)c^0Yt%0$qQr
zxlZ5=N_R<z1{c*q(AzT@rqs#PWniKt%V3z;_C#QqHz6Qq1VcJ~<q7o$)|D%iIroAW
z)M)LC9mw?cB6I7O@>C$1L~?l}64c>yXWC)ixWQ%=>D1jTgT;1AHkECUIcA*j$~>9u
zmK_bkwK}M_BsFT9#<FE9t5VdX(!ISvG=lKDXAzh`ABi=q0lG3!cL#ZKm>TZDg$`JB
zb+yqLeG3VS9Wf#`V`b!rZ?Ac0j2)*0#KQSa+nQat-|$>ghac>xFHgtkEsD+{1$@oM
zjlkWzELI{Xo5#rU<A{ums67qZ8=+%IRTh_o#!M!?GEYt!D5j^N0~3@(WY}Y?+GKY8
zF%FERmg1Z^Q36BmX`K!X8=X<>2nY3dawdJtNHiOi(@9+*BXyYW#NRj0)oZX$Q8A=%
zBt-;<Z4?$$Kc~GizdBzZ#nVBKDc;Z1b)`A0sPZn{^)@8Mj(z%fI9Cc;$T35|-81ow
zcg}qQVkHiAO1V}loa=baKH@G_^YTkDfBuCQ#h%3(Dvai-0+{v3(tQJB1N5Iu&sp*#
zswaE7c>0ZU(UU^#4;x}1{db%APW=jF=CcCi*(g+Wx0Q->1MhJ=(4jR?R`fi*sm2Ea
z#D-;ab26989^|>|gRQNF9OsQWn)AT_;DP@DHmZg;{?hwg00000NkvXXu0mjf^??`G

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_heart_large.png b/Habitica/res/drawable-xhdpi/ic_heart_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..369457895cb8e7c51308e1ab54fa2d6956a93fb0
GIT binary patch
literal 3455
zcmV-_4S@2AP)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px?IY~r8RCodHT5D_^)fGN>W@mQS_WG4L2_bfD^9ZkCs02u9d5HEGib%pkAOaFn
zD^;SZkSetxB&rlD1g%u5s)X8qNHnM@ggly3(N<~+5JFNVgwUjEi0vd0(!{ajwRd-R
z=hg3wGxqH4%<Sy4Hb~tg*)ww==briY-1E9a)TAZ?O$3?<G!bYb&_tk#!2c%#qEWA{
zZFpcUS@uid_g1ns`GR=uwTVXYj>E@(<dLpouJ{bb-b0djDz)v6U2*1B8}p?B((b>1
zkaYUBP4-%MF(K$8+2Vy{cjh<Zl~**keLk-C<Bz9`<5NE*VLxNr)akAvNbDkoo=k1s
zI_$R9bFCX77OXU$eaa^BG{8v(E-vV_EQx28q1CU7O`EL1F?BZDn>I=Mp~H`vmi;{0
z)EmSGAZdc^7uD|em+JkY>H^5wPNvOTGZ-Y8zfA~n7;R6dc5Hpi-&fDGw(kCWFz-d%
zwpYiQ51@ug7Eji*?P>xjXgkFb&>aJy{vpYUpQvxXzTa)D<yyM$p<67|_yvHutCo50
z*m|~IEP&!{C*D5=MWMEicCyDVxH45-u^>!^*dnCFGpX&bpQsoR(4eh<=nC61Uch#F
z&?X9%S+up1RxFXK>!E{c-FBgixpKzYP6f-Ni$#qL)1npkt|b)^==%>4O;5RODz4Bb
z9k%0l$)xn0*s|q(#Q-$e4?fsaELuOs+kPKfqXdm{+L9?!R`!xENi=@s2%MOpv@B6F
z!s^A{c2xl?+<PB>v|!TFb5SpnR?=q&B)ht(_mPM3I}5Uo9V7j~AtHbmMi@3Fg!D@_
zlm3->_0=4Yvmbk`wKP@uk!@Q)2G*Idxs*^S(YJ!+Wy>7BJb&OI8HN1p@Ps5&D;AK!
zB#hEK-;Bf{vXhwx0mMJdlwnY|SabyQFTU)~J18@Bqtk4cN@RZWFEa2)m=jLoEVOD9
z_d{E7wei*=B+DdUb{Qp>FDH?Zok6)XXJ~SGxMBjfGo_(fY4ilWY&C!q6&$NH@V*!;
z6rAl8HuT)yz0`X3)g+};Bvh3W-?*9NYgUnQ@FOz+b371K1_Z$THjJm+E-zh5iQW|s
zU$@QVAM4~P_p$5>yG5F1QVE)r0Z?+dGL_A9A0+oC?$xmDNN|{s1w%RU;fG}`MN11Q
z-&{lLhV>+^>?`Yw^B{G1k$Uq@q+Bsr1`f}i9z9968Ks?&3ERvFQlTn~*Q`NR_|0}t
z9R7sbSFa{zQTJ>c-$<Puq<;Huvd*0+ecyhv&z&pl_dkeChLnMRlG@t*UCy(S&r$B|
z7lD0^XslU-;x3BqLSyf~7dl*8(nHC$_mKLXyGe9(RE!g;G%47Y$<;T6g2R(0PmEN|
zZDd13HArf2hw~C-PEI;9PM<nO+VBXa1_wfAmiqcg?d>HCwn;yD&@tqR-ae9-E(tWM
zUPju5aVkz;oNeOuVav$MhKCokgJa$_6rcoLeA}J3Q}OtxR5<i8S@}Gjd+&W(0h=Si
z^MnzDDzAc3hkYRcC16aek&W0ZJ38tN6X`Um&@{GB+WULHz5ux|mAvXoQlT})e;=a)
zY|-?`hp8O~wi<~9ey<qdFrWMvU%*)yl)Pz(6o4xb^UMb|RD-+%3TRB~`s*lp)m1cw
zfU#98kPN%h2r^BRwANN?L)0!5wGk{sdCVI??utTHC<XP`kPfu6F}`G<-2R%cuuUa|
z3~FT1Su@wr3Dq}y=+xReGyr3=5gq6!Y72JRksLW(K)`9is2d9e4$Cv|8svTH{K=D)
zx%L{O%a<dEL4I}~IVz&^NMca?R}vu}V$#n2H*$ERI~Nq7QZ`Ha!~`kuc7!y9`cMeW
zAwNAohJ+S*otIi$h*km^9(##&ctun5jdMHa>AIi*@jK*@Gj()!I`NY8PB6B_e*llT
zj+9IS7^EUSi_txo8*t!Ryf_#0ICB@^-+}{VLQ_g-&r%ZEcp33l;%$_HeG-+XQJ<P3
zdjV~aD_f-`ZqGbkbDy6f3st`gLckaVjs>?~%+5sT6?5jfp`ieo9QGr^twuJ-F`s=_
zZP;vo=_0^E6`>k&bZt#yt2U4t3lLr;kE&iADj=ITb92?dusJ3QZhCGyth=nec<2xS
zYOJQ!43I1*NMS=7LfVm|q@Rgbeqgs>jf(JkamavO(~;VQ6Sl88XY|9zmG{&PkZN1h
zd*cxG-F6!-LVS|KNrIoIk)T={;+!f}g5lN2!vS#Iy5Ic=@U&3#);`!<(PP`Fi(}hq
zMbtrI;FF^IHuW=!0g(8;f0F*`aZ+2-)Qz%g@0v9<@U7cv2@=#6q!K8=lMQfkdp___
z3w+L<LNzeJZaHo}ruJxi_c?3w0t|rx8&?3Zc@*#q95>-d?ZlB(B~`wge@s<?Qkm2b
za6~dvHW403KXJklhT9V@De4#)pv!N&l?G6-zwEkeDFwkwC|y(|6Xn_B*~;ixpUR?)
zYF3->tYN?_>N-F{be_)_5ObEu!Vwe`1J;cnQ)Un8A$})*H&0XGZTYOgAw>GR2iBNm
z@5ZlMR#Qj}4pL&-(vVp*!s)2d=n$@il!D!L5OMvdb7+VpB(@wZ@;E-F;3LK`;x2vs
z0!{q!Pmw@okR*31<>4OcPo_-b4rRw1d&2m;?Nv312QnjJ<0And86zWPMdVV9z6yig
z+S5Z_{r%K|94w7(nDD7PZ!zukoZByP#2f$)Z#&*TC1`L7c4zYM??i%=fJ5oHbS&f*
zo!=!6I6Nm7Ks-=Q%0GvJDMuUv>&K7JZZ#fPK@1>(WJ;hO)UtRnbs!_}L>|_HJj?Zn
zg)w&fIWkK{xOM0J(BbQxM!>)_C_1iebeZz||2bRQbsGHtptXzB$+?uq?Z-Pf@8UjJ
zxyIUJE|0?chx>)4AHr81T>PCS8JeMRVi`r8#dnvVaJa*HOX<_o#IJ6lux7xPm;iz`
zCWuO>Pt!ECCyKgIhHdked0}_5wxkTDxBp=@YOc30wg&MeW{gFi@G{_g6GqZ4)cgBp
zpHZhK1bsoo^=cUhj3%=6)W9G~NM6Ih;VqrpQ|Z#Zd{a1*_JhOyEPE~B@SK_e;t9!}
zZ*0a&oB7^LIsk}FCOOe`yjr<daHO0^ji-Rxkd195!{czxsD0HcN<a(zG>xMqJ0doc
zVDP(=0cBXo?8xqCSmn89fS6yZE&T+x_-Gk#P6<v7mo-&9a2oK*5x5_?VE|Sb8>2iT
z;Gi0hf&<2m8&^|ipx@Ch3)?RH*T0bw5E6LT>4u$41i5s`>>U^PzAk{o=FM4|q>bz@
zy$e|vE|7s7D~c?fWo5VRpveOV$iSAWM(UC!)N$n%q<r={zB?L^9NvZ$C@qznRmY_Z
z@hHn2IXR@WEUpO|6WILxu_LFSU3D!7?{|3zSa8u2Je6~V<LO|V!bdd|M~_l*e4LEY
zQ5Y{{=77-ii&xZ%u=NB$Pr(s%+;BbIR}S-$p7;!S0(NW>>=>W1c?lZuoVs&sMK<6a
z6LnwCEox*yA3kuBwUV_P!mjal3l!y5Y!8>YhOIO?GD>E^cS6#lMU=)z4Q!a1GAPVD
z1balB^akW~22zl*cXrd%snauK0m@Q7>F|NWVM$7r?!X6HWtu)SDc*ng9pa4+7!~UJ
z@reqdw3;0rp(4_TNJ8M4y7d-P5Fa@JA&DinH32!AmyZT_KeqdQN<ynL4RGmR-tPUE
z28bCI?|on+N>vqVT!0Q0tmw~DTtWD%z}EDvUx&}u;?;CGS2I8Qm<-f`{3Ma|Xgyx5
zl8?Woj^{AfpGGX)jw4|?pvD}ujQ;6~*x*<Iv9#;0KyWw=X#_YdV_jY>=;Z=kKL&D|
z*bdu}M0`>n0R?fX-o`x4BS)#UeFxd_ntsAkqb!TRz24`B0mN=p67mKX&@T+{<5v8v
z9Y`LfnA+s$!Ou2IwEEkBA${+Mf%b{lc4Vm2r3bCqFo2l3x_!$>$+q+myvJ)nizVQi
zS)0^4zQi!$1&iCZlZCV<kgz7N%`yb`*V)(*BOSCh8*U`EFZ&Z)cWe<FmA6r4^2IaD
zzxQ2th;y}(-5Ve5BNGL>AmRj+bF4<$9RC^()gUi(7T8WoH*qZDZFldJY{0SI_*>>M
zvJhAnx9toChk5fF^92seHE#eh^YoT2BOIvVqo|+x(-Q7yXt-{Yc0ig_W_I7kzWr4C
z^V>6L_dM7`4lnRz-n@pVtKqkEQZ<})Im4N<t+g3Ds=vHv=E;O@nnqyQvtb?S@4QQP
zNWq>BG3SACD}q65)zY?L0I^W^#*OXTbm3*}u8pBWA{+>fpb_6V;Y0(yRHz)6Iu;Zl
zSD0!B+#Tm$=i3mw>jYiD5`b6`&f!oY+w4ztD}-btFO-e7Rst*d)Y&kvMmkC+e&Hws
zUS^1Es3AwKSx?_rra@j|{RVuY4Y5}i|NYkjAQo!Yfa89l4Y41T=5rH)CIU?ang}!z
hXd=)=posv{{{VxhG}Dm%eF6Xg002ovPDHLkV1n#mhztM#

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_heart_large.png b/Habitica/res/drawable-xxhdpi/ic_heart_large.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee94a8f260f0afec34b158df2e5d17d3c2aefaf6
GIT binary patch
literal 5283
zcmai&_ct33!1Yn8_NYyXy(?9-)QnY%m?4DJp0!79O=7PawOV_tS)*o!qN*q{O3c{1
z_V#|C^Zxvt=ZAamIiGXyKX7C8bu}nRSxE8l@F=u2K?eV&>;LG{!~Z<V-t_l>f$wdg
zp@LU4!nTEnM`x)8QZ@>}-?MazXPfq{+5fzi^*89->W8#|-6Nouwmgq^B&S>h&rJOX
zCJEkH1*Lu<pjUbKranybkO)|B(|eb4qqzb=5iyZC_2mov(P4w4#J~)kvBd%@808p@
z0hd~=1uSUz&&0>>?fJiZdwW466m8*aCqCUput}rNgUPCCo>u}XN?Z{jf*3+t5*}Jj
zo@7nH{{nhwsUzbsHHdHCWsrCO`nWewz_f__!4toms>9U0H0Np6Td26={bjXR$j!l^
z#C<={mGaryX%d;7Kg;PsU||$Wu=-}K>;NNqx;VD?Y2y9kg%rYN=+>P3{N$jr-Z{rz
zY?$kIeX5+##En$Sw_%gxy0lkeW}!z8QEunkerEp2EUM5Ny+6l`yb)d2*`=FOv=Im#
zPfU_s-t4h(%f|06({~<o4~khArGH|V`r`nP9%h~3;xTu=%N6$>+a{$Z=i8-qvDe%^
zH|!557*TNGv0MsbVD&aA2_a~8Aink+dJxW+FVLoFWJO@fYj|P)a^BXGZhikwg@PFs
z{Z~0Zk3?{p^>1g;BB^OrbIB`cOAS!+n1d))fx_-b3V0rC%VsZM^0@yt(8NzZJO}K#
zv-rH>;t728GkgHo7A)D~2F*`Pcw6|d8+om3I-%8xwS7(3zpod#MK}sxq}aJbld4iX
zl6zy%*N`FiA~%~F$hy<QwCCLyKbnt9s;qk0PBWbh9Mak%?3VcoI%*xHzTA6?h8s_k
zR`uT!QBJ{>^5d8;Ms&=B*%->^IDT}Z)U;xq<s&&}b#KNP2Hf~<JF{DV&XC6K+>xS`
zUunpRGC_1_civJj2hl|~bv}(gX&Ub8ye`CeXBaoT&c9(fc?p>`-*~=w01R{jD<;4=
zI4g__tKTkXQMoMhaSMyoT;oW#PzHq`D$R-@S25jOfp@{<iR`>Ko4dm)$SXeikF*Gl
z3B|A#>++RUBt}mmxWztO5wH1DKkc1`N$#RXh25|6T(PmHX;@Qb+2M{;uN5gDOLnD4
zY6`sx_GXOCdbs)G)M4VgjJj`nf0{V1y8@l{ncckMwvp!*EwgD&^1F*iS&WN0@7T`>
zx@SXFNEurE4|YO*)4o8bvspxjBw8-gy@U9Ce8DX2%DbC@$L#Qn8SP^Fy@?7XGp%9^
zAI(6SmiwRW*sGH^Mh*Cc!MU^VkwUv-vyi2~e-PRIZZF1nuC&4={&=IHwa6CMt>7y*
zOq5oNBfbmZOP>>z|F%=unRq#t_#@T?OX4x&oo*Y(;3N9A3G967_2FGmY3%x9$VYV)
zs<dlP4AlBdq*^pK2Z83=0vN#UDH#~bfo0c?R70Vn_TmzU-}ZRcW=q{w%WZQNRJY>>
zqK_^suHjFCnUR9A_i2)COGnYKRyK<w;lcFedj8a<oMxyU=&SKaqDO(cafABCZNY?3
zE%H2eV6W9YQ(qfre!M<rVOq><xntOFKj<=3)3M~oO-^fuT*`o%_a$gaQg@`hm5ZG{
zMk`9RHO)H$P=!Kn@wuU?M+cUb!4wzd8+=7VBJ^V}#RCWFq@VXks|sBBVFfj(tO5xn
z^ST5G{x99>edk~JZZAm2^W`Pn#a6tZfWd{2ctr~_zok=?y%=Mp6xfx`hO@PJ51}aJ
z+4t8|vCh-9GDq1}k(r%dOW_VQ`0merH=gh)-T<_!Oae3Fu9XmTsc#oSPQ%8qp_S&&
z^)LCM6s%*ULagh7ujv^|Ra?Yy8;d0?%=dK#GYiUFK?*uY8G0WcX_se!@{Ix~_&%7{
za)C!Kq)Z88jn&nIe@Se^wFTmdgSNgm_8ps0#~i=Yy1N+A3|+$Uoc#7FQue+4HnyO<
z1zpfPx}Hv%$snsn14AXIUOcPYf)JUj!?$Oc5;{-3HkG5LMfn1c`2|82HKJdrAnwJ@
zUfC$5NxK6o+U0x{Fa5=m6HBzJlCR0<c=l2C0q$1q8O3KF0=b+m5;B@x>l`?Ypa@aE
zN12DAladdhTP=?3Aazrz%w}U$Qj2AOUg`&WwFiGik)N4*>~tf~e}VGmDR2ndk|;jM
zUWn;W0L7m$*)4P+#9J2CE0~5>bO%PdaNDJU&whvf&M$>9wHISir^So!$mkQ<xlhr^
zih8TCHRJC$r#$BxP!-Py1Y!Y-9;|6CsLd1Rool0B8Zk`0r;x>GW+9u+yuV*lia)~)
zbU(+>ym5<_{(%;%*6!@YT>iPPI387e^}+4QI`Ofv@2!Gtao<oCN_`<){mV*6U|RdV
zf^+*hOxtYoE7Wbi6q1>`C1GK5ZgoeLz8D%s`lxzc%%Ye}gr~*1q|s5ei!rKJKhQO;
zuSWNSv^BWf$4T{yVnRz>pc-A?5zPEEdReeckK5iqGs6pk<v!A{Fx=5Y{j*^dGgz;Y
z6YP9L%~@IcqQI=zMG$F*#lN&Oc@SC)QU3AgnX`i_38xeS&*&8-$ByHIiNs(h24y#v
zZ4vP-kyl75>>IDPW*<v}J2taE&%}_Zkb@u}xRl)_+{@!Z*RED!N8f++=G+J!Jk{()
z4ZnqPA)*~^zcv@{9`Ktd%91Wu92u{MH`g@;EQx*r+Sf%}1wWLfqg8oDNCp5%5eNW4
zqg7n)#NK@PVDT+GBqsX$t??;Gqt`Ft_<?lAYbjsOI|rKH)10@Fd~uIsaiao=y-<S8
zf|0Ccku~$Lmiq#hQw_Vh`kACI2DPvvACBrm6<I>}2mvRy_VGHEm0TLdH`*-WYNxZa
znIg3eM|E}KSD|jwhktYRnSOEKkH~JTyAwqf*i##<N8hV!@QdhryDr)&{x+zlm(5z(
zul?F1NHXM$mo2N}tqzwT5E!f+YLN5c_Ve9chg?k8yzYBkKR>!jW$sr6pBGmB18??~
zXLUS$FIxo6(8hnJ5!e&#D)SEUNd}JkV@uVn2ML6*T+r}O)S=gD1Mg4FJ?O}f<2F=W
z{p;q)^%<x}y^xX%=-QT<^)xhusYKW`=JA_KUQ4j1@Jy<5m0SI@)0{%!CvHY#{pG!u
zA|CbjGo#qd>TTCPYoA#{=UDWRW-GY<l>MX8BW+wcNXOt9*Oyb`snu&y8EAXo@Alla
zvs55Hi#2RtRy_8fH!stA4!ht|==&Dyn*^F}uC7t?T!`Syu)!9cmmE_@@UyS$fYRR|
zR4z9tAJQKOkC0gs%>lp_@-GbN<Hb0UJ$*NfpY3aJ(bJzS8%jx`ZT1wR7VW4P)G5@T
z$gqDypcVMMBby0YL;}On0Qm=T+v3fxD+ZURhQ(1b@ZRsKHiOxvsdQYvVx)?amQh*M
z)&u>g802%KhfJcdE*;#*D8VFTb>e$MccbqGQJ6wx+KRO+sPg;GSu%6aD|)EJ3#Hg2
z@rH)rLCkA|`jasUdj2Y%S8%64KRLg$7?6`a_6t0t;;krK_)5)|ckMh-5Q!Xoz}9ij
z{dM(0i=mjf-&(Z|9@ElAgkry+A#Wd36Lop2HyI8c@R)3OT)Fk_p)>!2B+h8Jq0pc}
zznI`kf3l%O#MRi)N=o~V;4G!2lY6cyET}m${g<o5*)N&q7e<%+Hxl(~1^9k*F&oWn
z4L%#(D_v|`Q@<21l($)#@+};qjE9xJ7967CLFt;)M5~b(G-S<2Y90ErS6s}gH5f1d
zLx0}kg6d+f@KjQy7l+@r8oA;6U>tEhxmgB#(#y9&Et_V@=%i08g!A~BoesPF33O61
zxFGyu`1ea~M!~R4p_rWHLp03=6DB5&fD-zehGB+&#W5@f7xzq4&9>xFBna>QP-ZH*
zDwQj*aG6ttUYA1X_cjpvB{=EYYam55Uf5G3@^pmvZe4eq)gyt)n!3cxY@3~_IA_1@
z{ndn%bJV0=otdn#5XYE4d!#Sf%8`6oJSeWev1zI9MFq~rXD`b^RQOFCX^{v`#QK7S
z-=pAYJ4OvNtgQ&rQ%#mTggA7T^`lMrHq@cj(Xk;h7sgUb8J@h*gTIZY^kz`D5CpB$
z<t6&OzkK}XBFj68QI(v|2a-%GQL%D(Gk8D+LLAPx_fi4ZHd+ABwf$f^gxI7nz#U6w
zm3MN%^$x9bORXHqZ+KQVFTWiRzGoDm(00)nQKK3!Y{!SpCO^xKZ2wnC0BCu#4h1d{
zC)e>la~#9V7}A#!9(sX81^vLufS6Lw{aSmZ^48*cg)_|P513=V02$2P7sK+19$OvJ
z0v4xHBeWXCTr`DDtJFTE(ZW&FARjSH^_LK-uQtrdBlh-eZg%IUOKqve9v#Wx$OIAI
zf?RvE6z32Y%9An*D#MhdZFK-idF#N&K;P^7YKT2e_9tV^Xn+I#SsNJJaoP>YdIB3I
zYL#Rju;TXZm-}&piU@b3{cI}J4C&9Sq)TzKGdOQ+nu%a<oQlY3%l}H^ALZXDOSifD
z7g3UMGb%P1-N20}F_T1xh^G=lwE3-_9o)J&gn_$F?cnJn1O*D!YGjQ`#!ktKvXP#A
z0hDxVG2%)^pJc?Q$PUMwJUE>OD~0eKH|yA36e1<-=g15g{BtyNfgc+5%ZR5A%0wV0
zB9BIIWGeVbANw7!|Hx7E2U__0>0j2^z{J_yYmSDGQz!lw4s)k=dn|~#sGfPSc*E$b
zOg!)k$r;&^;!4d=6ky*Y4@Fo91zxqo>|6?g?(*aqvF8~7VMbW|>-jL3M^y_;viicD
z;~xJan-<;#j5-nSRhfdN8Fs|W$Ox$q{?JpZK|8#a@)>V0ZUrhM4&6njb>P?l046HO
z@BwAs=o?yenc-XOSf8l%j#}ezdIp+C3BE-eySMKj>&tn5{zf)n$K2XV8w$d8$n@XP
zBiA`~GtY8bDiMe79T&GU*dgKtVfV}7aO-k0o9uIP@8aodzKT(X^hd7rL^APB>meYS
zs$pB+F)Wi>b4^g262C62EyZh#mi`iZRP05L81Ju_nUbN9Cunl8&HkA2(glc+{&CXp
z3@&JVpDi3Or!S@0F%RgK(<ILut+k+jwyBAD_b?H!qTInP^#Y(EhV%^E&Cm{*?AuJ?
zmhc0#*=gauAcI?eNIC)0`rDo<*2|4wsL<6^Xjh*&JQGTmZuIcp&dD4NCWJZtx-<J8
z_wDJym0-f%ddnkKSz7fyq6amB`#+Vpj)@<Z2YFccn?KF3q+i`rmFU$o%f$FitC|f%
zE$R9x9OS&LA}vOanpm@<9XDmNXi))VYvNq%(z<#5^2p@rt>;DoSJTBd=Q85(5$=W8
zO4)d$Z^;h3lGgHW$$g)aoHt~!LregOff?>&`i96PaFlCL8N}L%gC*Tl#uBlFjiy2+
z<vuBFn1(toaXp`LNHwj=HJ+d3^^*HYEp%MBOG_t9&bXBh<}EYCB*|j59T^Zw%*Z@R
zyd>5S1Gm}OyR!<@(GZv4FFIc5?w>l3g{Nymb{ldklTiuZ!TCRF2$N*P#!>+RPw*no
zCk!-yuB(RA4_P1k#0CiVK(FzkB7z+w<*ckV;?<h<`Wq6?tMl(e{g9ux8?cj#OP{V6
zywB-W|B02B&~;NRX5VnF8vIq7nd_LV0tkzAdJ%cnNhN)>Nc1GlC5}ILR^8mp$42e*
zIf+kN51|7n25O|aY&V*)6rh(i9Ev0$Gd|SeUNc9ZhyvbnV?%(RWW>CgTN}2#9o;$#
z)L%r5tJfTwJ71aZp=<9&A<7TMOj1%F*$T#w26HAuDYgbF*)P{7Fzag>e*!uI9juGK
z51yQjph2fZ)k$8t&bHnOXHqJby{Cc$iQr|bQEL2V(<%{|CTjo%GOr=C)*Q5~nm~nQ
zDFoW{QEz)Q4{Oa6ERe?f>Pi-ScfCm;u%Z}-4;fx-Z3x71Owyp+edmBk&kbe$ykDA-
zEstm(hfco&PWGJkPh2n~7l=w)*uOAMy|YpHsvTL9Q>E8~r!18~;Yz&~KUBA}&99!>
zHfyI`?mq(JbyC7MVmi3r+EklX%XS248xhG^wCOCxm20j9pKSdHJ;G&Scv?nelP}I8
z7ujUSnxb43bBUeB2Cqp99bC(1aZ;K=I&8>2A3MEia58pjMYm4xcJbdKCpu<IAQl%l
zy}I>Z5~u7}!U6^Ex2KEQ(fGu$S|aM>;f`Y_g4n4wPeZzX?qw^7QtlR-^20K?dVhtq
zWwJ>>|4&{Wxij&rG3xLi3O7k~%PO|R!pB(hUzLaR7iOK~jeDs@*E5Ni1&bN+Ut|QA
zvhSx!x|jaFwhHKj+4VQYJlLP@Q7xW>)k_zJ<H%|oncAj>^LI8!&Rr%%hDYeh(8JL=
zhhz$l-3Pv(dJt0-+PM1&P9f&#cLI9*WM4$qV**`>?EXQDl4L3oDjB1Df1mdiJjpe@
zx(0@W5aTmy&1TDm)*3wpe0yVLnYEu$fe*W14y@pJ0QH8UgK$hI<WO^G1ieeiS9sI!
zZk-VESI=Sb4~@&<<0(C<F>C*rhs_Qc2kMbkoI0l?0VH}ZN7gj3{;xQLy#r7Pu>8Z1
zKh0jW+3jL6a))2{joWE=LHZ==cl1-T4PR~Z%uhed!$F_EHs9&JB(FlBDZWXAm#2p#
zIl4t_f%aXkZgYV26z-KqH5(2d)~xX0o-wEpxu314hVXCWvwt(S&~e^b=GC3@@V+a0
z)J&<9vGp=r_w99V9Z;?pj33ikbK904f&8Smar!@KVj{ecU-%cSXD_=2l+9M}VIw@;
zDeC|~Q&uD5@g{=I3~Y9Mo*>2bcwFIoRr?bY&^~04(J|f8u_#m8xeXcl1}am6;D^$D
zVE$e>)ax_SmGduT1e$5-sH-Gy8i5Sa8QHlv{coN%*W#bvAE&tLBFtORBZtPmRr$Y9
hy8qvBY$m)TeA#?8^8g42{r5WJX{qUgYE-Nv{~ruPLoWaT

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable/pill_bg.xml b/Habitica/res/drawable/pill_bg.xml
new file mode 100644
index 000000000..c5f636827
--- /dev/null
+++ b/Habitica/res/drawable/pill_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/pill_gray"/>
+    <corners android:radius="20dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_green.xml b/Habitica/res/drawable/pill_bg_green.xml
new file mode 100644
index 000000000..3c8e06bf7
--- /dev/null
+++ b/Habitica/res/drawable/pill_bg_green.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/good_10"/>
+    <corners android:radius="20dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_purple.xml b/Habitica/res/drawable/pill_bg_purple.xml
new file mode 100644
index 000000000..9dea0a7a0
--- /dev/null
+++ b/Habitica/res/drawable/pill_bg_purple.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/brand_100"/>
+    <corners android:radius="20dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/pill_bg_red.xml b/Habitica/res/drawable/pill_bg_red.xml
new file mode 100644
index 000000000..ec876d10c
--- /dev/null
+++ b/Habitica/res/drawable/pill_bg_red.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/worse_10"/>
+    <corners android:radius="20dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>
\ No newline at end of file
diff --git a/Habitica/res/drawable/subscription_selected.xml b/Habitica/res/drawable/subscription_selected.xml
index da78dfc66..574a817f9 100644
--- a/Habitica/res/drawable/subscription_selected.xml
+++ b/Habitica/res/drawable/subscription_selected.xml
@@ -5,14 +5,14 @@
     <item>
         <shape android:shape="oval">
             <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-            <solid android:color="@color/brand_100" />
+            <solid android:color="@color/white" />
             <stroke android:color="@color/transparent" android:width="5dp" />
         </shape>
     </item>
     <item>
         <shape android:shape="oval">
             <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
-            <stroke android:color="@color/brand_100" android:width="1dp" />
+            <stroke android:color="@color/white" android:width="1dp" />
             <size android:height="16dp" android:width="16dp" />
         </shape>
     </item>
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index 9e9cb0c8f..1872fab2a 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -21,7 +21,7 @@
             android:layout_gravity="center_horizontal"
             android:gravity="center"
             android:textColor="@color/best_10"
-            android:drawableTop="@drawable/ic_header_heart"
+            android:drawableTop="@drawable/ic_heart_large"
             android:textSize="14sp"
             android:lineSpacingExtra="4dp" />
         <LinearLayout
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index 881cf9e92..ccbf310c4 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -1,118 +1,172 @@
 <?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">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:scrollbarSize="3dp"
+        android:scrollbarThumbVertical="@color/md_grey_500"
+        android:scrollbars="vertical"
+        android:background="@color/white">
     <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="wrap_content"
-        android:padding="20dp">
+                  xmlns:app="http://schemas.android.com/apk/res-auto"
+                  android:orientation="vertical" android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:padding="20dp">
 
         <TextView android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:paddingLeft="16dp"
-            android:paddingRight="16dp"
-            android:paddingBottom="20dp"
-            android:text="@string/subscribe.title"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:textColor="@color/best_10"
-            android:drawableTop="@drawable/ic_header_heart"
-            android:textSize="14sp"
-            android:lineSpacingExtra="4dp" />
+                  android:layout_width="wrap_content"
+                  android:paddingLeft="16dp"
+                  android:paddingRight="16dp"
+                  android:paddingBottom="20dp"
+                  android:text="@string/subscribe.title"
+                  android:layout_gravity="center_horizontal"
+                  android:gravity="center"
+                  android:textColor="@color/best_10"
+                  android:drawableTop="@drawable/ic_heart_large"
+                  android:textSize="14sp"
+                  android:lineSpacingExtra="4dp" />
+
+        <ProgressBar
+                style="?android:attr/progressBarStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/loadingIndicator"/>
+
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+                android:id="@+id/subscriptionOptions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                >
+
             <com.habitrpg.android.habitica.ui.SubscriptionOptionView
                     android:id="@+id/subscription1month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:recurringText="month" />
+                    app:recurringText="@string/month"
+                    app:gemCapText="@string/subscribe1month.gemcap"/>
             <com.habitrpg.android.habitica.ui.SubscriptionOptionView
                     android:id="@+id/subscription3month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:recurringText="3 months" />
+                    app:recurringText="@string/three_months"
+                    app:gemCapText="@string/subscribe3month.gemcap"
+                    app:hourGlassCount="1" />
             <com.habitrpg.android.habitica.ui.SubscriptionOptionView
                     android:id="@+id/subscription6month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:recurringText="6 months" />
+                    app:recurringText="@string/six_months"
+                    app:gemCapText="@string/subscribe6month.gemcap"
+                    app:hourGlassCount="2" />
             <com.habitrpg.android.habitica.ui.SubscriptionOptionView
                     android:id="@+id/subscription12month"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:recurringText="12 months" />
+                    app:recurringText="@string/twelve_months"
+                    app:gemCapText="@string/subscribe12month.gemcap"
+                    app:hourGlassCount="4" >
+
+            </com.habitrpg.android.habitica.ui.SubscriptionOptionView>
+
+            <Button
+                    android:text="@string/subscribe"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/subscribeButton"
+                    android:layout_gravity="center"
+                    style="@style/Button.Purple"/>
         </LinearLayout>
 
-        <Button
-                android:text="@string/subscribe"
+
+        <com.habitrpg.android.habitica.ui.SubscriptionDetailsView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/subscribeButton"
-                android:textColor="@color/white"
-                android:background="@drawable/rounded_purple_square"
-                android:enabled="false" />
+                android:id="@+id/subscriptionDetails"/>
 
         <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/subscribe.subtitle"
-            android:gravity="center"
-            android:textStyle="normal|bold"
-            android:textColor="@color/brand_100"
-            android:textSize="16sp"
-            android:lineSpacingExtra="4dp"
-            android:layout_marginTop="23dp"
-            android:layout_marginBottom="12dp"/>
+                android:id="@+id/subscribeBenefitsTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/subscribe_prompt"
+                android:gravity="center"
+                android:textStyle="normal|bold"
+                android:textColor="@color/brand_100"
+                android:textSize="16sp"
+                android:lineSpacingExtra="4dp"
+                android:layout_marginTop="23dp"
+                android:layout_marginBottom="12dp"/>
 
-        <TextView
-            android:text="@string/subscribe.listitem1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/GemPurchaseListItem"
-            />
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/subscriptionBox"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp">
+            <TextView
+                    android:text="@string/subscribe.listitem1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/GemPurchaseListItem"
+                    />
+        </FrameLayout>
         <TextView
                 android:text="@string/subscribe.listitem1.description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItemDescription" />
 
-        <TextView
-            android:text="@string/subscribe.listitem2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/GemPurchaseListItem"
-            />
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/subscriptionBox"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp">
+            <TextView
+                    android:text="@string/subscribe.listitem2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/GemPurchaseListItem"
+                    />
+        </FrameLayout>
         <TextView
                 android:text="@string/subscribe.listitem2.description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItemDescription" />
 
-        <TextView
-            android:text="@string/subscribe.listitem3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/GemPurchaseListItem"
-            />
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/subscriptionBox"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="8dp">
+            <TextView
+                    android:text="@string/subscribe.listitem3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/GemPurchaseListItem"
+                    />
+        </FrameLayout>
         <TextView
                 android:text="@string/subscribe.listitem3.description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/GemPurchaseListItemDescription" />
 
-        <TextView
-            android:text="@string/subscribe.listitem4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            style="@style/GemPurchaseListItem"
-            />
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/subscriptionBox"
+                android:layout_marginBottom="8dp">
+            <TextView
+                    android:text="@string/subscribe.listitem4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/GemPurchaseListItem"
+                    />
+        </FrameLayout>
         <TextView
                 android:text="@string/subscribe.listitem4.description"
                 android:layout_width="match_parent"
diff --git a/Habitica/res/layout/purchase_subscription_view.xml b/Habitica/res/layout/purchase_subscription_view.xml
index 3df53f8e3..a3556cd59 100644
--- a/Habitica/res/layout/purchase_subscription_view.xml
+++ b/Habitica/res/layout/purchase_subscription_view.xml
@@ -3,7 +3,7 @@
               xmlns:tools="http://schemas.android.com/tools"
               android:orientation="horizontal" android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:background="@color/habit_inactive_gray"
+              android:background="@color/gem_view_background"
               android:gravity="center"
         android:minHeight="80dp"
         android:layout_marginBottom="12dp">
@@ -11,7 +11,8 @@
     <FrameLayout
             android:layout_width="50dp"
             android:layout_height="match_parent"
-            android:background="@color/brand_700">
+            android:background="@color/brand_700"
+            android:id="@+id/subscriptionSelectedFrameView">
         <View
                 android:id="@+id/subscriptionSelectedView"
                 android:layout_width="16dp"
@@ -20,21 +21,52 @@
                 android:layout_gravity="center"/>
             </FrameLayout>
 
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/priceLabel"
-            android:textColor="@color/brand_100"
-            android:gravity="center"
-            android:textSize="36sp"
-            tools:text="$ 21"
-            android:layout_marginStart="8dp"/>
-
-    <TextView
+    <LinearLayout
+            android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/descriptionTextView"
-            android:textColor="@color/brand_100"
-            tools:text="recurring every month"
-            android:layout_marginStart="16dp"/>
+            android:layout_marginEnd="8dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp">
+
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/priceLabel"
+                android:textColor="@color/brand_100"
+                android:textSize="24sp"
+                tools:text="$ 21"
+                />
+
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/descriptionTextView"
+                android:textColor="@color/brand_100"
+                tools:text="recurring every month"
+                />
+        <org.apmem.tools.layouts.FlowLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                >
+            <TextView
+                    android:id="@+id/gemCapTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="@string/subscribe1month.gemcap"
+                    style="@style/Pill"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginRight="8dp"
+                    android:layout_marginEnd="8dp"/>
+            <TextView
+                    android:id="@+id/hourglassTextView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="+1 Mystic Hourglass"
+                    style="@style/Pill"
+                    android:layout_marginTop="4dp"/>
+        </org.apmem.tools.layouts.FlowLayout>
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
new file mode 100644
index 000000000..91e7ba88e
--- /dev/null
+++ b/Habitica/res/layout/subscription_details.xml
@@ -0,0 +1,150 @@
+<?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:id="@+id/subscriptionDetails"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/subscriptionBox">
+        <LinearLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical">
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/subscription"
+                    style="@style/subscriptionBoxText.Title" />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/subscriptionDurationTextView"
+                    tools:text="Recurring every 3 months"
+                    style="@style/subscriptionBoxText.Subtitle" />
+        </LinearLayout>
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/active"
+                style="@style/Pill.Selected.Green"
+                android:id="@+id/subscriptionStatusActive" />
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/inactive"
+                style="@style/Pill.Selected.Red"
+                android:id="@+id/subscriptionStatusInactive"
+                android:visibility="gone"/>
+    </LinearLayout>
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/subscriptionBox">
+        <TextView
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:text="@string/payment_method"
+                style="@style/subscriptionBoxText.Title" />
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/paymentProcessorTextView"
+                tools:text="Google" />
+    </LinearLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/subscriptionBox"
+            android:orientation="vertical">
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/current_bonuses"
+                style="@style/subscriptionBoxText.Title"
+                android:layout_marginBottom="4dp"/>
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="12dp">
+            <TextView
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:text="@string/months_subscribed"
+                    style="@style/subscriptionBoxText.Subtitle"/>
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/Pill"
+                    android:id="@+id/monthsSubscribedTextView"
+                    tools:text="32 Months" />
+        </LinearLayout>
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="12dp">
+            <TextView
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:text="@string/monthly_gem_cap"
+                    style="@style/subscriptionBoxText.Subtitle" />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/Pill"
+                    android:id="@+id/gemCapTextView"
+                    tools:text="50 Gems" />
+        </LinearLayout>
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+            <TextView
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:text="@string/current_hourclasses"
+                    style="@style/subscriptionBoxText.Subtitle" />
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/Pill"
+                    android:id="@+id/currentHourglassesTextView"
+                    tools:text="4" />
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/subscriptionBox"
+            android:orientation="vertical">
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/cancel_subscription"
+                style="@style/subscriptionBoxText.Title.Red" />
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/subscriptionBoxText.Subtitle"
+                android:text="@string/cancel_subscription.description"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"/>
+        <Button
+                android:id="@+id/visitWebsiteButton"
+                android:layout_width="wrap_content"
+                android:layout_height="32dp"
+                android:text="@string/visit_habitica_website"
+                android:layout_gravity="center"
+                style="@style/Button.Purple.Small"/>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 69ce1ea97..d70780dc2 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -16,5 +16,7 @@
         <attr name="maxHeightMultiplier" format="float" />
     <declare-styleable name="SubscriptionOptionView">
         <attr name="recurringText" format="string" />
+        <attr name="gemCapText" format="string" />
+        <attr name="hourGlassCount" format="integer" />
     </declare-styleable>
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index fde09fd31..d19d041a4 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -104,10 +104,11 @@
 
     <color name="widget_background">#c8432874</color>
 
-    <color name="gem_view_background">#10bda8ff</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">#deddde</color>
 </resources>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index a20567454..c58b177a0 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -92,4 +92,9 @@
 	<dimen name="task_icon_space">12dp</dimen>
 	<dimen name="task_icon_size">18dp</dimen>
 	<dimen name="task_info_bar_bottom_space">-8dp</dimen>
+	<dimen name="pill_horizontal_padding">12dp</dimen>
+	<dimen name="pill_vertical_padding">4dp</dimen>
+	<dimen name="button_padding">32dp</dimen>
+	<dimen name="button_padding_small">16dp</dimen>
+	<dimen name="button_padding_vertical_small">4dp</dimen>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 96c7c58ec..c32b8fe6c 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -448,8 +448,8 @@ To start, which parts of your life do you want to improve?</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.subtitle">Become a subscriber and you’ll get  these useful benefits:</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>
@@ -461,6 +461,29 @@ To start, which parts of your life do you want to improve?</string>
     <string name="subscribe.listitem2.description">Makes completed To-Dos and task history available for longer.</string>
     <string name="subscribe.listitem3.description">Complete your stable faster!</string>
     <string name="subscribe.listitem4.description">Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.</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" formatted="false">+%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.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" formatted="false">%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="byLeader" formatted="false">by %s</string>
     <string name="challenge_details">Challenge Details</string>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 9049a207e..e4a4e62de 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -188,8 +188,7 @@
         <item name="android:gravity">center_horizontal</item>
         <item name="android:textSize">12sp</item>
         <item name="android:drawableLeft">@drawable/ic_check_purple</item>
-        <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:paddingTop">12dp</item>
+        <item name="android:layout_gravity">center</item>
     </style>
 
     <style name="FragmentDialogTitle">
@@ -203,8 +202,70 @@
 
     <style name="GemPurchaseListItemDescription">
         <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:gravity">center_horizontal</item>
         <item name="android:textSize">12sp</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:padding">12dp</item>
+        <item name="android:layout_marginTop">16dp</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="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>
+
+
 </resources>
\ No newline at end of file
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 736013265..1809e6e18 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
@@ -56,40 +56,44 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
                 validationRequest.transaction.receipt = purchase.data;
                 validationRequest.transaction.signature = purchase.signature;
 
-                apiHelper.apiService.validatePurchase(validationRequest).subscribe(purchaseValidationResult -> {
-                    purchasedOrderList.add(purchase.orderId);
+                if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
+                    apiHelper.apiService.validatePurchase(validationRequest).subscribe(purchaseValidationResult -> {
+                        purchasedOrderList.add(purchase.orderId);
 
-                    verifiedPurchases.add(purchase);
+                        verifiedPurchases.add(purchase);
 
-                    requestListener.onSuccess(verifiedPurchases);
+                        requestListener.onSuccess(verifiedPurchases);
 
-                    //TODO: find way to get $ price automatically.
-                    if (purchase.sku.equals(PurchaseTypes.Purchase4Gems)) {
-                        Seeds.sharedInstance().recordIAPEvent(purchase.sku, 0.99);
-                    } else if (purchase.sku.equals(PurchaseTypes.Purchase21Gems)) {
-                        Seeds.sharedInstance().recordIAPEvent(purchase.sku, 4.99);
-                    } else if (purchase.sku.equals(PurchaseTypes.Purchase42Gems)) {
-                        Seeds.sharedInstance().recordIAPEvent(purchase.sku, 9.99);
-                    } else if (purchase.sku.equals(PurchaseTypes.Purchase84Gems)) {
-                        Seeds.sharedInstance().recordSeedsIAPEvent(purchase.sku, 19.99);
-                    }
-                }, throwable -> {
-                    if (throwable.getClass().equals(HttpException.class)) {
-                        HttpException error = (HttpException)throwable;
-                        APIHelper.ErrorResponse res = apiHelper.getErrorResponse((HttpException) throwable);
-                        if (error.code() == 401) {
-                            if (res.message.equals("RECEIPT_ALREADY_USED")) {
-                                purchasedOrderList.add(purchase.orderId);
+                        //TODO: find way to get $ price automatically.
+                        if (purchase.sku.equals(PurchaseTypes.Purchase4Gems)) {
+                            Seeds.sharedInstance().recordIAPEvent(purchase.sku, 0.99);
+                        } else if (purchase.sku.equals(PurchaseTypes.Purchase21Gems)) {
+                            Seeds.sharedInstance().recordIAPEvent(purchase.sku, 4.99);
+                        } else if (purchase.sku.equals(PurchaseTypes.Purchase42Gems)) {
+                            Seeds.sharedInstance().recordIAPEvent(purchase.sku, 9.99);
+                        } else if (purchase.sku.equals(PurchaseTypes.Purchase84Gems)) {
+                            Seeds.sharedInstance().recordSeedsIAPEvent(purchase.sku, 19.99);
+                        }
+                    }, throwable -> {
+                        if (throwable.getClass().equals(HttpException.class)) {
+                            HttpException error = (HttpException) throwable;
+                            APIHelper.ErrorResponse res = apiHelper.getErrorResponse((HttpException) throwable);
+                            if (error.code() == 401) {
+                                if (res.message.equals("RECEIPT_ALREADY_USED")) {
+                                    purchasedOrderList.add(purchase.orderId);
 
-                                verifiedPurchases.add(purchase);
+                                    verifiedPurchases.add(purchase);
 
-                                requestListener.onSuccess(verifiedPurchases);
-                                return;
+                                    requestListener.onSuccess(verifiedPurchases);
+                                    return;
+                                }
                             }
                         }
-                    }
-                    requestListener.onError(purchases.indexOf(purchase), new Exception());
-                });
+                        requestListener.onError(purchases.indexOf(purchase), new Exception());
+                    });
+                } else if (PurchaseTypes.allSubscriptionTypes.contains(purchase.sku)) {
+
+                }
             }
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
new file mode 100644
index 000000000..77d592d8e
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
@@ -0,0 +1,95 @@
+package com.habitrpg.android.habitica.ui;
+
+
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.R;
+import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
+
+import org.w3c.dom.Text;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.view.View;
+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;
+
+    public SubscriptionDetailsView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        inflate(context, R.layout.subscription_details, this);
+
+        ButterKnife.bind(this);
+
+    }
+
+    public void setPlan(SubscriptionPlan 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.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()));
+    }
+
+    @OnClick(R.id.visitWebsiteButton)
+    public void openSubscriptionWebsite() {
+        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.BASE_URL+"/"));
+        getContext().startActivity(browserIntent);
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
index 5a6f29207..cf9d92e47 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
@@ -28,6 +28,15 @@ public class SubscriptionOptionView extends FrameLayout {
     @BindView(R.id.subscriptionSelectedView)
     View subscriptionSelectedView;
 
+    @BindView(R.id.subscriptionSelectedFrameView)
+    View subscriptionSelectedFrameView;
+
+    @BindView(R.id.gemCapTextView)
+    TextView gemCapTextView;
+
+    @BindView(R.id.hourglassTextView)
+    TextView hourGlassTextView;
+
     private String sku;
 
     public SubscriptionOptionView(Context context, AttributeSet attrs) {
@@ -44,6 +53,15 @@ public class SubscriptionOptionView extends FrameLayout {
 
         descriptionTextView.setText(context.getString(R.string.subscription_duration, a.getText(R.styleable.SubscriptionOptionView_recurringText)));
 
+        gemCapTextView.setText(a.getText(R.styleable.SubscriptionOptionView_gemCapText));
+        Integer hourGlassCount = a.getInteger(R.styleable.SubscriptionOptionView_hourGlassCount, 0);
+        if (hourGlassCount != 0) {
+            hourGlassTextView.setText(context.getString(R.string.subscription_hourglasses, hourGlassCount));
+            hourGlassTextView.setVisibility(View.VISIBLE);
+        } else {
+            hourGlassTextView.setVisibility(View.GONE);
+        }
+
     }
 
     public void setOnPurchaseClickListener(Button.OnClickListener listener) {
@@ -63,10 +81,26 @@ public class SubscriptionOptionView extends FrameLayout {
     }
 
     public void setIsPurchased(boolean purchased) {
+        int horizontalPadding = (int) getResources().getDimension(R.dimen.pill_horizontal_padding);
+        int verticalPadding = (int) getResources().getDimension(R.dimen.pill_vertical_padding);
         if (purchased) {
             subscriptionSelectedView.setBackgroundResource(R.drawable.subscription_selected);
+            subscriptionSelectedFrameView.setBackgroundResource(R.color.brand_100);
+            gemCapTextView.setBackgroundResource(R.drawable.pill_bg_green);
+            gemCapTextView.setTextColor(getContext().getResources().getColor(R.color.white));
+            gemCapTextView.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
+            hourGlassTextView.setBackgroundResource(R.drawable.pill_bg_green);
+            hourGlassTextView.setTextColor(getContext().getResources().getColor(R.color.white));
+            hourGlassTextView.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
         } else {
             subscriptionSelectedView.setBackgroundResource(R.drawable.subscription_unselected);
+            subscriptionSelectedFrameView.setBackgroundResource(R.color.brand_700);
+            gemCapTextView.setBackgroundResource(R.drawable.pill_bg);
+            gemCapTextView.setTextColor(getContext().getResources().getColor(R.color.text_light));
+            gemCapTextView.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
+            hourGlassTextView.setBackgroundResource(R.drawable.pill_bg);
+            hourGlassTextView.setTextColor(getContext().getResources().getColor(R.color.text_light));
+            hourGlassTextView.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
         }
     }
 }
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 837b76784..8346b943b 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,12 +1,16 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
+import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.BoughtGemsEvent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+import com.habitrpg.android.habitica.ui.SubscriptionDetailsView;
 import com.habitrpg.android.habitica.ui.SubscriptionOptionView;
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
 
 import org.greenrobot.eventbus.EventBus;
 import org.solovyev.android.checkout.ActivityCheckout;
@@ -22,10 +26,15 @@ 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 android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import java.util.Date;
 
 import javax.inject.Inject;
 
@@ -36,6 +45,15 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
     @Inject
     CrashlyticsProxy crashlyticsProxy;
 
+    @Inject
+    APIHelper apiHelper;
+
+    @BindView(R.id.loadingIndicator)
+    ProgressBar loadingIndicator;
+
+    @BindView(R.id.subscriptionOptions)
+    View subscriptionOptions;
+
     @BindView(R.id.subscription1month)
     SubscriptionOptionView subscription1MonthView;
     @BindView(R.id.subscription3month)
@@ -48,6 +66,12 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
     @BindView(R.id.subscribeButton)
     Button subscriptionButton;
 
+    @BindView(R.id.subscriptionDetails)
+    SubscriptionDetailsView subscriptionDetailsView;
+
+    @BindView(R.id.subscribeBenefitsTitle)
+    TextView subscribeBenefitsTitle;
+
     @Nullable
     String selectedSubscriptionSku;
 
@@ -55,18 +79,29 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
     private BillingRequests billingRequests;
     private Inventory inventory;
 
+    private HabitRPGUser user;
+    private boolean hasLoadedSubscriptionOptions;
+    private boolean isSubscribed;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
         super.onCreateView(inflater, container, savedInstanceState);
 
+        apiHelper.apiService.getUser().compose(apiHelper.configureApiCallObserver())
+                .subscribe(this::setUser, throwable -> {});
+
         return inflater.inflate(R.layout.fragment_subscription, container, false);
     }
 
     @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));
@@ -93,9 +128,6 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
                         billingRequests.consume(purchase.token, new RequestListener<Object>() {
                             @Override
                             public void onSuccess(@NonNull Object o) {
-                                if (purchase.sku.equals(PurchaseTypes.Purchase84Gems)) {
-                                    ((GemPurchaseActivity)getActivity()).showSeedsPromo(getString(R.string.seeds_interstitial_sharing), "store");
-                                }
                             }
 
                             @Override
@@ -134,6 +166,8 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
                                     updateButtonLabel(sku, sku.price, subscriptions);
                                 }
                                 selectSubscription(PurchaseTypes.Subscription1Month);
+                                hasLoadedSubscriptionOptions = true;
+                                updateSubscriptionInfo();
                             });
                 }
             });
@@ -194,7 +228,7 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
             @Override
             public void onSuccess(@NonNull Purchases purchases) {
                 for (Purchase purchase : purchases.list) {
-                    if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
+                    if (PurchaseTypes.allSubscriptionTypes.contains(purchase.sku)) {
                         billingRequests.consume(purchase.token, new RequestListener<Object>() {
                             @Override
                             public void onSuccess(@NonNull Object o) {
@@ -216,4 +250,32 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
         });
     }
 
+    public void setUser(HabitRPGUser newUser) {
+        user = newUser;
+        this.updateSubscriptionInfo();
+    }
+
+    private void updateSubscriptionInfo() {
+        if (user != null) {
+            SubscriptionPlan plan = user.getPurchased().getPlan();
+            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);
+            } else {
+                if (!hasLoadedSubscriptionOptions) {
+                    return;
+                }
+                this.subscriptionOptions.setVisibility(View.VISIBLE);
+            }
+            this.loadingIndicator.setVisibility(View.GONE);
+        }
+    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
index 2d7768876..5f16c9043 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
@@ -8,4 +8,21 @@ import java.util.List;
 public class Purchases {
 
     public List<Customization> customizations;
+    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/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
new file mode 100644
index 000000000..8a625369f
--- /dev/null
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
@@ -0,0 +1,29 @@
+package com.magicmicky.habitrpgwrapper.lib.models;
+
+import java.util.Date;
+
+public class SubscriptionPlan {
+
+    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";
+
+    public String customerId;
+    public Date dateCreated;
+    public Date dateUpdated;
+    public Date dateTerminated;
+    public String paymentMethod;
+    public String planId;
+    public Integer gemsBought;
+    public Integer extraMonths;
+    public Integer quantity;
+    public SubscriptionPlanConsecutive consecutive;
+
+    public boolean isActive() {
+        Date today = new Date();
+        return this.dateCreated.before(today) && (this.dateTerminated == null || this.dateTerminated.after(today));
+    }
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
new file mode 100644
index 000000000..a3a403d74
--- /dev/null
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
@@ -0,0 +1,41 @@
+package com.magicmicky.habitrpgwrapper.lib.models;
+
+public class SubscriptionPlanConsecutive {
+
+    private int trinkets;
+    private int gemCapExtra;
+    private int offset;
+    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;
+    }
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/PurchasedDeserializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/PurchasedDeserializer.java
index 14e8a1168..ebbf6d1b5 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/PurchasedDeserializer.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/PurchasedDeserializer.java
@@ -8,6 +8,7 @@ import com.google.gson.JsonParseException;
 
 import com.magicmicky.habitrpgwrapper.lib.models.Customization;
 import com.magicmicky.habitrpgwrapper.lib.models.Purchases;
+import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
 import com.raizlabs.android.dbflow.runtime.TransactionManager;
 import com.raizlabs.android.dbflow.runtime.transaction.process.ProcessModelInfo;
 import com.raizlabs.android.dbflow.runtime.transaction.process.SaveModelTransaction;
@@ -73,6 +74,7 @@ public class PurchasedDeserializer implements JsonDeserializer<Purchases> {
         TransactionManager.getInstance().addTransaction(new SaveModelTransaction<>(ProcessModelInfo.withModels(customizations)));
 
         purchases.customizations = customizations;
+        purchases.setPlan(context.deserialize(object.get("plan"), SubscriptionPlan.class));
 
         return purchases;
     }

From 9dc0d0ee84c97d8d18dac01ee000d4bccf753963 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 13 Jan 2017 13:43:03 +0100
Subject: [PATCH 05/32] move purchaseflow to activity

---
 .../ui/activities/GemPurchaseActivity.java    |  87 +++++++++++++
 .../ui/fragments/GemsPurchaseFragment.java    |  77 ------------
 .../ui/fragments/SubscriptionFragment.java    | 118 +++++++-----------
 .../lib/models/SubscriptionPlan.java          |   2 +-
 4 files changed, 133 insertions(+), 151 deletions(-)

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 ecca75079..424e997e9 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
@@ -4,18 +4,27 @@ 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.BoughtGemsEvent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment;
 import com.habitrpg.android.habitica.ui.fragments.SubscriptionFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
 import com.playseeds.android.sdk.Seeds;
 import com.playseeds.android.sdk.inappmessaging.InAppMessageListener;
 
+import org.greenrobot.eventbus.EventBus;
 import org.solovyev.android.checkout.ActivityCheckout;
+import org.solovyev.android.checkout.BillingRequests;
 import org.solovyev.android.checkout.Checkout;
+import org.solovyev.android.checkout.ProductTypes;
+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;
@@ -26,10 +35,15 @@ import android.view.MenuItem;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import butterknife.BindView;
 
 public class GemPurchaseActivity extends BaseActivity implements InAppMessageListener {
 
+    @Inject
+    CrashlyticsProxy crashlyticsProxy;
+
     private ActivityCheckout checkout;
 
     @BindView(R.id.tab_layout)
@@ -39,6 +53,7 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
     ViewPager viewPager;
 
     List<CheckoutFragment> fragments = new ArrayList<>();
+    private BillingRequests billingRequests;
 
     @Override
     protected int getLayoutResId() {
@@ -80,6 +95,49 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
         viewPager.setCurrentItem(0);
 
         setViewPagerAdapter();
+
+        checkout.destroyPurchaseFlow();
+
+        checkout.createPurchaseFlow(new RequestListener<Purchase>() {
+            @Override
+            public void onSuccess(@NonNull Purchase purchase) {
+                if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
+                    billingRequests.consume(purchase.token, new RequestListener<Object>() {
+                        @Override
+                        public void onSuccess(@NonNull Object o) {
+                            //EventBus.getDefault().post(new BoughtGemsEvent(GEMS_TO_ADD));
+                            if (purchase.sku.equals(PurchaseTypes.Purchase84Gems)) {
+                                GemPurchaseActivity.this.showSeedsPromo(getString(R.string.seeds_interstitial_sharing), "store");
+                            }
+                        }
+
+                        @Override
+                        public void onError(int i, @NonNull Exception e) {
+                            crashlyticsProxy.fabricLogE("Purchase", "Consume", e);
+                        }
+                    });
+                }
+            }
+
+            @Override
+            public void onError(int i, @NonNull Exception e) {
+                crashlyticsProxy.fabricLogE("Purchase", "Error", e);
+            }
+        });
+
+
+        checkout.whenReady(new Checkout.Listener() {
+            @Override
+            public void onReady(@NonNull final BillingRequests billingRequests) {
+                GemPurchaseActivity.this.billingRequests = billingRequests;
+
+                checkIfPendingPurchases();
+            }
+
+            @Override
+            public void onReady(@NonNull BillingRequests billingRequests, @NonNull String s, boolean b) {
+            }
+        });
     }
 
     @Override
@@ -204,4 +262,33 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
         void setupCheckout();
         void setListener(GemPurchaseActivity listener);
     }
+
+    private void checkIfPendingPurchases() {
+        billingRequests.getAllPurchases(ProductTypes.IN_APP, new RequestListener<Purchases>() {
+            @Override
+            public void onSuccess(@NonNull Purchases purchases) {
+                for (Purchase purchase : purchases.list) {
+                    if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
+                        billingRequests.consume(purchase.token, new RequestListener<Object>() {
+                            @Override
+                            public void onSuccess(@NonNull Object o) {
+                                //EventBus.getDefault().post(new BoughtGemsEvent(GEMS_TO_ADD));
+                            }
+
+                            @Override
+                            public void onError(int i, @NonNull Exception e) {
+                                crashlyticsProxy.fabricLogE("Purchase", "Consume", e);
+                            }
+                        });
+                    }
+                }
+            }
+
+            @Override
+            public void onError(int i, @NonNull Exception e) {
+                crashlyticsProxy.fabricLogE("Purchase", "getAllPurchases", e);
+            }
+        });
+    }
+
 }
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 68e93cf1d..c71c0cf5c 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
@@ -85,55 +85,8 @@ public class GemsPurchaseFragment extends BaseFragment implements GemPurchaseAct
     public void setupCheckout() {
         final ActivityCheckout checkout = listener.getActivityCheckout();
         if (checkout != null) {
-            checkout.destroyPurchaseFlow();
-
             inventory = checkout.makeInventory();
 
-            checkout.createPurchaseFlow(new RequestListener<Purchase>() {
-                @Override
-                public void onSuccess(@NonNull Purchase purchase) {
-                    if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
-                        billingRequests.consume(purchase.token, new RequestListener<Object>() {
-                            @Override
-                            public void onSuccess(@NonNull Object o) {
-                                EventBus.getDefault().post(new BoughtGemsEvent(GEMS_TO_ADD));
-                                if (purchase.sku.equals(PurchaseTypes.Purchase84Gems)) {
-                                    ((GemPurchaseActivity)getActivity()).showSeedsPromo(getString(R.string.seeds_interstitial_sharing), "store");
-                                }
-                            }
-
-                            @Override
-                            public void onError(int i, @NonNull Exception e) {
-                                crashlyticsProxy.fabricLogE("Purchase", "Consume", e);
-                            }
-                        });
-                    }
-                }
-
-                @Override
-                public void onError(int i, @NonNull Exception e) {
-                    crashlyticsProxy.fabricLogE("Purchase", "Error", e);
-                }
-            });
-
-
-            checkout.whenReady(new Checkout.Listener() {
-                @Override
-                public void onReady(@NonNull final BillingRequests billingRequests) {
-                    GemsPurchaseFragment.this.billingRequests = billingRequests;
-
-                    // if the user leaves the fragment before the checkout callback is done
-                    if (btnPurchaseGems != null) {
-                        btnPurchaseGems.setEnabled(true);
-
-                    }
-                    checkIfPendingPurchases();
-                }
-
-                @Override
-                public void onReady(@NonNull BillingRequests billingRequests, @NonNull String s, boolean b) {
-                }
-            });
             inventory.load(Inventory.Request.create()
                             .loadAllPurchases().loadSkus(ProductTypes.IN_APP, PurchaseTypes.allGemTypes),
                     products -> {
@@ -172,34 +125,6 @@ public class GemsPurchaseFragment extends BaseFragment implements GemPurchaseAct
         matchingView.setSku(sku);
     }
 
-    private void checkIfPendingPurchases() {
-        billingRequests.getAllPurchases(ProductTypes.IN_APP, new RequestListener<Purchases>() {
-            @Override
-            public void onSuccess(@NonNull Purchases purchases) {
-                for (Purchase purchase : purchases.list) {
-                    if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
-                        billingRequests.consume(purchase.token, new RequestListener<Object>() {
-                            @Override
-                            public void onSuccess(@NonNull Object o) {
-                                EventBus.getDefault().post(new BoughtGemsEvent(GEMS_TO_ADD));
-                            }
-
-                            @Override
-                            public void onError(int i, @NonNull Exception e) {
-                                crashlyticsProxy.fabricLogE("Purchase", "Consume", e);
-                            }
-                        });
-                    }
-                }
-            }
-
-            @Override
-            public void onError(int i, @NonNull Exception e) {
-                crashlyticsProxy.fabricLogE("Purchase", "getAllPurchases", e);
-            }
-        });
-    }
-
     public void purchaseGems(String sku) {
         // check if the user already bought and if it hasn't validated yet
         billingRequests.isPurchased(ProductTypes.IN_APP, sku, new RequestListener<Boolean>() {
@@ -209,8 +134,6 @@ public class GemsPurchaseFragment extends BaseFragment implements GemPurchaseAct
                     // no current product exist
                     final ActivityCheckout checkout = listener.getActivityCheckout();
                     billingRequests.purchase(ProductTypes.IN_APP, sku, null, checkout.getPurchaseFlow());
-                } else {
-                    checkIfPendingPurchases();
                 }
             }
 
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 8346b943b..a983965ab 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
@@ -35,10 +35,12 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import java.util.Date;
+import java.util.List;
 
 import javax.inject.Inject;
 
 import butterknife.BindView;
+import butterknife.OnClick;
 
 public class SubscriptionFragment extends BaseFragment implements GemPurchaseActivity.CheckoutFragment {
 
@@ -73,7 +75,8 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
     TextView subscribeBenefitsTitle;
 
     @Nullable
-    String selectedSubscriptionSku;
+    Sku selectedSubscriptionSku;
+    List<Sku> skus;
 
     private GemPurchaseActivity listener;
     private BillingRequests billingRequests;
@@ -119,58 +122,20 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
         if (checkout != null) {
             inventory = checkout.makeInventory();
 
-            checkout.destroyPurchaseFlow();
+            inventory.load(Inventory.Request.create()
+                            .loadAllPurchases().loadSkus(ProductTypes.SUBSCRIPTION, PurchaseTypes.allSubscriptionTypes),
+                    products -> {
+                        Inventory.Product subscriptions = products.get(ProductTypes.SUBSCRIPTION);
 
-            checkout.createPurchaseFlow(new RequestListener<Purchase>() {
-                @Override
-                public void onSuccess(@NonNull Purchase purchase) {
-                    if (PurchaseTypes.allSubscriptionTypes.contains(purchase.sku)) {
-                        billingRequests.consume(purchase.token, new RequestListener<Object>() {
-                            @Override
-                            public void onSuccess(@NonNull Object o) {
-                            }
+                        skus = subscriptions.getSkus();
 
-                            @Override
-                            public void onError(int i, @NonNull Exception e) {
-                                crashlyticsProxy.fabricLogE("Purchase", "Consume", e);
-                            }
-                        });
-                    }
-                }
-
-                @Override
-                public void onError(int i, @NonNull Exception e) {
-                    crashlyticsProxy.fabricLogE("Purchase", "Error", e);
-                }
-            });
-
-
-            checkout.whenReady(new Checkout.Listener() {
-                @Override
-                public void onReady(@NonNull final BillingRequests billingRequests) {
-                    SubscriptionFragment.this.billingRequests = billingRequests;
-
-                    checkIfPendingPurchases();
-                }
-
-                @Override
-                public void onReady(@NonNull BillingRequests billingRequests, @NonNull String s, boolean b) {
-                    inventory.load(Inventory.Request.create()
-                                    .loadAllPurchases().loadSkus(ProductTypes.SUBSCRIPTION, PurchaseTypes.allSubscriptionTypes),
-                            products -> {
-                                Inventory.Product subscriptions = products.get(ProductTypes.SUBSCRIPTION);
-
-                                java.util.List<Sku> skus = subscriptions.getSkus();
-
-                                for (Sku sku : skus) {
-                                    updateButtonLabel(sku, sku.price, subscriptions);
-                                }
-                                selectSubscription(PurchaseTypes.Subscription1Month);
-                                hasLoadedSubscriptionOptions = true;
-                                updateSubscriptionInfo();
-                            });
-                }
-            });
+                        for (Sku sku : skus) {
+                            updateButtonLabel(sku, sku.price, subscriptions);
+                        }
+                        selectSubscription(PurchaseTypes.Subscription1Month);
+                        hasLoadedSubscriptionOptions = true;
+                        updateSubscriptionInfo();
+                    });
         }
     }
 
@@ -184,6 +149,15 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
     }
 
     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) {
@@ -223,31 +197,24 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
         this.listener = listener;
     }
 
-    private void checkIfPendingPurchases() {
-        billingRequests.getAllPurchases(ProductTypes.SUBSCRIPTION, new RequestListener<Purchases>() {
-            @Override
-            public void onSuccess(@NonNull Purchases purchases) {
-                for (Purchase purchase : purchases.list) {
-                    if (PurchaseTypes.allSubscriptionTypes.contains(purchase.sku)) {
-                        billingRequests.consume(purchase.token, new RequestListener<Object>() {
-                            @Override
-                            public void onSuccess(@NonNull Object o) {
-                            }
-
-                            @Override
-                            public void onError(int i, @NonNull Exception e) {
-                                crashlyticsProxy.fabricLogE("Purchase", "Consume", e);
-                            }
-                        });
+    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", "getAllPurchases", e);
-            }
-        });
+                @Override
+                public void onError(int i, @NonNull Exception e) {
+                    crashlyticsProxy.fabricLogE("Purchase", "Error", e);
+                }
+            });
+        }
     }
 
     public void setUser(HabitRPGUser newUser) {
@@ -278,4 +245,9 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
             this.loadingIndicator.setVisibility(View.GONE);
         }
     }
+
+    @OnClick(R.id.subscribeButton)
+    public void subscribeUser() {
+        purchaseSubscription();
+    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
index 8a625369f..dcbf77e2c 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
@@ -24,6 +24,6 @@ public class SubscriptionPlan {
 
     public boolean isActive() {
         Date today = new Date();
-        return this.dateCreated.before(today) && (this.dateTerminated == null || this.dateTerminated.after(today));
+        return (this.dateCreated != null && this.dateCreated.before(today)) && (this.dateTerminated == null || this.dateTerminated.after(today));
     }
 }

From 3734ad3197d441efa877ceec20e001e0a3770523 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 13 Jan 2017 19:22:18 +0100
Subject: [PATCH 06/32] fix crash when updating avatar widget

---
 .../android/habitica/widget/AvatarStatsWidgetProvider.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9aca07b77..130b14c18 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
@@ -124,7 +124,7 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
             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().toString()));
+            remoteViews.setTextViewText(R.id.lvl_tv, context.getString(R.string.user_level, user.getStats().getLvl()));
 
             AvatarView avatarView = new AvatarView(context, true, true, true);
             ;

From 83bb7c3b6cdd56f300aa8e95028a7f349fe3272d Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 19 Jan 2017 09:18:19 +0100
Subject: [PATCH 07/32] handle new subscriptions

---
 .../habitica/HabiticaPurchaseVerifier.java    | 41 +++++++++++++--
 .../habitica/events/UserSubscribedEvent.java  |  4 ++
 .../ui/fragments/SubscriptionFragment.java    | 21 ++++++--
 .../habitrpgwrapper/lib/api/ApiService.java   |  4 ++
 .../models/SubscriptionValidationRequest.java |  9 ++++
 .../android/habitica/HabiticaApplication.java | 18 +++++++
 .../habitica/ReleaseDeveloperModule.java      | 13 +++++
 .../habitica/proxy/CrashlyticsProxyImpl.java  | 50 +++++++++++++++++++
 8 files changed, 151 insertions(+), 9 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/UserSubscribedEvent.java
 create mode 100644 Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionValidationRequest.java
 create mode 100644 Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/HabiticaApplication.java
 create mode 100644 Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.java
 create mode 100644 Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/proxy/CrashlyticsProxyImpl.java

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 1809e6e18..9a7282eaa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
@@ -1,11 +1,14 @@
 package com.habitrpg.android.habitica;
 
+import com.habitrpg.android.habitica.events.UserSubscribedEvent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
 import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationRequest;
 import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationResult;
+import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionValidationRequest;
 import com.magicmicky.habitrpgwrapper.lib.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;
@@ -51,12 +54,11 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
 
                 requestListener.onSuccess(verifiedPurchases);
             } else {
-                PurchaseValidationRequest validationRequest = new PurchaseValidationRequest();
-                validationRequest.transaction = new Transaction();
-                validationRequest.transaction.receipt = purchase.data;
-                validationRequest.transaction.signature = purchase.signature;
-
                 if (PurchaseTypes.allGemTypes.contains(purchase.sku)) {
+                    PurchaseValidationRequest validationRequest = new PurchaseValidationRequest();
+                    validationRequest.transaction = new Transaction();
+                    validationRequest.transaction.receipt = purchase.data;
+                    validationRequest.transaction.signature = purchase.signature;
                     apiHelper.apiService.validatePurchase(validationRequest).subscribe(purchaseValidationResult -> {
                         purchasedOrderList.add(purchase.orderId);
 
@@ -92,7 +94,36 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
                         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;
+                    apiHelper.apiService.validateSubscription(validationRequest).subscribe(purchaseValidationResult -> {
+                        purchasedOrderList.add(purchase.orderId);
 
+                        verifiedPurchases.add(purchase);
+
+                        requestListener.onSuccess(verifiedPurchases);
+
+                        EventBus.getDefault().post(new UserSubscribedEvent());
+                    }, throwable -> {
+                        if (throwable.getClass().equals(HttpException.class)) {
+                            HttpException error = (HttpException) throwable;
+                            APIHelper.ErrorResponse res = apiHelper.getErrorResponse((HttpException) throwable);
+                            if (error.code() == 401) {
+                                if (res.message.equals("RECEIPT_ALREADY_USED")) {
+                                    purchasedOrderList.add(purchase.orderId);
+
+                                    verifiedPurchases.add(purchase);
+
+                                    requestListener.onSuccess(verifiedPurchases);
+                                    return;
+                                }
+                            }
+                        }
+                        requestListener.onError(purchases.indexOf(purchase), new Exception());
+                    });
                 }
             }
         }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/UserSubscribedEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/UserSubscribedEvent.java
new file mode 100644
index 000000000..43afed555
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/UserSubscribedEvent.java
@@ -0,0 +1,4 @@
+package com.habitrpg.android.habitica.events;
+
+public class UserSubscribedEvent {
+}
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 a983965ab..8e7833e7b 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
@@ -4,6 +4,7 @@ import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.BoughtGemsEvent;
+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.SubscriptionDetailsView;
@@ -13,6 +14,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
 
 import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 import org.solovyev.android.checkout.ActivityCheckout;
 import org.solovyev.android.checkout.BillingRequests;
 import org.solovyev.android.checkout.Checkout;
@@ -80,7 +82,6 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
 
     private GemPurchaseActivity listener;
     private BillingRequests billingRequests;
-    private Inventory inventory;
 
     private HabitRPGUser user;
     private boolean hasLoadedSubscriptionOptions;
@@ -92,12 +93,22 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
 
         super.onCreateView(inflater, container, savedInstanceState);
 
-        apiHelper.apiService.getUser().compose(apiHelper.configureApiCallObserver())
-                .subscribe(this::setUser, throwable -> {});
+        fetchUser(null);
 
         return inflater.inflate(R.layout.fragment_subscription, container, false);
     }
 
+    @Override
+    public void onDestroyView() {
+         super.onDestroyView();
+    }
+
+    @Subscribe
+    public void fetchUser(@Nullable UserSubscribedEvent event) {
+        apiHelper.apiService.getUser().compose(apiHelper.configureApiCallObserver())
+                .subscribe(this::setUser, throwable -> {});
+    }
+
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
@@ -120,7 +131,7 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
     public void setupCheckout() {
         final ActivityCheckout checkout = listener.getActivityCheckout();
         if (checkout != null) {
-            inventory = checkout.makeInventory();
+            Inventory inventory = checkout.makeInventory();
 
             inventory.load(Inventory.Request.create()
                             .loadAllPurchases().loadSkus(ProductTypes.SUBSCRIPTION, PurchaseTypes.allSubscriptionTypes),
@@ -236,11 +247,13 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
                 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);
         }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
index 5641255f8..a93703bcb 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
@@ -14,6 +14,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationResult;
 import com.magicmicky.habitrpgwrapper.lib.models.Quest;
 import com.magicmicky.habitrpgwrapper.lib.models.Shop;
 import com.magicmicky.habitrpgwrapper.lib.models.Status;
+import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionValidationRequest;
 import com.magicmicky.habitrpgwrapper.lib.models.Tag;
 import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
 import com.magicmicky.habitrpgwrapper.lib.models.UserAuth;
@@ -243,6 +244,9 @@ public interface ApiService {
     @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);
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionValidationRequest.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionValidationRequest.java
new file mode 100644
index 000000000..8f54368a6
--- /dev/null
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionValidationRequest.java
@@ -0,0 +1,9 @@
+package com.magicmicky.habitrpgwrapper.lib.models;
+
+
+public class SubscriptionValidationRequest {
+
+    public Transaction transaction;
+    public String sku;
+
+}
diff --git a/Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/HabiticaApplication.java b/Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/HabiticaApplication.java
new file mode 100644
index 000000000..0d9f5117a
--- /dev/null
+++ b/Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/HabiticaApplication.java
@@ -0,0 +1,18 @@
+package com.habitrpg.android.habitica;
+
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.components.DaggerAppComponent;
+import com.habitrpg.android.habitica.modules.AppModule;
+
+import android.content.Context;
+
+public class HabiticaApplication extends HabiticaBaseApplication {
+    @Override
+    protected AppComponent initDagger() {
+        return DaggerAppComponent.builder()
+                .appModule(new AppModule(this))
+                .developerModule(new ReleaseDeveloperModule())
+                .build();
+    }
+
+}
diff --git a/Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.java b/Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.java
new file mode 100644
index 000000000..2421ebed3
--- /dev/null
+++ b/Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/ReleaseDeveloperModule.java
@@ -0,0 +1,13 @@
+package com.habitrpg.android.habitica;
+
+
+import com.habitrpg.android.habitica.modules.DeveloperModule;
+import com.habitrpg.android.habitica.proxy.CrashlyticsProxyImpl;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+
+//change debug proxy here by override methods
+public class ReleaseDeveloperModule extends DeveloperModule {
+    @Override protected CrashlyticsProxy provideCrashlyticsProxy() {
+        return new CrashlyticsProxyImpl();
+    }
+}
diff --git a/Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/proxy/CrashlyticsProxyImpl.java b/Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/proxy/CrashlyticsProxyImpl.java
new file mode 100644
index 000000000..8302568ba
--- /dev/null
+++ b/Habitica/src/releasedebuggable/java/com/habitrpg/android/habitica/proxy/CrashlyticsProxyImpl.java
@@ -0,0 +1,50 @@
+package com.habitrpg.android.habitica.proxy;
+
+
+import com.crashlytics.android.Crashlytics;
+import com.crashlytics.android.core.CrashlyticsCore;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
+
+import android.content.Context;
+
+import io.fabric.sdk.android.Fabric;
+
+public class CrashlyticsProxyImpl implements CrashlyticsProxy {
+    @Override
+    public void init(Context context) {
+        Crashlytics crashlytics = new Crashlytics.Builder()
+                .core(new CrashlyticsCore.Builder().build())
+                .build();
+        Fabric.with(context, crashlytics);
+    }
+
+
+    @Override
+    public void logException(Throwable t) {
+        Crashlytics.logException(t);
+    }
+
+    @Override
+    public void setString(String key, String value) {
+        Crashlytics.setString(key, value);
+    }
+
+    @Override
+    public void setUserIdentifier(String identifier) {
+        if (Crashlytics.getInstance().core != null && identifier != null) {
+            Crashlytics.getInstance().core.setUserIdentifier(identifier);
+        }
+    }
+
+    @Override
+    public void setUserName(String name) {
+        if (Crashlytics.getInstance().core != null && name != null) {
+            Crashlytics.getInstance().core.setUserName(name);
+        }
+    }
+
+    @Override
+    public void fabricLogE(String s1, String s2, Exception e) {
+        Fabric.getLogger().e(s1,s2,e);
+    }
+}

From 7d4f4c47e8cd614688d3f45605d8137b05444f9c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 26 Jan 2017 18:33:27 +0100
Subject: [PATCH 08/32] show subscription details in account details

---
 Habitica/assets/migrations/Habitica/31.sql    |  1 +
 Habitica/res/layout/subscription_details.xml  |  3 +-
 Habitica/res/values/strings.xml               |  4 +-
 Habitica/res/xml/preferences_fragment.xml     |  9 ++-
 .../android/habitica/HabitDatabase.java       |  2 +-
 .../habitica/ui/SubscriptionDetailsView.java  | 45 +++++++++--
 .../preferences/AccountDetailsFragment.java   | 77 ++++++++++++++++---
 .../lib/models/HabitRPGUser.java              |  9 ++-
 .../habitrpgwrapper/lib/models/Purchases.java | 23 +++++-
 .../lib/models/SubscriptionPlan.java          | 35 ++++++++-
 .../models/SubscriptionPlanConsecutive.java   | 16 +++-
 11 files changed, 196 insertions(+), 28 deletions(-)
 create mode 100644 Habitica/assets/migrations/Habitica/31.sql

diff --git a/Habitica/assets/migrations/Habitica/31.sql b/Habitica/assets/migrations/Habitica/31.sql
new file mode 100644
index 000000000..0537f19de
--- /dev/null
+++ b/Habitica/assets/migrations/Habitica/31.sql
@@ -0,0 +1 @@
+ALTER TABLE HabitRPGUser ADD COLUMN purchased_id varchar(255);
\ No newline at end of file
diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index 91e7ba88e..3cc1713cf 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -132,10 +132,11 @@
                 android:text="@string/cancel_subscription"
                 style="@style/subscriptionBoxText.Title.Red" />
         <TextView
+                android:id="@+id/cancelSubscriptionDescription"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/subscriptionBoxText.Subtitle"
-                android:text="@string/cancel_subscription.description"
+                android:text="@string/cancel_subscription_notgoogle.description"
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="8dp"/>
         <Button
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index c32b8fe6c..54dda47c4 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -470,7 +470,8 @@ To start, which parts of your life do you want to improve?</string>
     <string name="subscription">Subscription</string>
     <string name="active">Active</string>
     <string name="cancel_subscription">Cancel Subscription</string>
-    <string name="cancel_subscription.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="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>
@@ -484,6 +485,7 @@ To start, which parts of your life do you want to improve?</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" formatted="false">by %s</string>
     <string name="challenge_details">Challenge Details</string>
diff --git a/Habitica/res/xml/preferences_fragment.xml b/Habitica/res/xml/preferences_fragment.xml
index 49476d53b..e248041d3 100644
--- a/Habitica/res/xml/preferences_fragment.xml
+++ b/Habitica/res/xml/preferences_fragment.xml
@@ -47,13 +47,18 @@
                     android:summary="@string/SP_APIToken_summary"/>
 
                 <Preference
-                    android:key="@string/SP_user_qr_code"
+                    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>
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 bae213ca8..6382f94d3 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
@@ -7,5 +7,5 @@ public class HabitDatabase {
 
     public static final String NAME = "Habitica";
 
-    public static final int VERSION = 30;
+    public static final int VERSION = 31;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
index 77d592d8e..b3a506ec1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
@@ -7,11 +7,13 @@ import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
 
 import org.w3c.dom.Text;
 
+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;
 
@@ -41,16 +43,32 @@ public class SubscriptionDetailsView extends LinearLayout {
     @BindView(R.id.currentHourglassesTextView)
     TextView currentHourglassesTextView;
 
-    public SubscriptionDetailsView(Context context, AttributeSet attrs) {
-        super(context, attrs);
+    @BindView(R.id.cancelSubscriptionDescription)
+    TextView cancelSubscripnDescription;
 
-        inflate(context, R.layout.subscription_details, this);
+    @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);
@@ -85,11 +103,26 @@ public class SubscriptionDetailsView extends LinearLayout {
         }
         gemCapTextView.setText(String.valueOf(plan.consecutive.getGemCapExtra()+25));
         currentHourglassesTextView.setText(String.valueOf(plan.consecutive.getTrinkets()));
+
+        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() {
-        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.BASE_URL+"/"));
-        getContext().startActivity(browserIntent);
+        Intent intent;
+        if (plan.paymentMethod.equals("Google")) {
+            intent = new Intent("android.intent.action.VIEW");
+            intent.setComponent(new ComponentName("com.android.vending","com.android.vending.MyDownloadsActivity"));
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        } 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/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java
index 60412ada0..6c209e912 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,24 +1,26 @@
 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.SubscriptionDetailsView;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.magicmicky.habitrpgwrapper.lib.models.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;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceManager;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import net.glxn.qrgen.android.QRCode;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -27,6 +29,38 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
 
     private QrCodeManager qrCodeManager;
 
+    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
+        @Override
+        public void onResultReceived(HabitRPGUser habitRPGUser) {
+            AccountDetailsFragment.this.setUser(habitRPGUser);
+        }
+
+        @Override
+        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
+            return true;
+        }
+
+        @Override
+        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
+            return true;
+        }
+    };
+    private HabitRPGUser user;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        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);
+        }
+    }
+
+    public void setUser(HabitRPGUser user) {
+        this.user = user;
+    }
+
     @Override
     protected void setupPreferences() {
         for (Map.Entry<String, ?> preference : getPreferenceScreen().getSharedPreferences().getAll().entrySet()) {
@@ -46,8 +80,17 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference.getKey().equals(getString(R.string.SP_user_qr_code))) {
+        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()));
@@ -55,4 +98,16 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
         }
         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/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
index 85d6ba47d..1b3dc5b86 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
@@ -104,6 +104,10 @@ public class HabitRPGUser extends BaseModel {
 
     private List<PushDevice> pushDevices;
 
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "purchased_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
     private Purchases purchased;
 
     private TasksOrder tasksOrder;
@@ -352,9 +356,8 @@ public class HabitRPGUser extends BaseModel {
         items.user_id = id;
         authentication.user_id = id;
         flags.user_id = id;
-        if (contributor != null) {
-            contributor.user_id = id;
-        }
+        if (purchased != null) { purchased.user_id = id; }
+        if (contributor != null) { contributor.user_id = id; }
         if (invitations != null) {
             invitations.user_id = id;
         }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
index 5f16c9043..6a0bea830 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
@@ -1,13 +1,34 @@
 package com.magicmicky.habitrpgwrapper.lib.models;
 
+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.List;
 
 /**
  * Created by viirus on 14/01/16.
  */
-public class Purchases {
+@Table(databaseName = HabitDatabase.NAME)
+public class Purchases extends BaseModel {
+
+
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_id;
 
     public List<Customization> customizations;
+
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "plan_user_id",
+            columnType = String.class,
+            foreignColumnName = "customerId")})
     private SubscriptionPlan plan;
 
     public List<Customization> getCustomizations() {
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
index dcbf77e2c..b13b5d638 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
@@ -1,8 +1,17 @@
 package com.magicmicky.habitrpgwrapper.lib.models;
 
+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;
 
-public class SubscriptionPlan {
+@Table(databaseName = HabitDatabase.NAME)
+public class SubscriptionPlan extends BaseModel {
 
     public static String PLANID_BASIC = "basic";
     public static String PLANID_BASICEARNED = "basic_earned";
@@ -11,19 +20,43 @@ public class SubscriptionPlan {
     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
     public Date dateTerminated;
+    @Column
     public String paymentMethod;
+    @Column
     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 boolean isActive() {
         Date today = new Date();
         return (this.dateCreated != null && this.dateCreated.before(today)) && (this.dateTerminated == null || this.dateTerminated.after(today));
     }
+
+    @Override
+    public void save() {
+
+        if (consecutive != null) {
+            consecutive.customerId = customerId;
+        }
+
+        super.save();
+    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
index a3a403d74..edc81a692 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
@@ -1,10 +1,24 @@
 package com.magicmicky.habitrpgwrapper.lib.models;
 
-public class SubscriptionPlanConsecutive {
+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() {

From 19d0798719c6157e104336ae9466aa228ba6f03c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 26 Jan 2017 18:48:14 +0100
Subject: [PATCH 09/32] update translations

---
 Habitica/res/values-bg/strings.profile.xml     | 17 +++++++++++++++++
 Habitica/res/values-bg/strings.xml             |  4 +++-
 Habitica/res/values-de/strings.profile.xml     | 17 +++++++++++++++++
 Habitica/res/values-de/strings.xml             |  6 ++++--
 Habitica/res/values-en-rGB/strings.profile.xml | 17 +++++++++++++++++
 Habitica/res/values-es/strings.profile.xml     | 17 +++++++++++++++++
 Habitica/res/values-fr/strings.profile.xml     | 17 +++++++++++++++++
 Habitica/res/values-fr/strings.xml             |  6 ++++--
 Habitica/res/values-he/strings.profile.xml     | 13 +++++++++++++
 Habitica/res/values-hr-rHR/strings.profile.xml |  3 +++
 Habitica/res/values-id/strings.profile.xml     | 17 +++++++++++++++++
 Habitica/res/values-id/strings.xml             | 15 ++++++++++++++-
 Habitica/res/values-it/strings.profile.xml     | 17 +++++++++++++++++
 Habitica/res/values-it/strings.xml             |  5 +++--
 Habitica/res/values-ja/strings.profile.xml     | 14 ++++++++++++++
 Habitica/res/values-ja/strings.xml             |  1 +
 Habitica/res/values-ko/strings.profile.xml     | 17 +++++++++++++++++
 Habitica/res/values-ko/strings.xml             |  5 ++++-
 Habitica/res/values-lt/strings.profile.xml     | 14 ++++++++++++++
 Habitica/res/values-nl/strings.profile.xml     | 17 +++++++++++++++++
 Habitica/res/values-nl/strings.xml             |  4 +++-
 Habitica/res/values-pl/strings.profile.xml     | 17 +++++++++++++++++
 Habitica/res/values-pl/strings.xml             |  7 ++++++-
 Habitica/res/values-pt-rBR/strings.profile.xml | 17 +++++++++++++++++
 Habitica/res/values-pt-rBR/strings.xml         |  7 +++++++
 Habitica/res/values-pt-rPT/strings.profile.xml | 14 ++++++++++++++
 Habitica/res/values-ru/strings.profile.xml     | 17 +++++++++++++++++
 Habitica/res/values-ru/strings.xml             |  4 +++-
 Habitica/res/values-zh-rTW/strings.profile.xml | 13 +++++++++++++
 Habitica/res/values-zh/strings.profile.xml     | 14 ++++++++++++++
 30 files changed, 341 insertions(+), 12 deletions(-)
 create mode 100644 Habitica/res/values-bg/strings.profile.xml
 create mode 100644 Habitica/res/values-de/strings.profile.xml
 create mode 100644 Habitica/res/values-en-rGB/strings.profile.xml
 create mode 100644 Habitica/res/values-es/strings.profile.xml
 create mode 100644 Habitica/res/values-fr/strings.profile.xml
 create mode 100644 Habitica/res/values-he/strings.profile.xml
 create mode 100644 Habitica/res/values-hr-rHR/strings.profile.xml
 create mode 100644 Habitica/res/values-id/strings.profile.xml
 create mode 100644 Habitica/res/values-it/strings.profile.xml
 create mode 100644 Habitica/res/values-ja/strings.profile.xml
 create mode 100644 Habitica/res/values-ko/strings.profile.xml
 create mode 100644 Habitica/res/values-lt/strings.profile.xml
 create mode 100644 Habitica/res/values-nl/strings.profile.xml
 create mode 100644 Habitica/res/values-pl/strings.profile.xml
 create mode 100644 Habitica/res/values-pt-rBR/strings.profile.xml
 create mode 100644 Habitica/res/values-pt-rPT/strings.profile.xml
 create mode 100644 Habitica/res/values-ru/strings.profile.xml
 create mode 100644 Habitica/res/values-zh-rTW/strings.profile.xml
 create mode 100644 Habitica/res/values-zh/strings.profile.xml

diff --git a/Habitica/res/values-bg/strings.profile.xml b/Habitica/res/values-bg/strings.profile.xml
new file mode 100644
index 000000000..4fdf05896
--- /dev/null
+++ b/Habitica/res/values-bg/strings.profile.xml
@@ -0,0 +1,17 @@
+<?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>
+
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 52e11f17e..70f5a5c1f 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -139,7 +139,6 @@
   <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>
@@ -320,6 +319,8 @@
   <string name="opt_out_class">Отказване</string>
   <string name="opt_out_description">Не Ви се занимава с класове? Искате да изберете по-късно? Откажете се от тях — ще бъдете воин без специални умения. Можете да прочетете относно класовата система по-късно в уикито, както и да включите класовете когато пожелаете.</string>
   <string name="class_confirmation" formatted="false">Наистина ли искате да бъдете %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>
@@ -343,6 +344,7 @@
   <string name="share_raised" formatted="false">Току-що се сдобих с превоз — %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" formatted="false">Съобщение от %1$s</string>
   <string name="leaderName" formatted="false">Водач: %1$s</string>
   <string name="confirm">Потвърждаване</string>
diff --git a/Habitica/res/values-de/strings.profile.xml b/Habitica/res/values-de/strings.profile.xml
new file mode 100644
index 000000000..774820136
--- /dev/null
+++ b/Habitica/res/values-de/strings.profile.xml
@@ -0,0 +1,17 @@
+<?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.xml b/Habitica/res/values-de/strings.xml
index 270209af5..fde115929 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -139,7 +139,6 @@
   <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>
@@ -277,7 +276,7 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</string>
   <string name="quests">Quests</string>
   <string name="pets">Haustiere</string>
   <string name="mounts">Reittiere</string>
-  <string name="armoireEquipment" formatted="false">Du hast einen seltenen Ausrüstungsgegenstand im Schrank gefunden: %s! Juhu!</string>
+  <string name="armoireEquipment" formatted="false">Du hast einen seltenen Ausrüstungsgegenstand im Schrank gefunden: %s! Großartig!</string>
   <string name="armoireFood" formatted="false">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" formatted="false">Öffne den Schrank um zufällig spezielle Gegenstände, Erfahrung oder Nahrung zu erhalten! Verbleibende Ausrüstungsgegenstände: %d</string>
@@ -320,6 +319,8 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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" formatted="false">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>
@@ -343,6 +344,7 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</string>
   <string name="share_raised" formatted="false">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" formatted="false">Nachricht von %1$s</string>
   <string name="leaderName" formatted="false">Führender: %1$s</string>
   <string name="confirm">Bestätigen</string>
diff --git a/Habitica/res/values-en-rGB/strings.profile.xml b/Habitica/res/values-en-rGB/strings.profile.xml
new file mode 100644
index 000000000..985619b41
--- /dev/null
+++ b/Habitica/res/values-en-rGB/strings.profile.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Pets & Mounts</string>
+    <string name="profile_pets_found">Pets Found</string>
+    <string name="profile_mounts_tamed">Mounts Tamed</string>
+    <string name="profile_loading_data">loading member data.</string>
+    <string name="profile_send_message_to">Send message to %s</string>
+    <string name="profile_message_sent_to">Message sent to %s</string>
+    <string name="profile_level">Level:</string>
+    <string name="profile_class_bonus">Class-Bonus</string>
+    <string name="profile_allocated">Allocated:</string>
+    <string name="profile_boosts">Boosts:</string>
+    <string name="profile_private_message">Private Message</string>
+    <string name="profile_achievements">Achievements</string>
+    <string name="profile_achievement_ok">Ok</string>
+
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-es/strings.profile.xml b/Habitica/res/values-es/strings.profile.xml
new file mode 100644
index 000000000..322e14cfd
--- /dev/null
+++ b/Habitica/res/values-es/strings.profile.xml
@@ -0,0 +1,17 @@
+<?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-fr/strings.profile.xml b/Habitica/res/values-fr/strings.profile.xml
new file mode 100644
index 000000000..4646f34b2
--- /dev/null
+++ b/Habitica/res/values-fr/strings.profile.xml
@@ -0,0 +1,17 @@
+<?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.xml b/Habitica/res/values-fr/strings.xml
index 5d9648c5b..d47315275 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -139,7 +139,6 @@
   <string name="members">Membres</string>
   <string name="habits">Habitudes</string>
   <string name="dailies">Tâches Quotidiennes</string>
-  <string name="todos">À 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>
@@ -320,6 +319,8 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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" formatted="false">Ê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>
@@ -343,6 +344,7 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</string>
   <string name="share_raised" formatted="false">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" formatted="false">Message de %1$s</string>
   <string name="leaderName" formatted="false">Leader : %1$s</string>
   <string name="confirm">Confirmer</string>
@@ -396,7 +398,7 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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.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>
diff --git a/Habitica/res/values-he/strings.profile.xml b/Habitica/res/values-he/strings.profile.xml
new file mode 100644
index 000000000..e68e4dff5
--- /dev/null
+++ b/Habitica/res/values-he/strings.profile.xml
@@ -0,0 +1,13 @@
+<?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_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>
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-hr-rHR/strings.profile.xml b/Habitica/res/values-hr-rHR/strings.profile.xml
new file mode 100644
index 000000000..efe0a1d8e
--- /dev/null
+++ b/Habitica/res/values-hr-rHR/strings.profile.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-id/strings.profile.xml b/Habitica/res/values-id/strings.profile.xml
new file mode 100644
index 000000000..daf807a29
--- /dev/null
+++ b/Habitica/res/values-id/strings.profile.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Peliharan &amp; Tunggangan</string>
+    <string name="profile_pets_found">Peliharaan Temuan</string>
+    <string name="profile_mounts_tamed">Tunggangan yang terjinakkan</string>
+    <string name="profile_loading_data">memuat data anggota.</string>
+    <string name="profile_send_message_to">Mengirim pesan ke %s</string>
+    <string name="profile_message_sent_to">Pesan terkirim ke %s</string>
+    <string name="profile_level">Tingkat:</string>
+    <string name="profile_class_bonus">Bonus-Kelas:</string>
+    <string name="profile_allocated">Teralokasi:</string>
+    <string name="profile_boosts">Tambahan:</string>
+    <string name="profile_private_message">Pesan Pribadi</string>
+    <string name="profile_achievements">Pencapaian</string>
+    <string name="profile_achievement_ok">Oke</string>
+
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-id/strings.xml b/Habitica/res/values-id/strings.xml
index ff54280a7..8aab4da58 100644
--- a/Habitica/res/values-id/strings.xml
+++ b/Habitica/res/values-id/strings.xml
@@ -27,6 +27,7 @@
   <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>
@@ -53,6 +54,7 @@
   <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>
@@ -136,7 +138,7 @@
   <string name="chat">Obrolan</string>
   <string name="members">Anggota</string>
   <string name="habits">Kebiasaan</string>
-  <string name="dailies">Keseharian</string>
+  <string name="dailies">Harian</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>
@@ -317,6 +319,8 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</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" formatted="false">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>
@@ -340,7 +344,9 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</string>
   <string name="share_raised" formatted="false">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" formatted="false">Pesan dari %1$s</string>
+  <string name="leaderName" formatted="false">Ketua: %1$s</string>
   <string name="confirm">Pastikan</string>
   <string name="market">Pasar</string>
   <string name="timeTravelers">Penjelajah Waktu</string>
@@ -387,6 +393,7 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</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_todo_list">Daftar Tugas Habitica</string>
   <string name="widget_add_task">Habitica Menambahkan Tugas</string>
   <string name="google_services_missing">Google play services tidak dapat ditemukan.</string>
   <string name="gem.purchase.toolbartitle">Bayar</string>
@@ -402,5 +409,11 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</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" formatted="false">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
new file mode 100644
index 000000000..8140922e2
--- /dev/null
+++ b/Habitica/res/values-it/strings.profile.xml
@@ -0,0 +1,17 @@
+<?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>
+
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index e12ff9f26..6b3a1dae6 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -83,7 +83,7 @@
   <string name="tags">Etichette</string>
   <string name="trivial">Triviale</string>
   <string name="easy">Facile</string>
-  <string name="medium">Medio</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>
@@ -139,7 +139,6 @@
   <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>
@@ -321,6 +320,7 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <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" formatted="false">Vuoi davvero essere un %s?</string>
+  <string name="class_changed">Ora sei un %s!</string>
   <string name="choose_class">Scegli classe</string>
   <string name="dialog_go_back">Ritorna</string>
   <string name="opt_out_confirmation">Vuoi davvero rinunciare?</string>
@@ -344,6 +344,7 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <string name="share_raised" formatted="false">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" formatted="false">Messaggio da %1$s</string>
   <string name="leaderName" formatted="false">Leader: %1$s</string>
   <string name="confirm">Conferma</string>
diff --git a/Habitica/res/values-ja/strings.profile.xml b/Habitica/res/values-ja/strings.profile.xml
new file mode 100644
index 000000000..14bc277ee
--- /dev/null
+++ b/Habitica/res/values-ja/strings.profile.xml
@@ -0,0 +1,14 @@
+<?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>
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index a86c58588..3a106b081 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -320,6 +320,7 @@
   <string name="opt_out_class">選ばない</string>
   <string name="opt_out_description">クラスなんてめんどくさい? 後で選びたい? 選ばなくても構わないよ。スキルのない戦士になります。クラスのしくみについてwiki を参照し、いつでも ユーザー -&gt; ステータス で有効にできる。</string>
   <string name="class_confirmation" formatted="false">%s になります。いいですか?</string>
+  <string name="class_changed">あなたは%s に転職した！</string>
   <string name="choose_class">クラスを選ぶ</string>
   <string name="dialog_go_back">戻る</string>
   <string name="opt_out_confirmation">選ばないでいい?</string>
diff --git a/Habitica/res/values-ko/strings.profile.xml b/Habitica/res/values-ko/strings.profile.xml
new file mode 100644
index 000000000..31afe88e1
--- /dev/null
+++ b/Habitica/res/values-ko/strings.profile.xml
@@ -0,0 +1,17 @@
+<?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.xml b/Habitica/res/values-ko/strings.xml
index 9e9d6fece..53945f71e 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -139,7 +139,6 @@
   <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>
@@ -327,6 +326,8 @@
   <string name="opt_out_class">선택 유예</string>
   <string name="opt_out_description">직업을 신경쓰고 싶지 않으신가요? 나중에 고르고 싶으시다고요? 선택유예 하세요 - 당신은 아무런 능력이 없는 전사가 되어있을 꺼에요. wiki를 방문하면 직업시스템에 대해서 자세히 알 수 있고, 이후에 언제라도 직업을 선택할 수 있습니다.</string>
   <string name="class_confirmation" formatted="false">%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>
@@ -350,6 +351,7 @@
   <string name="share_raised" formatted="false">일상생활의 과제들을 달성하여 %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" formatted="false">%1$s로부터 온 메세지</string>
   <string name="leaderName" formatted="false">리더: %1$s</string>
   <string name="confirm">확인</string>
@@ -418,6 +420,7 @@
   <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>
 </resources>
diff --git a/Habitica/res/values-lt/strings.profile.xml b/Habitica/res/values-lt/strings.profile.xml
new file mode 100644
index 000000000..6992cc11f
--- /dev/null
+++ b/Habitica/res/values-lt/strings.profile.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Augintiniai</string>
+    <string name="profile_pets_found">Augintinių Maistas</string>
+    <string name="profile_mounts_tamed">Užauginti Augintiniai</string>
+    <string name="profile_loading_data">kraunami narių duomenys.</string>
+    <string name="profile_send_message_to">Siųsti žinutę %s</string>
+    <string name="profile_message_sent_to">Žinutė išsiųsta %s</string>
+    <string name="profile_level">Lygis:</string>
+    <string name="profile_class_bonus">Klasės-Bonusai:</string>
+    <string name="profile_allocated">Priskirta:</string>
+    <string name="profile_boosts">Sustiprinimai:</string>
+    <string name="profile_private_message">Privati Žinutė</string>
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-nl/strings.profile.xml b/Habitica/res/values-nl/strings.profile.xml
new file mode 100644
index 000000000..3c04c13a5
--- /dev/null
+++ b/Habitica/res/values-nl/strings.profile.xml
@@ -0,0 +1,17 @@
+<?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>
+
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index 2e53806fb..d8ca35ece 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -139,7 +139,6 @@
   <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>
@@ -320,6 +319,8 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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" formatted="false">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>
@@ -343,6 +344,7 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
   <string name="share_raised" formatted="false">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" formatted="false">Bericht van %1$s</string>
   <string name="leaderName" formatted="false">Leider: %1$s</string>
   <string name="confirm">Bevestig</string>
diff --git a/Habitica/res/values-pl/strings.profile.xml b/Habitica/res/values-pl/strings.profile.xml
new file mode 100644
index 000000000..4570ca2a3
--- /dev/null
+++ b/Habitica/res/values-pl/strings.profile.xml
@@ -0,0 +1,17 @@
+<?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>
+
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 855fb3ffa..afb800737 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -139,7 +139,6 @@
   <string name="members">Członkowie</string>
   <string name="habits">Nawyki</string>
   <string name="dailies">Codzienne</string>
-  <string name="todos">DoZrobienia</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>
@@ -320,6 +319,8 @@ Od czego chcesz zacząć poprawiać swoje życie?</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" formatted="false">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>
@@ -343,6 +344,7 @@ Od czego chcesz zacząć poprawiać swoje życie?</string>
   <string name="share_raised" formatted="false">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" formatted="false">Wiadomość od %1$s</string>
   <string name="leaderName" formatted="false">Lider: %1$s</string>
   <string name="confirm">Potwierdź</string>
@@ -411,4 +413,7 @@ Od czego chcesz zacząć poprawiać swoje życie?</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>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.profile.xml b/Habitica/res/values-pt-rBR/strings.profile.xml
new file mode 100644
index 000000000..132a1db70
--- /dev/null
+++ b/Habitica/res/values-pt-rBR/strings.profile.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Mascotes & Montarias</string>
+    <string name="profile_pets_found">Mascotes Encontrados</string>
+    <string name="profile_mounts_tamed">Montarias Domesticadas</string>
+    <string name="profile_loading_data">Carregando dados de membro</string>
+    <string name="profile_send_message_to">Enviar mensagem para %s</string>
+    <string name="profile_message_sent_to">Mensagem enviada para %s</string>
+    <string name="profile_level">Nível</string>
+    <string name="profile_class_bonus">Bônus de Classe</string>
+    <string name="profile_allocated">Alocado:</string>
+    <string name="profile_boosts">Aumentos:</string>
+    <string name="profile_private_message">Mensagem Privada</string>
+    <string name="profile_achievements">Conquistas</string>
+    <string name="profile_achievement_ok">Ok</string>
+
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 314a807b1..1f77d7a6a 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -319,6 +319,8 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="opt_out_class">Cancelar</string>
   <string name="opt_out_description">Não quer se preocupar com classes? Quer escolher depois? Cancelar - você será um guerreiro sem habilidades especiais. Você pode ler sobre o sistema de classes mais tarde na wiki e habilitá-las a qualquer momento.</string>
   <string name="class_confirmation" formatted="false">Você tem certeza que quer ser um %s?</string>
+  <string name="class_changed">Você é um %s agora!</string>
+  <string name="class_changed_description">Você tem a nova Engrenagem de Batalha padrão, que você pode alterar em equipamentos!</string>
   <string name="choose_class">Escolha a sua classe</string>
   <string name="dialog_go_back">Voltar</string>
   <string name="opt_out_confirmation">Você tem certeza que quer cancelar?</string>
@@ -343,7 +345,9 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="share_raised" formatted="false">Eu acabei de ganhar um %1$s %2$s de montaria no Habitica por completar minhas tarefas da vida real!</string>
   <string name="open_in_store">Abra na Play Store</string>
   <string name="change_class_confirmation">Você tem certeza que quer mudar sua classe? Isso irá custar 3 gemas.</string>
+  <string name="change_class_equipment_warning">Aviso: Você não poderá mais comprar equipamentos da classe %s.</string>
   <string name="leaderMessage" formatted="false">Mensagem de %1$s</string>
+  <string name="leaderName" formatted="false">Líder: %1$s</string>
   <string name="confirm">Confirmar</string>
   <string name="market">Mercado</string>
   <string name="timeTravelers">Viajantes no tempo</string>
@@ -410,4 +414,7 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="AudioTheme_summary">Mudar o tema de áudio do Habitica</string>
   <!--Login Incentives-->
   <string name="see_you_tomorrow">Vejo você amanhã!</string>
+  <string name="belongs_to_challenge">Pertence ao Desafio</string>
+  <string name="has_reminder">Tem Lembrete</string>
+  <string name="has_tag">Tem Etiqueta</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.profile.xml b/Habitica/res/values-pt-rPT/strings.profile.xml
new file mode 100644
index 000000000..91056ca81
--- /dev/null
+++ b/Habitica/res/values-pt-rPT/strings.profile.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="profile_pets_and_mounts">Animais de Estimação e Montadas</string>
+    <string name="profile_pets_found">Animais de Estimação Encontrados</string>
+    <string name="profile_mounts_tamed">Montadas Domesticada</string>
+    <string name="profile_loading_data">a carregar os dados de membro.</string>
+    <string name="profile_send_message_to">Enviar mensagem para %s</string>
+    <string name="profile_message_sent_to">Mensagem enviada para %s</string>
+    <string name="profile_level">Nível:</string>
+    <string name="profile_class_bonus">Bónus-classe:</string>
+    <string name="profile_allocated">Alocada:</string>
+    <string name="profile_boosts">Aumentos</string>
+    <string name="profile_private_message">Mensagem Privada</string>
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ru/strings.profile.xml b/Habitica/res/values-ru/strings.profile.xml
new file mode 100644
index 000000000..100853fd1
--- /dev/null
+++ b/Habitica/res/values-ru/strings.profile.xml
@@ -0,0 +1,17 @@
+<?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-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 6a7a7c6cb..3fb719d6c 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -139,7 +139,6 @@
   <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>
@@ -320,6 +319,8 @@
   <string name="opt_out_class">Отказаться</string>
   <string name="opt_out_description">Не хотите утруждать себя классами? Тогда откажитесь — и останетесь воином и ваши очки будут обрабатываться автоматически. Активировать классы можно будет позже в меню настроек.</string>
   <string name="class_confirmation" formatted="false">Вы уверены, что хотите быть %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>
@@ -343,6 +344,7 @@
   <string name="share_raised" formatted="false">Я только что получил скакуна %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" formatted="false">Сообщение от %1$s</string>
   <string name="leaderName" formatted="false">Предводитель: %1$s</string>
   <string name="confirm">Подтвердить</string>
diff --git a/Habitica/res/values-zh-rTW/strings.profile.xml b/Habitica/res/values-zh-rTW/strings.profile.xml
new file mode 100644
index 000000000..cf20c48ed
--- /dev/null
+++ b/Habitica/res/values-zh-rTW/strings.profile.xml
@@ -0,0 +1,13 @@
+<?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_private_message">私人訊息</string>
+    </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
new file mode 100644
index 000000000..4ae0e762b
--- /dev/null
+++ b/Habitica/res/values-zh/strings.profile.xml
@@ -0,0 +1,14 @@
+<?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>
+    </resources>
\ No newline at end of file

From 6af6c29e3de17b9414f48f2b1ede6890f13bf5fa Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 30 Jan 2017 12:47:54 +0100
Subject: [PATCH 10/32] Implement subscriber features

---
 Habitica/res/layout/row_shopitem.xml          | 11 +++-
 .../res/values-en-rGB/strings.profile.xml     |  2 +-
 .../res/values-pt-rBR/strings.profile.xml     |  2 +-
 Habitica/res/values/attrs.xml                 |  1 +
 Habitica/res/values/strings.xml               | 10 +++-
 .../habitica/events/OpenMysteryItemEvent.java |  5 ++
 .../events/OpenedMysteryItemEvent.java        | 10 ++++
 .../events/UpdateGoldGemsPurchasedevent.java  |  8 +++
 .../habitica/ui/activities/BaseActivity.java  |  3 ++
 .../habitica/ui/activities/MainActivity.java  | 31 +++++++++--
 .../inventory/ItemRecyclerAdapter.java        | 31 ++++++++++-
 .../inventory/ShopRecyclerAdapter.java        | 24 +++++++++
 .../ui/fragments/BaseMainFragment.java        |  1 +
 .../inventory/items/ItemRecyclerFragment.java | 52 ++++++++++++++++++-
 .../inventory/items/ItemsFragment.java        | 11 +++-
 .../inventory/shops/ShopFragment.java         | 26 ++++++++++
 .../habitrpgwrapper/lib/api/ApiService.java   |  6 +++
 .../habitrpgwrapper/lib/models/ShopItem.java  | 34 ++++++++++++
 .../lib/models/SubscriptionPlan.java          | 12 +++++
 .../models/SubscriptionPlanConsecutive.java   | 10 ++++
 .../lib/models/inventory/SpecialItem.java     | 30 +++++++++++
 21 files changed, 306 insertions(+), 14 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenMysteryItemEvent.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/UpdateGoldGemsPurchasedevent.java
 create mode 100644 Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java

diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index 7191ecaa5..2f96dc761 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -23,14 +23,21 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:text="Title"
-                style="@style/RowTitle" />
+                style="@style/Subheader1" />
+        <TextView
+                android:id="@+id/limitedCountText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="visible"
+                tools:text="2 Left"
+                style="@style/Caption3" />
         <TextView
                 android:id="@+id/descriptionView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 tools:text="Description"
                 android:maxLines="5"
-                style="@style/RowText" />
+                style="@style/Caption2.Regular" />
     </LinearLayout>
 
     <Button
diff --git a/Habitica/res/values-en-rGB/strings.profile.xml b/Habitica/res/values-en-rGB/strings.profile.xml
index 985619b41..776d014c2 100644
--- a/Habitica/res/values-en-rGB/strings.profile.xml
+++ b/Habitica/res/values-en-rGB/strings.profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="profile_pets_and_mounts">Pets & Mounts</string>
+    <string name="profile_pets_and_mounts">Pets &amp; Mounts</string>
     <string name="profile_pets_found">Pets Found</string>
     <string name="profile_mounts_tamed">Mounts Tamed</string>
     <string name="profile_loading_data">loading member data.</string>
diff --git a/Habitica/res/values-pt-rBR/strings.profile.xml b/Habitica/res/values-pt-rBR/strings.profile.xml
index 132a1db70..6704db386 100644
--- a/Habitica/res/values-pt-rBR/strings.profile.xml
+++ b/Habitica/res/values-pt-rBR/strings.profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="profile_pets_and_mounts">Mascotes & Montarias</string>
+    <string name="profile_pets_and_mounts">Mascotes &amp; Montarias</string>
     <string name="profile_pets_found">Mascotes Encontrados</string>
     <string name="profile_mounts_tamed">Montarias Domesticadas</string>
     <string name="profile_loading_data">Carregando dados de membro</string>
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index d70780dc2..e6c448064 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -14,6 +14,7 @@
 
     <declare-styleable name="MaxHeightScrollView">
         <attr name="maxHeightMultiplier" format="float" />
+    </declare-styleable>
     <declare-styleable name="SubscriptionOptionView">
         <attr name="recurringText" format="string" />
         <attr name="gemCapText" format="string" />
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 54dda47c4..d2241b80f 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -309,7 +309,7 @@ To start, which parts of your life do you want to improve?</string>
     <string name="armoireNotesFull" formatted="false">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" formatted="false">Sell (%s Gold)</string>
+    <string name="sell" formatted="false">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>
@@ -511,4 +511,12 @@ To start, which parts of your life do you want to improve?</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" formatted="false">%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>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenMysteryItemEvent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenMysteryItemEvent.java
new file mode 100644
index 000000000..bf39a97cc
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenMysteryItemEvent.java
@@ -0,0 +1,5 @@
+package com.habitrpg.android.habitica.events;
+
+public class OpenMysteryItemEvent {
+
+}
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
new file mode 100644
index 000000000..ef7ec941d
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/OpenedMysteryItemEvent.java
@@ -0,0 +1,10 @@
+package com.habitrpg.android.habitica.events;
+
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+
+public class OpenedMysteryItemEvent {
+
+    public int numberLeft;
+
+    public ItemData mysteryItem;
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/UpdateGoldGemsPurchasedevent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/UpdateGoldGemsPurchasedevent.java
new file mode 100644
index 000000000..61e740f5f
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/UpdateGoldGemsPurchasedevent.java
@@ -0,0 +1,8 @@
+package com.habitrpg.android.habitica.events;
+
+
+public class UpdateGoldGemsPurchasedevent {
+
+    public int numberLeft;
+
+}
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 cf56e62d6..e1c570582 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
@@ -3,6 +3,7 @@ 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 com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
 
 import android.content.Intent;
 import android.os.Build;
@@ -82,4 +83,6 @@ public abstract class BaseActivity extends AppCompatActivity {
         intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
         startActivity(intent);
     }
+
+
 }
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 2d260f4e6..d815faf6c 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
@@ -18,6 +18,8 @@ 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;
@@ -26,6 +28,7 @@ import com.habitrpg.android.habitica.events.TaskSaveEvent;
 import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
 import com.habitrpg.android.habitica.events.ToggledEditTagsEvent;
 import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
+import com.habitrpg.android.habitica.events.UpdateGoldGemsPurchasedevent;
 import com.habitrpg.android.habitica.events.commands.BuyGemItemCommand;
 import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
 import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand;
@@ -181,6 +184,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     CrashlyticsProxy crashlyticsProxy;
 
     @BindView(R.id.floating_menu_wrapper)
+    public
     FrameLayout floatingMenuWrapper;
     @BindView(R.id.toolbar)
     Toolbar toolbar;
@@ -981,14 +985,16 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             }
             observable
                     .compose(apiHelper.configureApiCallObserver())
-                    .doOnNext(aVoid -> {
-                        showSnackbar(this, floatingMenuWrapper, getString(R.string.successful_purchase, event.item.text), SnackbarDisplayType.NORMAL);
-                    })
+                    .doOnNext(aVoid -> showSnackbar(this, floatingMenuWrapper, getString(R.string.successful_purchase, event.item.text), SnackbarDisplayType.NORMAL))
                     .subscribe(buyResponse -> {
                         apiHelper.retrieveUser(false)
                                 .compose(apiHelper.configureApiCallObserver())
-                                .subscribe(new HabitRPGUserCallback(this), throwable -> {
-                                });
+                                .subscribe(new HabitRPGUserCallback(user1 -> {
+                                    UpdateGoldGemsPurchasedevent event1 = new UpdateGoldGemsPurchasedevent();
+                                    event1.numberLeft = user1.getPurchased().getPlan().numberOfGemsLeft();
+                                    EventBus.getDefault().post(event1);
+                                    MainActivity.this.onUserReceived(user1);
+                                }), throwable -> {});
                     }, throwable -> {
                         HttpException error = (HttpException) throwable;
                         if (error.code() == 401 && event.item.getCurrency().equals("gems")) {
@@ -1089,6 +1095,21 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                 });
     }
 
+    @Subscribe
+    public void openMysteryItem(OpenMysteryItemEvent event) {
+        apiHelper.apiService.openMysteryItem().compose(apiHelper.configureApiCallObserver())
+                .subscribe(mysteryItem -> {
+                    apiHelper.retrieveUser(false).compose(apiHelper.configureApiCallObserver())
+                            .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(OpenGemPurchaseFragmentCommand cmd) {
         drawer.setSelection(MainDrawerBuilder.SIDEBAR_PURCHASE);
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 60a396da6..d140f8da8 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
@@ -2,6 +2,7 @@ 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;
@@ -10,12 +11,14 @@ import com.habitrpg.android.habitica.events.commands.SellItemCommand;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
+import com.magicmicky.habitrpgwrapper.lib.models.ShopItem;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Item;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
+import com.magicmicky.habitrpgwrapper.lib.models.inventory.SpecialItem;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -67,6 +70,21 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
         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;
 
@@ -105,6 +123,8 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
             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) {
@@ -127,7 +147,7 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
         public void onClick(View v) {
             if (!isHatching && !isFeeding) {
                 BottomSheetMenu menu = new BottomSheetMenu(context);
-                if (!(item instanceof QuestContent)) {
+                if (!(item instanceof QuestContent) && !(item instanceof  SpecialItem)) {
                     menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.sell, item.getValue()), true));
                 }
                 if (item instanceof Egg) {
@@ -136,9 +156,14 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
                     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) && index == 0) {
+                    if (!((item instanceof QuestContent) || (item instanceof SpecialItem)) && index == 0) {
                         SellItemCommand event = new SellItemCommand();
                         event.item = item;
                         EventBus.getDefault().post(event);
@@ -170,6 +195,8 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
                         InvitePartyToQuestCommand event = new InvitePartyToQuestCommand();
                         event.questKey = item.getKey();
                         EventBus.getDefault().post(event);
+                    } else if (item instanceof SpecialItem) {
+                        EventBus.getDefault().post(new OpenMysteryItemEvent());
                     }
                 });
                 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 8d85943f3..a74819f87 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
@@ -103,6 +103,21 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         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)
@@ -115,6 +130,8 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         Button buyButton;
         @BindView(R.id.unlockView)
         TextView unlockView;
+        @BindView(R.id.limitedCountText)
+                TextView limitedCountText;
 
         String shopIdentifier;
         ShopItem item;
@@ -195,6 +212,13 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             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
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 ab4abc2f3..92ad89d40 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
@@ -82,6 +82,7 @@ public abstract class BaseMainFragment extends BaseFragment {
             if (this.usesTabLayout) {
                 tabLayout.removeAllTabs();
                 tabLayout.setVisibility(View.VISIBLE);
+                tabLayout.setTabMode(TabLayout.MODE_FIXED);
             } else {
                 tabLayout.setVisibility(View.GONE);
             }
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 4b90f2109..ef64c32d5 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
@@ -3,18 +3,27 @@ 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.UpdateGoldGemsPurchasedevent;
 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.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Item;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
+import com.magicmicky.habitrpgwrapper.lib.models.inventory.SpecialItem;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
+import com.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;
@@ -32,6 +41,7 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -39,6 +49,8 @@ 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)
@@ -61,12 +73,14 @@ public class ItemRecyclerFragment extends BaseFragment {
     public Item hatchingItem;
     public Pet feedingPet;
     public HashMap<String, Integer> ownedPets;
+    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);
         }
@@ -183,8 +197,20 @@ public class ItemRecyclerFragment extends BaseFragment {
                 from = new Select().from(QuestContent.class);
         }
 
+        List<Item> items = new ArrayList<>();
         if (from != null) {
-            List<Item> items = from.where(Condition.column("owned").greaterThan(0)).queryList();
+            items.addAll(from.where(Condition.column("owned").greaterThan(0)).queryList());
+        }
+
+        if (this.itemType.equals("special")) {
+            if (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);
         }
     }
@@ -205,4 +231,28 @@ public class ItemRecyclerFragment extends BaseFragment {
         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;
+            }
+        });
+    }
 }
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 3f160c98f..1885a4d66 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
@@ -6,12 +6,14 @@ import com.habitrpg.android.habitica.events.commands.HatchingCommand;
 import com.habitrpg.android.habitica.events.commands.InvitePartyToQuestCommand;
 import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
+import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment;
 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;
@@ -71,17 +73,21 @@ public class ItemsFragment extends BaseMainFragment {
                         fragment.itemType = "quests";
                         break;
                     }
+                    case 4: {
+                        fragment.itemType = "special";
+                    }
                 }
                 fragment.isHatching = false;
                 fragment.isFeeding = false;
                 fragment.itemTypeText = this.getPageTitle(position).toString();
+                fragment.user = ItemsFragment.this.user;
 
                 return fragment;
             }
 
             @Override
             public int getCount() {
-                return 4;
+                return 5;
             }
 
             @Override
@@ -95,12 +101,15 @@ public class ItemsFragment extends BaseMainFragment {
                         return activity.getString(R.string.food);
                     case 3:
                         return activity.getString(R.string.quests);
+                    case 4:
+                        return getString(R.string.special);
                 }
                 return "";
             }
         });
         if (tabLayout != null && viewPager != null) {
             tabLayout.setupWithViewPager(viewPager);
+            tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE);
         }
     }
 
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 d50a2d765..ba70b37a9 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
@@ -3,12 +3,17 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.shops;
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.events.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.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.Shop;
+import com.magicmicky.habitrpgwrapper.lib.models.ShopCategory;
+import com.magicmicky.habitrpgwrapper.lib.models.ShopItem;
+
+import org.greenrobot.eventbus.Subscribe;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -18,6 +23,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import java.util.ArrayList;
+
 import javax.inject.Inject;
 
 import butterknife.BindView;
@@ -102,6 +109,20 @@ public class ShopFragment extends BaseFragment {
         }
         this.apiHelper.apiService.fetchShopInventory(shopUrl)
                 .compose(this.apiHelper.configureApiCallObserver())
+                .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);
@@ -118,4 +139,9 @@ public class ShopFragment extends BaseFragment {
         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/magicmicky/habitrpgwrapper/lib/api/ApiService.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
index a93703bcb..39494147d 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
@@ -5,6 +5,7 @@ import android.databinding.ObservableList;
 
 import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
 import com.magicmicky.habitrpgwrapper.lib.models.ContentResult;
+import com.magicmicky.habitrpgwrapper.lib.models.Gear;
 import com.magicmicky.habitrpgwrapper.lib.models.Group;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.Items;
@@ -172,6 +173,8 @@ public interface ApiService {
     @POST("user/mark-pms-read")
     Observable<HabitResponse<Void>> markPrivateMessagesRead();
 
+
+
     /* Group API */
 
     @GET("groups")
@@ -295,4 +298,7 @@ public interface ApiService {
     // Notifications
     @POST("notifications/{notificationId}/read")
     Observable<HabitResponse<Void>> readNotificaiton(@Path("notificationId") String notificationId);
+
+    @POST("user/open-mystery-item")
+    Observable<HabitResponse<ItemData>> openMysteryItem();
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java
index d844cc194..584460d5f 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java
@@ -2,8 +2,13 @@ package com.magicmicky.habitrpgwrapper.lib.models;
 
 import com.google.gson.annotations.SerializedName;
 
+import com.habitrpg.android.habitica.R;
+
+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;
@@ -13,6 +18,7 @@ public class ShopItem {
     public String currency;
     public String purchaseType;
     public String categoryIdentifier;
+    public Integer limitedNumberLeft;
     public ShopItemUnlockCondition unlockCondition;
 
     public String getKey() {
@@ -86,6 +92,22 @@ public class ShopItem {
         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;
     }
@@ -103,4 +125,16 @@ public class ShopItem {
             return false;
         }
     }
+
+    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;
+    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
index b13b5d638..7f3f30e47 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
@@ -9,6 +9,7 @@ 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 {
@@ -45,6 +46,8 @@ public class SubscriptionPlan extends BaseModel {
             foreignColumnName = "customerId")})
     public SubscriptionPlanConsecutive consecutive;
 
+    public List<String> mysteryItems;
+
     public boolean isActive() {
         Date today = new Date();
         return (this.dateCreated != null && this.dateCreated.before(today)) && (this.dateTerminated == null || this.dateTerminated.after(today));
@@ -59,4 +62,13 @@ public class SubscriptionPlan extends BaseModel {
 
         super.save();
     }
+
+    public Integer numberOfGemsLeft() {
+        if (customerId == null) {
+            return 0;
+        }
+        return 25+consecutive.getGemCapExtra()-gemsBought;
+    }
+
+
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
index edc81a692..b571c50ff 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
@@ -6,6 +6,8 @@ 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;
+
 @Table(databaseName = HabitDatabase.NAME)
 public class SubscriptionPlanConsecutive extends BaseModel {
 
@@ -52,4 +54,12 @@ 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/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java
new file mode 100644
index 000000000..f642b1ae1
--- /dev/null
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java
@@ -0,0 +1,30 @@
+package com.magicmicky.habitrpgwrapper.lib.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;
+
+    @Override
+    public String getType() {
+        return "special";
+    }
+
+    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;
+    }
+}

From 30a88aa09d43cbbfbb454339bf0e61f56e53488c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 30 Jan 2017 14:13:29 +0100
Subject: [PATCH 11/32] fix challenge leaving

---
 .../habitrpg/android/habitica/HabitDatabase.java    |  2 +-
 .../social/challenges/ChallengeListFragment.java    |  5 +++++
 .../habitrpgwrapper/lib/models/HabitRPGUser.java    | 13 +++++++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

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 6382f94d3..5c5ee61a4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
@@ -7,5 +7,5 @@ public class HabitDatabase {
 
     public static final String NAME = "Habitica";
 
-    public static final int VERSION = 31;
+    public static final int VERSION = 32;
 }
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 1965df1c0..eae9104d5 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
@@ -68,6 +68,8 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
                         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();
@@ -153,6 +155,9 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
     }
 
     private void setChallengeEntries(List<Challenge> challenges) {
+        if (swipeRefreshEmptyLayout == null || swipeRefreshLayout == null) {
+            return;
+        }
         if (viewUserChallengesOnly && challenges.size() == 0) {
             swipeRefreshEmptyLayout.setVisibility(View.VISIBLE);
             swipeRefreshLayout.setVisibility(View.GONE);
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
index 1b3dc5b86..6d9e56c48 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
@@ -17,6 +17,7 @@ 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;
@@ -118,10 +119,14 @@ public class HabitRPGUser extends BaseModel {
     @OneToMany(methods = {OneToMany.Method.SAVE, OneToMany.Method.DELETE}, variableName = "challengeList")
     public List<Challenge> getChallengeList() {
         if (challengeList == null) {
-            challengeList = new Select()
-                    .from(Challenge.class)
-                    .where(Condition.column("user_id").eq(this.id))
-                    .queryList();
+            try {
+                challengeList = new Select()
+                        .from(Challenge.class)
+                        .where(Condition.column("user_id").eq(this.id))
+                        .queryList();
+            } catch (SQLiteException exception) {
+                challengeList = new ArrayList<>();
+            }
         }
         return challengeList;
     }

From d7e7d87d0edf0d3680373e30ae004a50020d6c20 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 30 Jan 2017 15:05:34 +0100
Subject: [PATCH 12/32] fix challenge refreshing

---
 .../social/challenges/ChallengeListFragment.java     |  7 +++++--
 .../habitrpgwrapper/lib/models/HabitRPGUser.java     | 12 ++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

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 eae9104d5..17b716fc4 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
@@ -75,14 +75,15 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
                         challenge.async().save();
                     }
 
+                    setRefreshingIfVisible(swipeRefreshLayout, false);
+                    setRefreshingIfVisible(swipeRefreshEmptyLayout, false);
+
                     if (viewUserChallengesOnly) {
                         setChallengeEntries(userChallenges);
                     } else {
                         setChallengeEntries(challenges);
                     }
 
-                    setRefreshingIfVisible(swipeRefreshLayout, false);
-                    setRefreshingIfVisible(swipeRefreshEmptyLayout, false);
 
                 }, throwable -> {
                     Log.e("ChallengeListFragment", "", throwable);
@@ -160,8 +161,10 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
         }
         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);
         }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
index 6d9e56c48..d5c12f4c3 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
@@ -393,7 +393,7 @@ public class HabitRPGUser extends BaseModel {
         }
 
         List<Challenge> challenges = getChallengeList();
-
+        List<Challenge> newChallenges = new ArrayList<>();
         if (getChallenges() != null) {
             for (String s : getChallenges()) {
                 boolean challengeExistInDatabase = false;
@@ -401,7 +401,8 @@ public class HabitRPGUser extends BaseModel {
                 for (Challenge challenge : challenges) {
                     if (challenge.id.equals(s)) {
                         challengeExistInDatabase = true;
-
+                        challenges.remove(challenge);
+                        newChallenges.add(challenge);
                         break;
                     }
                 }
@@ -411,12 +412,15 @@ public class HabitRPGUser extends BaseModel {
                     challenge.id = s;
                     challenge.user_id = id;
 
-                    challenges.add(challenge);
+                    newChallenges.add(challenge);
                 }
             }
+            for (Challenge challenge : challenges) {
+                challenge.user_id = null;
+            }
         }
 
-        setChallengeList(challenges);
+        setChallengeList(newChallenges);
 
         super.save();
     }

From 17e32c989bb9ce8a854b9000371aafca419c0e39 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 30 Jan 2017 15:05:40 +0100
Subject: [PATCH 13/32] update dependencies

---
 Habitica/build.gradle | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 74cf219ce..6e56d1e59 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -35,8 +35,8 @@ repositories {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     //Networking
-    compile 'com.squareup.okhttp3:okhttp:3.4.1'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
+    compile 'com.squareup.okhttp3:okhttp:3.6.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
     //REST API handling
     compile('com.squareup.retrofit2:retrofit:2.1.0') {
         exclude module: 'okhttp'
@@ -45,17 +45,17 @@ dependencies {
     compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
 
     //Crash Logging
-    releaseCompile('com.crashlytics.sdk.android:crashlytics:2.6.0@aar') {
+    releaseCompile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
         transitive = true;
     }
 
     // View Elements Binding :)
-    compile 'com.jakewharton:butterknife:8.4.0'
-    apt 'com.jakewharton:butterknife-compiler:8.4.0'
+    compile 'com.jakewharton:butterknife:8.5.1'
+    apt 'com.jakewharton:butterknife-compiler:8.5.1'
 
     //Dependency Injection
-    compile 'com.google.dagger:dagger:2.7'
-    apt 'com.google.dagger:dagger-compiler:2.7'
+    compile 'com.google.dagger:dagger:2.8'
+    apt 'com.google.dagger:dagger-compiler:2.8'
     provided 'org.glassfish:javax.annotation:10.0-b28'
     //App Compatibility and Material Design
     compile('com.mikepenz:materialdrawer:5.3.6@aar') {
@@ -74,7 +74,7 @@ dependencies {
     compile 'com.github.viirus:emoji-lib:0.0.3.2'
 
     // Markdown
-    compile 'com.commonsware.cwac:anddown:0.2.4'
+    compile 'com.commonsware.cwac:anddown:0.3.0'
 
     // About View for all dependent Libraries, we are using
     compile('com.mikepenz:aboutlibraries:5.7.1@aar') {
@@ -93,10 +93,10 @@ dependencies {
     compile 'org.greenrobot:eventbus:3.0.0'
 
     // IAP Handling / Verification
-    compile 'org.solovyev.android:checkout:0.9.1@aar'
+    compile 'org.solovyev.android:checkout:0.9.3@aar'
 
     //Facebook
-    compile('com.facebook.android:facebook-android-sdk:4.17.0') {
+    compile('com.facebook.android:facebook-android-sdk:4.19.0') {
         transitive = true
     }
 
@@ -107,13 +107,13 @@ dependencies {
     compile 'io.reactivex:rxjava:1.2.0'
 
     //Analytics
-    compile 'com.amplitude:android-sdk:2.9.2'
+    compile 'com.amplitude:android-sdk:2.13.1'
 
     // Fresco Image Management Library
-    compile('com.facebook.fresco:fresco:0.14.0') {
+    compile('com.facebook.fresco:fresco:1.0.1') {
         exclude module: 'bolts-android'
     }
-    compile('com.facebook.fresco:animated-gif:0.14.0') {
+    compile('com.facebook.fresco:animated-gif:1.0.1') {
         exclude module: 'bolts-android'
     }
     //Tests

From a30dc2e12af25eebfccc64e1690daa09ec29c4c5 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 30 Jan 2017 18:48:30 +0100
Subject: [PATCH 14/32] fix audio playback issue. Fixes #701

---
 .../habitrpg/android/habitica/APIHelper.java   |  6 +++++-
 .../helpers/PopupNotificationsManager.java     |  8 ++++----
 .../android/habitica/helpers/SoundFile.java    | 18 +++++++++++++-----
 .../android/habitica/helpers/SoundManager.java |  5 ++---
 4 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
index 563a02bb6..41a9f5cc0 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
@@ -75,6 +75,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import android.app.Activity;
+import android.content.Context;
 import android.media.Image;
 import android.os.Build;
 import android.support.v7.app.AlertDialog;
@@ -126,6 +127,9 @@ public class APIHelper implements Action1<Throwable> {
     @Inject
     CrashlyticsProxy crashlyticsProxy;
 
+    @Inject
+    Context context;
+
     // I think we don't need the APIHelper anymore we could just use ApiService
     public final ApiService apiService;
     final Observable.Transformer apiCallTransformer =
@@ -133,7 +137,7 @@ public class APIHelper implements Action1<Throwable> {
                     .map(new Func1<HabitResponse, Object>() {
                         @Override public Object call(HabitResponse habitResponse) {
                             if (habitResponse.notifications != null) {
-                                PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(APIHelper.this);
+                                PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(APIHelper.this, context);
                                 popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
                             }
                             return habitResponse.getData();
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 16c896344..c8b3439bd 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
@@ -33,15 +33,15 @@ public class PopupNotificationsManager {
 
     // @TODO: A queue for displaying alert dialogues
 
-    private PopupNotificationsManager(APIHelper apiHelper) {
+    private PopupNotificationsManager(APIHelper apiHelper, Context context) {
         this.apiHelper = apiHelper;
         this.seenNotifications = new HashMap<>();
-	    context.getApplicationContext();
+        this.context = context;
     }
 
-    public static PopupNotificationsManager getInstance(APIHelper apiHelper) {
+    public static PopupNotificationsManager getInstance(APIHelper apiHelper, Context context) {
         if (instance == null) {
-            instance = new PopupNotificationsManager(apiHelper);
+            instance = new PopupNotificationsManager(apiHelper, context);
         }
         return instance;
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.java
index 8e67df704..77cf810e7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.java
@@ -2,21 +2,24 @@ package com.habitrpg.android.habitica.helpers;
 
 import android.media.AudioManager;
 import android.media.MediaPlayer;
+import android.util.Log;
 
 import java.io.File;
 
-public class SoundFile {
+public class SoundFile implements MediaPlayer.OnCompletionListener {
     private String theme;
     private String fileName;
     private File file;
     private MediaPlayer mp;
     private Boolean playerPrepared = false;
+    private boolean isPlaying;
 
     public SoundFile(String theme, String fileName){
 
         this.theme = theme;
         this.fileName = fileName;
         mp = new MediaPlayer();
+        mp.setOnCompletionListener(this);
     }
 
     public String getTheme() {
@@ -65,11 +68,16 @@ public class SoundFile {
     }
 
     public void play(){
-        prepareMediaPlayer();
-        if(mp.isPlaying()) {
-            mp.stop();
+        if(isPlaying) {
+            return;
         }
-
+        prepareMediaPlayer();
+        isPlaying = true;
         mp.start();
     }
+
+    @Override
+    public void onCompletion(MediaPlayer mediaPlayer) {
+        isPlaying = false;
+    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.java
index 1e14120ca..ab8d28569 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.java
@@ -47,7 +47,7 @@ public class SoundManager {
     }
 
     public Observable<List<SoundFile>> preloadAllFiles() {
-        if(soundTheme == "off") {
+        if(soundTheme.equals("off")) {
             return Observable.empty();
         }
 
@@ -71,8 +71,7 @@ public class SoundManager {
     }
 
     public void loadAndPlayAudio(String type){
-        if(soundTheme == "off")
-        {
+        if(soundTheme.equals("off")) {
             return;
         }
 

From 454a398a8ddbc3fe3c50f16b312b7bb497e5dc85 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 31 Jan 2017 16:19:56 +0100
Subject: [PATCH 15/32] fix potential crash

---
 Habitica/AndroidManifest.xml                                  | 4 ++--
 .../habitrpg/android/habitica/components/AppComponent.java    | 3 +++
 .../android/habitica/ui/activities/GemPurchaseActivity.java   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index d8d7ad509..c9265498d 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="149"
-    android:versionName="0.0.36"
+    android:versionCode="151"
+    android:versionName="0.0.37"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
 
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 d14211371..c10c95066 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
@@ -14,6 +14,7 @@ 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;
@@ -228,4 +229,6 @@ public interface AppComponent {
     void inject(ChallengeTasksRecyclerViewFragment challengeTasksRecyclerViewFragment);
 
     void inject(TaskListFactory taskListFactory);
+
+    void inject(GemPurchaseActivity gemPurchaseActivity);
 }
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 424e997e9..6d03126de 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
@@ -62,7 +62,7 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
 
     @Override
     protected void injectActivity(AppComponent component) {
-
+        component.inject(this);
     }
 
     @Override

From 8e648ebed1ea4a26b0ad368a3553200780a67e64 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 1 Feb 2017 13:46:28 +0100
Subject: [PATCH 16/32] fix various memory leaks

---
 .../habitica/HabiticaBaseApplication.java     |  14 ++-
 .../helpers/PopupNotificationsManager.java    |   2 +-
 .../habitica/helpers/TaskAlarmManager.java    |   2 +-
 .../PushNotificationManager.java              |  21 ++--
 .../habitica/ui/activities/MainActivity.java  |   5 +-
 .../tasks/BaseTasksRecyclerViewAdapter.java   | 113 +++++++-----------
 .../habitica/ui/fragments/BaseFragment.java   |   4 +
 .../tasks/TaskRecyclerViewFragment.java       |  31 +++++
 .../ui/fragments/tasks/TasksFragment.java     |   3 +-
 .../habitrpgwrapper/lib/api/ApiService.java   |   2 +-
 10 files changed, 107 insertions(+), 90 deletions(-)

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 0afd18362..05588a48b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -29,6 +29,7 @@ import com.habitrpg.android.habitica.ui.activities.LoginActivity;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.raizlabs.android.dbflow.config.FlowManager;
 import com.squareup.leakcanary.LeakCanary;
+import com.squareup.leakcanary.RefWatcher;
 
 import org.solovyev.android.checkout.Billing;
 import org.solovyev.android.checkout.Cache;
@@ -56,6 +57,9 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
     @Inject
     CrashlyticsProxy crashlyticsProxy;
     private static AppComponent component;
+
+    public RefWatcher refWatcher;
+
     /**
      * For better performance billing class should be used as singleton
      */
@@ -123,6 +127,11 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
     @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();
@@ -177,10 +186,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
     protected abstract AppComponent initDagger();
 
     private void setupLeakCanary() {
-        // LeakCanary 1.3.1 has problems on Marshmallow; can remove check once updated with fixes
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            LeakCanary.install(this);
-        }
+        refWatcher = LeakCanary.install(this);
     }
 
     private void setupFlowManager() {
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 c8b3439bd..5f3dc0f67 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
@@ -36,7 +36,7 @@ public class PopupNotificationsManager {
     private PopupNotificationsManager(APIHelper apiHelper, Context context) {
         this.apiHelper = apiHelper;
         this.seenNotifications = new HashMap<>();
-        this.context = context;
+        this.context = context.getApplicationContext();
     }
 
     public static PopupNotificationsManager getInstance(APIHelper apiHelper, Context context) {
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 bbf836c1d..2ea8181eb 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
@@ -48,7 +48,7 @@ public class TaskAlarmManager {
 
     private TaskAlarmManager(Context context) {
         HabiticaBaseApplication.getComponent().inject(this);
-        this.context = context;
+        this.context = context.getApplicationContext();
         EventBus.getDefault().register(this);
         am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
     }
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 2afcf899f..e1f49b636 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/PushNotificationManager.java
@@ -1,17 +1,16 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
+import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.messaging.RemoteMessage;
+
+import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.magicmicky.habitrpgwrapper.lib.models.PushDevice;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.util.Log;
-
-import com.google.firebase.iid.FirebaseInstanceId;
-import com.google.firebase.messaging.RemoteMessage;
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.PushDevice;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -55,11 +54,11 @@ public class PushNotificationManager {
 
     public static PushNotificationManager getInstance(Context context) {
         if(instance == null) {
-            instance = new PushNotificationManager(context);
+            instance = new PushNotificationManager(context.getApplicationContext());
         }
 
         instance.refreshedToken = instance.sharedPreferences.getString(DEVICE_TOKEN_PREFERENCE_KEY, "");
-        instance.context = context;
+        instance.context = context.getApplicationContext();
 
         return instance;
     }
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 d815faf6c..346a9738b 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
@@ -882,7 +882,10 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     }
 
     private void setTranslatedFragmentTitle(BaseMainFragment fragment){
-	    if(fragment!= null && fragment.customTitle() != null){
+        if (getSupportActionBar() == null) {
+            return;
+        }
+	    if(fragment!= null && fragment.isAdded() && fragment.customTitle() != null){
 		    getSupportActionBar().setTitle(fragment.customTitle());
 	    }
 	    else if(user != null && user.getProfile() != null){
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 6e159cfef..09ed5c951 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
@@ -19,7 +19,6 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import android.app.Activity;
 import android.content.Context;
 import android.databinding.ObservableArrayList;
 import android.support.v7.widget.RecyclerView;
@@ -43,7 +42,7 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
 
     private final String userID;
     int layoutResource;
-    String taskType;
+    public String taskType;
     Context context;
     protected List<Task> content;
     protected List<Task> filteredContent;
@@ -53,7 +52,7 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
                                         Context newContext, String userID) {
         this.setHasStableIds(true);
         this.taskType = taskType;
-        this.context = newContext;
+        this.context = newContext.getApplicationContext();
         this.tagsHelper = tagsHelper;
         this.userID = userID;
         this.filteredContent = new ArrayList<>();
@@ -99,72 +98,9 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
         return LayoutInflater.from(parent.getContext()).inflate(layoutResource, parent, false);
     }
 
-    @Override
-    public void onAttachedToRecyclerView(RecyclerView recyclerView) {
-        super.onAttachedToRecyclerView(recyclerView);
-        EventBus.getDefault().register(this);
-    }
-
-    @Override
-    public void onDetachedFromRecyclerView(RecyclerView recyclerView) {
-        super.onDetachedFromRecyclerView(recyclerView);
-        EventBus.getDefault().unregister(this);
-
-    }
-
-    @Subscribe
-    public void onEvent(FilterTasksByTagsCommand cmd) {
-        filter();
-    }
-
-    @Subscribe
-    public void onEvent(TaskCheckedCommand evnt) {
-        if (!taskType.equals(evnt.Task.getType()))
+    public void updateTask(Task task) {
+        if (!taskType.equals(task.getType()))
             return;
-
-        if (evnt.completed && evnt.Task.getType().equals("todo")) {
-            // remove from the list
-            content.remove(evnt.Task);
-        }
-        this.updateTask(evnt.Task);
-        filter();
-    }
-
-    @Subscribe
-    public void onEvent(TaskUpdatedEvent evnt) {
-        if (!taskType.equals(evnt.task.getType()))
-            return;
-        this.updateTask(evnt.task);
-        filter();
-    }
-
-    @Subscribe
-    public void onEvent(TaskCreatedEvent evnt) {
-        if (!taskType.equals(evnt.task.getType()))
-            return;
-
-        content.add(0, evnt.task);
-        filter();
-    }
-
-    @Subscribe
-    public void onEvent(TaskRemovedEvent evnt) {
-        Task taskToDelete = null;
-
-        for (Task t : content) {
-            if (t.getId().equals(evnt.deletedTaskId)) {
-                taskToDelete = t;
-                break;
-            }
-        }
-
-        if (taskToDelete != null) {
-            content.remove(taskToDelete);
-            filter();
-        }
-    }
-
-    private void updateTask(Task task) {
         int i;
         for (i = 0; i < this.content.size(); ++i) {
             if (content.get(i).getId().equals(task.getId())) {
@@ -174,9 +110,10 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
         if (i < content.size()) {
             content.set(i, task);
         }
+        filter();
     }
 
-    private void filter() {
+    public void filter() {
         if (this.tagsHelper == null || this.tagsHelper.howMany() == 0) {
             filteredContent = content;
         } else {
@@ -184,7 +121,7 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
             filteredContent.addAll(this.tagsHelper.filter(content));
         }
 
-        ((Activity) context).runOnUiThread(this::notifyDataSetChanged);
+        this.notifyDataSetChanged();
     }
 
     public void loadContent(boolean forced) {
@@ -228,4 +165,40 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
     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/fragments/BaseFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
index 650d0a61e..88874880e 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
@@ -8,6 +8,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.DisplayTutorialEvent;
 import com.habitrpg.android.habitica.helpers.AmplitudeManager;
@@ -17,6 +18,7 @@ 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;
@@ -116,6 +118,8 @@ public abstract class BaseFragment extends DialogFragment {
         }
 
         super.onDestroyView();
+        RefWatcher refWatcher = HabiticaApplication.getInstance(getContext()).refWatcher;
+        refWatcher.watch(this);
     }
 
     public String getDisplayedClassName() {
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 3d25b510c..a42ac1a98 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
@@ -13,7 +13,12 @@ import android.view.ViewGroup;
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.events.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.TagsHelper;
 import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder;
@@ -29,6 +34,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 
 import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -226,4 +232,29 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
     String getClassName() {
         return 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);
+    }
 }
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 2c2684122..1769d9566 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
@@ -661,5 +661,6 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
 
 
 	@Override
-	public String customTitle() {	return getString(R.string.sidebar_tasks);	}
+	public String customTitle() {
+        return getString(R.string.sidebar_tasks);	}
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
index 39494147d..c12ffde1c 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
@@ -150,7 +150,7 @@ public interface ApiService {
 
 
     @POST("user/sleep")
-    Observable<HabitResponse<Void>> sleep();
+    Observable<HabitResponse<Boolean>> sleep();
 
     @POST("user/revive")
     Observable<HabitResponse<HabitRPGUser>> revive();

From c99ff5628881ccfb967379665fad5489c4c922a7 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 1 Feb 2017 14:15:24 +0100
Subject: [PATCH 17/32] add findbugs gradle plugin

---
 Habitica/build.gradle                             |  1 +
 .../ui/fragments/GemsPurchaseFragment.java        | 15 +--------------
 build.gradle                                      |  1 +
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 6e56d1e59..2fca32fe2 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.android.databinding'
 apply plugin: 'io.fabric'
 apply plugin: 'com.neenbedankt.android-apt'
+apply plugin: 'com.chaitanyapramod.findbugs-android'
 
 buildscript {
     repositories {
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 c71c0cf5c..3b1686785 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
@@ -2,34 +2,24 @@ package com.habitrpg.android.habitica.ui.fragments;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.BoughtGemsEvent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.GemPurchaseOptionsView;
 import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
 
-import org.greenrobot.eventbus.EventBus;
 import org.solovyev.android.checkout.ActivityCheckout;
 import org.solovyev.android.checkout.BillingRequests;
-import org.solovyev.android.checkout.Checkout;
 import org.solovyev.android.checkout.Inventory;
 import org.solovyev.android.checkout.ProductTypes;
-import org.solovyev.android.checkout.Purchase;
-import org.solovyev.android.checkout.Purchases;
 import org.solovyev.android.checkout.RequestListener;
 import org.solovyev.android.checkout.Sku;
 
-import android.content.Context;
 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 android.widget.Button;
-
-import java.util.HashMap;
 
 import javax.inject.Inject;
 
@@ -49,11 +39,8 @@ public class GemsPurchaseFragment extends BaseFragment implements GemPurchaseAct
     @Inject
     CrashlyticsProxy crashlyticsProxy;
 
-    private static final int GEMS_TO_ADD = 21;
-    Button btnPurchaseGems;
     private GemPurchaseActivity listener;
     private BillingRequests billingRequests;
-    private Inventory inventory;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -85,7 +72,7 @@ public class GemsPurchaseFragment extends BaseFragment implements GemPurchaseAct
     public void setupCheckout() {
         final ActivityCheckout checkout = listener.getActivityCheckout();
         if (checkout != null) {
-            inventory = checkout.makeInventory();
+            Inventory inventory = checkout.makeInventory();
 
             inventory.load(Inventory.Request.create()
                             .loadAllPurchases().loadSkus(ProductTypes.IN_APP, PurchaseTypes.allGemTypes),
diff --git a/build.gradle b/build.gradle
index 744edbc25..fcf34d14b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,7 @@ 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 'com.chaitanyapramod.gradle:findbugs-android:1.0'
     }
 }
 

From 18ae2edbea968ede0b978901a35618376f0c5973 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 1 Feb 2017 14:51:08 +0100
Subject: [PATCH 18/32] minor changes

---
 .../helpers/notifications/PushNotificationManager.java    | 3 ++-
 .../ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java    | 8 --------
 .../ui/adapter/tasks/DailiesRecyclerViewHolder.java       | 5 -----
 3 files changed, 2 insertions(+), 14 deletions(-)

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 e1f49b636..8b1eccfce 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
@@ -5,6 +5,7 @@ import com.google.firebase.messaging.RemoteMessage;
 
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.PushDevice;
 
@@ -44,7 +45,7 @@ public class PushNotificationManager {
     private HabitRPGUser user;
 
     protected PushNotificationManager(Context context) {
-        HabiticaApplication.getInstance(context).getComponent().inject(this);
+        HabiticaBaseApplication.getComponent().inject(this);
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
     }
 
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 09ed5c951..4d9bea2f2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java
@@ -2,11 +2,6 @@ package com.habitrpg.android.habitica.ui.adapter.tasks;
 
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.TaskCreatedEvent;
-import com.habitrpg.android.habitica.events.TaskRemovedEvent;
-import com.habitrpg.android.habitica.events.TaskUpdatedEvent;
-import com.habitrpg.android.habitica.events.commands.FilterTasksByTagsCommand;
-import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand;
 import com.habitrpg.android.habitica.helpers.TagsHelper;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
@@ -16,9 +11,6 @@ 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 org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
 import android.content.Context;
 import android.databinding.ObservableArrayList;
 import android.support.v7.widget.RecyclerView;
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 ac10ab171..decc5ab01 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
@@ -29,9 +29,4 @@ public class DailiesRecyclerViewHolder extends SortableTasksRecyclerViewAdapter<
     protected void injectThis(AppComponent component) {
         HabiticaBaseApplication.getComponent().inject(this);
     }
-
-    @Override
-    public void onBindViewHolder(DailyViewHolder holder, int position) {
-        super.onBindViewHolder(holder, position);
-    }
 }

From d9167db77150174c059a91d3059a21f450ebce47 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 1 Feb 2017 15:05:33 +0100
Subject: [PATCH 19/32] update travis config

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 72ac656dd..0fab055ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 language: android
 jdk: oraclejdk8
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
 before_install:
   - export JAVA7_HOME=/usr/lib/jvm/java-7-oracle
   - export JAVA8_HOME=/usr/lib/jvm/java-8-oracle

From 67a0deee6126ac9806895a1f92e5609ac081b118 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 1 Feb 2017 16:58:53 +0100
Subject: [PATCH 20/32] fix a bunch of linter errors

---
 .tx/config                                    |   2 +-
 Habitica/build.gradle                         |   3 +-
 Habitica/res/layout/activity_full_profile.xml |   4 +-
 .../res/layout/dialog_challenge_detail.xml    |   4 +-
 .../layout/dialog_challenge_detail_daily.xml  |  13 +-
 .../layout/dialog_challenge_detail_habit.xml  |  13 +-
 .../layout/dialog_challenge_detail_reward.xml |  21 +-
 .../layout/dialog_challenge_detail_todo.xml   |  13 +-
 .../dialog_choose_message_recipient.xml       |   3 +-
 Habitica/res/layout/dialog_edit_tag.xml       |   3 +-
 .../layout/edit_tags_section_drawer_item.xml  |   4 +-
 Habitica/res/layout/fragment_about.xml        |   1 -
 .../material_drawer_item_section_icon.xml     |  16 +-
 .../res/layout/profile_achievement_item.xml   |  17 +-
 Habitica/res/layout/qr_code.xml               |   3 +-
 Habitica/res/layout/qr_dialogue.xml           |   3 +-
 Habitica/res/layout/tavern_chat_item.xml      |   8 +-
 Habitica/res/layout/widget_add_task.xml       |   1 -
 Habitica/res/values-bg/strings.xml            | 137 ++++--
 Habitica/res/values-de/strings.xml            | 118 +++--
 Habitica/res/values-en-rGB/strings.xml        | 137 ++++--
 Habitica/res/values-es/strings.xml            |  64 +--
 Habitica/res/values-fr/strings.xml            | 137 ++++--
 Habitica/res/values-he/strings.profile.xml    |  13 -
 Habitica/res/values-he/strings.sidebar.xml    |  20 -
 Habitica/res/values-he/strings.tutorial.xml   |  14 -
 Habitica/res/values-he/strings.xml            | 369 ---------------
 Habitica/res/values-hr-rHR/strings.xml        |  50 +--
 Habitica/res/values-id/strings.profile.xml    |  17 -
 Habitica/res/values-id/strings.sidebar.xml    |  20 -
 Habitica/res/values-id/strings.tutorial.xml   |  14 -
 Habitica/res/values-id/strings.xml            | 419 ------------------
 Habitica/res/values-in/strings.sidebar.xml    |   3 +-
 Habitica/res/values-in/strings.xml            | 158 +++++--
 Habitica/res/values-it/strings.xml            | 138 ++++--
 Habitica/res/values-iw/strings.sidebar.xml    |   1 +
 Habitica/res/values-iw/strings.xml            | 104 +++--
 Habitica/res/values-ja/strings.profile.xml    |   5 +-
 Habitica/res/values-ja/strings.xml            |  86 ++--
 Habitica/res/values-ko/strings.xml            |  64 +--
 Habitica/res/values-lt/strings.xml            |  62 +--
 Habitica/res/values-nl/strings.xml            | 137 ++++--
 Habitica/res/values-pl/strings.xml            | 109 +++--
 Habitica/res/values-pt-rBR/strings.xml        |  98 ++--
 .../res/values-pt-rPT/strings.profile.xml     |   5 +-
 .../res/values-pt-rPT/strings.tutorial.xml    |   2 +-
 Habitica/res/values-pt-rPT/strings.xml        |  94 ++--
 Habitica/res/values-ru/strings.xml            | 125 ++++--
 Habitica/res/values-tr/strings.profile.xml    |   2 +-
 Habitica/res/values-tr/strings.tutorial.xml   |  18 +-
 Habitica/res/values-tr/strings.xml            |  92 ++--
 Habitica/res/values-zh-rTW/strings.xml        |  58 +--
 Habitica/res/values-zh/strings.profile.xml    |   5 +-
 Habitica/res/values-zh/strings.xml            | 134 ++++--
 Habitica/res/values/strings.sidebar.xml       |   2 +-
 Habitica/res/values/strings.xml               |  84 ++--
 .../PushNotificationManager.java              |  30 +-
 .../habitica/prefs/CustomListPreference.java  | 219 ---------
 .../habitica/ui/activities/MainActivity.java  |   4 +-
 .../habitica/ui/activities/SetupActivity.java |   2 +-
 .../CustomizationRecyclerViewAdapter.java     |   4 +-
 .../setup/CustomizationSetupAdapter.java      |   6 +-
 translations/store_strings-tr.xml             |   2 +-
 63 files changed, 1632 insertions(+), 1882 deletions(-)
 delete mode 100644 Habitica/res/values-he/strings.profile.xml
 delete mode 100644 Habitica/res/values-he/strings.sidebar.xml
 delete mode 100644 Habitica/res/values-he/strings.tutorial.xml
 delete mode 100644 Habitica/res/values-he/strings.xml
 delete mode 100644 Habitica/res/values-id/strings.profile.xml
 delete mode 100644 Habitica/res/values-id/strings.sidebar.xml
 delete mode 100644 Habitica/res/values-id/strings.tutorial.xml
 delete mode 100644 Habitica/res/values-id/strings.xml
 delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/prefs/CustomListPreference.java

diff --git a/.tx/config b/.tx/config
index a3df04c4e..69b82749a 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,6 +1,6 @@
 [main]
 host = https://www.transifex.com
-lang_map = pt_BR: pt-rBR, zh_TW: zh-rTW, hr_HR: hr-rHR, pt_PT: pt-rPT, en_GB: en-rGB
+lang_map = pt_BR: pt-rBR, zh_TW: zh-rTW, hr_HR: hr-rHR, pt_PT: pt-rPT, en_GB: en-rGB, he: iw, id: in
 
 [habitica-android.store_stringsxml]
 file_filter = translations/store_strings-<lang>.xml
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 2fca32fe2..29e3ab6e5 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -208,7 +208,8 @@ android {
     }
 
     lintOptions {
-        disable 'UnusedResources'
+        disable 'UnusedResources','MissingTranslation','UnusedAttribute','InvalidPackage'
+        enable 'LogConditional','IconExpectedSize','MissingRegistered','TypographyQuotes'
     }
 }
 
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index ffd566b61..5846402b9 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -9,7 +9,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <android.support.v7.widget.CardView
@@ -27,7 +27,6 @@
                     android:id="@+id/avatar_with_bars"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
                     android:layout_marginTop="5dp"
                     android:adjustViewBounds="true"
                     android:background="@color/transparent"
@@ -185,7 +184,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:visibility="gone"
-                        android:onClick=""
                         android:id="@+id/copy_userid" />
                 </LinearLayout>
             </LinearLayout>
diff --git a/Habitica/res/layout/dialog_challenge_detail.xml b/Habitica/res/layout/dialog_challenge_detail.xml
index 90d22542c..ab70fcc7a 100644
--- a/Habitica/res/layout/dialog_challenge_detail.xml
+++ b/Habitica/res/layout/dialog_challenge_detail.xml
@@ -70,7 +70,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             android:scrollbarAlwaysDrawVerticalTrack="true"
             android:scrollbars="vertical">
@@ -138,7 +138,7 @@
         android:orientation="horizontal">
 
         <LinearLayout
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"
             android:layout_marginTop="10dp"
diff --git a/Habitica/res/layout/dialog_challenge_detail_daily.xml b/Habitica/res/layout/dialog_challenge_detail_daily.xml
index 523588813..fe8705b6c 100644
--- a/Habitica/res/layout/dialog_challenge_detail_daily.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_daily.xml
@@ -1,11 +1,12 @@
 <?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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/border_1f000000"
-    android:orientation="horizontal"
-    android:weightSum="3">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="@drawable/border_1f000000"
+              android:orientation="horizontal"
+              android:weightSum="3"
+              android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/dialog_challenge_detail_habit.xml b/Habitica/res/layout/dialog_challenge_detail_habit.xml
index 715131225..c66f3f10c 100644
--- a/Habitica/res/layout/dialog_challenge_detail_habit.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_habit.xml
@@ -1,11 +1,12 @@
 <?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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:background="@drawable/border_1f000000"
-    android:weightSum="3">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal"
+              android:background="@drawable/border_1f000000"
+              android:weightSum="3"
+              android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/dialog_challenge_detail_reward.xml b/Habitica/res/layout/dialog_challenge_detail_reward.xml
index 42a10cefa..eed88b277 100644
--- a/Habitica/res/layout/dialog_challenge_detail_reward.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_reward.xml
@@ -1,11 +1,12 @@
 <?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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:background="@drawable/border_1f000000"
-    android:weightSum="3">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal"
+              android:background="@drawable/border_1f000000"
+              android:weightSum="3"
+              android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -44,12 +45,4 @@
             tools:text="Long text to see" />
 
     </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-
-    </LinearLayout>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_detail_todo.xml b/Habitica/res/layout/dialog_challenge_detail_todo.xml
index 5fc9d7fa3..402ded014 100644
--- a/Habitica/res/layout/dialog_challenge_detail_todo.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_todo.xml
@@ -1,11 +1,12 @@
 <?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:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/border_1f000000"
-    android:orientation="horizontal"
-    android:weightSum="3">
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:background="@drawable/border_1f000000"
+              android:orientation="horizontal"
+              android:weightSum="3"
+              android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/dialog_choose_message_recipient.xml b/Habitica/res/layout/dialog_choose_message_recipient.xml
index 9de9d9469..e03f7d683 100644
--- a/Habitica/res/layout/dialog_choose_message_recipient.xml
+++ b/Habitica/res/layout/dialog_choose_message_recipient.xml
@@ -12,7 +12,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/uuidEditText" android:layout_gravity="center_horizontal"
-            android:focusable="true" android:singleLine="true"/>
+            android:focusable="true"
+            android:maxLines="1"/>
     <Button
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/dialog_edit_tag.xml b/Habitica/res/layout/dialog_edit_tag.xml
index 4c1e23a00..d89801c06 100644
--- a/Habitica/res/layout/dialog_edit_tag.xml
+++ b/Habitica/res/layout/dialog_edit_tag.xml
@@ -8,7 +8,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/tagEditText" android:layout_gravity="center_horizontal"
-            android:focusable="true" android:singleLine="true"/>
+            android:focusable="true"
+            android:maxLines="1"/>
     <Button
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/edit_tags_section_drawer_item.xml b/Habitica/res/layout/edit_tags_section_drawer_item.xml
index b32d89997..5d40b5ebd 100644
--- a/Habitica/res/layout/edit_tags_section_drawer_item.xml
+++ b/Habitica/res/layout/edit_tags_section_drawer_item.xml
@@ -24,9 +24,9 @@
                 android:lines="1"
                 android:paddingLeft="@dimen/material_drawer_vertical_padding"
                 android:paddingRight="@dimen/material_drawer_vertical_padding"
-                android:singleLine="true"
                 android:textSize="@dimen/material_drawer_item_section_text"
-                android:text="@string/filter_drawer_filter_tags"/>
+                android:text="@string/filter_drawer_filter_tags"
+                android:maxLines="1"/>
         <Button
                 android:id="@+id/btnEdit"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/fragment_about.xml b/Habitica/res/layout/fragment_about.xml
index ae84e86df..63d0e15d7 100644
--- a/Habitica/res/layout/fragment_about.xml
+++ b/Habitica/res/layout/fragment_about.xml
@@ -60,7 +60,6 @@
 
                 android:layout_marginTop="35sp"
                 android:background="@drawable/rounded_purple_square"
-                android:capitalize="none"
                 android:text="@string/about.rate_our_app"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
diff --git a/Habitica/res/layout/material_drawer_item_section_icon.xml b/Habitica/res/layout/material_drawer_item_section_icon.xml
index 12c6a2920..d11464594 100644
--- a/Habitica/res/layout/material_drawer_item_section_icon.xml
+++ b/Habitica/res/layout/material_drawer_item_section_icon.xml
@@ -9,12 +9,12 @@
     android:paddingTop="@dimen/material_drawer_section_vertical_padding"
     android:paddingBottom="@dimen/material_drawer_section_vertical_padding">
     <TextView
-        android:id="@+id/material_drawer_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fontFamily="sans-serif-medium"
-        android:gravity="center_vertical|start"
-        android:lines="1"
-        android:singleLine="true"
-        android:textSize="@dimen/drawer_section_item_text" />
+            android:id="@+id/material_drawer_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|start"
+            android:lines="1"
+            android:textSize="@dimen/drawer_section_item_text"
+            android:maxLines="1"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/profile_achievement_item.xml b/Habitica/res/layout/profile_achievement_item.xml
index 42e71af3a..5d7afb70d 100644
--- a/Habitica/res/layout/profile_achievement_item.xml
+++ b/Habitica/res/layout/profile_achievement_item.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:fresco="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/achievement_item_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="10dp"
-    android:orientation="vertical">
+              xmlns:fresco="http://schemas.android.com/apk/res-auto"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@+id/achievement_item_layout"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_margin="10dp"
+              android:orientation="vertical">
 
     <FrameLayout
         android:layout_width="wrap_content"
@@ -24,11 +25,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|right"
-            android:text="2"
+            tools:text="2"
             android:background="@drawable/layout_rounded_bg_brand"
             android:paddingLeft="2dp"
             android:paddingRight="2dp"
-            android:textSize="10dp"
+            android:textSize="12sp"
             android:textColor="#ffffff" />
     </FrameLayout>
 
diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml
index 6a014e57d..150a1608b 100644
--- a/Habitica/res/layout/qr_code.xml
+++ b/Habitica/res/layout/qr_code.xml
@@ -14,7 +14,6 @@
          />
 
     <FrameLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="300dp"
@@ -26,7 +25,7 @@
             android:id="@+id/QRImageView"
             android:layout_gravity="center" />
 
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <RelativeLayout
             android:orientation="vertical"
             android:layout_width="60dp"
             android:layout_height="60dp"
diff --git a/Habitica/res/layout/qr_dialogue.xml b/Habitica/res/layout/qr_dialogue.xml
index 6b6039ea4..b0c658db3 100644
--- a/Habitica/res/layout/qr_dialogue.xml
+++ b/Habitica/res/layout/qr_dialogue.xml
@@ -10,11 +10,10 @@
         android:id="@+id/dialogButtonOK"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Ok"
+        android:text="@string/profile_achievement_ok"
         android:layout_marginTop="5dp"
         android:layout_marginRight="5dp"
         android:layout_centerHorizontal="true"
-        android:layout_below="@+id/qrLayout"
         />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/tavern_chat_item.xml b/Habitica/res/layout/tavern_chat_item.xml
index e1eecce73..cc287c3b8 100644
--- a/Habitica/res/layout/tavern_chat_item.xml
+++ b/Habitica/res/layout/tavern_chat_item.xml
@@ -9,7 +9,6 @@
     <android.support.v7.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_columnSpan="2"
         style="@style/CardView.Default">
 
         <LinearLayout
@@ -20,9 +19,10 @@
 
 
             <LinearLayout
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:weightSum="1.0">
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:weightSum="1.0"
+                    android:baselineAligned="false">
 
                 <LinearLayout
                     android:layout_width="0dp"
diff --git a/Habitica/res/layout/widget_add_task.xml b/Habitica/res/layout/widget_add_task.xml
index a161126f5..677b10b35 100644
--- a/Habitica/res/layout/widget_add_task.xml
+++ b/Habitica/res/layout/widget_add_task.xml
@@ -19,7 +19,6 @@
         android:layout_gravity="center_horizontal"
         android:textSize="12sp"
         android:textColor="@android:color/white"
-        android:singleLine="false"
         android:shadowColor="@android:color/black"
         android:shadowRadius="2"
         android:shadowDx="1"
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 70f5a5c1f..2f57a98af 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">Опресняване</string>
   <string name="XP_default">Опит</string>
   <string name="HP_default">Здраве</string>
@@ -116,9 +116,9 @@
   <string name="faint_button">Възстановете здравето си и опитайте отново</string>
   <string name="filter">Филтър</string>
   <string name="profile_image">Профилно изображение</string>
-  <string name="mana_price_button" formatted="false">%d МТ</string>
-  <string name="used_skill" formatted="false">Използвахте %1$s за %2$d точки мана.</string>
-  <string name="used_skill_without_mana" formatted="false">Вие използвахте %1$s.</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>
@@ -139,6 +139,7 @@
   <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>
@@ -162,9 +163,9 @@
   <string name="avatar_size_broad">Широк</string>
   <string name="avatar_background">Фон</string>
   <string name="purchase_customization">Купуване на персонализация</string>
-  <string name="purchase_set_button" formatted="false">Отключване на комплекта за %d диамант(а)</string>
+  <string name="purchase_set_button">Отключване на комплекта за %d диамант(а)</string>
   <string name="purchase_button">Купуване</string>
-  <string name="purchase_set_title" formatted="false">Купуване на комплекта %s</string>
+  <string name="purchase_set_title">Купуване на комплекта %s</string>
   <string name="due_date">Крайна дата</string>
   <string name="quest.accept">Приемане</string>
   <string name="quest.reject">Отказване</string>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">Приета</string>
   <string name="quest.rejected">Отказана</string>
   <string name="quest.participants">Участници</string>
-  <string name="version_info" formatted="false">Версия %s (%d)</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_title">Добре дошли в Хабитика</string>
-  <string name="intro_1_description" formatted="false">Присъединете се към останалите %s човека, които се забавляват, докато изпълняват ежедневните си задължения. Създайте си герой и следете истинските си задачи.</string>
+  <string name="intro_1_description">Присъединете се към останалите %s човека, които се забавляват, докато изпълняват ежедневните си задължения. Създайте си герой и следете истинските си задачи.</string>
   <string name="intro_2_title">Напредък в играта = напредък в живота</string>
   <string name="intro_2_description">Отключвайте функционалностите на играта като изпълнявате задачите в истинския си живот. Печелете екипировка, любимци и още, като награда за постигането на целите си!</string>
   <string name="intro_3_title">Общност и битки с чудовища</string>
@@ -243,8 +244,8 @@
   <string name="write_message">Напишете съобщение</string>
   <string name="post">Изпр.</string>
   <string name="guild_search_hint">Търсене на гилдии</string>
-  <string name="todo_due" formatted="false">Срок: %s</string>
-  <string name="daily_streak" formatted="false">текуща серия: %d</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>
@@ -263,10 +264,10 @@
   <string name="quest_begin_message">Наистина ли искате да започнете мисията? След като мисията започне, никой повече няма да може да се присъедини към нея.</string>
   <string name="quest.invitation.text">Получихте покана за участие в мисия!</string>
   <string name="ago_1day">Преди 1 ден</string>
-  <string name="ago_days" formatted="false">Преди %d дни</string>
+  <string name="ago_days">Преди %d дни</string>
   <string name="ago_1Minute">Преди 1 минута</string>
-  <string name="ago_minutes" formatted="false">Преди %d минути</string>
-  <string name="ago_hours" formatted="false">Преди %d часа</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>
@@ -276,26 +277,26 @@
   <string name="quests">Мисии</string>
   <string name="pets">Любимци</string>
   <string name="mounts">Превози</string>
-  <string name="armoireEquipment" formatted="false">Намерихте рядък предмет в гардероба: %s! Страхотно!</string>
-  <string name="armoireFood" formatted="false">Тършувате из гардероба и намирате %1$s %2$s. Какво ли прави това там?</string>
+  <string name="armoireEquipment">Намерихте рядък предмет в гардероба: %s! Страхотно!</string>
+  <string name="armoireFood">Тършувате из гардероба и намирате %1$s %2$s. Какво ли прави това там?</string>
   <string name="armoireExp">Сборвате се с гардероба и получавате опит. Така му се пада!</string>
-  <string name="armoireNotesFull" formatted="false">Отворете гардероба, за да получите специална екипировка, опит или храна! Оставащи предмети: %d</string>
+  <string name="armoireNotesFull">Отворете гардероба, за да получите специална екипировка, опит или храна! Оставащи предмети: %d</string>
   <string name="armoireLastItem">Намерихте последния рядък предмет за екипиране в омагьосания гардероб.</string>
   <string name="armoireNotesEmpty">В гардероба ще се появяват нови предмети през първата седмица на всеки месец. До тогава продължавайте да щракате за опит и храна!</string>
-  <string name="sell" formatted="false">Продаване (%s злато)</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" formatted="false">Хранене на %1$s %2$s с:</string>
+  <string name="dialog_feeding">Хранене на %1$s %2$s с:</string>
   <string name="use_animal">Използване</string>
   <string name="feed">Хранене</string>
-  <string name="hatch_with" formatted="false">Излюпване на любимец с %s</string>
-  <string name="hatched_pet_title" formatted="false">Вие излюпихте %1$s %2$s!</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" formatted="false">Вие нахранихте своя(та/то) %1$s %2$s!</string>
-  <string name="notification_purchase" formatted="false">%s беше закупен(а/о)</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>
@@ -306,7 +307,9 @@
   <string name="sectionspecialMounts">Редки превози</string>
   <string name="world_quest">Световна мисия</string>
   <string name="inn_description">Починете в странноприемницата, за да не Ви наранят неизпълнените ежедневни задачи! (Забележка: това не Ви защитава от получаването на щети от главатари.)</string>
-  <string name="empty_items" formatted="false">Нямате %s</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>
@@ -318,7 +321,7 @@
   <string name="select_class">Изберете клас</string>
   <string name="opt_out_class">Отказване</string>
   <string name="opt_out_description">Не Ви се занимава с класове? Искате да изберете по-късно? Откажете се от тях — ще бъдете воин без специални умения. Можете да прочетете относно класовата система по-късно в уикито, както и да включите класовете когато пожелаете.</string>
-  <string name="class_confirmation" formatted="false">Наистина ли искате да бъдете %s?</string>
+  <string name="class_confirmation">Наистина ли искате да бъдете %s?</string>
   <string name="class_changed">Вие вече сте %s!</string>
   <string name="class_changed_description">Вече имате ново бойно снаряжение по подразбиране, което можете да намерите в „Екипировка“!</string>
   <string name="choose_class">Избиране на класа</string>
@@ -339,14 +342,14 @@
   <string name="email">Е-поща</string>
   <string name="invite_users">Поканване в групата</string>
   <string name="share_using">Споделяне чрез</string>
-  <string name="share_levelup" formatted="false">Достигнах ниво %s в Хабитика, като подобрих навиците си в истинския живот!</string>
-  <string name="share_hatched" formatted="false">Току-що излюпих любимец — %1$s %2$s в Хабитика, като изпълнявах задачите си в истинския живот!</string>
-  <string name="share_raised" formatted="false">Току-що се сдобих с превоз — %1$s %2$s в Хабитика като изпълнявах задачите си в истинския живот!</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" formatted="false">Съобщение от %1$s</string>
-  <string name="leaderName" formatted="false">Водач: %1$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>
@@ -355,9 +358,9 @@
   <string name="party_invite">Отключете като поканите приятели</string>
   <string name="no_gold">Нямате достатъчно злато</string>
   <string name="no_potion">Няма нужда да купувате лековита отвара</string>
-  <string name="successful_purchase" formatted="false">Закупено успешно: %1$s</string>
+  <string name="successful_purchase">Закупено успешно: %1$s</string>
   <string name="purchase_confirmation_title">Потвърждаване на покупката</string>
-  <string name="confirm_purchase_text" formatted="false">Купуване на %1$s за %2$s %3$s</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>
@@ -408,7 +411,7 @@
   <string name="hatching_market_info">Не Ви се падат предметите, които искате? Прегледайте пазара!</string>
   <string name="feeding_market_info">Нуждаете се от друга храна? Купете още от пазара!</string>
   <string name="open_market">Отваряне на пазара</string>
-  <string name="cds_description" formatted="false">Ежедневните Ви задачи ще се подновят при първия път, когато използвате Хабитика след %1$s. Уверете се, че сте изпълнили ежедневните си задачи преди това време!</string>
+  <string name="cds_description">Ежедневните Ви задачи ще се подновят при първия път, когато използвате Хабитика след %1$s. Уверете се, че сте изпълнили ежедневните си задачи преди това време!</string>
   <string name="AudioTheme_title">Звукова тема</string>
   <string name="AudioTheme_summary">Промяна на звуковата тема на Хабитика</string>
   <!--Login Incentives-->
@@ -416,4 +419,74 @@
   <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 злато за диамант. Месечните му доставки отначало ще бъдат ограничени до 25 диаманта на месец, но това ограничение се вдига с по 5 диаманта след всеки три месеца непрекъснат абонамент, докато не достигне 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 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="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">Тъй като имате абонамент за Хабитика, можете всеки месец да купувате определен брой диаманти срещу злато.</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>
 </resources>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index fde115929..31e9e35d4 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<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>
@@ -116,9 +116,9 @@
   <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" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">Du hast %1$s für %2$d Mana benutzt.</string>
-  <string name="used_skill_without_mana" formatted="false">Du hast %1$s benutzt.</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>
@@ -139,6 +139,7 @@
   <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>
@@ -162,9 +163,9 @@
   <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" formatted="false">Set für %d Edelsteine freischalten</string>
+  <string name="purchase_set_button">Set für %d Edelsteine freischalten</string>
   <string name="purchase_button">Kaufen</string>
-  <string name="purchase_set_title" formatted="false">Set %s 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>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">Angenommen</string>
   <string name="quest.rejected">Abgelehnt</string>
   <string name="quest.participants">Teilnehmer</string>
-  <string name="version_info" formatted="false">Version %s (%d)</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_title">Willkommen in Habitica</string>
-  <string name="intro_1_description" formatted="false">Tritt einer Gemeinschaft von über %s Menschen bei und erledige Dinge mit Spaß. Erstelle einen Avatar und verwalte spielerisch Deine Aufgaben des Alltags.</string>
+  <string name="intro_1_description">Tritt einer Gemeinschaft von über %s Menschen bei und erledige Dinge mit Spaß. Erstelle einen Avatar und verwalte spielerisch Deine Aufgaben des Alltags.</string>
   <string name="intro_2_title">Spielfortschritt = Lebensfortschritt</string>
   <string name="intro_2_description">Schalte zusätzliche Spielinhalte frei, indem Du Aufgaben im echten Leben erledigst. Verdiene Dir Ausrüstung, Haustiere und mehr als Belohnung für die Erfüllung Deiner Ziele!</string>
   <string name="intro_3_title">Werde sozial und kämpfe gegen Monster</string>
@@ -243,8 +244,8 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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" formatted="false">Bis: %s</string>
-  <string name="daily_streak" formatted="false">Aktuelle Serie: %d</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>
@@ -263,10 +264,10 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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" formatted="false">Vor %d Tagen</string>
+  <string name="ago_days">Vor %d Tagen</string>
   <string name="ago_1Minute">Vor einer Minute</string>
-  <string name="ago_minutes" formatted="false">Vor %d Minuten</string>
-  <string name="ago_hours" formatted="false">Vor %d Stunden</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>
@@ -276,26 +277,26 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</string>
   <string name="quests">Quests</string>
   <string name="pets">Haustiere</string>
   <string name="mounts">Reittiere</string>
-  <string name="armoireEquipment" formatted="false">Du hast einen seltenen Ausrüstungsgegenstand im Schrank gefunden: %s! Großartig!</string>
-  <string name="armoireFood" formatted="false">Du wühlst im Schrank herum und findest %1$s %2$s. Was macht das denn hier?</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" formatted="false">Öffne den Schrank um zufällig spezielle Gegenstände, Erfahrung oder Nahrung zu erhalten! Verbleibende Ausrüstungsgegenstände: %d</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" formatted="false">Verkaufen (%s Gold)</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" formatted="false">Füttere %1$s %2$s mit:</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" formatted="false">Haustier mit %s ausbrüten</string>
-  <string name="hatched_pet_title" formatted="false">Du hast ein %1$s %2$s ausgebrütet!</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" formatted="false">Du hast Dein/e/n %1$s %2$s gefüttert!</string>
-  <string name="notification_purchase" formatted="false">%s gekauft</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>
@@ -306,7 +307,7 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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" formatted="false">Du hast kein/e %s</string>
+  <string name="empty_items">Du hast kein/e %s</string>
   <string name="warrior">Krieger</string>
   <string name="rogue">Schurke</string>
   <string name="mage">Magier</string>
@@ -318,7 +319,7 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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" formatted="false">Bist Du sicher, dass Du %s werden willst?</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>
@@ -339,14 +340,14 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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" formatted="false">Mit dem Verbessern meiner Real-Life-Gewohnheiten habe ich Level %s in Habitica erreicht!</string>
-  <string name="share_hatched" formatted="false">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" formatted="false">Durch das Erfüllen meiner Real-Life-Aufgaben habe ich ein %1$s %2$s Reittier in Habitica erhalten!</string>
+  <string name="share_levelup">Mit dem Verbessern meiner Real-Life-Gewohnheiten habe ich 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" formatted="false">Nachricht von %1$s</string>
-  <string name="leaderName" formatted="false">Führender: %1$s</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>
@@ -355,9 +356,9 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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" formatted="false">%1$s gekauft</string>
+  <string name="successful_purchase">%1$s gekauft</string>
   <string name="purchase_confirmation_title">Kauf bestätigen</string>
-  <string name="confirm_purchase_text" formatted="false">%1$s für %2$s %3$s kaufen</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>
@@ -408,7 +409,7 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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" formatted="false">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="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-->
@@ -416,4 +417,57 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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="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 Edelsteine zu 20 Goldmünzen je Stück verkaufen. Seine monatlichen Lieferungen sind zunächst auf 25 Edelsteine pro Monat beschränkt. Sie steigen aber um 5 Edelsteine für jeweils drei durchgehend abonnierte Monate, bis zu einem Maximum von 50 Edelsteinen pro Monat.</string>
+  <string name="subscribe.listitem3.description">Vervollständige deinen Stall schneller!</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="payment_method">Zahlungsmethode</string>
+  <string name="subscription">Abonnement</string>
+  <string name="active">Aktiv</string>
+  <string name="cancel_subscription">Abonnement kündigen</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="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="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="inbox">Posteingang</string>
+  <string name="FAQ">Häufig gestellte Fragen</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="gem_shop">Edelstein</string>
+  <string name="open">Öffnen</string>
+  <string name="notification_mystery_item">Du öffnest die Kiste und findest %s!</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Deine nächste Belohnung wird nach %1$d Log-Ins freigeschalten </string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index 84e4f8ab0..123a7b7ee 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<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>
@@ -116,9 +116,9 @@
   <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" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">You used %1$s for %2$d mana.</string>
-  <string name="used_skill_without_mana" formatted="false">You used %1$s.</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>
@@ -139,6 +139,7 @@
   <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>
@@ -162,9 +163,9 @@
   <string name="avatar_size_broad">Broad</string>
   <string name="avatar_background">Background</string>
   <string name="purchase_customization">Purchase Customisation</string>
-  <string name="purchase_set_button" formatted="false">Unlock set for %d gems</string>
+  <string name="purchase_set_button">Unlock set for %d gems</string>
   <string name="purchase_button">Purchase</string>
-  <string name="purchase_set_title" formatted="false">Purchase set %s</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>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">Accepted</string>
   <string name="quest.rejected">Rejected</string>
   <string name="quest.participants">Participants</string>
-  <string name="version_info" formatted="false">Version %s (%d)</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_title">Welcome to Habitica</string>
-  <string name="intro_1_description" formatted="false">Join over %s people having fun while getting things done. Create an avatar and track your real-life tasks.</string>
+  <string name="intro_1_description">Join over %s people having fun while getting things done. Create an avatar and track your real-life tasks.</string>
   <string name="intro_2_title">Game Progress = Life Progress</string>
   <string name="intro_2_description">Unlock features in the game by checking off your real-life tasks. Earn armour, pets, and more to reward you for meeting your goals!</string>
   <string name="intro_3_title">Get Social and Fight Monsters</string>
@@ -243,8 +244,8 @@ To start, which parts of your life do you want to improve?</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" formatted="false">Due: %s</string>
-  <string name="daily_streak" formatted="false">current streak: %d</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>
@@ -263,10 +264,10 @@ To start, which parts of your life do you want to improve?</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" formatted="false">%d days ago</string>
+  <string name="ago_days">%d days ago</string>
   <string name="ago_1Minute">1 minute ago</string>
-  <string name="ago_minutes" formatted="false">%d minutes ago</string>
-  <string name="ago_hours" formatted="false">%d hours 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>
@@ -276,26 +277,26 @@ To start, which parts of your life do you want to improve?</string>
   <string name="quests">Quests</string>
   <string name="pets">Pets</string>
   <string name="mounts">Mounts</string>
-  <string name="armoireEquipment" formatted="false">You found a piece of rare Equipment in the Armoire: %s! Awesome!</string>
-  <string name="armoireFood" formatted="false">You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here?</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" formatted="false">Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining: %d</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" formatted="false">Sell (%s Gold)</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" formatted="false">Feed %1$s %2$s with:</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" formatted="false">Hatch pet with %s</string>
-  <string name="hatched_pet_title" formatted="false">You hatched a %1$s %2$s!</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" formatted="false">You fed your %1$s %2$s!</string>
-  <string name="notification_purchase" formatted="false">%s was purchased</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>
@@ -306,7 +307,9 @@ To start, which parts of your life do you want to improve?</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" formatted="false">You don\'t have any %s</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>
@@ -318,7 +321,7 @@ To start, which parts of your life do you want to improve?</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" formatted="false">Are you sure you want to be a %s?</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>
@@ -339,14 +342,14 @@ To start, which parts of your life do you want to improve?</string>
   <string name="email">Email</string>
   <string name="invite_users">Invite to Party</string>
   <string name="share_using">Share using</string>
-  <string name="share_levelup" formatted="false">I got to level %s in Habitica by improving my real-life habits!</string>
-  <string name="share_hatched" formatted="false">I just hatched a %1$s %2$s pet in Habitica by completing my real-life tasks!</string>
-  <string name="share_raised" formatted="false">I just gained a %1$s %2$s mount in Habitica by completing my real-life tasks!</string>
+  <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" formatted="false">Message from %1$s</string>
-  <string name="leaderName" formatted="false">Leader: %1$s</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>
@@ -355,9 +358,9 @@ To start, which parts of your life do you want to improve?</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 a health potion</string>
-  <string name="successful_purchase" formatted="false">%1$s successfully purchased</string>
+  <string name="successful_purchase">%1$s successfully purchased</string>
   <string name="purchase_confirmation_title">Confirm purchase</string>
-  <string name="confirm_purchase_text" formatted="false">Purchase %1$s for %2$s %3$s</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>
@@ -408,7 +411,7 @@ To start, which parts of your life do you want to improve?</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" formatted="false">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="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-->
@@ -416,4 +419,74 @@ To start, which parts of your life do you want to improve?</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 sell you Gems at a cost of 20 gold per gem. His monthly shipments are initially capped at 25 Gems per month, but this 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">Makes completed To-Dos and task history available for longer.</string>
+  <string name="subscribe.listitem3.description">Complete your stable faster!</string>
+  <string name="subscribe.listitem4.description">Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.</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="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="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>
 </resources>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 0dc608dca..c5034c57b 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<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>
@@ -116,9 +116,9 @@
   <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" formatted="false">%d PM</string>
-  <string name="used_skill" formatted="false">Has usado %1$s por %2$d de maná.</string>
-  <string name="used_skill_without_mana" formatted="false">Has usado %1$s.</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>
@@ -162,9 +162,9 @@
   <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" formatted="false">Desbloquear el conjunto por %d gemas</string>
+  <string name="purchase_set_button">Desbloquear el conjunto por %d gemas</string>
   <string name="purchase_button">Comprar</string>
-  <string name="purchase_set_title" formatted="false">Comprar conjunto %s</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>
@@ -176,12 +176,12 @@
   <string name="quest.accepted">Aceptada</string>
   <string name="quest.rejected">Rechazada</string>
   <string name="quest.participants">Participantes</string>
-  <string name="version_info" formatted="false">Versión %s (%d)</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_1_title">Te damos la bienvenida a Habitica</string>
-  <string name="intro_1_description" formatted="false">Únete a mas de %s de personas que se divierten mientras van realizando sus quehaceres. Crea un personaje y registra tus tareas del mundo real.</string>
+  <string name="intro_1_description">Únete a mas de %s de personas que se divierten mientras van realizando sus quehaceres. Crea un personaje y registra tus tareas del mundo real.</string>
   <string name="intro_2_title">Progreso en el juego = Progreso en la vida</string>
   <string name="intro_2_description">Desbloquea funciones del juego completando tareas en el mundo real. Obtén recompensas, como armaduras, mascotas y otras cosas, por cumplir tus objetivos.</string>
   <string name="intro_3_title">Socializa y combate monstruos</string>
@@ -243,8 +243,8 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</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" formatted="false">Para: %s</string>
-  <string name="daily_streak" formatted="false">racha actual: %d</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>
@@ -263,10 +263,10 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</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" formatted="false">Hace %d días</string>
+  <string name="ago_days">Hace %d días</string>
   <string name="ago_1Minute">Hace 1 minuto</string>
-  <string name="ago_minutes" formatted="false">Hace %d minutos</string>
-  <string name="ago_hours" formatted="false">Hace %d horas</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>
@@ -276,26 +276,26 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</string>
   <string name="quests">Misiones</string>
   <string name="pets">Mascotas</string>
   <string name="mounts">Monturas</string>
-  <string name="armoireEquipment" formatted="false">¡Genial! Has encontrado una prenda insólita en el Armario: %s.</string>
-  <string name="armoireFood" formatted="false">Rebuscando en el Armario, encuentras esto: %1$s %2$s. ¿Qué hace aquí?</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" formatted="false">Abre el Armario para recibir prendas especiales, experiencia o comida al azar. Prendas que te faltan por conseguir: %d.</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" formatted="false">Vender (%s de oro)</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" formatted="false">Dar de comer a %2$s %1$s:</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" formatted="false">Criar mascota con %s</string>
-  <string name="hatched_pet_title" formatted="false">¡Ha nacido un/a %2$s %1$s!</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" formatted="false">¡Tu %2$s %1$s ha comido!</string>
-  <string name="notification_purchase" formatted="false">Has comprado %s</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>
@@ -306,7 +306,7 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</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" formatted="false">No tienes %s</string>
+  <string name="empty_items">No tienes %s</string>
   <string name="warrior">Guerrero</string>
   <string name="rogue">Pícaro</string>
   <string name="mage">Mago</string>
@@ -318,7 +318,7 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</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" formatted="false">¿Seguro que quieres ser %s?</string>
+  <string name="class_confirmation">¿Seguro que quieres ser %s?</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>
@@ -337,13 +337,13 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</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" formatted="false">¡He subido al nivel %s en Habitica mejorando mis hábitos en el mundo real!</string>
-  <string name="share_hatched" formatted="false">¡He criado un %1$s %2$s de mascota en Habitica realizando tareas en mi vida real!</string>
-  <string name="share_raised" formatted="false">¡He conseguido una montura de %1$s %2$s en Habitica realizando tareas en mi vida real!</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="leaderMessage" formatted="false">Mensaje de %1$s</string>
-  <string name="leaderName" formatted="false">Líder: %1$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>
@@ -352,9 +352,9 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</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" formatted="false">Has comprado %1$s</string>
+  <string name="successful_purchase">Has comprado %1$s</string>
   <string name="purchase_confirmation_title">Confirmar la compra</string>
-  <string name="confirm_purchase_text" formatted="false">Comprar %1$s para %2$s %3$s</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>
@@ -405,7 +405,7 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</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" formatted="false">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="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-->
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index d47315275..62286cd88 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<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>
@@ -116,9 +116,9 @@
   <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" formatted="false">%d Points de Mana</string>
-  <string name="used_skill" formatted="false">Vous avez utilisé %1$s pour %2$d points de mana.</string>
-  <string name="used_skill_without_mana" formatted="false">Vous avez utilisé %1$s.</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>
@@ -139,6 +139,7 @@
   <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>
@@ -162,9 +163,9 @@
   <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" formatted="false">Débloquer le lot pour %d gemmes</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" formatted="false">Acheter le lot %s</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>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">Acceptée</string>
   <string name="quest.rejected">Rejetée</string>
   <string name="quest.participants">Participants</string>
-  <string name="version_info" formatted="false">Version %s (%d)</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_title">Bienvenue sur Habitica</string>
-  <string name="intro_1_description" formatted="false">Rejoignez plus de  %s personnes qui s\'amusent en progressant dans leur vie. Créez un avatar et suivez vos objectifs personnels.</string>
+  <string name="intro_1_description">Rejoignez plus de  %s personnes qui s\'amusent en progressant dans leur vie. Créez un avatar et suivez vos objectifs personnels.</string>
   <string name="intro_2_title">Progrès dans le jeu = Progrès dans la vie</string>
   <string name="intro_2_description">Débloquez du contenu dans le jeu en accomplissant vos tâches dans la vie réelle. Recevez des armures, des animaux, et plus, pour vous récompenser d\'avoir atteint vos buts !</string>
   <string name="intro_3_title">Réunissez-vous et battez-vous contre des monstres</string>
@@ -243,8 +244,8 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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" formatted="false">Échéance : %s</string>
-  <string name="daily_streak" formatted="false">combo actuel : %d</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>
@@ -263,10 +264,10 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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" formatted="false">il y a %d jours</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" formatted="false">il y a %d minutes</string>
-  <string name="ago_hours" formatted="false">il y a %d heures</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>
@@ -276,26 +277,26 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</string>
   <string name="quests">Quêtes</string>
   <string name="pets">Familiers</string>
   <string name="mounts">Montures</string>
-  <string name="armoireEquipment" formatted="false">Vous avez trouvé une pièce d\'Équipement rare dans l\'Armoire : %s! Génial !</string>
-  <string name="armoireFood" formatted="false">Vous farfouillez dans l\'Armoire et trouvez %1$s %2$s. Qu\'est-ce que ça fait là ?</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" formatted="false">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="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" formatted="false">Vendre (%s pièces d\'or)</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" formatted="false">Nourrissez %1$s %2$s avec :</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" formatted="false">Faire éclore le familier avec %s</string>
-  <string name="hatched_pet_title" formatted="false">Vous avez fait éclore un·e %1$s %2$s !</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" formatted="false">Vous avez nourri votre %1$s %2$s !</string>
-  <string name="notification_purchase" formatted="false">%s acheté</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>
@@ -306,7 +307,9 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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" formatted="false">Vous n\'avez pas de %s</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>
@@ -318,7 +321,7 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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" formatted="false">Êtes vous sûr de vouloir devenir un %s?</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>
@@ -339,14 +342,14 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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" formatted="false">J\'ai atteint le niveau %s à Habitica en améliorant mes habitudes dans le monde réél!</string>
-  <string name="share_hatched" formatted="false">Je viens de faire éclore un familier%1$s %2$s à Habitica en réalisant mes tâches quotidiennes</string>
-  <string name="share_raised" formatted="false">Je viens de gagner un-e %1$s %2$s monture en réalisant mes tâches quotidiennes!</string>
+  <string name="share_levelup">J\'ai atteint le niveau %d à Habitica en améliorant mes habitudes dans le monde réél!</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" formatted="false">Message de %1$s</string>
-  <string name="leaderName" formatted="false">Leader : %1$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>
@@ -355,9 +358,9 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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" formatted="false">%1$s acheté avec succès</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" formatted="false">Acheter %1$s pour %2$s %3$s</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>
@@ -408,7 +411,7 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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" formatted="false">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="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-->
@@ -416,4 +419,74 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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. Ses commandes mensuelles sont plafonnées initialement à 25 gemmes par mois, mais 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">Les tâches complétées et leur historique sont disponibles plus longtemps.</string>
+  <string name="subscribe.listitem3.description">Complétez votre étable plus vite !</string>
+  <string name="subscribe.listitem4.description">Chaque mois, vous recevrez un objet cosmétique unique pour votre avatar ! En plus, pour chaque période de trois mois consécutifs d\'abonnement, les mystérieux voyageurs temporels vous donneront accès à des objets cosmétiques passés (et futurs !)</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="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="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>
 </resources>
diff --git a/Habitica/res/values-he/strings.profile.xml b/Habitica/res/values-he/strings.profile.xml
deleted file mode 100644
index e68e4dff5..000000000
--- a/Habitica/res/values-he/strings.profile.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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_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>
-    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-he/strings.sidebar.xml b/Habitica/res/values-he/strings.sidebar.xml
deleted file mode 100644
index 95dd7e4f2..000000000
--- a/Habitica/res/values-he/strings.sidebar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="sidebar.tasks">משימות</string>
-  <string name="sidebar.skills">מיומניויות</string>
-  <string name="sidebar.section.social">חברתי</string>
-  <string name="sidebar.inbox">דואר נכנס</string>
-  <string name="sidebar.tavern">פונדק</string>
-  <string name="sidebar.party">חבורה</string>
-  <string name="sidebar.purchaseGems">קנה אבני חן</string>
-  <string name="sidebar.guilds">גילדות</string>
-  <string name="sidebar.challenges">אתגרים</string>
-  <string name="sidebar.section.inventory">מלאי ציוד</string>
-  <string name="sidebar.avatar">דמות</string>
-  <string name="sidebar.equipment">ציוד</string>
-  <string name="sidebar.stable">אורווה</string>
-  <string name="sidebar.news">חדשות</string>
-  <string name="sidebar.settings">הגדרות</string>
-  <string name="sidebar.about">אודות</string>
-  <string name="sidebar_shops">חנויות</string>
-</resources>
diff --git a/Habitica/res/values-he/strings.tutorial.xml b/Habitica/res/values-he/strings.tutorial.xml
deleted file mode 100644
index 129a2757d..000000000
--- a/Habitica/res/values-he/strings.tutorial.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_habits">השלימו הרגלים חיוביים כדי לזכות בזהב וניסיון! הרגלים רעים יפגעו בדמות שלכם אם תלחצו עליהם, אז המנעו מהם בחיים האמיתיים!</string>
-  <string name="tutorial_dailies">הביסו את המטלות היומיות שלכם כדי לזכות בזהב וניסיון. זהירות! מטלות יומיות יפגעו בדמות שלכם אם אתם לא משלימים אותן בזמן.</string>
-  <string name="tutorial_todos">השלימו את המטרות שלכם בחיים האמיתיים, ולאחר מכן סמנו שהושלמו כדי לקבל זהב וניסיון - כך שתוכלו להרוויח פרסים ולאפשר יכולות נוספות במשחק!</string>
-  <string name="tutorial_rewards">אלו הם הפרסים שלכם! הרוויחו זהב על-ידי השלמת הרגלים, מטלות יומיות ומטרות בעולם האמיתי. ואז בזבזו אותו על פרסים במשחק או פרסים שהתאמתם לעצמכם אישית בעולם האמיתי!</string>
-  <string name="tutorial_equipment">כאשר אתם קונים ציוד הוא מופיע כאן. ציוד הקרב שלכם משפיע על תכונות, והתחפושת שלכם (אם מאופשרת) משפיעה על הלבוש של הדמות שלכם.</string>
-  <string name="tutorial_items">הרוויחו חפצים על-ידי השלמת משימות ועלייה בדרגות. לחצו על חפץ כדי להשתמש בו!</string>
-  <string name="tutorial_pets">בזמן שאתם משלימים משימות בעולם האמיתי, יש לכם סיכוי למצוא ביצים ושיקויים. שלבו אותם כדי להבקיע חיות מחמד</string>
-  <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-he/strings.xml b/Habitica/res/values-he/strings.xml
deleted file mode 100644
index b40c6a204..000000000
--- a/Habitica/res/values-he/strings.xml
+++ /dev/null
@@ -1,369 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <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="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_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="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">פרטי חשבון</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="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" formatted="false">%d מאנה</string>
-  <string name="used_skill" formatted="false">השתמשתם ב %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="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" formatted="false">שחררו סט בעבור %d אבני חן</string>
-  <string name="purchase_button">קנייה</string>
-  <string name="purchase_set_title" formatted="false">קנו סט %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" formatted="false">גרסה %s (%d)</string>
-  <string name="sidebar_help">עזרה ושאלות נפוצות</string>
-  <string name="complete_tutorial">הבנתי!</string>
-  <string name="dismiss_tutorial">הזכר לי שוב</string>
-  <string name="intro_1_title">ברוכים הבאים להאביטיקה</string>
-  <string name="intro_2_title">התקדמות במשחק = התקדמות בחיים</string>
-  <string name="intro_2_description">אפשרו יכולות של המשחק על ידי סימון שהשלמתם משימות בעולם האמיתי. הרוויחו שיריון, חיות מחמד, ועוד - כדי לתגמל את עצמכם על עמידה ביעדים!</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_heathWellness">בריאות + אורח חיים</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" formatted="false">חל: %s</string>
-  <string name="daily_streak" formatted="false">רצף נוכחי: %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" formatted="false">לפני %d ימים</string>
-  <string name="ago_1Minute">לפני דקה</string>
-  <string name="ago_minutes" formatted="false">לפני %d דקות</string>
-  <string name="ago_hours" formatted="false">לפני %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" formatted="false">מצאתם חתיכת ציוד נדיר בארמואר: %s! מגניב!</string>
-  <string name="armoireFood" formatted="false">אתם נוברים בארמואר ומוצאים %1$s %2$s. מה זה עושה פה?</string>
-  <string name="armoireExp">אתם נאבקים בארמואר וצוברים ניסיון. קבלו!</string>
-  <string name="armoireNotesFull" formatted="false">פתחו את הארמואר כדי לקבל ציוד מיוחד אקראי, ניסיון, או אוכל! חתיכות ציוד שנותרו: %d</string>
-  <string name="armoireLastItem">מצאתם את חתיכת הציוד הנדיר האחרונה בארמואר הקסום.</string>
-  <string name="armoireNotesEmpty">הארמואר יכיל ציוד חדש בשבוע הראשון של כל חודש. עד אז, המשיכו ללחוץ כדי לקבל ניסיון ואוכל!</string>
-  <string name="sell" formatted="false">מיכרו (%s זהב)</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" formatted="false">האכלתם %1$s %2$s עם:</string>
-  <string name="use_animal">השתמשו</string>
-  <string name="feed">האכילו</string>
-  <string name="hatch_with" formatted="false">הבקיעו חיית מחמד עם %s</string>
-  <string name="hatched_pet_title" formatted="false">הבקעתם %1$s %2$s!</string>
-  <string name="close">סיגרו</string>
-  <string name="share">שתפו</string>
-  <string name="notification_pet_fed" formatted="false">האכלתם את ה %1$s %2$s שלכם!</string>
-  <string name="notification_purchase" formatted="false">%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" formatted="false">אין לכם כל %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" formatted="false">האם אתם בטוחים שברצונכם להיות %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_levelup" formatted="false">הגעתי לדרגה %s בהאביטיקה על ידי שיפור הרגלים שלי מהעולם האמיתי!</string>
-  <string name="share_hatched" formatted="false">הרגע הבקעתי ביצת חיית מחמד של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
-  <string name="share_raised" formatted="false">הרגע הרווחתי חיית רכיבה של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
-  <string name="open_in_store">פתיחה בפליי סטור</string>
-  <string name="change_class_confirmation">האם אתם בטוחים שאתם מעוניינים להחליף מקצוע? זה יעלה לכם 3 אבני חן.</string>
-  <string name="leaderMessage" formatted="false">הודעה מאת %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" formatted="false">%1$s נרכש בהצלחה</string>
-  <string name="purchase_confirmation_title">אשרו רכישה</string>
-  <string name="confirm_purchase_text" formatted="false">קנו %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_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-->
-</resources>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 3b12a77c9..aded245b9 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">Osvježi</string>
   <string name="XP_default">Iskustvo</string>
   <string name="HP_default">Život</string>
@@ -94,8 +94,8 @@
   <string name="faint_header">Ostao/la si bez života</string>
   <string name="filter">Filtriraj</string>
   <string name="profile_image">Profilna Slika</string>
-  <string name="mana_price_button" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">Iskoristio si %1$s za %2$d mane.</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Iskoristio si %1$s za %2$d mane.</string>
   <string name="new_checklist_item">Novi predmet na spisku</string>
   <string name="add_checklist_item">Dodaj</string>
   <string name="reminder_title">Sjeti se označiti Dailiese</string>
@@ -139,9 +139,9 @@
   <string name="avatar_size_broad">Široko</string>
   <string name="avatar_background">Pozadina</string>
   <string name="purchase_customization">Kupi Prilagodbe</string>
-  <string name="purchase_set_button" formatted="false">Otključaj set za %d dragulja</string>
+  <string name="purchase_set_button">Otključaj set za %d dragulja</string>
   <string name="purchase_button">Kupi</string>
-  <string name="purchase_set_title" formatted="false">Kupi set %s</string>
+  <string name="purchase_set_title">Kupi set %s</string>
   <string name="due_date">Do Dana</string>
   <string name="quest.accept">Prihvati </string>
   <string name="quest.reject">Odbij</string>
@@ -153,7 +153,7 @@
   <string name="quest.accepted">Prihvaćeno</string>
   <string name="quest.rejected">Odbijeno</string>
   <string name="quest.participants">Sudionici </string>
-  <string name="version_info" formatted="false">Verzija %s (%d)</string>
+  <string name="version_info">Verzija %1$s (%2$d)</string>
   <string name="sidebar_help">Pomoć &amp; Često Postavljena Pitanja</string>
   <string name="complete_tutorial">Razumijem!</string>
   <string name="dismiss_tutorial">Podsjeti me ponovno</string>
@@ -218,8 +218,8 @@ Za početak, koje djelove života želiš poboljšati?</string>
   <string name="privacy">Privatnost </string>
   <string name="write_message">Napiši Poruku</string>
   <string name="post">Objavi</string>
-  <string name="todo_due" formatted="false">Do: %s</string>
-  <string name="daily_streak" formatted="false">Trenutni niz: %d</string>
+  <string name="todo_due">Do: %s</string>
+  <string name="daily_streak">Trenutni niz: %d</string>
   <string name="todo_has_duedate">Zadatak ima Rok Do</string>
   <string name="battle_gear">Borbena Oprema</string>
   <string name="costume">Kostim</string>
@@ -238,10 +238,10 @@ Za početak, koje djelove života želiš poboljšati?</string>
   <string name="quest_begin_message">Jesi li siguran da želiš započeti pothvat? Jednom kad je aktivan, članovi grupe se ne mogu pridružiti.</string>
   <string name="quest.invitation.text">Pozvani ste na sudjelovanje u pothvatu!</string>
   <string name="ago_1day">Prije 1 dan</string>
-  <string name="ago_days" formatted="false">Prije %d dana </string>
+  <string name="ago_days">Prije %d dana </string>
   <string name="ago_1Minute">Prije 1 minute </string>
-  <string name="ago_minutes" formatted="false">Prije %d minuta</string>
-  <string name="ago_hours" formatted="false">Prije %d sati</string>
+  <string name="ago_minutes">Prije %d minuta</string>
+  <string name="ago_hours">Prije %d sati</string>
   <string name="ago_1hour">Prije 1 sat</string>
   <string name="today">Danas</string>
   <string name="sidebar_items">Predmeti</string>
@@ -251,26 +251,26 @@ Za početak, koje djelove života želiš poboljšati?</string>
   <string name="quests">Pothvati </string>
   <string name="pets">Ljubimci</string>
   <string name="mounts">Životinje za jahanje</string>
-  <string name="armoireEquipment" formatted="false">Našao si komad rijetke Opreme u Ormaru: %s!! Zakon!</string>
-  <string name="armoireFood" formatted="false">Premećeš po Ormaru i nalaziš %1$s %2$s. Što to radi ovdje?</string>
+  <string name="armoireEquipment">Našao si komad rijetke Opreme u Ormaru: %s!! Zakon!</string>
+  <string name="armoireFood">Premećeš po Ormaru i nalaziš %1$s %2$s. Što to radi ovdje?</string>
   <string name="armoireExp">Hrvaš se s Ormarom i zarađuješ iskustvo. Evo ti ovo!</string>
-  <string name="armoireNotesFull" formatted="false">Otvori Ormar za nasumično dobivanje Opreme, Iskustva ili hrane! Ostalo komada opreme: %d</string>
+  <string name="armoireNotesFull">Otvori Ormar za nasumično dobivanje Opreme, Iskustva ili hrane! Ostalo komada opreme: %d</string>
   <string name="armoireLastItem">Našao si zadnji komad rijetke Opreme u Začaranom Ormaru.</string>
   <string name="armoireNotesEmpty">Ormar će dobiti novu opremu u prvom tjednu svakog mjeseca. Do tada, nastavi klikati za Iskustvo i Hranu!</string>
-  <string name="sell" formatted="false">Prodaj(%s Zlata) </string>
+  <string name="sell">Prodaj(%d Zlata) </string>
   <string name="hatch_with_potion">Izlegni s napitkom</string>
   <string name="feed_to_pet">Nahrani ljubimca</string>
   <string name="hatch_egg">Izlegni s jajetom</string>
   <string name="invite_party">Pozovi grupu</string>
-  <string name="dialog_feeding" formatted="false">Nahrani %1$s %2$s s:</string>
+  <string name="dialog_feeding">Nahrani %1$s %2$s s:</string>
   <string name="use_animal">Koristi</string>
   <string name="feed">Nahrani</string>
-  <string name="hatch_with" formatted="false">Izlegni ljubimca sa %s</string>
-  <string name="hatched_pet_title" formatted="false">%1$s %2$s se izlegao/la!</string>
+  <string name="hatch_with">Izlegni ljubimca sa %s</string>
+  <string name="hatched_pet_title">%1$s %2$s se izlegao/la!</string>
   <string name="close">Zatvori</string>
   <string name="share">Podijeli</string>
-  <string name="notification_pet_fed" formatted="false">Nahranio/la si svoju/ga %1$s %2$s!</string>
-  <string name="notification_purchase" formatted="false">%s je kupljen/a</string>
+  <string name="notification_pet_fed">Nahranio/la si svoju/ga %1$s %2$s!</string>
+  <string name="notification_purchase">%s je kupljen/a</string>
   <string name="sectionpets">Bazni Ljubimci</string>
   <string name="sectionpremiumPets">Ljubimci Čarobnog Napitka</string>
   <string name="sectionquestPets">Ljubimci s Pothvata</string>
@@ -281,7 +281,7 @@ Za početak, koje djelove života želiš poboljšati?</string>
   <string name="sectionspecialMounts">Rijetke Životinje za jahanje</string>
   <string name="world_quest">Svjetski Pothvat</string>
   <string name="inn_description">Odmori se u Krčmi da spriječiš prekonoćnu ozljedu od neizvršenih Dailies-a! (Napomena: ne sprječava od primanja ozljeda od Šefova.)</string>
-  <string name="empty_items" formatted="false">Nemaš %s</string>
+  <string name="empty_items">Nemaš %s</string>
   <string name="warrior">Ratnik</string>
   <string name="rogue">Odmetnik</string>
   <string name="mage">Čarobnjak</string>
@@ -293,7 +293,7 @@ Za početak, koje djelove života želiš poboljšati?</string>
   <string name="select_class">Odaberi Klasu</string>
   <string name="opt_out_class">Isključi se</string>
   <string name="opt_out_description">Ne želiš da te gnjave klase? Želiš odabrati kasnije? Isključi se - bit ćeš Ratnik bez posebnih sposobnosti. Možeš pročitati sve o sustavu klasa kasnije na wikiju i uključiti klase u bilo kojem trenutku.</string>
-  <string name="class_confirmation" formatted="false">Jeste li sigurni da želite biti %s?</string>
+  <string name="class_confirmation">Jeste li sigurni da želite biti %s?</string>
   <string name="choose_class">Odaberi Klasu </string>
   <string name="dialog_go_back">Idi natrag</string>
   <string name="opt_out_confirmation">Jeste li sigurni da želite isključiti?</string>
@@ -312,9 +312,9 @@ Za početak, koje djelove života želiš poboljšati?</string>
   <string name="email">Email</string>
   <string name="invite_users">Pozovi u Grupu</string>
   <string name="share_using">Podijeli koristeći</string>
-  <string name="share_levelup" formatted="false">Stigao sam do %s razine u Habitici izvršavanjem svojih zadataka u stvarnom životu!</string>
-  <string name="share_hatched" formatted="false">Upravo sam izlegao %1$s %2$s ljubimca u Habitici izvršavajući svoje zadatke u stvarnom životu!</string>
-  <string name="share_raised" formatted="false">Upravo sam dobio %1$s %2$s životinju za jahanje u Habitici izvršavanjem svojih zadataka u stvarnom životu!</string>
+  <string name="share_levelup">Stigao sam do %d razine u Habitici izvršavanjem svojih zadataka u stvarnom životu!</string>
+  <string name="share_hatched">Upravo sam izlegao %1$s %2$s ljubimca u Habitici izvršavajući svoje zadatke u stvarnom životu!</string>
+  <string name="share_raised">Upravo sam dobio %1$s %2$s životinju za jahanje u Habitici izvršavanjem svojih zadataka u stvarnom životu!</string>
   <string name="open_in_store">Otvori u Trgovini Play</string>
   <string name="change_class_confirmation">Jeste li sigurni da želite promijeniti svoju Klasu? Ovo će te koštati 3 dragulja.</string>
   <!--QR Strings-->
diff --git a/Habitica/res/values-id/strings.profile.xml b/Habitica/res/values-id/strings.profile.xml
deleted file mode 100644
index daf807a29..000000000
--- a/Habitica/res/values-id/strings.profile.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="profile_pets_and_mounts">Peliharan &amp; Tunggangan</string>
-    <string name="profile_pets_found">Peliharaan Temuan</string>
-    <string name="profile_mounts_tamed">Tunggangan yang terjinakkan</string>
-    <string name="profile_loading_data">memuat data anggota.</string>
-    <string name="profile_send_message_to">Mengirim pesan ke %s</string>
-    <string name="profile_message_sent_to">Pesan terkirim ke %s</string>
-    <string name="profile_level">Tingkat:</string>
-    <string name="profile_class_bonus">Bonus-Kelas:</string>
-    <string name="profile_allocated">Teralokasi:</string>
-    <string name="profile_boosts">Tambahan:</string>
-    <string name="profile_private_message">Pesan Pribadi</string>
-    <string name="profile_achievements">Pencapaian</string>
-    <string name="profile_achievement_ok">Oke</string>
-
-</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-id/strings.sidebar.xml b/Habitica/res/values-id/strings.sidebar.xml
deleted file mode 100644
index 53b9f2e5a..000000000
--- a/Habitica/res/values-id/strings.sidebar.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="sidebar.tasks">Tugas</string>
-  <string name="sidebar.skills">Keahlian</string>
-  <string name="sidebar.section.social">Sosial</string>
-  <string name="sidebar.inbox">Kotak Pesan</string>
-  <string name="sidebar.tavern">Kedai</string>
-  <string name="sidebar.party">Teman</string>
-  <string name="sidebar.purchaseGems">Beli Permata</string>
-  <string name="sidebar.guilds">Kelompok</string>
-  <string name="sidebar.challenges">Tantangan</string>
-  <string name="sidebar.section.inventory">Inventori</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Perlengkapan</string>
-  <string name="sidebar.stable">Istal</string>
-  <string name="sidebar.news">Berita</string>
-  <string name="sidebar.settings">Pengaturan</string>
-  <string name="sidebar.about">Tentang Kami</string>
-  <string name="sidebar_shops">Toko</string>
-</resources>
diff --git a/Habitica/res/values-id/strings.tutorial.xml b/Habitica/res/values-id/strings.tutorial.xml
deleted file mode 100644
index 2a1d146bb..000000000
--- a/Habitica/res/values-id/strings.tutorial.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="tutorial_habits">Lakukan Kebiasaan Baik untuk mendapatkan emas dan pengalaman! Kebiasaan Buruk akan menyakiti avatarmu jika kamu ketuk, jadi hindari melakukannya di dunia nyata!</string>
-  <string name="tutorial_dailies">Selesaikan tugas harianmu yang berulang untuk mendapatkan emas dan pengalaman. Bahaya! Keseharian akan menyakiti avatarmu jika kamu tidak menyelesaikannya tepat waktu.</string>
-  <string name="tutorial_todos">Lakukan Tugasmu di dunia nyata, lalu ceklis daftar untuk EMAS dan PENGALAMAN sehingga kamu bisa mendapatkan Hadiah dan membuka fitur baru!</string>
-  <string name="tutorial_rewards">Ini adalah Hadiahmu! Dapatkan emas dengan menyelesaikan Tugas dunia-nyata, Keseharian, dan Daftar Tugas. Kemudian habiskan untuk Hadiah dalam game atau Hadiah dunia nyata kustom!</string>
-  <string name="tutorial_equipment">Perlengkapan yang kamu beli akan muncul di sini. Perlengkapan Bertarung milikmu akan mempengaruhi status, dan Kostum (jika dicentang) hanya mempengaruhi apa yang avatarmu kenakan.</string>
-  <string name="tutorial_items">Dapatkan item dengan menyelesaikan tugas dan meningkatkan level. Ketuk pada item untuk menggunakannya!</string>
-  <string name="tutorial_pets">Seiring kamu menyelesaikan tugas dunia-nyata, kamu sekarang memiliki kesempatan acak untuk menemukan telur dan ramuan. Campurkan mereka untuk menetaskan peliharaan</string>
-  <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-id/strings.xml b/Habitica/res/values-id/strings.xml
deleted file mode 100644
index 8aab4da58..000000000
--- a/Habitica/res/values-id/strings.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <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="unknown_error">Terjadi kesalahan...</string>
-  <string name="pref_account_header">Akun</string>
-  <string name="pref_first_day_of_the_week_title">Hari Pertama dalam Minggu</string>
-  <string name="pref_first_day_of_the_week_summary">Hari pertama dalam minggu di semua kalender</string>
-  <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="new_todo">Tugas baru</string>
-  <string name="new_reward">Hadiah baru</string>
-  <string name="new_daily">Keseharian baru</string>
-  <string name="new_habit">Kebiasaan baru</string>
-  <string name="action_edit">Edit</string>
-  <string name="action_delete">Hapus</string>
-  <string name="action_cancel">Batal</string>
-  <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" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">Kamu menggunakan %1$s dengan %2$d mana.</string>
-  <string name="used_skill_without_mana" formatted="false">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">Harian</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" formatted="false">Buka set seharga %d permata</string>
-  <string name="purchase_button">Beli</string>
-  <string name="purchase_set_title" formatted="false">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" formatted="false">Versi %s (%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_1_title">Selamat datang di Habitica</string>
-  <string name="intro_1_description" formatted="false">Bergabunglah dengan lebih dari %s orang yang bersenang-senang sambil menyelesaikan tugas. Buatlah avatar dan catat tugas dunia-nyatamu.</string>
-  <string name="intro_2_title">Kemajuan dalam Permainan = Kemajuan dalam Hidup</string>
-  <string name="intro_2_description">Buka fitur dalam game dengan mencentang tugas harianmu. Dapatkan baju, peliharaan, dan banyak lagi untuk hadiahmu menyelesaikan tujuan!</string>
-  <string name="intro_3_title">Bersosialisasi sambil Mengalahkan Monster</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="intro_finish_button">Mulai</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="avatar_setup_description">Pertama, kamu butuh avatar di dalam game untuk menggambarkan dirimu! Hal-hal yang kamu lakukan di dunia nyata akan mempengaruhi kesehatan, level pengalaman, dan emas avatarmu.</string>
-  <string name="task_setup_description">Keren! Sekarang mari mengatur tugas-tugasmu jadi kamu dapat mulai mendapatkan pengalaman dan emas.
-
-Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</string>
-  <string name="setup_group_work">Kerja</string>
-  <string name="setup_group_exercise">Latihan Fisik</string>
-  <string name="setup_group_heathWellness">Kesehatan + Kebaikan</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="copy_as_todo">Salin sebagai Tugas</string>
-  <string name="send_pm">Kirim PM</string>
-  <string name="flag">Tandai</string>
-  <string name="delete">Hapus</string>
-  <string name="name">Nama </string>
-  <string name="description">Deskripsi</string>
-  <string name="add_tag">Beri Label</string>
-  <string name="privacy">Privasi</string>
-  <string name="write_message">Tulis Pesan</string>
-  <string name="post">Kirim</string>
-  <string name="guild_search_hint">Mencari Perserikatan</string>
-  <string name="todo_due" formatted="false">Tenggat: %s</string>
-  <string name="daily_streak" formatted="false">%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" formatted="false">%d hari yang lalu</string>
-  <string name="ago_1Minute">1 menit yang lalu</string>
-  <string name="ago_minutes" formatted="false">%d menit yang lalu</string>
-  <string name="ago_hours" formatted="false">%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" formatted="false">Kamu menemukan perlengkapan langka di dalam Peti Harta Karun: %s! Keren!</string>
-  <string name="armoireFood" formatted="false">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" formatted="false">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" formatted="false">Jual (%s 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" formatted="false">Beri makan %2$s %1$s dengan:</string>
-  <string name="use_animal">Gunakan</string>
-  <string name="feed">Beri makan</string>
-  <string name="hatch_with" formatted="false">Tetaskan dengan %s</string>
-  <string name="hatched_pet_title" formatted="false">Kamu menetaskan seekor %2$s %1$s!</string>
-  <string name="close">Tutup</string>
-  <string name="share">Bagikan</string>
-  <string name="notification_pet_fed" formatted="false">Kamu memberi makan %2$s %1$s !</string>
-  <string name="notification_purchase" formatted="false">%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" formatted="false">Kamu tidak memiliki %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" formatted="false">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_levelup" formatted="false">Saya naik level %s di Habitica dengan meningkatkan kebiasaan kehidupan-nyata saya!</string>
-  <string name="share_hatched" formatted="false">Saya menetaskan peliharaan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya! </string>
-  <string name="share_raised" formatted="false">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" formatted="false">Pesan dari %1$s</string>
-  <string name="leaderName" formatted="false">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" formatted="false">%1$s telah sukses terbeli</string>
-  <string name="purchase_confirmation_title">Pastikan belian</string>
-  <string name="confirm_purchase_text" formatted="false">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_todo_list">Daftar Tugas Habitica</string>
-  <string name="widget_add_task">Habitica Menambahkan Tugas</string>
-  <string name="google_services_missing">Google play services tidak dapat ditemukan.</string>
-  <string name="gem.purchase.toolbartitle">Bayar</string>
-  <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" formatted="false">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-in/strings.sidebar.xml b/Habitica/res/values-in/strings.sidebar.xml
index f6a378ec7..2b8e12a82 100644
--- a/Habitica/res/values-in/strings.sidebar.xml
+++ b/Habitica/res/values-in/strings.sidebar.xml
@@ -3,9 +3,9 @@
   <string name="sidebar.tasks">Tugas</string>
   <string name="sidebar.skills">Keahlian</string>
   <string name="sidebar.section.social">Sosial</string>
+  <string name="sidebar.inbox">Kotak Pesan</string>
   <string name="sidebar.tavern">Kedai</string>
   <string name="sidebar.party">Teman</string>
-  <string name="sidebar.purchaseGems">Beli Permata</string>
   <string name="sidebar.guilds">Kelompok</string>
   <string name="sidebar.challenges">Tantangan</string>
   <string name="sidebar.section.inventory">Inventori</string>
@@ -15,4 +15,5 @@
   <string name="sidebar.news">Berita</string>
   <string name="sidebar.settings">Pengaturan</string>
   <string name="sidebar.about">Tentang Kami</string>
+  <string name="sidebar_shops">Toko</string>
 </resources>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index 9c6014742..643b06b97 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">Habitica</string>
+<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>
@@ -13,12 +12,30 @@
   <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="unknown_error">Terjadi kesalahan...</string>
   <string name="pref_account_header">Akun</string>
+  <string name="pref_first_day_of_the_week_title">Hari Pertama dalam Minggu</string>
+  <string name="pref_first_day_of_the_week_summary">Hari pertama dalam minggu di semua kalender</string>
   <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="new_todo">Tugas baru</string>
@@ -37,6 +54,7 @@
   <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>
@@ -58,6 +76,7 @@
   <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>
@@ -70,6 +89,7 @@
   <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>
@@ -93,10 +113,12 @@
   <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" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">Kamu menggunakan %1$s dengan %2$d mana.</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>
@@ -141,9 +163,9 @@
   <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" formatted="false">Buka set seharga %d permata</string>
+  <string name="purchase_set_button">Buka set seharga %d permata</string>
   <string name="purchase_button">Beli</string>
-  <string name="purchase_set_title" formatted="false">Beli set %s</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>
@@ -155,12 +177,12 @@
   <string name="quest.accepted">Diterima</string>
   <string name="quest.rejected">Ditolak</string>
   <string name="quest.participants">Partisipan</string>
-  <string name="version_info" formatted="false">Versi %s (%d)</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_1_title">Selamat datang di Habitica</string>
-  <string name="intro_1_description">Bergabunglah dengan lebih dari 1.100.000 orang bersenang-senang dalam menyelesaikan tugas. Buatlah avatar dan catat tugas dunia-nyatamu.</string>
+  <string name="intro_1_description">Bergabunglah dengan lebih dari %s orang bersenang-senang dalam menyelesaikan tugas. Buatlah avatar dan catat tugas dunia-nyatamu.</string>
   <string name="intro_2_title">Kemajuan dalam Permainan = Kemajuan dalam Hidup</string>
   <string name="intro_2_description">Buka fitur dalam game dengan mencentang tugas harianmu. Dapatkan baju, peliharaan, dan banyak lagi untuk hadiahmu menyelesaikan tujuan!</string>
   <string name="intro_3_title">Bersosialisasi sambil Mengalahkan Monster</string>
@@ -221,8 +243,9 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</string>
   <string name="privacy">Privasi</string>
   <string name="write_message">Tulis Pesan</string>
   <string name="post">Kirim</string>
-  <string name="todo_due" formatted="false">Tenggat: %s</string>
-  <string name="daily_streak" formatted="false">%d kali berturut-turut</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>
@@ -241,10 +264,10 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</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" formatted="false">%d 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" formatted="false">%d menit yang lalu</string>
-  <string name="ago_hours" formatted="false">%d jam 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>
@@ -254,26 +277,26 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</string>
   <string name="quests">Misi</string>
   <string name="pets">Peliharaan</string>
   <string name="mounts">Tunggangan</string>
-  <string name="armoireEquipment" formatted="false">Kamu menemukan perlengkapan langka di dalam Peti Harta Karun: %s! Keren!</string>
-  <string name="armoireFood" formatted="false">Kamu mengacak-acak Peti Harta Karun dan menemukan %2$s %1$s. Kenapa berada di dalam sini, ya?</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" formatted="false">Buka Peti Harta Karun untuk mendapatkan perlengkapan spesial, Pengalaman, atau makanan secara acak! Perlengkapan yang tersisa: %d</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" formatted="false">Jual (%s Emas)</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" formatted="false">Beri makan %2$s %1$s dengan:</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" formatted="false">Tetaskan dengan %s</string>
-  <string name="hatched_pet_title" formatted="false">Kamu menetaskan seekor %2$s %1$s!</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" formatted="false">Kamu memberi makan %2$s %1$s !</string>
-  <string name="notification_purchase" formatted="false">%s telah dibeli</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>
@@ -284,9 +307,9 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</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" formatted="false">Kamu tidak memiliki %s</string>
-  <string name="user_level" formatted="false">LVL %d</string>
-  <string name="user_level_with_class" formatted="false">LVL %1$d - %2$s</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>
@@ -298,11 +321,14 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</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" formatted="false">Apakah kamu yakin ingin menjadi seorang %s?</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>
@@ -316,7 +342,81 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</string>
   <string name="email">Email</string>
   <string name="invite_users">Undang sebagai Teman</string>
   <string name="share_using">Bagikan dengan</string>
-  <string name="share_levelup" formatted="false">Saya naik level %s di Habitica dengan meningkatkan kebiasaan kehidupan-nyata saya!</string>
-  <string name="share_hatched" formatted="false">Saya menetaskan peliharaan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya! </string>
-  <string name="share_raised" formatted="false">Saya baru mendapatkan tunggangan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya!</string>
+  <string name="share_levelup">Saya naik level %d di Habitica dengan meningkatkan kebiasaan kehidupan-nyata saya!</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_todo_list">Daftar Tugas Habitica</string>
+  <string name="widget_add_task">Habitica Menambahkan Tugas</string>
+  <string name="google_services_missing">Google play services tidak dapat ditemukan.</string>
+  <string name="gem.purchase.toolbartitle">Bayar</string>
+  <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.xml b/Habitica/res/values-it/strings.xml
index 6b3a1dae6..ef0fe3eb6 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">Aggiorna</string>
   <string name="XP_default">Esperienza</string>
   <string name="HP_default">Salute</string>
@@ -116,9 +116,9 @@
   <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" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">Hai usato %1$s per %2$d mana.</string>
-  <string name="used_skill_without_mana" formatted="false">Hai usato %1$s.</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>
@@ -139,6 +139,7 @@
   <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>
@@ -162,9 +163,9 @@
   <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" formatted="false">Sblocca set per %d gemme</string>
+  <string name="purchase_set_button">Sblocca set per %d gemme</string>
   <string name="purchase_button">Compra</string>
-  <string name="purchase_set_title" formatted="false">Compra set  %s</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>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">Accettata</string>
   <string name="quest.rejected">Rifiutata</string>
   <string name="quest.participants">Partecipanti</string>
-  <string name="version_info" formatted="false">Versione %s (%d)</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_title">Benvenuto in Habitica</string>
-  <string name="intro_1_description" formatted="false">Unisciti ad oltre %s persone che si divertono raggiungendo i propri obiettivi. Crea un avatar e tieni traccia delle tue attività nella vita reale.</string>
+  <string name="intro_1_description">Unisciti ad oltre %s persone che si divertono raggiungendo i propri obiettivi. Crea un avatar e tieni traccia delle tue attività nella vita reale.</string>
   <string name="intro_2_title">Progressi nel gioco = 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 fatto del tuo meglio!</string>
   <string name="intro_3_title">Sconfiggi mostri in compagnia</string>
@@ -243,8 +244,8 @@ Per cominciare, quali parti della tua vita vuoi migliorare?</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" formatted="false">Scade: %s</string>
-  <string name="daily_streak" formatted="false">serie: %d</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>
@@ -263,10 +264,10 @@ Per cominciare, quali parti della tua vita vuoi migliorare?</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" formatted="false">%d giorni fa</string>
+  <string name="ago_days">%d giorni fa</string>
   <string name="ago_1Minute">1 minuto fa</string>
-  <string name="ago_minutes" formatted="false">%d minuti fa</string>
-  <string name="ago_hours" formatted="false">%d ore 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>
@@ -276,26 +277,26 @@ Per cominciare, quali parti della tua vita vuoi migliorare?</string>
   <string name="quests">Missioni</string>
   <string name="pets">Animali</string>
   <string name="mounts">Cavalcature</string>
-  <string name="armoireEquipment" formatted="false">Hai trovato dell\'equipaggiamento raro nello Scrigno Incantato: %s! Fantastico!</string>
-  <string name="armoireFood" formatted="false">Frughi nello Scrigno e trovi %1$s %2$s. Cosa ci fa qui dentro?</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" formatted="false">Apri lo Scrigno Incantato per ricevere casualmente Equipaggiamento speciale, Esperienza o cibo! Oggetti rimanenti: %d</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" formatted="false">Vendi (%s Oro)</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" formatted="false">Dai da mangiare a %1$s %2$s:</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" formatted="false">Fai nascere un animale con %s</string>
-  <string name="hatched_pet_title" formatted="false">E\' nato un %2$s %1$s!</string>
+  <string name="hatch_with">Fai nascere un animale con %s</string>
+  <string name="hatched_pet_title">E\' nato un %2$s %1$s!</string>
   <string name="close">Chiudi</string>
   <string name="share">Condividi</string>
-  <string name="notification_pet_fed" formatted="false">Hai dato da mangiare al tuo %1$s %2$s!</string>
-  <string name="notification_purchase" formatted="false">Hai acquistato %s</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>
@@ -306,7 +307,9 @@ Per cominciare, quali parti della tua vita vuoi migliorare?</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" formatted="false">Non hai alcun %s</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>
@@ -319,8 +322,9 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <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" formatted="false">Vuoi davvero essere un %s?</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>
@@ -339,14 +343,14 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <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" formatted="false">Ho raggiunto il livello %s su Habitica migliorando le mie abitudini nella vita reale!</string>
-  <string name="share_hatched" formatted="false">Oh apena schiuso un %1$s %2$s beniamino in Habitica completando I miei compiti nella vita reale!</string>
-  <string name="share_raised" formatted="false">Oh apena guadagnato una %1$s %2$s montatura in Habitica completando I miei compiti nella vita reale!</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" formatted="false">Messaggio da %1$s</string>
-  <string name="leaderName" formatted="false">Leader: %1$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>
@@ -355,9 +359,9 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <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" formatted="false">%1$s comprato con successo</string>
+  <string name="successful_purchase">%1$s comprato con successo</string>
   <string name="purchase_confirmation_title">Conferma acquisto</string>
-  <string name="confirm_purchase_text" formatted="false">Compra %1$s per %2$s %3$s</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>
@@ -408,7 +412,7 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <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">Entra nel Mercato</string>
-  <string name="cds_description" formatted="false">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="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-->
@@ -416,4 +420,74 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <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">Alexander il Mercante ti venderà Gemme al prezzo di 20 Oro per gemma. Le sue consegne mensili saranno inizialmente limitate a 25 gemme al mese, ma questo limite aumenta di 5 gemme per ogni tre mesi di abbonamento consecutivi, fino a un massimo di 50 gemme al mese!</string>
+  <string name="subscribe.listitem2.description">Rende le To-Do completate e la cronologia dei progressi delle attività disponibili più a lungo.</string>
+  <string name="subscribe.listitem3.description">Riempi le tue scuderie più velocemente!</string>
+  <string name="subscribe.listitem4.description">Ogni mese riceverai un oggetto davvero unico per il tuo avatar! In più, ogni tre mesi di abbonamento consecutivi, i misteriosi Viaggiatori del Tempo ti permetteranno di ottenere oggetti antichi (e futuri!).</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="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="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>
 </resources>
diff --git a/Habitica/res/values-iw/strings.sidebar.xml b/Habitica/res/values-iw/strings.sidebar.xml
index 67a835b31..95dd7e4f2 100644
--- a/Habitica/res/values-iw/strings.sidebar.xml
+++ b/Habitica/res/values-iw/strings.sidebar.xml
@@ -16,4 +16,5 @@
   <string name="sidebar.news">חדשות</string>
   <string name="sidebar.settings">הגדרות</string>
   <string name="sidebar.about">אודות</string>
+  <string name="sidebar_shops">חנויות</string>
 </resources>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index e559feaa5..5a7afa125 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">האביטיקה</string>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">ריענון</string>
   <string name="XP_default">ניסיון</string>
   <string name="HP_default">בריאות</string>
@@ -13,12 +12,22 @@
   <string name="SP_userID_summary">מזהה המשתמש שלכם</string>
   <string name="SP_APIToken_title">מפתח API</string>
   <string name="SP_APIToken_summary">מפתח ה API שלכם</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_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="new_todo">מטרה חדשה</string>
@@ -97,8 +106,8 @@
   <string name="faint_button">מלאו בריאות ונסו מחדש</string>
   <string name="filter">מסנן</string>
   <string name="profile_image">תמונת פרופיל</string>
-  <string name="mana_price_button" formatted="false">%d מאנה</string>
-  <string name="used_skill" formatted="false">השתמשתם ב %1$s בעבור %2$d מאנה.</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>
@@ -143,9 +152,9 @@
   <string name="avatar_size_broad">רחב</string>
   <string name="avatar_background">רקע</string>
   <string name="purchase_customization">ריכשו התאמה אישית</string>
-  <string name="purchase_set_button" formatted="false">שחררו סט בעבור %d אבני חן</string>
+  <string name="purchase_set_button">שחררו סט בעבור %d אבני חן</string>
   <string name="purchase_button">קנייה</string>
-  <string name="purchase_set_title" formatted="false">קנו סט %s</string>
+  <string name="purchase_set_title">קנו סט %s</string>
   <string name="due_date">תאריך יעד</string>
   <string name="quest.accept">קבלו</string>
   <string name="quest.reject">דחו</string>
@@ -157,12 +166,11 @@
   <string name="quest.accepted">התקבל</string>
   <string name="quest.rejected">נדחה</string>
   <string name="quest.participants">משתתפים</string>
-  <string name="version_info" formatted="false">גרסה %s (%d)</string>
   <string name="sidebar_help">עזרה ושאלות נפוצות</string>
   <string name="complete_tutorial">הבנתי!</string>
   <string name="dismiss_tutorial">הזכר לי שוב</string>
   <string name="intro_1_title">ברוכים הבאים להאביטיקה</string>
-  <string name="intro_1_description">הצטרפו ללמעלה מ 1,100,000 אנשים שנהנים בזמן שהם גורמים לדברים לקרות. צרו דמות ועיקבו אחר משימותיכם מהעולם האמיתי.</string>
+  <string name="intro_1_description">הצטרפו ללמעלה מ %s אנשים שנהנים בזמן שהם גורמים לדברים לקרות. צרו דמות ועיקבו אחר משימותיכם מהעולם האמיתי.</string>
   <string name="intro_2_title">התקדמות במשחק = התקדמות בחיים</string>
   <string name="intro_2_description">אפשרו יכולות של המשחק על ידי סימון שהשלמתם משימות בעולם האמיתי. הרוויחו שיריון, חיות מחמד, ועוד - כדי לתגמל את עצמכם על עמידה ביעדים!</string>
   <string name="intro_3_title">היו חברותיים והילחמו במפלצות</string>
@@ -223,8 +231,9 @@
   <string name="privacy">פרטיות</string>
   <string name="write_message">כיתבו הודעה</string>
   <string name="post">שליחה</string>
-  <string name="todo_due" formatted="false">חל: %s</string>
-  <string name="daily_streak" formatted="false">רצף נוכחי: %d</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>
@@ -243,10 +252,10 @@
   <string name="quest_begin_message">האם אתם בטוחים שאתם מעוניינים להתחיל בהרפתקאה? ברגע שהיא מתחילה, חברי חבורה נוספים לא יכולים להצטרף אליה.</string>
   <string name="quest.invitation.text">הוזמנתם להשתתף בהרפתקאה!</string>
   <string name="ago_1day">לפני יום</string>
-  <string name="ago_days" formatted="false">לפני %d ימים</string>
+  <string name="ago_days">לפני %d ימים</string>
   <string name="ago_1Minute">לפני דקה</string>
-  <string name="ago_minutes" formatted="false">לפני %d דקות</string>
-  <string name="ago_hours" formatted="false">לפני %d שעות</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>
@@ -256,26 +265,26 @@
   <string name="quests">הרפתקאות</string>
   <string name="pets">חיות מחמד</string>
   <string name="mounts">חיות רכיבה</string>
-  <string name="armoireEquipment" formatted="false">מצאתם חתיכת ציוד נדיר בארמואר: %s! מגניב!</string>
-  <string name="armoireFood" formatted="false">אתם נוברים בארמואר ומוצאים %1$s %2$s. מה זה עושה פה?</string>
+  <string name="armoireEquipment">מצאתם חתיכת ציוד נדיר בארמואר: %s! מגניב!</string>
+  <string name="armoireFood">אתם נוברים בארמואר ומוצאים %1$s %2$s. מה זה עושה פה?</string>
   <string name="armoireExp">אתם נאבקים בארמואר וצוברים ניסיון. קבלו!</string>
-  <string name="armoireNotesFull" formatted="false">פתחו את הארמואר כדי לקבל ציוד מיוחד אקראי, ניסיון, או אוכל! חתיכות ציוד שנותרו: %d</string>
+  <string name="armoireNotesFull">פתחו את הארמואר כדי לקבל ציוד מיוחד אקראי, ניסיון, או אוכל! חתיכות ציוד שנותרו: %d</string>
   <string name="armoireLastItem">מצאתם את חתיכת הציוד הנדיר האחרונה בארמואר הקסום.</string>
   <string name="armoireNotesEmpty">הארמואר יכיל ציוד חדש בשבוע הראשון של כל חודש. עד אז, המשיכו ללחוץ כדי לקבל ניסיון ואוכל!</string>
-  <string name="sell" formatted="false">מיכרו (%s זהב)</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" formatted="false">האכלתם %1$s %2$s עם:</string>
+  <string name="dialog_feeding">האכלתם %1$s %2$s עם:</string>
   <string name="use_animal">השתמשו</string>
   <string name="feed">האכילו</string>
-  <string name="hatch_with" formatted="false">הבקיעו חיית מחמד עם %s</string>
-  <string name="hatched_pet_title" formatted="false">הבקעתם %1$s %2$s!</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" formatted="false">האכלתם את ה %1$s %2$s שלכם!</string>
-  <string name="notification_purchase" formatted="false">%s נקנה</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>
@@ -286,9 +295,9 @@
   <string name="sectionspecialMounts">חיות רכיבה נדירות</string>
   <string name="world_quest">הרפתקאה עולמית</string>
   <string name="inn_description">נוחו באכסנייה כדי למנוע ממטלות יומיות לא מושלמות לפגוע בכם במהלך הלילה! (שימו לב: לא מונע מכם להפגע מאוייבים.)</string>
-  <string name="empty_items" formatted="false">אין לכם כל %s</string>
-  <string name="user_level" formatted="false">דרגה %d</string>
-  <string name="user_level_with_class" formatted="false">דרגה %1$d - %2$s</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>
@@ -300,7 +309,7 @@
   <string name="select_class">בחרו מקצוע</string>
   <string name="opt_out_class">וותרו</string>
   <string name="opt_out_description">לא מעניינים אתכם מקצועות? רוצים לבחור מאוחר יותר? וותרו - תהיו לוחמים ללא תכונות מיוחדות. תוכלו לקראו על מערכת המקצועות מאוחר יותר בוויקי ולאפשר מקצועות בכל שעה.</string>
-  <string name="class_confirmation" formatted="false">האם אתם בטוחים שברצונכם להיות %s?</string>
+  <string name="class_confirmation">האם אתם בטוחים שברצונכם להיות %s?</string>
   <string name="choose_class">בחרו מקצוע</string>
   <string name="dialog_go_back">חזרה</string>
   <string name="opt_out_confirmation">האם אתם בטוחים שאתם מעוניינים לוותר?</string>
@@ -319,10 +328,45 @@
   <string name="email">מייל</string>
   <string name="invite_users">הזמינו לחבורה</string>
   <string name="share_using">שתפו באמצעות</string>
-  <string name="share_levelup" formatted="false">הגעתי לדרגה %s בהאביטיקה על ידי שיפור הרגלים שלי מהעולם האמיתי!</string>
-  <string name="share_hatched" formatted="false">הרגע הבקעתי ביצת חיית מחמד של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
-  <string name="share_raised" formatted="false">הרגע הרווחתי חיית רכיבה של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</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="leaderMessage" formatted="false">הודעה מאת %1$s</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_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-->
 </resources>
diff --git a/Habitica/res/values-ja/strings.profile.xml b/Habitica/res/values-ja/strings.profile.xml
index 14bc277ee..e72a7c198 100644
--- a/Habitica/res/values-ja/strings.profile.xml
+++ b/Habitica/res/values-ja/strings.profile.xml
@@ -11,4 +11,7 @@
     <string name="profile_allocated">割当済み : </string>
     <string name="profile_boosts">勢い : </string>
     <string name="profile_private_message">プライベートメッセージ</string>
-    </resources>
\ No newline at end of file
+    <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.xml b/Habitica/res/values-ja/strings.xml
index 3a106b081..1a5a09772 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">更新</string>
   <string name="XP_default">経験値</string>
   <string name="HP_default">体力</string>
@@ -116,9 +116,9 @@
   <string name="faint_button">体力を全回復してやり直す</string>
   <string name="filter">フィルター</string>
   <string name="profile_image">プロフィール画像</string>
-  <string name="mana_price_button" formatted="false">%d マナ</string>
-  <string name="used_skill" formatted="false">%2$dマナを消費して%1$sを唱えた。</string>
-  <string name="used_skill_without_mana" formatted="false">%1$s を唱えた。</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>
@@ -139,6 +139,7 @@
   <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>
@@ -162,9 +163,9 @@
   <string name="avatar_size_broad">がっしり</string>
   <string name="avatar_background">背景</string>
   <string name="purchase_customization">カスタマイズを購入</string>
-  <string name="purchase_set_button" formatted="false">%d ジェムでセットをアンロック</string>
+  <string name="purchase_set_button">%d ジェムでセットをアンロック</string>
   <string name="purchase_button">購入</string>
-  <string name="purchase_set_title" formatted="false">%s セットを購入</string>
+  <string name="purchase_set_title">%s セットを購入</string>
   <string name="due_date">締切日</string>
   <string name="quest.accept">承認</string>
   <string name="quest.reject">拒否</string>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">承認済</string>
   <string name="quest.rejected">拒否</string>
   <string name="quest.participants">参加者</string>
-  <string name="version_info" formatted="false">バージョン : %s (%d)</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_title">Habitica へようこそ</string>
-  <string name="intro_1_description" formatted="false">%s人以上の方々が、やるべき事をかたづけるのを楽しんでいるよ。アバターをつくって、実生活のタスクを記録してみよう。</string>
+  <string name="intro_1_description">%s人以上の方々が、やるべき事をかたづけるのを楽しんでいるよ。アバターをつくって、実生活のタスクを記録してみよう。</string>
   <string name="intro_2_title">ゲームの進行 = 人生の進行</string>
   <string name="intro_2_description">実生活でタスクをこなし、ゲーム内の機能をアンロックしよう。よろい、ペット、そして「ごほうび」を手に入れながら、自分自身の目標に接近しよう!</string>
   <string name="intro_3_title">友達とつながってモンスターと戦おう</string>
@@ -244,8 +245,8 @@
   <string name="write_message">メッセージを書く</string>
   <string name="post">投稿</string>
   <string name="guild_search_hint">ギルドを検索</string>
-  <string name="todo_due" formatted="false">期限 : %s</string>
-  <string name="daily_streak" formatted="false">現在の連続実行 : %d 回</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>
@@ -264,10 +265,10 @@
   <string name="quest_begin_message">クエストをはじめます。よろしいですか?　クエストを開始すると、新たにメンバーがクエストに参加することはできません。</string>
   <string name="quest.invitation.text">クエストへの招待状が届いた!</string>
   <string name="ago_1day">1日前</string>
-  <string name="ago_days" formatted="false">%d日前</string>
+  <string name="ago_days">%d日前</string>
   <string name="ago_1Minute">1分前</string>
-  <string name="ago_minutes" formatted="false">%d分前</string>
-  <string name="ago_hours" formatted="false">%d時間前</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>
@@ -277,26 +278,26 @@
   <string name="quests">クエスト</string>
   <string name="pets">ペット</string>
   <string name="mounts">乗騎</string>
-  <string name="armoireEquipment" formatted="false">宝箱に貴重なアイテム、 %s を見つけた!　すごい!</string>
-  <string name="armoireFood" formatted="false">宝箱をひっかきまわして%1$s%2$sを見つけた。何でこんなとこに?</string>
+  <string name="armoireEquipment">宝箱に貴重なアイテム、 %s を見つけた!　すごい!</string>
+  <string name="armoireFood">宝箱をひっかきまわして%1$s%2$sを見つけた。何でこんなとこに?</string>
   <string name="armoireExp">宝箱と格闘して経験値を増やした。どうぞっ!</string>
-  <string name="armoireNotesFull" formatted="false">宝箱を開くと、特別な装備、経験値、えさなどが手に入るよ!　残っているアイテムの数 : %d</string>
+  <string name="armoireNotesFull">宝箱を開くと、特別な装備、経験値、えさなどが手に入るよ!　残っているアイテムの数 : %d</string>
   <string name="armoireLastItem">最後の貴重なアイテムをラッキー宝箱で発見した。</string>
   <string name="armoireNotesEmpty">宝箱には毎月最初の週に新しいアイテムが入ります。それまでは、クリックして経験値やえさを手に入れよう!</string>
-  <string name="sell" formatted="false">%s ゴールドで売る</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" formatted="false">%1$s%2$s にえさをやる :</string>
+  <string name="dialog_feeding">%1$s%2$s にえさをやる :</string>
   <string name="use_animal">連れていく</string>
   <string name="feed">えさをやる</string>
-  <string name="hatch_with" formatted="false">%s でペットをかえす</string>
-  <string name="hatched_pet_title" formatted="false">%1$s%2$sが生まれた!</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" formatted="false">%1$s%2$sにえさをやった!</string>
-  <string name="notification_purchase" formatted="false">%s は購入済み</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>
@@ -307,7 +308,9 @@
   <string name="sectionspecialMounts">レアな乗騎</string>
   <string name="world_quest">世界のクエスト</string>
   <string name="inn_description">ロッジで休んでいる間は、日課をやらずに夜が明けてもダメージを受けない! ( 注 : ボスから受けるダメージは避けられない)</string>
-  <string name="empty_items" formatted="false">%s を持ってないよ</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>
@@ -319,8 +322,9 @@
   <string name="select_class">クラスを選ぶ</string>
   <string name="opt_out_class">選ばない</string>
   <string name="opt_out_description">クラスなんてめんどくさい? 後で選びたい? 選ばなくても構わないよ。スキルのない戦士になります。クラスのしくみについてwiki を参照し、いつでも ユーザー -&gt; ステータス で有効にできる。</string>
-  <string name="class_confirmation" formatted="false">%s になります。いいですか?</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>
@@ -339,12 +343,14 @@
   <string name="email">メール</string>
   <string name="invite_users">パーティーに招待する</string>
   <string name="share_using">共有 ( シェア ) : </string>
-  <string name="share_levelup" formatted="false">生活を改善して、Habitica でのレベルが %s になった!</string>
-  <string name="share_hatched" formatted="false">実生活でのタスクをこなして、Habitica で %1$s%2$s のペットを飼いはじめた。</string>
-  <string name="share_raised" formatted="false">実生活でのタスクをこなして、%1$s%2$s のペットが乗れるほど大きな乗騎まで成長した。</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="leaderMessage" formatted="false">%1$s からのメッセージ</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>
@@ -353,9 +359,9 @@
   <string name="party_invite">友達を招待するとアンロック</string>
   <string name="no_gold">ゴールドが足りません</string>
   <string name="no_potion">体力回復の薬を買う必要がありません</string>
-  <string name="successful_purchase" formatted="false">%1$s を買いました</string>
+  <string name="successful_purchase">%1$s を買いました</string>
   <string name="purchase_confirmation_title">購入の確認</string>
-  <string name="confirm_purchase_text" formatted="false">%2$s %3$s で %1$s  を買う</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>
@@ -406,9 +412,27 @@
   <string name="hatching_market_info">ほしい落とし物が見つからない?　市場をチェックしてみよう!</string>
   <string name="feeding_market_info">違うえさがほしい?　市場で買いましょう!</string>
   <string name="open_market">市場を開く</string>
-  <string name="cds_description" formatted="false">あなたの日課が次に更新されるのは %1$s です。この時間までに日課を片付けておきましょう!</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="challenge_details">チャレンジの概要</string>
+  <string name="challenge_leave_title">チャレンジから抜ける</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="add_reminder">リマインダーを追加する</string>
+  <string name="inbox">受信箱</string>
+  <string name="FAQ">よくある質問</string>
 </resources>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index 53945f71e..f5325652f 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">새로고침</string>
   <string name="XP_default">경험치</string>
   <string name="HP_default">체력</string>
@@ -116,9 +116,9 @@
   <string name="faint_button">체력을 채우고 다시 도전하세요.</string>
   <string name="filter">필터</string>
   <string name="profile_image">프로필 사진</string>
-  <string name="mana_price_button" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">당신은 %1$s을 사용해 %2$d 마나를 얻었습니다.</string>
-  <string name="used_skill_without_mana" formatted="false">%1$s을(를) 사용했습니다.</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>
@@ -162,9 +162,9 @@
   <string name="avatar_size_broad">통통하게</string>
   <string name="avatar_background">배경</string>
   <string name="purchase_customization"> 구매</string>
-  <string name="purchase_set_button" formatted="false">%d개의 보석으로 전체 세트 열기</string>
+  <string name="purchase_set_button">%d개의 보석으로 전체 세트 열기</string>
   <string name="purchase_button">구매</string>
-  <string name="purchase_set_title" formatted="false">%s 세트 구매</string>
+  <string name="purchase_set_title">%s 세트 구매</string>
   <string name="due_date">만기일</string>
   <string name="quest.accept">승인</string>
   <string name="quest.reject">거부</string>
@@ -176,12 +176,12 @@
   <string name="quest.accepted">승인됨</string>
   <string name="quest.rejected">거부됨</string>
   <string name="quest.participants">참가자</string>
-  <string name="version_info" formatted="false">버젼 %s (%d)</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_title">Habitica에 오신걸 환영합니다</string>
-  <string name="intro_1_description" formatted="false">%s명이 넘는 사람들과 함께 아바타도 만들고 재미있게 즐기면서 실생활 목표들을 달성하세요.</string>
+  <string name="intro_1_description">%s명이 넘는 사람들과 함께 아바타도 만들고 재미있게 즐기면서 실생활 목표들을 달성하세요.</string>
   <string name="intro_2_title">게임 진행도 = 인생 진행도</string>
   <string name="intro_2_description">일상생활의 과제들을 해결하면서 게임의 새로운 기능을 열어보세요. 당신이 목표를 달성할 때 마다 갑옷, 펫과 같은 다양한 보상들을 얻을 수 있습니다!</string>
   <string name="intro_3_title">친구들과 몬스터를 물리치세요</string>
@@ -250,8 +250,8 @@
   <string name="write_message">메세지 작성</string>
   <string name="post">게시</string>
   <string name="guild_search_hint">길드 검색</string>
-  <string name="todo_due" formatted="false">만기: %s</string>
-  <string name="daily_streak" formatted="false">연속 달성: %d</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>
@@ -270,10 +270,10 @@
   <string name="quest_begin_message">정말 이 퀘스트를 시작하시겠습니까? 시작 후 더이상 새로운 파티 멤버가 참여할 수 없습니다.</string>
   <string name="quest.invitation.text">퀘스트에 초대받았습니다!</string>
   <string name="ago_1day">하루 전</string>
-  <string name="ago_days" formatted="false">%d 일 전</string>
+  <string name="ago_days">%d 일 전</string>
   <string name="ago_1Minute">1분 전</string>
-  <string name="ago_minutes" formatted="false">%d 분 전</string>
-  <string name="ago_hours" formatted="false">%d 시간 전</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>
@@ -283,26 +283,26 @@
   <string name="quests">퀘스트</string>
   <string name="pets">펫</string>
   <string name="mounts">탑승펫</string>
-  <string name="armoireEquipment" formatted="false">옷장에서 귀한 장비를 찾았습니다: %s! 대단해요!</string>
-  <string name="armoireFood" formatted="false">당신은 옷장안에서  %1$s %2$s 를 발견합니다. 왜 이것들이 여기 들어있지?</string>
+  <string name="armoireEquipment">옷장에서 귀한 장비를 찾았습니다: %s! 대단해요!</string>
+  <string name="armoireFood">당신은 옷장안에서  %1$s %2$s 를 발견합니다. 왜 이것들이 여기 들어있지?</string>
   <string name="armoireExp">당신은 옷장과 씨름하여 경험치를 얻었습니다. 맛 좀 봐라!</string>
-  <string name="armoireNotesFull" formatted="false">옷장을 열어 무작위로 장비, 경험치, 혹은 음식을 얻으세요! 남은 장비 부품: %d</string>
+  <string name="armoireNotesFull">옷장을 열어 무작위로 장비, 경험치, 혹은 음식을 얻으세요! 남은 장비 부품: %d</string>
   <string name="armoireLastItem">당신은 마지막 귀한 장비를 마법의 옷장에서 찾았습니다.</string>
   <string name="armoireNotesEmpty">옷장에는 매달 첫째주에 새로운 장비가 들어있을 것입니다. 그때까지는 계속 클릭하여 경험치와 음식을 얻으세요!</string>
-  <string name="sell" formatted="false">팔기 (%s 골드)</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" formatted="false">%1$s %2$s 에게 다음의 먹이 주기:</string>
+  <string name="dialog_feeding">%1$s %2$s 에게 다음의 먹이 주기:</string>
   <string name="use_animal">사용</string>
   <string name="feed">먹이주기</string>
-  <string name="hatch_with" formatted="false">%s 으로 펫 부화</string>
-  <string name="hatched_pet_title" formatted="false">당신은 %1$s %2$s 를 부화시켰습니다!</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" formatted="false">%1$s %2$s 에게 먹이를 줬습니다!</string>
-  <string name="notification_purchase" formatted="false">%s 를 구매했습니다</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>
@@ -313,7 +313,7 @@
   <string name="sectionspecialMounts">희귀 탑승펫</string>
   <string name="world_quest">세계 퀘스트</string>
   <string name="inn_description">여관에서 쉬면 완료하지 못한 일일과제가 당신을 다치게 하는 것을 막을 수 있습니다. (주의: 보스로부터 받는 데미지는 피하지 못합니다.)</string>
-  <string name="empty_items" formatted="false">%s 가 하나도 없습니다</string>
+  <string name="empty_items">%s 가 하나도 없습니다</string>
   <string name="warrior">전사</string>
   <string name="rogue">도적</string>
   <string name="mage">마법사</string>
@@ -325,7 +325,7 @@
   <string name="select_class">직업 고르기</string>
   <string name="opt_out_class">선택 유예</string>
   <string name="opt_out_description">직업을 신경쓰고 싶지 않으신가요? 나중에 고르고 싶으시다고요? 선택유예 하세요 - 당신은 아무런 능력이 없는 전사가 되어있을 꺼에요. wiki를 방문하면 직업시스템에 대해서 자세히 알 수 있고, 이후에 언제라도 직업을 선택할 수 있습니다.</string>
-  <string name="class_confirmation" formatted="false">%s 가 되고싶은 것이 확실한가요?</string>
+  <string name="class_confirmation">%s 가 되고싶은 것이 확실한가요?</string>
   <string name="class_changed">%s가 되었습니다!</string>
   <string name="class_changed_description">장비 메뉴에서 교체할 수 있는 새로운 기본 전투 장비를 얻었습니다!</string>
   <string name="choose_class">직업 선택</string>
@@ -346,14 +346,14 @@
   <string name="email">이메일</string>
   <string name="invite_users">파티 초대</string>
   <string name="share_using">올리기</string>
-  <string name="share_levelup" formatted="false">일상생활의 습관을 개선하여 Habitica에서 레벨 %s가 되었어요!</string>
-  <string name="share_hatched" formatted="false">일상생활의 과제들을 달성하여 Habitica에서 %1$s %2$s 펫을 깨웠어요!</string>
-  <string name="share_raised" formatted="false">일상생활의 과제들을 달성하여 %1$s %2$s 탈것을 얻었어요!</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" formatted="false">%1$s로부터 온 메세지</string>
-  <string name="leaderName" formatted="false">리더: %1$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>
@@ -362,9 +362,9 @@
   <string name="party_invite">친구를 초대하여 잠금 해제하기</string>
   <string name="no_gold">골드가 충분하지 않음</string>
   <string name="no_potion">체력 물약을 살 필요가 없음</string>
-  <string name="successful_purchase" formatted="false">%1$s을(를) 성공적으로 구매했음</string>
+  <string name="successful_purchase">%1$s을(를) 성공적으로 구매했음</string>
   <string name="purchase_confirmation_title">구매 확인</string>
-  <string name="confirm_purchase_text" formatted="false">%1$s을(를) %2$s %3$s(으)로 구매함</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>
@@ -415,7 +415,7 @@
   <string name="hatching_market_info">필요한 아이템이 드롭되지 않나요? 시장으로 가보세요!</string>
   <string name="feeding_market_info">다른 종류의 음식이 필요한가요? 시장에서 음식을 구매해보세요!</string>
   <string name="open_market">시장으로</string>
-  <string name="cds_description" formatted="false">일일과제는 %1$s 후에 처음 해비티카를 사용할 때 리셋됩니다. 꼭 이 시간 전에 일일과제들을 완료하세요!</string>
+  <string name="cds_description">일일과제는 %1$s 후에 처음 해비티카를 사용할 때 리셋됩니다. 꼭 이 시간 전에 일일과제들을 완료하세요!</string>
   <string name="AudioTheme_title">오디오 테마</string>
   <string name="AudioTheme_summary">Habitica 오디오 바꾸기</string>
   <!--Login Incentives-->
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index f1c4275b9..0430119ec 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<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>
@@ -116,9 +116,9 @@
   <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" formatted="false">%d Magijos Taškai</string>
-  <string name="used_skill" formatted="false">Panaudojai [%1$s] už %2$d magijos taškus.</string>
-  <string name="used_skill_without_mana" formatted="false">Panaudojai %1$s.</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>
@@ -162,9 +162,9 @@
   <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" formatted="false">Atidengti už %d brangakmenių</string>
+  <string name="purchase_set_button">Atidengti už %d brangakmenių</string>
   <string name="purchase_button">Pirkti</string>
-  <string name="purchase_set_title" formatted="false">Pirkti rinkinį %s</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>
@@ -176,12 +176,12 @@
   <string name="quest.accepted">Sutiko</string>
   <string name="quest.rejected">Atsisakė</string>
   <string name="quest.participants">Dalyviai</string>
-  <string name="version_info" formatted="false">Versija: %s (%d)</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_1_title">Sveiki užsukę į Habitica</string>
-  <string name="intro_1_description" formatted="false">Prisijunkite prie virš %s žmonių smagiai atliekančių kasdienes užduotis. Susikurkite avatarą ir sekite savo realaus gyvenimo užduotis.</string>
+  <string name="intro_1_description">Prisijunkite prie virš %s žmonių smagiai atliekančių kasdienes užduotis. Susikurkite avatarą ir sekite savo realaus gyvenimo užduotis.</string>
   <string name="intro_2_title">Progresas Žaidime = Progresas Gyvenime</string>
   <string name="intro_2_description">Atidenk naujas žaidimo funkcijas žymėdamas savo gyvenimo užduotis. Užsidirbk šarvus, augintinius ir kitus atlygius siekdamas savo tikslų!</string>
   <string name="intro_3_title">Bendrauk ir Kovok su Pabaisomis</string>
@@ -243,8 +243,8 @@ Pradžiai, kurias savo gyvenimo dalis norėtum tobulint?</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" formatted="false">Terminas: %s</string>
-  <string name="daily_streak" formatted="false">dabartinė serija: %d</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>
@@ -263,10 +263,10 @@ Pradžiai, kurias savo gyvenimo dalis norėtum tobulint?</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" formatted="false">prieš %d dieną(as)</string>
+  <string name="ago_days">prieš %d dieną(as)</string>
   <string name="ago_1Minute">prieš 1 minutę</string>
-  <string name="ago_minutes" formatted="false">prieš %d minutę(es)</string>
-  <string name="ago_hours" formatted="false">prieš %d valandą(as)</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>
@@ -276,26 +276,26 @@ Pradžiai, kurias savo gyvenimo dalis norėtum tobulint?</string>
   <string name="quests">Misijos</string>
   <string name="pets">Maži Augintiniai</string>
   <string name="mounts">Suaugę Augintiniai</string>
-  <string name="armoireEquipment" formatted="false">Radai retos aprangos dalį Drabužinėje: %s! Nuostabu!</string>
-  <string name="armoireFood" formatted="false">Betyrinėjant Drabužinę randi %1$s %2$s. Ką tai čia veikia?</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" formatted="false">Atidaryk Drabužinę ir gauk retos Aprangos dalį, Patirties ar maisto! Nerasto aprangos dalys: %d</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" formatted="false">Parduoti (%s Augso)</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" formatted="false">Pašerti %1$s %2$s su:</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" formatted="false">Užauginti gyvūną su %s</string>
-  <string name="hatched_pet_title" formatted="false">Užauginai %1$s %2$s!</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" formatted="false">Pašėrei savo %1$s %2$s!</string>
-  <string name="notification_purchase" formatted="false">%s nupirkta</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>
@@ -306,7 +306,7 @@ Pradžiai, kurias savo gyvenimo dalis norėtum tobulint?</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" formatted="false">Nebeturi %s</string>
+  <string name="empty_items">Nebeturi %s</string>
   <string name="warrior">Karys</string>
   <string name="rogue">Sukčius</string>
   <string name="mage">Magas</string>
@@ -318,7 +318,7 @@ Pradžiai, kurias savo gyvenimo dalis norėtum tobulint?</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" formatted="false">Ar tikrai nori būti %s?</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>
@@ -337,12 +337,12 @@ Pradžiai, kurias savo gyvenimo dalis norėtum tobulint?</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_levelup" formatted="false">Pasiekiau %s Habitica lygį tobulinant savo gyvenimo įpročius!</string>
-  <string name="share_hatched" formatted="false">Kątik gavau %1$s %2$s Habitica augintinį atliekant kasdienes užduotis!</string>
-  <string name="share_raised" formatted="false">Kątik užauginau %1$s %2$s Habitica augintinį atliekant kasdienes užduotis!</string>
+  <string name="share_levelup">Pasiekiau %d Habitica lygį tobulinant savo gyvenimo įpročius!</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" formatted="false">Žinutė nuo %1$s</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>
@@ -351,9 +351,9 @@ Pradžiai, kurias savo gyvenimo dalis norėtum tobulint?</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" formatted="false">%1$s nupirktas</string>
+  <string name="successful_purchase">%1$s nupirktas</string>
   <string name="purchase_confirmation_title">Patvirtinti pirkinį</string>
-  <string name="confirm_purchase_text" formatted="false">Pirkti %1$s už %2$s %3$s</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>
@@ -404,7 +404,7 @@ Pradžiai, kurias savo gyvenimo dalis norėtum tobulint?</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" formatted="false">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="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-->
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index d8ca35ece..df3872a0e 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<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>
@@ -116,9 +116,9 @@
   <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" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">Je hebt %1$s voor %2$d mana gebruikt.</string>
-  <string name="used_skill_without_mana" formatted="false">Je hebt %1$s gebruikt.</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>
@@ -139,6 +139,7 @@
   <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>
@@ -162,9 +163,9 @@
   <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" formatted="false">Ontgrendel set voor %d edelstenen</string>
+  <string name="purchase_set_button">Ontgrendel set voor %d edelstenen</string>
   <string name="purchase_button">Koop</string>
-  <string name="purchase_set_title" formatted="false">Koop set %s</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>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">Aanvaard</string>
   <string name="quest.rejected">Afgewezen</string>
   <string name="quest.participants">Deelnemers</string>
-  <string name="version_info" formatted="false">Versie %s (%d)</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_title">Welkom bij Habitica</string>
-  <string name="intro_1_description" formatted="false">Sluit je aan bij meer dan %s mensen en heb plezier terwijl je dingen gedaan krijgt. Maak een avatar en houd je taken in de echte wereld bij.</string>
+  <string name="intro_1_description">Sluit je aan bij meer dan %s mensen en heb plezier terwijl je dingen gedaan krijgt. Maak een avatar en houd je taken in de echte wereld bij.</string>
   <string name="intro_2_title">Vooruitgang in het spel = Vooruitgang in je leven</string>
   <string name="intro_2_description">Speel functies vrij in het spel door je echte taken af te strepen. Verdien uitrusting, huisdieren en meer als beloning voor het bereiken van je doelen.</string>
   <string name="intro_3_title">Word sociaal en vecht tegen monsters</string>
@@ -243,8 +244,8 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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" formatted="false">Tegen: %s</string>
-  <string name="daily_streak" formatted="false">huidige serie: %d</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>
@@ -263,10 +264,10 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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" formatted="false">%d dagen geleden</string>
+  <string name="ago_days">%d dagen geleden</string>
   <string name="ago_1Minute">1 minuut geleden</string>
-  <string name="ago_minutes" formatted="false">%d minuten geleden</string>
-  <string name="ago_hours" formatted="false">%d uren 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>
@@ -276,26 +277,26 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
   <string name="quests">Queesten</string>
   <string name="pets">Huisdieren</string>
   <string name="mounts">Rijdieren</string>
-  <string name="armoireEquipment" formatted="false">Je hebt een zeldzaam stuk van een uitrusting gevonden in het Kabinet: %s! Geweldig!</string>
-  <string name="armoireFood" formatted="false">Je rommelt wat rond in het Kabinet en vindt %1$s %2$s. Wat doet dat hier?</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" formatted="false">Open het Kabinet om willekeurig speciale uitrustingen, ervaring of voedsel te vinden! Stukken uitrusting die nog over zijn: %d</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" formatted="false">Verkoop (%s Goud)</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" formatted="false">Voeder %1$s %2$s met:</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" formatted="false">Laat huisdier uitkomen met %s</string>
-  <string name="hatched_pet_title" formatted="false">Je hebt een %1$s %2$s laten uitkomen!</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" formatted="false">Je hebt je %1$s %2$s gevoederd!</string>
-  <string name="notification_purchase" formatted="false">%s werd gekocht</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>
@@ -306,7 +307,9 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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" formatted="false">Je hebt geen %s</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>
@@ -318,7 +321,7 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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" formatted="false">Weet je zeker dat je een %s wilt zijn?</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>
@@ -339,14 +342,14 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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" formatted="false">Ik ben in Habitica tot niveau %s gekomen door mijn echte gewoontes te verbeteren!</string>
-  <string name="share_hatched" formatted="false">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" formatted="false">Ik heb net een %1$s %2$s rijdier gekregen in Habitica door mijn echte taken uit te voeren!</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" formatted="false">Bericht van %1$s</string>
-  <string name="leaderName" formatted="false">Leider: %1$s</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>
@@ -355,9 +358,9 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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" formatted="false">%1$s succesvol gekocht</string>
+  <string name="successful_purchase">%1$s succesvol gekocht</string>
   <string name="purchase_confirmation_title">Bevestig aankoop</string>
-  <string name="confirm_purchase_text" formatted="false">Koop %1$s voor %2$s %3$s</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>
@@ -408,7 +411,7 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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" formatted="false">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="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-->
@@ -416,4 +419,74 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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 edelstenen aan je verkopen voor 20 goud pet edelsteen. Zijn maandelijkse levering is initieel beperkt tot 25 edelstenen per maand, maar dit 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">Maakt afgewerkte To-do\'s en taakgeschiedenis langer beschikbaar.</string>
+  <string name="subscribe.listitem3.description">Vervolledig je stal sneller!</string>
+  <string name="subscribe.listitem4.description">Iedere maand ontvang je een uniek cosmetisch voorwerp voor je avatar! Plus, voor iedere drie opeenvolgende abonnementen geven de Mysterieuze Tijdreizigers je toegang tot historische (en futuristische!) cosmetische voorwerpen.</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="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="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>
 </resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index afb800737..8582a731a 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<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>
@@ -116,9 +116,9 @@
   <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" formatted="false">%d PM</string>
-  <string name="used_skill" formatted="false">Użyłeś %1$s za %2$d pkt. many.</string>
-  <string name="used_skill_without_mana" formatted="false">Użyto %1$s.</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>
@@ -139,6 +139,7 @@
   <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>
@@ -162,9 +163,9 @@
   <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" formatted="false">Odblokuj zestaw za %d gemó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" formatted="false">Kup zestaw %s</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>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">Zaakceptowane</string>
   <string name="quest.rejected">Odrzucone</string>
   <string name="quest.participants">Uczestnicy</string>
-  <string name="version_info" formatted="false">Wersja %s (%d)</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_title">Witaj w Habitica</string>
-  <string name="intro_1_description" formatted="false">Dołącz do ponad %s ludzi bawiących się podczas wypełniania swoich zadań. Stwórz awatar i śledź swoje zadania w życiu codziennym.</string>
+  <string name="intro_1_description">Dołącz do ponad %s ludzi bawiących się podczas wypełniania swoich zadań. Stwórz awatar i śledź swoje zadania w życiu codziennym.</string>
   <string name="intro_2_title">Awans w grze = Awans w życiu</string>
   <string name="intro_2_description">Odblokuj właściwości gry poprzez wypełnianie zadań w życiu. Zdobądź broń, chowańce i wiele innych nagród za zrealizowanie celów!</string>
   <string name="intro_3_title">Połącz siły w innymi graczami i pokonuj potwory</string>
@@ -243,8 +244,8 @@ Od czego chcesz zacząć poprawiać swoje życie?</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" formatted="false">Termin: %s</string>
-  <string name="daily_streak" formatted="false">licznik serii: %d</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>
@@ -263,10 +264,10 @@ Od czego chcesz zacząć poprawiać swoje życie?</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" formatted="false">%d dni temu</string>
+  <string name="ago_days">%d dni temu</string>
   <string name="ago_1Minute">1 minutę temu</string>
-  <string name="ago_minutes" formatted="false">%d minut temu</string>
-  <string name="ago_hours" formatted="false">%d godzin 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>
@@ -276,26 +277,26 @@ Od czego chcesz zacząć poprawiać swoje życie?</string>
   <string name="quests">Misje</string>
   <string name="pets">Zwierzaki</string>
   <string name="mounts">Wierzchowce</string>
-  <string name="armoireEquipment" formatted="false">Znalazłeś element rzadkiego Ekwipunku w Skrzyni: %s! Super!</string>
-  <string name="armoireFood" formatted="false">Przeszukujesz Skrzynię i znajdujesz %1$s %2$s. Co to tam robi?</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" formatted="false">Otwórz Skrzynię żeby losowo otrzymać specjalne Wyposażenie, Doświadczenie lub jedzenie! Pozostało elementów : %d</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" formatted="false">Sprzedaj (%s Złoto)</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" formatted="false">Nakarm %1$s %2$s</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" formatted="false">Wykluj za pomocą %s</string>
-  <string name="hatched_pet_title" formatted="false">Wyklułeś/as %1$s %2$s!</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" formatted="false">Nakarmiłeś/aś %1$s %2$s!</string>
-  <string name="notification_purchase" formatted="false">%s zakupiony</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>
@@ -306,7 +307,9 @@ Od czego chcesz zacząć poprawiać swoje życie?</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" formatted="false">Nie posiadasz %s</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>
@@ -318,7 +321,7 @@ Od czego chcesz zacząć poprawiać swoje życie?</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" formatted="false">Jesteś pewien, że chcesz być %s?</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>
@@ -339,14 +342,14 @@ Od czego chcesz zacząć poprawiać swoje życie?</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" formatted="false">Ulepszając życiowe nawyki, osiągnąłem %s level w Habitice!</string>
-  <string name="share_hatched" formatted="false">Właśnie wyklułem chowańca %1$s %2$s w Habitice dzięki wypełnianiu życiowych zadań!</string>
-  <string name="share_raised" formatted="false">Właśnie zyskałem wierzchowca %1$s %2$s w Habitice dzięki wypełnianiu życiowych zadań!</string>
+  <string name="share_levelup">Ulepszając życiowe nawyki, osiągnąłem %d level w Habitice!</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" formatted="false">Wiadomość od %1$s</string>
-  <string name="leaderName" formatted="false">Lider: %1$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>
@@ -355,9 +358,9 @@ Od czego chcesz zacząć poprawiać swoje życie?</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" formatted="false">%1$s jest w Twoim posiadaniu</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" formatted="false">Zakup %1$s za %2$s %3$s</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>
@@ -408,7 +411,7 @@ Od czego chcesz zacząć poprawiać swoje życie?</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" formatted="false">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="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-->
@@ -416,4 +419,46 @@ Od czego chcesz zacząć poprawiać swoje życie?</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.listitem1">Kup klejnoty za złoto</string>
+  <string name="subscribe.listitem2">Ekskluzywne przedmioty miesiąca </string>
+  <string name="subscriptions">Subskrypcje</string>
+  <string name="subscription">Subskrypcja</string>
+  <string name="active">Aktywne</string>
+  <string name="cancel_subscription">Anuluj Subskrypcję</string>
+  <string name="visit_habitica_website">Odwiedź Stronę Habitiki</string>
+  <string name="current_bonuses">Obecne Dodatki</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="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="add_reminder">Dodaj przypomnienie</string>
+  <string name="warning">Uwaga</string>
+  <string name="open_settings">Otwórz ustawienia</string>
+  <string name="inbox">Skrzynka odbiorcza</string>
+  <string name="FAQ">Najczęściej Zadawane Pytania</string>
+  <string name="special">Specjalne</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>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 1f77d7a6a..3879b306e 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">Atualizar</string>
   <string name="XP_default">Experiência</string>
   <string name="HP_default">Vida</string>
@@ -116,9 +116,9 @@
   <string name="faint_button">Restaurar Vida &amp; Tentar Novamente</string>
   <string name="filter">Filtro</string>
   <string name="profile_image">Imagem de Perfil</string>
-  <string name="mana_price_button" formatted="false">%d PM</string>
-  <string name="used_skill" formatted="false">Você usou %1$s para %2$d mana.</string>
-  <string name="used_skill_without_mana" formatted="false">Você usou %1$s.</string>
+  <string name="mana_price_button">%d PM</string>
+  <string name="used_skill">Você usou %1$s para %2$d mana.</string>
+  <string name="used_skill_without_mana">Você usou %1$s.</string>
   <string name="new_checklist_item">Novo item de lista de controle</string>
   <string name="add_checklist_item">Adicionar</string>
   <string name="reminder_title">Lembre-se de checar suas Diárias!</string>
@@ -139,6 +139,7 @@
   <string name="members">Membros</string>
   <string name="habits">Hábitos</string>
   <string name="dailies">Diárias</string>
+  <string name="todos">Afazeres</string>
   <string name="rewards">Recompensas</string>
   <string name="taskform.delete.title">Você tem certeza?</string>
   <string name="taskform.delete.message">Você realmente quer deletar?</string>
@@ -162,9 +163,9 @@
   <string name="avatar_size_broad">Largo</string>
   <string name="avatar_background">Cenário</string>
   <string name="purchase_customization">Comprar customização</string>
-  <string name="purchase_set_button" formatted="false">Desbloquear conjunto por %d gemas</string>
+  <string name="purchase_set_button">Desbloquear conjunto por %d gemas</string>
   <string name="purchase_button">Comprar</string>
-  <string name="purchase_set_title" formatted="false">Comprar conjunto %s</string>
+  <string name="purchase_set_title">Comprar conjunto %s</string>
   <string name="due_date">Data limite</string>
   <string name="quest.accept">Aceitar</string>
   <string name="quest.reject">Rejeitar</string>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">Aceito</string>
   <string name="quest.rejected">Rejeitado</string>
   <string name="quest.participants">Participantes</string>
-  <string name="version_info" formatted="false">Versão %s (%d)</string>
+  <string name="version_info">Versão %1$s (%2$d)</string>
   <string name="sidebar_help">Ajuda &amp; Perguntas Frequentes</string>
   <string name="complete_tutorial">Entendi!</string>
   <string name="dismiss_tutorial">Lembre-me novamente</string>
   <string name="intro_1_title">Bem vindo(a) ao Habitica</string>
-  <string name="intro_1_description" formatted="false">Junte-se a mais de %s pessoas se divertindo enquanto realizam suas tarefas. Crie um avatar e acompanhe suas tarefas da vida real.</string>
+  <string name="intro_1_description">Junte-se a mais de %s pessoas se divertindo enquanto realizam suas tarefas. Crie um avatar e acompanhe suas tarefas da vida real.</string>
   <string name="intro_2_title">Progresso no jogo = Progresso na vida</string>
   <string name="intro_2_description">Desbloqueie recursos no jogo ao completar suas tarefas da vida real. Ganhe armaduras, mascotes, montarias e mais para recompensá-lo por atingir suas metas!</string>
   <string name="intro_3_title">Socialize e lute contra monstros</string>
@@ -243,8 +244,8 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="write_message">Escrever mensagem</string>
   <string name="post">Publicar</string>
   <string name="guild_search_hint">Buscar guildas</string>
-  <string name="todo_due" formatted="false">Data limite: %s</string>
-  <string name="daily_streak" formatted="false">Combo atual: %d</string>
+  <string name="todo_due">Data limite: %s</string>
+  <string name="daily_streak">Combo atual: %d</string>
   <string name="todo_has_duedate">Tarefa com vencimento</string>
   <string name="battle_gear">Equipamento de batalha</string>
   <string name="costume">Fantasia</string>
@@ -263,10 +264,10 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="quest_begin_message">Tem certeza que deseja começar a missão? Uma vez ativa, outros membros do grupo não poderão juntar-se à missão.</string>
   <string name="quest.invitation.text">Você foi convidado a participar de uma missão!</string>
   <string name="ago_1day">1 dia atrás</string>
-  <string name="ago_days" formatted="false">%d dias atrás</string>
+  <string name="ago_days">%d dias atrás</string>
   <string name="ago_1Minute">1 minuto atrás</string>
-  <string name="ago_minutes" formatted="false">%d minutos atrás</string>
-  <string name="ago_hours" formatted="false">%d horas atrás</string>
+  <string name="ago_minutes">%d minutos atrás</string>
+  <string name="ago_hours">%d horas atrás</string>
   <string name="ago_1hour">1 hora atrás</string>
   <string name="today">Hoje</string>
   <string name="sidebar_items">Itens</string>
@@ -276,26 +277,26 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="quests">Missões</string>
   <string name="pets">Mascotes</string>
   <string name="mounts">Montarias</string>
-  <string name="armoireEquipment" formatted="false">Você encontrou uma peça de um Equipamento raro no Armário: %s Incrível!</string>
-  <string name="armoireFood" formatted="false">Você abriu a caixa e encontrou %1$s %2$s. O que isso está fazendo aqui?</string>
+  <string name="armoireEquipment">Você encontrou uma peça de um Equipamento raro no Armário: %s Incrível!</string>
+  <string name="armoireFood">Você abriu a caixa e encontrou %1$s %2$s. O que isso está fazendo aqui?</string>
   <string name="armoireExp">Você lutou com o Armário e ganhou Experiência. Toma essa!</string>
-  <string name="armoireNotesFull" formatted="false">Abra o Armário para receber aleatoriamente um Equipamento especial, Experiência, ou comida! Peças de Equipamentos restantes: %d</string>
+  <string name="armoireNotesFull">Abra o Armário para receber aleatoriamente um Equipamento especial, Experiência, ou comida! Peças de Equipamentos restantes: %d</string>
   <string name="armoireLastItem">Você encontrou a ultima peça de um Equipamento raro no Armário Encantado.</string>
   <string name="armoireNotesEmpty">O Armário terá novos Equipamentos na primeira semana de cada mês. Até lá, continue clicando para Experiência e Comida!</string>
-  <string name="sell" formatted="false">Vender (%s Ouro)</string>
+  <string name="sell">Vender (%d Ouro)</string>
   <string name="hatch_with_potion">Chocar com poção</string>
   <string name="feed_to_pet">Alimentar mascote</string>
   <string name="hatch_egg">Chocar com ovo</string>
   <string name="invite_party">Convidar Grupo</string>
-  <string name="dialog_feeding" formatted="false">Alimentar %1$s %2$s com:</string>
+  <string name="dialog_feeding">Alimentar %1$s %2$s com:</string>
   <string name="use_animal">Usar</string>
   <string name="feed">Alimentar</string>
-  <string name="hatch_with" formatted="false">Chocar mascote com %s</string>
-  <string name="hatched_pet_title" formatted="false">Você chocou um %1$s %2$s!</string>
+  <string name="hatch_with">Chocar mascote com %s</string>
+  <string name="hatched_pet_title">Você chocou um %1$s %2$s!</string>
   <string name="close">Fechar</string>
   <string name="share">Compartilhar</string>
-  <string name="notification_pet_fed" formatted="false">Você alimentou seu %1$s %2$s!</string>
-  <string name="notification_purchase" formatted="false">%s foi comprado</string>
+  <string name="notification_pet_fed">Você alimentou seu %1$s %2$s!</string>
+  <string name="notification_purchase">%s foi comprado</string>
   <string name="sectionpets">Mascotes Básicos</string>
   <string name="sectionpremiumPets">Mascotes de Poções Mágicas</string>
   <string name="sectionquestPets">Mascotes de Missões</string>
@@ -306,7 +307,9 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="sectionspecialMounts">Montarias Raras</string>
   <string name="world_quest">Missão Globais</string>
   <string name="inn_description">Descanse na Pousada para prevenir suas metas incompletas de lhe causarem dano de um dia para o outro! (Nota: Não lhe previne de receber dano dos montros)</string>
-  <string name="empty_items" formatted="false">Você não tem nenhum %s</string>
+  <string name="empty_items">Você não tem nenhum %s</string>
+  <string name="user_level">Nível %d</string>
+  <string name="user_level_with_class">Nível %1$d %2$s</string>
   <string name="warrior">Guerreiro</string>
   <string name="rogue">Andarilho</string>
   <string name="mage">Mago</string>
@@ -318,7 +321,7 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="select_class">Escolha sua Classe</string>
   <string name="opt_out_class">Cancelar</string>
   <string name="opt_out_description">Não quer se preocupar com classes? Quer escolher depois? Cancelar - você será um guerreiro sem habilidades especiais. Você pode ler sobre o sistema de classes mais tarde na wiki e habilitá-las a qualquer momento.</string>
-  <string name="class_confirmation" formatted="false">Você tem certeza que quer ser um %s?</string>
+  <string name="class_confirmation">Você tem certeza que quer ser um %s?</string>
   <string name="class_changed">Você é um %s agora!</string>
   <string name="class_changed_description">Você tem a nova Engrenagem de Batalha padrão, que você pode alterar em equipamentos!</string>
   <string name="choose_class">Escolha a sua classe</string>
@@ -340,14 +343,14 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="email">E-mail</string>
   <string name="invite_users">Convidar para o Grupo</string>
   <string name="share_using">Compartilhar via</string>
-  <string name="share_levelup" formatted="false">Eu cheguei ao nível %s no Habitica melhorando os hábitos da minha vida real.</string>
-  <string name="share_hatched" formatted="false">Eu acabei de ganhar um filhote de %1$s %2$s no Habitica por completar minhas tarefas da vida real!</string>
-  <string name="share_raised" formatted="false">Eu acabei de ganhar um %1$s %2$s de montaria no Habitica por completar minhas tarefas da vida real!</string>
+  <string name="share_levelup">Eu cheguei ao nível %d no Habitica melhorando os hábitos da minha vida real.</string>
+  <string name="share_hatched">Eu acabei de ganhar um filhote de %1$s %2$s no Habitica por completar minhas tarefas da vida real!</string>
+  <string name="share_raised">Eu acabei de ganhar um %1$s %2$s de montaria no Habitica por completar minhas tarefas da vida real!</string>
   <string name="open_in_store">Abra na Play Store</string>
   <string name="change_class_confirmation">Você tem certeza que quer mudar sua classe? Isso irá custar 3 gemas.</string>
   <string name="change_class_equipment_warning">Aviso: Você não poderá mais comprar equipamentos da classe %s.</string>
-  <string name="leaderMessage" formatted="false">Mensagem de %1$s</string>
-  <string name="leaderName" formatted="false">Líder: %1$s</string>
+  <string name="leaderMessage">Mensagem 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">Viajantes no tempo</string>
@@ -356,9 +359,9 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="party_invite">Desbloqueie ao convidar amigos</string>
   <string name="no_gold">Sem ouro suficiente</string>
   <string name="no_potion">Você não precisa comprar uma poção de vida</string>
-  <string name="successful_purchase" formatted="false">%1$s comprado com sucesso</string>
+  <string name="successful_purchase">%1$s comprado com sucesso</string>
   <string name="purchase_confirmation_title">Confirmar compra</string>
-  <string name="confirm_purchase_text" formatted="false">Compre %1$s por %2$s %3$s</string>
+  <string name="confirm_purchase_text">Compre %1$s por %2$s %3$s</string>
   <string name="gem">gema</string>
   <string name="hourglass">ampulheta</string>
   <string name="hourglasses">ampulhetas</string>
@@ -409,7 +412,7 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="hatching_market_info">Não conseguindo o drop certo? Dê uma olhada no Mercado!</string>
   <string name="feeding_market_info">Precisa de uma comida diferente? Compre no mercado!</string>
   <string name="open_market">Mercado Aberto</string>
-  <string name="cds_description" formatted="false">As suas tarefas diárias serão reiniciadas ao utilizar Habitica depois de %1$s. Certifique-se de que completou as suas tarefas diárias antes deste horário!</string>
+  <string name="cds_description">As suas tarefas diárias serão reiniciadas ao utilizar Habitica depois de %1$s. Certifique-se de que completou as suas tarefas diárias antes deste horário!</string>
   <string name="AudioTheme_title">Tema de áudio</string>
   <string name="AudioTheme_summary">Mudar o tema de áudio do Habitica</string>
   <!--Login Incentives-->
@@ -417,4 +420,35 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="belongs_to_challenge">Pertence ao Desafio</string>
   <string name="has_reminder">Tem Lembrete</string>
   <string name="has_tag">Tem Etiqueta</string>
+  <string name="subscribe.title">Assinaturas contribuen com os desenvolvedores e ajudam a manter o Habitica funcionando</string>
+  <string name="subscribe_prompt">Seja um assinante e você terá estes úteis benefícios</string>
+  <string name="subscribe.listitem1">Comprar gemas com ouro</string>
+  <string name="subscribe.listitem2">Itens mensais exclusivos</string>
+  <string name="subscribe.listitem3">Manter entradas adicionais no histórico</string>
+  <string name="subscribe.listitem4">Chances diárias de achar itens dobram</string>
+  <string name="subscriptions">Assinaturas</string>
+  <string name="subscription_duration">Recorrente a cada %s</string>
+  <string name="subscribe">Assine</string>
+  <string name="byLeader">em %s</string>
+  <string name="challenge_details">Detalhes do Desafios</string>
+  <string name="challenge_leave_title">Deixar Desafio</string>
+  <string name="my_challenges">Meus Desafios</string>
+  <string name="public_challenges">Públicos</string>
+  <string name="challenges">Desafios</string>
+  <string name="daily">Tarefas Diárias</string>
+  <string name="habit">Hábitos</string>
+  <string name="reward">Recompensa</string>
+  <string name="todo">Afazer</string>
+  <string name="official">Oficial</string>
+  <string name="participating">Participando</string>
+  <string name="challenge">Desafio</string>
+  <string name="go_to_challenge">Vá para o Desafio</string>
+  <string name="not_part_of_a_challenge">Você não está participando de nenhum Desafio no momento</string>
+  <string name="join_a_challenge">Participe de um Desafio para adicionar um conjunto de tarefas selecionadas para sua lista, então concorra com outros Habiticanos para ganhar conquistas e até gemas!</string>
+  <string name="check_the_public_challenge_tab">Toque na guia \"Público\" para encontrar os Desafios criados por usuários que sejam mais adequados para você!</string>
+  <string name="add_reminder">Adicionar Lembrete</string>
+  <string name="warning">Aviso</string>
+  <string name="open_settings">Abrir Configurações</string>
+  <string name="inbox">Caixa de Entrada</string>
+  <string name="FAQ">Perguntas Frequentes</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.profile.xml b/Habitica/res/values-pt-rPT/strings.profile.xml
index 91056ca81..1c9d20b93 100644
--- a/Habitica/res/values-pt-rPT/strings.profile.xml
+++ b/Habitica/res/values-pt-rPT/strings.profile.xml
@@ -11,4 +11,7 @@
     <string name="profile_allocated">Alocada:</string>
     <string name="profile_boosts">Aumentos</string>
     <string name="profile_private_message">Mensagem Privada</string>
-    </resources>
\ No newline at end of file
+    <string name="profile_achievements">Conquistas</string>
+    <string name="profile_achievement_ok">ACEITAR</string>
+
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values-pt-rPT/strings.tutorial.xml b/Habitica/res/values-pt-rPT/strings.tutorial.xml
index fcf2d97f2..735b33880 100644
--- a/Habitica/res/values-pt-rPT/strings.tutorial.xml
+++ b/Habitica/res/values-pt-rPT/strings.tutorial.xml
@@ -10,5 +10,5 @@
   <string name="tutorial_skills">Atributos são habilidades especiais que têm efeitos poderosos! Toque num atributo para o usar. Este irá custar Mana (a barra azul), que ganha ao verificar e completar todos os dias as suas tarefas da vida real. Consulte as FAQs no menu para mais informação!</string>
   <string name="tutorial_party">Isto é onde você e os seus amigos podem responsabilizar-se mutuamente para os vossos objetivos e lutar contra monstros com as vossas tarefas!</string>
   <string name="tutorial_tavern">Bem-vindo ao Tabern, uma sala de conversação publica para todas as idades! Aqui pode conversar sobre a produtividade e colocar questões. Divirta-se!</string>
-  <string name="tutorial_classes">Escolhe tornares-te um Guerreiro, um Feiticeiro, um Curandeiro ou um bandido! Cada classe tem equipamento e atributos únicos. Carrega em (?) para saber mais!</string>
+  <string name="tutorial_classes">Escolha para se tornar num Guerreiro, Feiticeiro, Curandeiro ou Bandido! Cada classe tem equipamento e atributos únicos. Toque em (?) para saber mais!</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index 40c8c1eed..410996e77 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">Atualizar</string>
   <string name="XP_default">Experiência</string>
   <string name="HP_default">Vida</string>
@@ -27,6 +27,7 @@
   <string name="pref_cds_picker">Definir Hora do Início do Dia Personalizado</string>
   <string name="pref_push_notifications_checkbox">Enviar Notificações do Utilizador</string>
   <string name="push_notifications">Enviar Notificações</string>
+  <string name="push_notifications_sum">Defina as suas definições das notificações de \'envio\'</string>
   <string name="preference_push_you_won_challenge">Ganhou um Desafio!</string>
   <string name="preference_push_received_a_private_message">Recebeu uma Mensagem Privada</string>
   <string name="preference_push_gifted_gems">Gemas Oferecidas</string>
@@ -53,6 +54,7 @@
   <string name="confirmpassword">Confirmar palavra-passe</string>
   <string name="logout">Terminar Sessão</string>
   <string name="logout_description">Termine a sessão da sua conta</string>
+  <string name="account_details_sum">Verifique os detalhes da sua conta</string>
   <string name="account_details">Detalhes da Conta</string>
   <string name="LoginActivityName">Bem-vindo</string>
   <string name="string_revive">Reanimar</string>
@@ -114,9 +116,9 @@
   <string name="faint_button">Recarregue a Vida e Tente Novamente</string>
   <string name="filter">Filtro</string>
   <string name="profile_image">Imagem de Perfil</string>
-  <string name="mana_price_button" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">Usou %1$s de %2$d mana.</string>
-  <string name="used_skill_without_mana" formatted="false">Utilizou %1$s.</string>
+  <string name="mana_price_button">%d MP</string>
+  <string name="used_skill">Usou %1$s de %2$d mana.</string>
+  <string name="used_skill_without_mana">Utilizou %1$s.</string>
   <string name="new_checklist_item">novo item da lista de verificações</string>
   <string name="add_checklist_item">Adicionar</string>
   <string name="reminder_title">Lembre-se de verificar as suas Tarefas Diárias!</string>
@@ -137,6 +139,7 @@
   <string name="members">Membros</string>
   <string name="habits">Hábitos</string>
   <string name="dailies">Tarefas Diárias</string>
+  <string name="todos">Tarefas</string>
   <string name="rewards">Recompensas</string>
   <string name="taskform.delete.title">Tem a certeza?</string>
   <string name="taskform.delete.message">Quer mesmo eliminar?</string>
@@ -160,9 +163,9 @@
   <string name="avatar_size_broad">Largo</string>
   <string name="avatar_background">Fundo</string>
   <string name="purchase_customization">Comprar Personalização</string>
-  <string name="purchase_set_button" formatted="false">Desbloquear conjunto por %d gemas</string>
+  <string name="purchase_set_button">Desbloquear conjunto por %d gemas</string>
   <string name="purchase_button">Comprar</string>
-  <string name="purchase_set_title" formatted="false">Comprar conjunto %s</string>
+  <string name="purchase_set_title">Comprar conjunto %s</string>
   <string name="due_date">Data Limite</string>
   <string name="quest.accept">Aceitar</string>
   <string name="quest.reject">Rejeitar</string>
@@ -174,12 +177,12 @@
   <string name="quest.accepted">Aceite</string>
   <string name="quest.rejected">Rejeitado</string>
   <string name="quest.participants">Participantes</string>
-  <string name="version_info" formatted="false">Versão %s (%d)</string>
+  <string name="version_info">Versão %1$s (%2$d)</string>
   <string name="sidebar_help">Ajuda e FAQs</string>
   <string name="complete_tutorial">Percebi!</string>
   <string name="dismiss_tutorial">Lembrar-me novamente</string>
   <string name="intro_1_title">Bem-vindo ao Habitica</string>
-  <string name="intro_1_description" formatted="false">Junta-te a mais de %s pessoas divertindo-se enquanto fazem as suas coisas. Cria um avatar e vigia as tuas tarefas da vida real.</string>
+  <string name="intro_1_description">Junta-te a mais de %s pessoas divertindo-se enquanto fazem as suas coisas. Cria um avatar e vigia as tuas tarefas da vida real.</string>
   <string name="intro_2_title">Progresso do Jogo = Progresso da Vida Real</string>
   <string name="intro_2_description">Desbloqueie funcionalidades no jogo, ao cumprires as tuas tarefas da vida real. Ganhe armaduras, animais, e muito mais para o recompensar por cumprir os seus objetivos!</string>
   <string name="intro_3_title">Socialize e Lute Contra Monstros</string>
@@ -241,8 +244,8 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="write_message">Escrever Mensagem</string>
   <string name="post">Publicar</string>
   <string name="guild_search_hint">Procurar por corporações</string>
-  <string name="todo_due" formatted="false">Data limite: %s</string>
-  <string name="daily_streak" formatted="false">elemento atual: %d</string>
+  <string name="todo_due">Data limite: %s</string>
+  <string name="daily_streak">elemento atual: %d</string>
   <string name="todo_has_duedate">A Tarefa tem Data Limite</string>
   <string name="battle_gear">Equipamento de Batalha</string>
   <string name="costume">Traje</string>
@@ -261,10 +264,10 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="quest_begin_message">Tem a certeza que pretende iniciar a missão? Assim que esta seja iniciada, nenhum membro da equipa adicional pode juntar-se à missão.</string>
   <string name="quest.invitation.text">Foi convidado para participar numa missão!</string>
   <string name="ago_1day">Há 1 dia</string>
-  <string name="ago_days" formatted="false">Há %d dias</string>
+  <string name="ago_days">Há %d dias</string>
   <string name="ago_1Minute">Há 1 minuto</string>
-  <string name="ago_minutes" formatted="false">Há %d minutos</string>
-  <string name="ago_hours" formatted="false">Há %d horas</string>
+  <string name="ago_minutes">Há %d minutos</string>
+  <string name="ago_hours">Há %d horas</string>
   <string name="ago_1hour">Há 1 hora</string>
   <string name="today">Hoje</string>
   <string name="sidebar_items">Itens</string>
@@ -274,26 +277,26 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="quests">Missões</string>
   <string name="pets">Animais de Estimação</string>
   <string name="mounts">Montadas</string>
-  <string name="armoireEquipment" formatted="false">Encontraste uma peça rara de Equipamento no Armário: %s! Fenomenal!</string>
-  <string name="armoireFood" formatted="false">Vasculhas o Armário e encontras %1$s %2$s. Que é que isto está aqui a fazer?</string>
+  <string name="armoireEquipment">Encontraste uma peça rara de Equipamento no Armário: %s! Fenomenal!</string>
+  <string name="armoireFood">Vasculhas o Armário e encontras %1$s %2$s. Que é que isto está aqui a fazer?</string>
   <string name="armoireExp">Lutas com o Armário e ganhas experiência. Boa!</string>
-  <string name="armoireNotesFull" formatted="false">Abre o Armário para receberes aleatoriamente uma peça de Equipamento, Experiência ou comida! Número de peças de Equipamento que restam por encontrar: %d</string>
+  <string name="armoireNotesFull">Abre o Armário para receberes aleatoriamente uma peça de Equipamento, Experiência ou comida! Número de peças de Equipamento que restam por encontrar: %d</string>
   <string name="armoireLastItem">Encontraste a última peça rara de Equipamento no Armário Encantado.</string>
   <string name="armoireNotesEmpty">O Armário terá novos Equipamentos na primeira semana de cada mês. Até lá, continua a clicar para receberes Experiência e comida!</string>
-  <string name="sell" formatted="false">Vender (%s Ouro)</string>
+  <string name="sell">Vender (%d Ouro)</string>
   <string name="hatch_with_potion">Nascimento com poção</string>
   <string name="feed_to_pet">Alimento para o animal</string>
   <string name="hatch_egg">Nascimento com ovo</string>
   <string name="invite_party">Convidar a equipa</string>
-  <string name="dialog_feeding" formatted="false">Alimente %1$s %2$s com:</string>
+  <string name="dialog_feeding">Alimente %1$s %2$s com:</string>
   <string name="use_animal">Usar</string>
   <string name="feed">Alimentar</string>
-  <string name="hatch_with" formatted="false">Nascimento do animal com %s</string>
-  <string name="hatched_pet_title" formatted="false">Chocou um %1$s %2$s!</string>
+  <string name="hatch_with">Nascimento do animal com %s</string>
+  <string name="hatched_pet_title">Chocou um %1$s %2$s!</string>
   <string name="close">Fechar</string>
   <string name="share">Partilhar</string>
-  <string name="notification_pet_fed" formatted="false">Alimentou o seu %1$s %2$s!</string>
-  <string name="notification_purchase" formatted="false">Comprou %s</string>
+  <string name="notification_pet_fed">Alimentou o seu %1$s %2$s!</string>
+  <string name="notification_purchase">Comprou %s</string>
   <string name="sectionpets">Animais de Estimação Base</string>
   <string name="sectionpremiumPets">Animais de Estimação de Poção Mágica</string>
   <string name="sectionquestPets">Animais de Estimação de Missão</string>
@@ -304,7 +307,7 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="sectionspecialMounts">Montadas Raras</string>
   <string name="world_quest">Missão Mundial</string>
   <string name="inn_description">Descanse na Taverna para evitar que as Tarefas Diárias o magoem de um dia para o outro! (Nota: não evita que receba um dano do Chefe.) </string>
-  <string name="empty_items" formatted="false">Não tem quaisquer %s</string>
+  <string name="empty_items">Não tem quaisquer %s</string>
   <string name="warrior">Guerreiro</string>
   <string name="rogue">Bandido</string>
   <string name="mage">Mago</string>
@@ -316,7 +319,8 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="select_class">Selecionar Classe</string>
   <string name="opt_out_class">Optar</string>
   <string name="opt_out_description">Não queres saber das classes? Preferes escolher mais tarde? Abstém-te - serás um guerreiro sem habilidades especiais. Podes ler mais sobre o sistema de classes na wiki e activar as classes quando quiseres em Utilizador -&gt; Atributos.</string>
-  <string name="class_confirmation" formatted="false">Tem a certeza que deseja ser um %s?</string>
+  <string name="class_confirmation">Tem a certeza que deseja ser um %s?</string>
+  <string name="class_changed">Agora é um %s!</string>
   <string name="choose_class">Escolher Classe</string>
   <string name="dialog_go_back">Recuar</string>
   <string name="opt_out_confirmation">Tem a certeza que deseja Optar?</string>
@@ -335,12 +339,14 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="email">E-mail</string>
   <string name="invite_users">Convidar para a Equipa</string>
   <string name="share_using">Partilhe, utilizando</string>
-  <string name="share_levelup" formatted="false">Eu cheguei até ao níve l%s em Habitica melhorando meus hábitos na vida real!</string>
-  <string name="share_hatched" formatted="false">Eu acabei de ganhar uma mascote %1$s %2$s no Habitica ao concluir as minhas tarefas da vida real!</string>
-  <string name="share_raised" formatted="false">Eu acabei de ganhar uma montada %1$s %2$s no Habitica ao concluir as minhas tarefas da vida real!</string>
+  <string name="share_levelup">Eu cheguei até ao níve l%d em Habitica melhorando meus hábitos na vida real!</string>
+  <string name="share_hatched">Eu acabei de ganhar uma mascote %1$s %2$s no Habitica ao concluir as minhas tarefas da vida real!</string>
+  <string name="share_raised">Eu acabei de ganhar uma montada %1$s %2$s no Habitica ao concluir as minhas tarefas da vida real!</string>
   <string name="open_in_store">Abrir na Play Store</string>
   <string name="change_class_confirmation">Tem a certeza que pretende alterar a sua classe? Isto irá custar 3 gemas.</string>
-  <string name="leaderMessage" formatted="false">Mensagem de %1$s</string>
+  <string name="change_class_equipment_warning">Aviso: já não irá poder comprar equipamento da classe %s.</string>
+  <string name="leaderMessage">Mensagem 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">Viajantes no Tempo</string>
@@ -349,9 +355,9 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="party_invite">Desbloqueie ao Convidar amigos</string>
   <string name="no_gold">Ouro insuficiente</string>
   <string name="no_potion">Precisa de comprar uma poção de vida</string>
-  <string name="successful_purchase" formatted="false">Comprou %1$s com sucesso</string>
+  <string name="successful_purchase">Comprou %1$s com sucesso</string>
   <string name="purchase_confirmation_title">Confirmar compra</string>
-  <string name="confirm_purchase_text" formatted="false">Comprar %1$s por %2$s %3$s</string>
+  <string name="confirm_purchase_text">Comprar %1$s por %2$s %3$s</string>
   <string name="gem">gema</string>
   <string name="hourglass">ampulheta</string>
   <string name="hourglasses">ampulhetas</string>
@@ -387,6 +393,7 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="all_dailies_completed">Você completou todas suas tarefas diárias. Parabéns!</string>
   <string name="widget_habit_button">Habitica Fazer Hábito</string>
   <string name="widget_dailies">Habitica Tarefas Diárias </string>
+  <string name="widget_todo_list">Lista de Tarefas do Habitica</string>
   <string name="widget_add_task">Habitica Adicionar Tarefa</string>
   <string name="google_services_missing">Os serviços Google play não pode ser achado.</string>
   <string name="gem.purchase.toolbartitle">Comprar</string>
@@ -401,8 +408,33 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="hatching_market_info">Não encontras os objectos certos? Dá uma olhada no Mercado!</string>
   <string name="feeding_market_info">Precisas de outra comida? Compra mais no mercado!</string>
   <string name="open_market">Mercado Aberto</string>
-  <string name="cds_description" formatted="false">As tuas Tarefas Diárias irão re-iniciar na próxima vez que visitares o Habitica após as%1$s. Não te esqueças de cumprir as tuas tarefas a tempo!</string>
+  <string name="cds_description">As tuas Tarefas Diárias irão re-iniciar na próxima vez que visitares o Habitica após as%1$s. Não te esqueças de cumprir as tuas tarefas a tempo!</string>
   <string name="AudioTheme_title">Tema de Audio</string>
   <string name="AudioTheme_summary">Alterar o Tema de Audio do Habitica</string>
   <!--Login Incentives-->
+  <string name="see_you_tomorrow">Até amanhã!</string>
+  <string name="belongs_to_challenge">Pertence ao Desafio</string>
+  <string name="has_reminder">Tem Lembrete</string>
+  <string name="has_tag">Tem Etiqueta</string>
+  <string name="byLeader">por %s</string>
+  <string name="challenge_details">Detalhes do Desafio</string>
+  <string name="challenge_leave_title">Sair do Desafio</string>
+  <string name="my_challenges">Os Meus Desafios</string>
+  <string name="public_challenges">Público
+ </string>
+  <string name="challenges">Desafios</string>
+  <string name="daily">Diariamente</string>
+  <string name="reward">Prémio</string>
+  <string name="todo">Tarefa</string>
+  <string name="official">Oficial</string>
+  <string name="participating">Participação</string>
+  <string name="challenge">Desafio</string>
+  <string name="go_to_challenge">Ir para o Desafio</string>
+  <string name="not_part_of_a_challenge">De momento, não faz parte de qualquer desafio!</string>
+  <string name="join_a_challenge">Participe num Desafio para adicionar um conjunto de tarefas para a sua lista, e depois competir contra outros Habiticans para ganhar conquistas e até mesmo gemas!</string>
+  <string name="add_reminder">Adicionar Lembrete</string>
+  <string name="warning">Aviso</string>
+  <string name="open_settings">Abrir Definições</string>
+  <string name="inbox">Caixa de Entrada</string>
+  <string name="FAQ">Perguntas Mais Frequentes</string>
 </resources>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 3fb719d6c..bf7e948a8 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">Обновить</string>
   <string name="XP_default">Опыт</string>
   <string name="HP_default">Здоровье</string>
@@ -116,9 +116,9 @@
   <string name="faint_button">Восстановить здоровье &amp; Попробовать ещё раз</string>
   <string name="filter">Фильтр</string>
   <string name="profile_image">Аватар</string>
-  <string name="mana_price_button" formatted="false">%d М</string>
-  <string name="used_skill" formatted="false">Вы использовали %1$s за %2$d маны.</string>
-  <string name="used_skill_without_mana" formatted="false">Вы использовали %1$s.</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>
@@ -139,6 +139,7 @@
   <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>
@@ -162,9 +163,9 @@
   <string name="avatar_size_broad">Плотное</string>
   <string name="avatar_background">Фон</string>
   <string name="purchase_customization">Приобрести Персонализацию</string>
-  <string name="purchase_set_button" formatted="false">Разблокируйте набор за %d кристаллов</string>
+  <string name="purchase_set_button">Разблокируйте набор за %d кристаллов</string>
   <string name="purchase_button">Купить</string>
-  <string name="purchase_set_title" formatted="false">Купить комплект %s</string>
+  <string name="purchase_set_title">Купить комплект %s</string>
   <string name="due_date">Дата выполнения</string>
   <string name="quest.accept">Принять</string>
   <string name="quest.reject">Отклонить</string>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">Принято</string>
   <string name="quest.rejected">Отклонено</string>
   <string name="quest.participants">Участники</string>
-  <string name="version_info" formatted="false">Версия %s (%d)</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_title">Добро пожаловать в Habitica</string>
-  <string name="intro_1_description" formatted="false">Присоединитесь к более %s участникам, которые развлекаются и добиваются успехов. Создайте аватар и отслеживайте ваши задачи.</string>
+  <string name="intro_1_description">Присоединитесь к более %s участникам, которые развлекаются и добиваются успехов. Создайте аватар и отслеживайте ваши задачи.</string>
   <string name="intro_2_title">Прогресс в игре = Прогресс в жизни</string>
   <string name="intro_2_description">Разблокируйте функции в игре, выполняя реальные задачи. Зарабатывайте оружие, питомцев и многое другое в качестве награды!</string>
   <string name="intro_3_title">Общайтесь и сражайтесь с монстрами</string>
@@ -243,8 +244,8 @@
   <string name="write_message">Написать сообщение</string>
   <string name="post">Отправить</string>
   <string name="guild_search_hint">Поиск для гильдий</string>
-  <string name="todo_due" formatted="false">Выполнить к: %s</string>
-  <string name="daily_streak" formatted="false">выполнено подряд: %d</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>
@@ -263,10 +264,10 @@
   <string name="quest_begin_message">Вы уверены, что хотите начать квест? Никто больше не сможет присоединиться к нему.</string>
   <string name="quest.invitation.text">Вас пригласили в квест!</string>
   <string name="ago_1day">1 день назад</string>
-  <string name="ago_days" formatted="false">%d дней назад</string>
+  <string name="ago_days">%d дней назад</string>
   <string name="ago_1Minute">1 минуту назад</string>
-  <string name="ago_minutes" formatted="false">%d минут назад</string>
-  <string name="ago_hours" formatted="false">%d часов назад</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>
@@ -276,26 +277,26 @@
   <string name="quests">Квесты</string>
   <string name="pets">Питомцы</string>
   <string name="mounts">Скакуны</string>
-  <string name="armoireEquipment" formatted="false">Вы нашли в сундуке редкий предмет: %s! Потрясающе!</string>
-  <string name="armoireFood" formatted="false">Копаясь в сундуке, вы находите %1$s %2$s. Откуда это здесь?</string>
+  <string name="armoireEquipment">Вы нашли в сундуке редкий предмет: %s! Потрясающе!</string>
+  <string name="armoireFood">Копаясь в сундуке, вы находите %1$s %2$s. Откуда это здесь?</string>
   <string name="armoireExp">Вы сражаетесь с сундуком и набираете опыт. Получай!</string>
-  <string name="armoireNotesFull" formatted="false">Откройте сундук, чтобы случайным образом получить особое снаряжение, опыт или еду! Осталось предметов снаряжения: %d</string>
+  <string name="armoireNotesFull">Откройте сундук, чтобы случайным образом получить особое снаряжение, опыт или еду! Осталось предметов снаряжения: %d</string>
   <string name="armoireLastItem">Вы получили последний редкий предмет из зачарованного сундука.</string>
   <string name="armoireNotesEmpty">Новое снаряжение будет появляться в сундуке раз в месяц. До тех пор – продолжайте кликать ради опыта и еды!</string>
-  <string name="sell" formatted="false">Продать (%s золота)</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" formatted="false">Покормить %1$s %2$s:</string>
+  <string name="dialog_feeding">Покормить %1$s %2$s:</string>
   <string name="use_animal">Использовать</string>
   <string name="feed">Покормить</string>
-  <string name="hatch_with" formatted="false">Вылупить питомца с помощью %s</string>
-  <string name="hatched_pet_title" formatted="false">У вас вылупился %1$s %2$s!</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" formatted="false">Вы покормили вашего %1$s %2$s!</string>
-  <string name="notification_purchase" formatted="false">%s приобретен</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>
@@ -306,7 +307,9 @@
   <string name="sectionspecialMounts">Редкие скакуны</string>
   <string name="world_quest">Мировой квест</string>
   <string name="inn_description">Отдых в гостинице оградит ваши ежедневными заданиями  от нанесения вам урона ночью! (Примечание: не предотвращает получение урона от мирового босса.)</string>
-  <string name="empty_items" formatted="false">У вас нет %s</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>
@@ -318,7 +321,7 @@
   <string name="select_class">Выберите класс</string>
   <string name="opt_out_class">Отказаться</string>
   <string name="opt_out_description">Не хотите утруждать себя классами? Тогда откажитесь — и останетесь воином и ваши очки будут обрабатываться автоматически. Активировать классы можно будет позже в меню настроек.</string>
-  <string name="class_confirmation" formatted="false">Вы уверены, что хотите быть %s?</string>
+  <string name="class_confirmation">Вы уверены, что хотите быть %s?</string>
   <string name="class_changed">Теперь вы %s!</string>
   <string name="class_changed_description">У вас есть новая Боевая Экипировка по умолчанию, которую вы можете сменить в секции Снаряжение!</string>
   <string name="choose_class">Выбрать класс</string>
@@ -339,14 +342,14 @@
   <string name="email">Электронная почта</string>
   <string name="invite_users">Пригласить в команду</string>
   <string name="share_using">Поделиться с помощью</string>
-  <string name="share_levelup" formatted="false">Я получил %s уровень в Habitica, улучшая привычки в реальной жизни!</string>
-  <string name="share_hatched" formatted="false">У меня только что вылупился питомец %1$s %2$s в Habitica, потому что я выполнял задачи в реальной жизни!</string>
-  <string name="share_raised" formatted="false">Я только что получил скакуна %1$s %2$s в Habitica, выполняя задачи в реальной жизни!</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" formatted="false">Сообщение от %1$s</string>
-  <string name="leaderName" formatted="false">Предводитель: %1$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>
@@ -355,9 +358,9 @@
   <string name="party_invite">Разблокировать, пригласив друзей</string>
   <string name="no_gold">Недостаточно Золота</string>
   <string name="no_potion">Вам не нужно покупать зелье здоровья</string>
-  <string name="successful_purchase" formatted="false">%1$s успешно куплен</string>
+  <string name="successful_purchase">%1$s успешно куплен</string>
   <string name="purchase_confirmation_title">Подтвердите покупку</string>
-  <string name="confirm_purchase_text" formatted="false">Купить %1$s для %2$s %3$s</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>
@@ -408,7 +411,7 @@
   <string name="hatching_market_info">Не выпадает то, что нужно? Посмотри на рынке!</string>
   <string name="feeding_market_info">Нужна определенная еда? Купи сколько угодно на рынке!</string>
   <string name="open_market">Зайти на рынок</string>
-  <string name="cds_description" formatted="false">Ваши ежедневные задания будут обновлены после %1$s. Выполните их до этого времени!</string>
+  <string name="cds_description">Ваши ежедневные задания будут обновлены после %1$s. Выполните их до этого времени!</string>
   <string name="AudioTheme_title">Аудио-тема</string>
   <string name="AudioTheme_summary">Выбрать аудио-тему Habitica</string>
   <!--Login Incentives-->
@@ -416,4 +419,62 @@
   <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="visit_habitica_website">Посетите вебсайт Habitica</string>
+  <string name="current_bonuses">Текущие бонусы</string>
+  <string name="current_hourclasses">Текущие Мистические песочные часы</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="challenge_details">Детали Испытания</string>
+  <string name="challenge_leave_title">Покинуть испытание</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="limited_count">%d осталось</string>
+  <string name="gem_shop">Самоцвет</string>
+  <string name="mystery_item">Мистический предмет</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>
 </resources>
diff --git a/Habitica/res/values-tr/strings.profile.xml b/Habitica/res/values-tr/strings.profile.xml
index 8a67bc15f..5d4a9ebbf 100644
--- a/Habitica/res/values-tr/strings.profile.xml
+++ b/Habitica/res/values-tr/strings.profile.xml
@@ -8,7 +8,7 @@
     <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">Tahsis Edilmiş:</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>
diff --git a/Habitica/res/values-tr/strings.tutorial.xml b/Habitica/res/values-tr/strings.tutorial.xml
index f74092fe6..95ce17c24 100644
--- a/Habitica/res/values-tr/strings.tutorial.xml
+++ b/Habitica/res/values-tr/strings.tutorial.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Pozitif Alışkanlıkları tamamlayarak Altın ve Deneyim kazanın! Negatif Alışkanlıkların üzerlerine tıklarsanız Avatar\'ınız can kaybeder, bu yüzden onlardan gerçek hayatta kaçının! </string>
-  <string name="tutorial_dailies">Tekrar eden Günlük işlerinizi Altın ve Deneyim kazanmık için bozguna uğratın. Tehlike! Günlük işler, zamanında tamamlayamazsanız karakterinize zarar verecektir. </string>
-  <string name="tutorial_todos">Gerçek hayatta Yapılacak-İşleriniz tamamlayın, sonrasında oyun içerisinde ALTIN ve DENEYİM için işaretleyin ki Öfüller kazanıp yeni özellikler açabilesiniz! </string>
-  <string name="tutorial_rewards">Bunlar senin ödüllerin! Gerçek hayat alışkanlıklarınızı, günlüklerinizi, ve yapılacak işler listenizi tamamlayarak altın kazanın. Sonra o altınları oyun içi ödüllerine ya da kendi belirlediğiniz gerçek hayat ödüllerinde harcayın!</string>
-  <string name="tutorial_equipment">Donanım satın aldığınızda burada gözükür. Savaş Tertibatın istatistiğini, 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 öge kazan. Kullanmak için ögenin üzerine basın.</string>
-  <string name="tutorial_pets">Gerçek dünya görevlerini tamamladığından, artık rastgele yumurta ve iksir bulma şansın var. Hayvancıkları yumurtadan çıkarmak için o ikisini birleştir.</string>
-  <string name="tutorial_skills">Beceriler güçlü etkileri olan özel yeteneklerdir! Kullanmak için bir beceriye bas. Bu Mana (mavi çubuk), yani hergün giriş yapmakla ve gerçek hayat görevlerini tamamlamakla kazandığın şeyle ödenir. Daha fazla bilgi için menüdeki FAQ\'ı kontrol et!</string>
+  <string name="tutorial_habits">Pozitif Alışkanlıkları tamamlayarak altın ve deneyim kazan! Negatif Alışkanlıkların üzerlerine tıklarsan avatar\'ın can kaybeder, bu yüzden onlardan gerçek hayatta kaçın! </string>
+  <string name="tutorial_dailies">Tekrar eden Günlük işlerini altın ve deneyim kazanmak için bozguna uğrat. Tehlike! Günlük işleri, zamanında tamamlayamazsan karakterine zarar verir. </string>
+  <string name="tutorial_todos">Gerçek hayatta Yapılacak İşlerini tamamla, sonrasında oyun içerisinde ALTIN ve DENEYİM için işaretle ki Ödüller kazanıp yeni özellikler açabilesin!</string>
+  <string name="tutorial_rewards">Bunlar senin Ödüllerin! Gerçek hayat Alışkanlıklarını, Günlük İşlerini, ve Yapılacak İşlerini tamamlayarak altın kazan. Sonra o altınları oyun içi Ödüllerine ya da kendi belirlediğin gerçek hayat Ödüllerinde harca!</string>
+  <string name="tutorial_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 (?)\' a bas!</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 c9bdc099a..ea2d40032 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<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>
@@ -116,9 +116,9 @@
   <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" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">%2$d mana karşılığında %1$s kullandın.</string>
-  <string name="used_skill_without_mana" formatted="false">%1$s kullandın.</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>
@@ -163,9 +163,9 @@
   <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" formatted="false">%d elmas ile setin kilidini aç</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" formatted="false">%s seti 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>
@@ -177,12 +177,12 @@
   <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" formatted="false">Versiyon %s (%d)</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_title">Habitica\'ya Hoş Geldin</string>
-  <string name="intro_1_description" formatted="false">%s\'dan fazla insanın bir şeyleri tamamlarken eğlenmesine katıl. Bir avatar oluştur ve gerçek hayatta ki görevlerini takip et.</string>
+  <string name="intro_1_description">%s\'dan fazla insanın bir şeyleri tamamlarken eğlenmesine katıl. Bir avatar oluştur ve gerçek hayatta ki görevlerini takip et.</string>
   <string name="intro_2_title">Oyun Gelişimi = Yaşam Gelişimi</string>
   <string name="intro_2_description">Gerçek hayatınızdaki görevleri tamamlayarak oyun içindeki özelliklerin kilidini açın. Zırh, evcil hayvan ve daha fazlasını hedeflerinizle tanıştığınızda ödül olarak kazanın.</string>
   <string name="intro_3_title">Sosyalleş ve Canavarlarla Savaş</string>
@@ -244,8 +244,8 @@ Başlarken, hayatında neyi geliştirmek istiyorsun?</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" formatted="false">Şu zamana: %s</string>
-  <string name="daily_streak" formatted="false">mevcut seri: %d</string>
+  <string name="todo_due">Şu zamana: %s</string>
+  <string name="daily_streak">mevcut seri: %d</string>
   <string name="todo_has_duedate">Görevin Bitirme Tarihi var</string>
   <string name="battle_gear">Savaş Ekipmanı</string>
   <string name="costume">Kostüm</string>
@@ -264,10 +264,10 @@ Başlarken, hayatında neyi geliştirmek istiyorsun?</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" formatted="false">%d 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" formatted="false">%d dakika önce</string>
-  <string name="ago_hours" formatted="false">%d saat ö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>
@@ -277,26 +277,26 @@ Başlarken, hayatında neyi geliştirmek istiyorsun?</string>
   <string name="quests">Görevler</string>
   <string name="pets">Evcil Hayvanlar</string>
   <string name="mounts">Binekler</string>
-  <string name="armoireEquipment" formatted="false">Gardırop içerisinde nadir bir Ekipman parçası buldun: : %s! Harika!</string>
-  <string name="armoireFood" formatted="false">Gardırobun altını üstünü getirdin ve %1$s %2$s buldun. Onun burada ne işi var?</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" formatted="false">Gardırobu rastgele özel Ekipman, Tecrübe ve yiyecek elde etmek için açın! Kalan ekipman parçaları: %d</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 edin.</string>
-  <string name="sell" formatted="false">Sat (%s Altın)</string>
+  <string name="sell">Sat (%d Altın)</string>
   <string name="hatch_with_potion">İksir ile üretin</string>
   <string name="feed_to_pet">Evcil hayvana besle</string>
   <string name="hatch_egg">Yumurta ile üretin</string>
   <string name="invite_party">Takımı davet et</string>
-  <string name="dialog_feeding" formatted="false">%1$s %2$s besle:</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" formatted="false">Evcil hayvanı %s ile üretin</string>
-  <string name="hatched_pet_title" formatted="false">%1$s %2$s ürettiniz!</string>
+  <string name="hatch_with">Evcil hayvanı %s ile üretin</string>
+  <string name="hatched_pet_title">%1$s %2$s ürettiniz!</string>
   <string name="close">Kapat</string>
   <string name="share">Paylaş</string>
-  <string name="notification_pet_fed" formatted="false">%1$s %2$s beslediniz!</string>
-  <string name="notification_purchase" formatted="false">%s satın alındı</string>
+  <string name="notification_pet_fed">%1$s %2$s beslediniz!</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>
@@ -307,9 +307,9 @@ Başlarken, hayatında neyi geliştirmek istiyorsun?</string>
   <string name="sectionspecialMounts">Nadir Binekler</string>
   <string name="world_quest">Dünya Görevi</string>
   <string name="inn_description">Gece boyunca tamamlayamadığınız Günlük Görevlerin sizi incitmesinden korunmak için Han\'da dinlenin. (Not: Canavar hasarı almaktan korumaz.)</string>
-  <string name="empty_items" formatted="false">Hiç %s sahibi değilsin</string>
-  <string name="user_level" formatted="false">SVY %s</string>
-  <string name="user_level_with_class" formatted="false">SVY %1$s - %2$s</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>
@@ -321,7 +321,7 @@ Başlarken, hayatında neyi geliştirmek istiyorsun?</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" formatted="false">Bir %s olmak istediğine emin misin?</string>
+  <string name="class_confirmation">Bir %s olmak istediğine emin misin?</string>
   <string name="class_changed">Yeni sınıfınız: %s!</string>
   <string name="class_changed_description">Ekipmanlar menüsü altında değiştirebileceğiniz yeni varsayılan Savaş Ekipmanınız var!</string>
   <string name="choose_class">Sınıf Seç</string>
@@ -342,14 +342,14 @@ Başlarken, hayatında neyi geliştirmek istiyorsun?</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" formatted="false">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %s seviye elde ettim.</string>
-  <string name="share_hatched" formatted="false">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" formatted="false">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %1$s %2$s binek kazandım.</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" formatted="false">%1$s \'dan Mesaj Geldi</string>
-  <string name="leaderName" formatted="false">Lider: %1$s</string>
+  <string name="leaderMessage">%1$s \'dan Mesaj Geldi</string>
+  <string name="leaderName">Lider: %1$s</string>
   <string name="confirm">Onayla</string>
   <string name="market">Pazar</string>
   <string name="timeTravelers">Zaman Yolcuları</string>
@@ -358,9 +358,9 @@ Başlarken, hayatında neyi geliştirmek istiyorsun?</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" formatted="false">%1$s başarıyla satın alındı</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" formatted="false">%2$s %3$s karşılığında %1$s satın al</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>
@@ -411,7 +411,7 @@ Başlarken, hayatında neyi geliştirmek istiyorsun?</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" formatted="false">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="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-->
@@ -419,7 +419,23 @@ Başlarken, hayatında neyi geliştirmek istiyorsun?</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="byLeader" formatted="false">%s \'a/e göre</string>
+  <string name="subscribe.title">Abome olmak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
+  <string name="subscribe.listitem1">Altınla elmas satın alabilir</string>
+  <string name="subscriptions">Abonelikler</string>
+  <string name="subscription_duration">Her %s tekrar eden</string>
+  <string name="subscribe">Abone Ol</string>
+  <string name="subscription_hourglasses">+%d Mistik Kum Saati</string>
+  <string name="subscription">Abonelik</string>
+  <string name="active">Etkin</string>
+  <string name="cancel_subscription">Aboneliği İptal Et</string>
+  <string name="visit_habitica_website">Habitica Websitesini Ziyaret Et</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="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 çıkmak istediğinden emin misin?</string>
@@ -437,4 +453,10 @@ Başlarken, hayatında neyi geliştirmek istiyorsun?</string>
   <string name="not_part_of_a_challenge">Henüz herhangi bir Mücadele katılımcısı değilsin!</string>
   <string name="add_reminder">Hatırlatıcı Ekle</string>
   <string name="open_settings">Ayarları Aç</string>
+  <string name="inbox">Mesaj Kutusu</string>
+  <string name="FAQ">Sıkça Sorulan Sorular</string>
+  <string name="limited_count">%d kaldı</string>
+  <string name="gem_shop">Elmas</string>
+  <string name="open">Aç</string>
+  <string name="notification_mystery_item">Kutuyu açtın ve %s buldun!</string>
 </resources>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index 26eec745c..21f178831 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">更新</string>
   <string name="XP_default">經驗值</string>
   <string name="HP_default">生命值</string>
@@ -114,9 +114,9 @@
   <string name="faint_button">補全生命值 &amp; 请重試</string>
   <string name="filter">過濾器</string>
   <string name="profile_image">頭像</string>
-  <string name="mana_price_button" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">你在 %1$s 用了 %2$d 魔法值。</string>
-  <string name="used_skill_without_mana" formatted="false">你使用了 %1$s。</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>
@@ -160,9 +160,9 @@
   <string name="avatar_size_broad">強壯</string>
   <string name="avatar_background">背景</string>
   <string name="purchase_customization">用戶支付</string>
-  <string name="purchase_set_button" formatted="false">解鎖%d寶石</string>
+  <string name="purchase_set_button">解鎖%d寶石</string>
   <string name="purchase_button">支付</string>
-  <string name="purchase_set_title" formatted="false">購買禮包 %s</string>
+  <string name="purchase_set_title">購買禮包 %s</string>
   <string name="due_date">截止日期</string>
   <string name="quest.accept">接受</string>
   <string name="quest.reject">拒絕</string>
@@ -174,7 +174,7 @@
   <string name="quest.accepted">接受了</string>
   <string name="quest.rejected">拒絕的</string>
   <string name="quest.participants">參與者</string>
-  <string name="version_info" formatted="false">版本%s (%d)</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>
@@ -240,8 +240,8 @@
   <string name="write_message">寫消息</string>
   <string name="post">公告</string>
   <string name="guild_search_hint">搜尋公會</string>
-  <string name="todo_due" formatted="false">到期：%s</string>
-  <string name="daily_streak" formatted="false">目前連擊數：%d</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>
@@ -260,10 +260,10 @@
   <string name="quest_begin_message">準備好開始任務了嗎?開始後就無法加入新成員了</string>
   <string name="quest.invitation.text">你已經被邀請加入任務!</string>
   <string name="ago_1day">1 天前</string>
-  <string name="ago_days" formatted="false">%d 天前</string>
+  <string name="ago_days">%d 天前</string>
   <string name="ago_1Minute">1 分鐘之前</string>
-  <string name="ago_minutes" formatted="false">%d 分鐘之前</string>
-  <string name="ago_hours" formatted="false">%d 小時之前</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>
@@ -273,26 +273,26 @@
   <string name="quests">任務</string>
   <string name="pets">寵物</string>
   <string name="mounts">坐騎</string>
-  <string name="armoireEquipment" formatted="false">你在神秘寶箱裡找到稀有物品: %s! 真是太棒了!</string>
-  <string name="armoireFood" formatted="false">你在魔法衣櫥裡找到了%1$s %2$s。它是用來做什麼的？</string>
+  <string name="armoireEquipment">你在神秘寶箱裡找到稀有物品: %s! 真是太棒了!</string>
+  <string name="armoireFood">你在魔法衣櫥裡找到了%1$s %2$s。它是用來做什麼的？</string>
   <string name="armoireExp">你奮力打開神秘寶箱而且拿到經驗值!</string>
-  <string name="armoireNotesFull" formatted="false">打開神秘寶箱會隨機獲得特殊裝備，經驗，或是食物! 數量剩下: %d 份</string>
+  <string name="armoireNotesFull">打開神秘寶箱會隨機獲得特殊裝備，經驗，或是食物! 數量剩下: %d 份</string>
   <string name="armoireLastItem">你在神秘寶箱裡找到最後一份稀有裝備。</string>
   <string name="armoireNotesEmpty">神秘寶箱會在每個月的第一個星期更新，在那之前，持續點擊以獲得經驗值與食物!</string>
-  <string name="sell" formatted="false">賣掉 (%s 黃金)</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" formatted="false">餵養%1$s %2$s用：</string>
+  <string name="dialog_feeding">餵養%1$s %2$s用：</string>
   <string name="use_animal">用</string>
   <string name="feed">餵</string>
-  <string name="hatch_with" formatted="false">用 %s 孵化寵物</string>
-  <string name="hatched_pet_title" formatted="false">你孵化了一隻 %1$s %2$s！</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" formatted="false">你餵食了你的%1$s %2$s！</string>
-  <string name="notification_purchase" formatted="false">%s 被買下來了</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>
@@ -303,7 +303,7 @@
   <string name="sectionspecialMounts">稀有坐騎</string>
   <string name="world_quest">世界任務</string>
   <string name="inn_description">在客棧休息讓你未完成的每日任務不會傷害你！ (注意：它不能阻止來自任務怪物的傷害。)</string>
-  <string name="empty_items" formatted="false">你沒有擁有任何的%s</string>
+  <string name="empty_items">你沒有擁有任何的%s</string>
   <string name="warrior">戰士</string>
   <string name="rogue">盜賊</string>
   <string name="mage">法師</string>
@@ -315,7 +315,7 @@
   <string name="select_class">選擇職業</string>
   <string name="opt_out_class">退出</string>
   <string name="opt_out_description">不知道選什麼職業？想以後再選？沒問題 - 你現在可以先做一個沒有特殊技能的戰士。我們的維基頁面上有關於職業系統的介紹，之後隨時可以定你的職業。</string>
-  <string name="class_confirmation" formatted="false">你確定想要成為%s嗎？</string>
+  <string name="class_confirmation">你確定想要成為%1$s嗎？</string>
   <string name="choose_class">選擇職業</string>
   <string name="dialog_go_back">返回</string>
   <string name="opt_out_confirmation">你確定要退出嗎？</string>
@@ -334,12 +334,12 @@
   <string name="email">電子郵件</string>
   <string name="invite_users">邀請加入隊伍</string>
   <string name="share_using">分享使用</string>
-  <string name="share_levelup" formatted="false">我在Habitica中通過改善我現實生活中的習慣到達了%s級！</string>
-  <string name="share_hatched" formatted="false">我剛剛在Habitica中通完成我現實生活中的任務孵化了一隻寵物%1$s %2$s！</string>
-  <string name="share_raised" formatted="false">我剛剛在Habitica中通完成我現實生活中的任務得到了一匹坐騎%1$s %2$s！</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">開啟Play sotre</string>
   <string name="change_class_confirmation">你確定要變更職業嗎？這會花費3寶石。</string>
-  <string name="leaderMessage" formatted="false">訊息來自%1$s</string>
+  <string name="leaderMessage">訊息來自%1$s</string>
   <string name="confirm">確認</string>
   <string name="market">市集</string>
   <string name="timeTravelers">時光旅人</string>
@@ -348,9 +348,9 @@
   <string name="party_invite">解鎖 邀請朋友</string>
   <string name="no_gold">金幣不足</string>
   <string name="no_potion">你不需要購買治療藥水</string>
-  <string name="successful_purchase" formatted="false">成功購入 %1$s</string>
+  <string name="successful_purchase">成功購入 %1$s</string>
   <string name="purchase_confirmation_title">確認購買</string>
-  <string name="confirm_purchase_text" formatted="false">購買 %1$s 用了 %2$s %3$s</string>
+  <string name="confirm_purchase_text">購買 %1$s 用了 %2$s %3$s</string>
   <string name="gem">寶石</string>
   <string name="gold_singular">金幣</string>
   <string name="gold_plural">金幣</string>
diff --git a/Habitica/res/values-zh/strings.profile.xml b/Habitica/res/values-zh/strings.profile.xml
index 4ae0e762b..ad873186b 100644
--- a/Habitica/res/values-zh/strings.profile.xml
+++ b/Habitica/res/values-zh/strings.profile.xml
@@ -11,4 +11,7 @@
     <string name="profile_allocated">已分配：</string>
     <string name="profile_boosts">增益：</string>
     <string name="profile_private_message">私信</string>
-    </resources>
\ No newline at end of file
+    <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-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 4c75bc1aa..3b4ca815f 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">刷新</string>
   <string name="XP_default">经验值</string>
   <string name="HP_default">生命值</string>
@@ -116,9 +116,9 @@
   <string name="faint_button">补满生命值 &amp; 再次尝试</string>
   <string name="filter">过滤器</string>
   <string name="profile_image">头像</string>
-  <string name="mana_price_button" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">你在 %1$s 用了 %2$d 魔法值。</string>
-  <string name="used_skill_without_mana" formatted="false">你使用了 %1$s.</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>
@@ -139,6 +139,7 @@
   <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>
@@ -162,9 +163,9 @@
   <string name="avatar_size_broad">强壮</string>
   <string name="avatar_background">背景</string>
   <string name="purchase_customization">用户支付</string>
-  <string name="purchase_set_button" formatted="false">解锁%d宝石</string>
+  <string name="purchase_set_button">解锁%d宝石</string>
   <string name="purchase_button">支付</string>
-  <string name="purchase_set_title" formatted="false">购买礼包 %s</string>
+  <string name="purchase_set_title">购买礼包 %s</string>
   <string name="due_date">截止日期</string>
   <string name="quest.accept">接受</string>
   <string name="quest.reject">拒绝</string>
@@ -176,12 +177,12 @@
   <string name="quest.accepted">接受了</string>
   <string name="quest.rejected">拒绝的</string>
   <string name="quest.participants">参与者</string>
-  <string name="version_info" formatted="false">版本%s (%d)</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_title">欢迎来到Habitica</string>
-  <string name="intro_1_description" formatted="false">和 %s 玩家一起，用游戏战胜拖延症！你可以创建一个账户，用它来跟踪你生活中的点滴琐事。</string>
+  <string name="intro_1_description">和 %s 玩家一起，用游戏战胜拖延症！你可以创建一个账户，用它来跟踪你生活中的点滴琐事。</string>
   <string name="intro_2_title">生活即游戏！</string>
   <string name="intro_2_description">通过完成现实生活中的任务来解锁游戏内容。得到装备、宠物和更多的奖励来促使你完成你的目标吧！</string>
   <string name="intro_3_title">与小伙伴一起，并肩击退怪兽</string>
@@ -243,8 +244,8 @@
   <string name="write_message">写消息</string>
   <string name="post">公告</string>
   <string name="guild_search_hint">寻找工会</string>
-  <string name="todo_due" formatted="false">到期：%s</string>
-  <string name="daily_streak" formatted="false">目前连击数：%d</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>
@@ -263,10 +264,10 @@
   <string name="quest_begin_message">你是否确定要直接开始这个探索任务？一旦开始，其他队伍成员就不能加入这个探索任务。</string>
   <string name="quest.invitation.text">你被邀请参加一个探索任务！</string>
   <string name="ago_1day">1天前</string>
-  <string name="ago_days" formatted="false">%d天前</string>
+  <string name="ago_days">%d天前</string>
   <string name="ago_1Minute">1分钟前</string>
-  <string name="ago_minutes" formatted="false">%d分钟前</string>
-  <string name="ago_hours" formatted="false">%d小时前</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>
@@ -276,26 +277,26 @@
   <string name="quests">任务</string>
   <string name="pets">宠物</string>
   <string name="mounts">坐骑</string>
-  <string name="armoireEquipment" formatted="false">您在魔法衣橱里找到了一件稀有装备：%s！恭喜你！</string>
-  <string name="armoireFood" formatted="false">你在魔法衣橱里找到了%1$s %2$s。它是用来做什么的？</string>
+  <string name="armoireEquipment">您在魔法衣橱里找到了一件稀有装备：%s！恭喜你！</string>
+  <string name="armoireFood">你在魔法衣橱里找到了%1$s %2$s。它是用来做什么的？</string>
   <string name="armoireExp">你和大衣柜展开了殊死搏斗，并赢得了经验，尝尝这个吧！</string>
-  <string name="armoireNotesFull" formatted="false">拉开 魔法衣橱 来获得随机的特殊装备，经验或者食物！剩余的装备：%d</string>
+  <string name="armoireNotesFull">拉开 魔法衣橱 来获得随机的特殊装备，经验或者食物！剩余的装备：%d</string>
   <string name="armoireLastItem">您在魔法衣橱里找到了最后一件稀有装备。</string>
   <string name="armoireNotesEmpty">每个月的第一个星期这里都会有新的装备，到时记得常点进来获得经验和食物！</string>
-  <string name="sell" formatted="false">出售 (%s金币)</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" formatted="false">喂养%1$s %2$s用：</string>
+  <string name="dialog_feeding">喂养%1$s %2$s用：</string>
   <string name="use_animal">使用</string>
   <string name="feed">喂食</string>
-  <string name="hatch_with" formatted="false">用%s孵化宠物</string>
-  <string name="hatched_pet_title" formatted="false">你孵化了一个 %1$s %2$s！</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" formatted="false">你喂食了你的%1$s %2$s！</string>
-  <string name="notification_purchase" formatted="false">已购买 %s</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>
@@ -306,7 +307,9 @@
   <string name="sectionspecialMounts">稀有坐骑</string>
   <string name="world_quest">世界任务</string>
   <string name="inn_description">在客栈休息让你未完成的每日任务不会伤害你！(注意：它不能阻止来自任务怪物的伤害。)</string>
-  <string name="empty_items" formatted="false">你没有拥有任何的%s</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>
@@ -318,7 +321,9 @@
   <string name="select_class">选择职业</string>
   <string name="opt_out_class">退出</string>
   <string name="opt_out_description">不知道选什么职业？想以后再选？没问题 - 你现在可以先做一个没有特殊技能的战士。我们的维基页面上有关于职业系统的介绍，之后随时可以定你的职业。</string>
-  <string name="class_confirmation" formatted="false">你确定想要成为%s吗？</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>
@@ -337,13 +342,14 @@
   <string name="email">电子邮件</string>
   <string name="invite_users">邀请加入队伍</string>
   <string name="share_using">分享使用</string>
-  <string name="share_levelup" formatted="false">我在Habitica中通过改善我现实生活中的习惯到达了%s级！</string>
-  <string name="share_hatched" formatted="false">我刚刚在Habitica中通完成我现实生活中的任务孵化了一只宠物%1$s %2$s！</string>
-  <string name="share_raised" formatted="false">我刚刚在Habitica中通完成我现实生活中的任务得到了一匹坐骑%1$s %2$s！</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="leaderMessage" formatted="false">从%1$s来的消息</string>
-  <string name="leaderName" formatted="false">%1$s的会长</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>
@@ -352,9 +358,9 @@
   <string name="party_invite">通过邀请朋友来解锁</string>
   <string name="no_gold">没有足够的金币</string>
   <string name="no_potion">你不需要购买生命药水</string>
-  <string name="successful_purchase" formatted="false">已购买 %1$s</string>
+  <string name="successful_purchase">已购买 %1$s</string>
   <string name="purchase_confirmation_title">确认购买</string>
-  <string name="confirm_purchase_text" formatted="false">为 %2$s %3$s 购买 %1$s</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>
@@ -405,7 +411,7 @@
   <string name="hatching_market_info">没有得到想要的掉落物品？来市场瞧瞧！</string>
   <string name="feeding_market_info">需要不同的食物？在市场可以买到更多！</string>
   <string name="open_market">打开市场</string>
-  <string name="cds_description" formatted="false">你的每日任务将会在 %1$s 后第一次打开 Habitica 时进行结算并被重置。请确保在此之前完成所有的每日任务！</string>
+  <string name="cds_description">你的每日任务将会在 %1$s 后第一次打开 Habitica 时进行结算并被重置。请确保在此之前完成所有的每日任务！</string>
   <string name="AudioTheme_title">声音主题</string>
   <string name="AudioTheme_summary">更高 Habitica 的声音主题</string>
   <!--Login Incentives-->
@@ -413,4 +419,68 @@
   <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="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="challenge_details">挑战细节</string>
+  <string name="challenge_leave_title">退出挑战</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>
 </resources>
diff --git a/Habitica/res/values/strings.sidebar.xml b/Habitica/res/values/strings.sidebar.xml
index a59cc13ae..bedc2a53f 100644
--- a/Habitica/res/values/strings.sidebar.xml
+++ b/Habitica/res/values/strings.sidebar.xml
@@ -6,7 +6,7 @@
     <string name="sidebar.inbox">Inbox</string>
     <string name="sidebar.tavern">Tavern</string>
     <string name="sidebar.party">Party</string>
-    <string name="sidebar.purchaseGems">Purchase Gems</string>
+    <string name="sidebar.purchaseGems">Gems &amp; Subscription</string>
     <string name="sidebar.guilds">Guilds</string>
     <string name="sidebar.challenges">Challenges</string>
     <string name="sidebar.section.inventory">Inventory</string>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 9fa7b0fbd..b5f980bf9 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="action_refresh">Refresh</string>
     <string name="XP_default">Experience</string>
@@ -137,9 +137,9 @@
     <string name="filter">Filter</string>
     <string name="profile_image">Profile Image</string>
 
-    <string name="mana_price_button" formatted="false">%d MP</string>
-    <string name="used_skill" formatted="false">You used %1$s for %2$d mana.</string>
-    <string name="used_skill_without_mana" formatted="false">You used %1$s.</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>
 
@@ -185,9 +185,9 @@
     <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" formatted="false">Unlock set for %d gems</string>
+    <string name="purchase_set_button" >Unlock set for %d gems</string>
     <string name="purchase_button">Purchase</string>
-    <string name="purchase_set_title" formatted="false">Purchase set %s</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>
@@ -199,13 +199,13 @@
     <string name="quest.accepted">Accepted</string>
     <string name="quest.rejected">Rejected</string>
     <string name="quest.participants">Participants</string>
-    <string name="version_info" formatted="false">Version %s (%d)</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_title">Welcome to Habitica</string>
-    <string name="intro_1_description" formatted="false">Join over %s people having fun while getting things done. Create an avatar and track your real-life tasks.</string>
+    <string name="intro_1_description" >Join over %s people having fun while getting things done. Create an avatar and track your real-life tasks.</string>
     <string name="intro_2_title">Game Progress = Life Progress</string>
     <string name="intro_2_description">Unlock features in the game by checking off your real-life tasks. Earn armor, pets, and more to reward you for meeting your goals!</string>
     <string name="intro_3_title">Get Social and Fight Monsters</string>
@@ -269,8 +269,8 @@ To start, which parts of your life do you want to improve?</string>
     <string name="post">Post</string>
     <string name="guild_search_hint">Search for guilds</string>
 
-    <string name="todo_due" formatted="false">Due: %s</string>
-    <string name="daily_streak" formatted="false">current streak: %d</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>
@@ -289,10 +289,10 @@ To start, which parts of your life do you want to improve?</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" formatted="false">%d days ago</string>
+    <string name="ago_days" >%d days ago</string>
     <string name="ago_1Minute">1 minute ago</string>
-    <string name="ago_minutes" formatted="false">%d minutes ago</string>
-    <string name="ago_hours" formatted="false">%d hours 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>
@@ -303,26 +303,26 @@ To start, which parts of your life do you want to improve?</string>
     <string name="pets">Pets</string>
     <string name="mounts">Mounts</string>
 
-    <string name="armoireEquipment" formatted="false">You found a piece of rare Equipment in the Armoire: %s! Awesome!</string>
-    <string name="armoireFood" formatted="false">You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here?</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" formatted="false">Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining: %d</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" formatted="false">Sell (%d Gold)</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" formatted="false">Feed %1$s %2$s with:</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" formatted="false">Hatch pet with %s</string>
-    <string name="hatched_pet_title" formatted="false">You hatched a %1$s %2$s!</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" formatted="false">You fed your %1$s %2$s!</string>
-    <string name="notification_purchase" formatted="false">%s was purchased</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>
@@ -333,9 +333,9 @@ To start, which parts of your life do you want to improve?</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" formatted="false">You don\'t have any %s</string>
-    <string name="user_level" formatted="false">Lvl %d</string>
-    <string name="user_level_with_class" formatted="false">Lvl %1$d %2$s</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>
@@ -347,7 +347,7 @@ To start, which parts of your life do you want to improve?</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" formatted="false">Are you sure you want to be a %s?</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>
@@ -368,14 +368,14 @@ To start, which parts of your life do you want to improve?</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" formatted="false">I got to level %s in Habitica by improving my real-life habits!</string>
-    <string name="share_hatched" formatted="false">I just hatched a %1$s %2$s pet in Habitica by completing my real-life tasks!</string>
-    <string name="share_raised" formatted="false">I just gained a %1$s %2$s mount in Habitica by completing my real-life tasks!</string>
+    <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" formatted="false">Message from %1$s</string>
-    <string name="leaderName" formatted="false">Leader: %1$s</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>
@@ -384,9 +384,9 @@ To start, which parts of your life do you want to improve?</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" formatted="false">%1$s successfully purchased</string>
+    <string name="successful_purchase" >%1$s successfully purchased</string>
     <string name="purchase_confirmation_title">Confirm purchase</string>
-    <string name="confirm_purchase_text" formatted="false">Purchase %1$s for %2$s %3$s</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>
@@ -438,7 +438,7 @@ To start, which parts of your life do you want to improve?</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" formatted="false">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="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>
@@ -455,7 +455,7 @@ To start, which parts of your life do you want to improve?</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" formatted="false">Recurring every %s</string>
+    <string name="subscription_duration" >Recurring every %s</string>
     <string name="subscribe">Subscribe</string>
     <string name="subscribe.listitem1.description">Alexander the Merchant will sell you Gems at a cost of 20 gold per gem. His monthly shipments are initially capped at 25 Gems per month, but this 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">Makes completed To-Dos and task history available for longer.</string>
@@ -465,7 +465,7 @@ To start, which parts of your life do you want to improve?</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" formatted="false">+%d Mystic Hourglass</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>
@@ -479,7 +479,7 @@ To start, which parts of your life do you want to improve?</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" formatted="false">%d Months</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>
@@ -487,10 +487,10 @@ To start, which parts of your life do you want to improve?</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" formatted="false">by %s</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_leave_text">Are you sure you want to leave the Challenge “%s”?</string>
     <string name="my_challenges">My Challenges</string>
     <string name="public_challenges">Public</string>
     <string name="challenges">Challenges</string>
@@ -508,17 +508,17 @@ To start, which parts of your life do you want to improve?</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="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" formatted="false">%d left</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">Your next prize unlocks at %1$d Check-Ins</string>
+    <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Your next prize unlocks at %1$d Check-Ins</string>
 </resources>
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 8b1eccfce..7eec7ac62 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
@@ -4,7 +4,6 @@ import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.messaging.RemoteMessage;
 
 import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.PushDevice;
@@ -18,22 +17,19 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-/**
- * Created by keithholliday on 6/27/16.
- */
 public class PushNotificationManager {
 
     private static PushNotificationManager instance = null;
-    public static String DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference";
+    private static String DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference";
 
-    public static String PARTY_INVITE_PUSH_NOTIFICATION_KEY = "invitedParty";
-    public static String RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY = "newPM";
-    public static String RECEIVED_GEMS_PUSH_NOTIFICATION_KEY = "giftedGems";
-    public static String RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY = "giftedSubscription";
-    public static String GUILD_INVITE_PUSH_NOTIFICATION_KEY = "invitedGuild";
-    public static String QUEST_INVITE_PUSH_NOTIFICATION_KEY = "questInvitation";
-    public static String QUEST_BEGUN_PUSH_NOTIFICATION_KEY = "questStarted";
-    public static String WON_CHALLENGE_PUSH_NOTIFICATION_KEY = "wonChallenge";
+    static String PARTY_INVITE_PUSH_NOTIFICATION_KEY = "invitedParty";
+    static String RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY = "newPM";
+    static String RECEIVED_GEMS_PUSH_NOTIFICATION_KEY = "giftedGems";
+    static String RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY = "giftedSubscription";
+    static String GUILD_INVITE_PUSH_NOTIFICATION_KEY = "invitedGuild";
+    static String QUEST_INVITE_PUSH_NOTIFICATION_KEY = "questInvitation";
+    static String QUEST_BEGUN_PUSH_NOTIFICATION_KEY = "questStarted";
+    static String WON_CHALLENGE_PUSH_NOTIFICATION_KEY = "wonChallenge";
 
 
     @Inject
@@ -64,7 +60,7 @@ public class PushNotificationManager {
         return instance;
     }
 
-    public void setRefreshedToken (String refreshedToken) {
+    void setRefreshedToken(String refreshedToken) {
         if (this.refreshedToken == null) {
             return;
         }
@@ -72,7 +68,7 @@ public class PushNotificationManager {
         this.refreshedToken = refreshedToken;
         SharedPreferences.Editor editor = sharedPreferences.edit();
         editor.putString(DEVICE_TOKEN_PREFERENCE_KEY, refreshedToken);
-        editor.commit();
+        editor.apply();
     }
 
     //@TODO: Use preferences
@@ -93,7 +89,7 @@ public class PushNotificationManager {
             return;
         }
 
-        Map<String, String> pushDeviceData = new HashMap<String, String>();
+        Map<String, String> pushDeviceData = new HashMap<>();
         pushDeviceData.put("regId", this.refreshedToken);
         pushDeviceData.put("type", "android");
         apiHelper.apiService.addPushDevice(pushDeviceData)
@@ -120,7 +116,7 @@ public class PushNotificationManager {
         return false;
     }
 
-    public void displayNotification (RemoteMessage remoteMessage) {
+    void displayNotification(RemoteMessage remoteMessage) {
         String remoteMessageIdentifier = remoteMessage.getData().get("identifier");
 
         HabiticaLocalNotificationFactory notificationFactory = new HabiticaLocalNotificationFactory();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/CustomListPreference.java b/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/CustomListPreference.java
deleted file mode 100644
index 94ff0930b..000000000
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/CustomListPreference.java
+++ /dev/null
@@ -1,219 +0,0 @@
-package com.habitrpg.android.habitica.prefs;
-
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.R;
-
-import android.app.AlertDialog.Builder;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.ListPreference;
-import android.preference.PreferenceManager;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.BaseAdapter;
-import android.widget.EditText;
-import android.widget.RadioButton;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-
-public class CustomListPreference extends ListPreference {
-    private CustomListPreferenceAdapter customListPreferenceAdapter = null;
-    private Context mContext;
-    private LayoutInflater mInflater;
-    private CharSequence[] entries;
-    private CharSequence[] entryValues;
-    private ArrayList<RadioButton> rButtonList;
-    private SharedPreferences prefs;
-    private SharedPreferences.Editor editor;
-    private String value = "";
-    private EditText text;
-
-    public CustomListPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-        mInflater = LayoutInflater.from(context);
-        rButtonList = new ArrayList<RadioButton>();
-        prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        editor = prefs.edit();
-    }
-
-    @Override
-    protected void onPrepareDialogBuilder(Builder builder) {
-        entries = getEntries();
-        entryValues = getEntryValues();
-
-        if (entries == null || entryValues == null || entries.length != entryValues.length) {
-            throw new IllegalStateException(
-                    "ListPreference requires an entries array and an entryValues array which are both the same length");
-        }
-
-        customListPreferenceAdapter = new CustomListPreferenceAdapter(mContext);
-        builder.setAdapter(customListPreferenceAdapter, (dialog, which) -> {
-
-        });
-        builder.setPositiveButton("OK", (arg0, arg1) -> {
-            if (value != null && value.equals("custom")) {
-                Log.d("commiting", "custom value");
-                value = text.getText().toString();
-            }
-            if (value == null || !value.startsWith("http")) {
-                Log.v("Commiting", "changing values to default");
-                value = BuildConfig.BASE_URL;
-            }
-
-            Log.d("Commiting", "putting string: " + value);
-            editor.putString(mContext.getString(R.string.SP_address), value);
-            editor.commit();
-            arg0.dismiss();
-        });
-
-    }
-
-    private class CustomListPreferenceAdapter extends BaseAdapter {
-        public CustomListPreferenceAdapter(Context context) {
-
-        }
-
-        public int getCount() {
-            return entries.length;
-        }
-
-        public Object getItem(int position) {
-            return position;
-        }
-
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public View getView(final int position, View convertView, ViewGroup parent) {
-            View row = convertView;
-
-            if (row == null) {
-                // do whatever you need here, for me I wanted the last item to be greyed out and unclickable
-                if (position < 2) {
-                    NormalHolder holder = null;
-
-                    row = mInflater.inflate(R.layout.normal_list_preference_row, parent, false);
-                    if (prefs.getString(mContext.getString(R.string.SP_address), "0").equals(entryValues[position])) {
-                        holder = new NormalHolder(row, position, true);
-                        Log.v("Prefs", entryValues[position] + " already exists at position " + position);
-                        value = entryValues[position].toString();
-                    } else {
-                        holder = new NormalHolder(row, position, false);
-                    }
-
-
-                    row.setTag(holder);
-                    // row.setClickable(true);
-                    row.setOnClickListener(v -> {
-                        if (!rButtonList.get(position).isChecked()) {
-                            for (RadioButton rb : rButtonList) {
-                                if (rb.getId() == position) {
-                                    Log.d("row.OnClickListener - " + position, "isChecked");
-                                    if (!rb.isChecked())
-                                        rb.setChecked(true);
-                                }
-                            }
-                        }
-                    });
-                } else {
-                    row = mInflater.inflate(R.layout.custom_list_preference_row, parent, false);
-                    String fromPref = prefs.getString(mContext.getString(R.string.SP_address), "0");
-                    boolean flag = false;
-                    for (CharSequence entry : entryValues) {
-                        if (entry.toString().equals(fromPref)) {
-                            Log.v("ListPref", entry.toString() + " already exists");
-                            flag = true;
-                        }
-                    }
-                    CustomHolder holder;
-                    if (!flag && fromPref != null && !fromPref.equals("")) {
-                        holder = new CustomHolder(row, position, fromPref, true);
-                        value = "custom";
-                    } else {
-                        holder = new CustomHolder(row, position, "", false);
-
-                    }
-                    row.setTag(holder);
-                }
-            }
-
-            return row;
-        }
-
-        class NormalHolder {
-            private TextView text = null;
-            private RadioButton rButton = null;
-
-            NormalHolder(View row, int position, boolean isCheked) {
-                text = (TextView) row.findViewById(R.id.custom_list_view_row_text_view);
-                text.setText(entries[position]);
-                rButton = (RadioButton) row.findViewById(R.id.custom_list_view_row_radio_button);
-                rButton.setId(position);
-                rButton.setChecked(isCheked);
-
-                // also need to do something to check your preference and set the right button as checked
-
-                rButtonList.add(rButton);
-                rButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                    if (isChecked) {
-                        for (RadioButton rb : rButtonList) {
-                            if (rb.getId() != buttonView.getId())
-                                rb.setChecked(false);
-                        }
-
-                        int index = buttonView.getId();
-                        value = entryValues[index].toString();
-                        Log.v("NormalHolder.onCheckedChanged", "putting string" + value);
-                    }
-                });
-            }
-
-        }
-
-        class CustomHolder {
-            private RadioButton rButton = null;
-
-            CustomHolder(View row, int position, String pref, boolean checked) {
-                rButton = (RadioButton) row.findViewById(R.id.custom_list_view_row_radio_button);
-                rButton.setId(position);
-                rButton.setChecked(checked);
-
-                text = (EditText) row.findViewById(R.id.ET_prefs_customText);
-                text.setText(pref);
-                text.setOnFocusChangeListener((v, hasFocus) -> {
-                    if (hasFocus) {
-                        if (!rButton.isChecked())
-                            rButton.setChecked(true);
-                    }
-                });
-                getDialog().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
-                rButtonList.add(rButton);
-
-                // also need to do something to check your preference and set the right button as checked
-
-                rButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
-                    if (isChecked) {
-                        for (RadioButton rb : rButtonList) {
-                            if (rb != buttonView)
-                                rb.setChecked(false);
-                        }
-                        if (!text.hasFocus())
-                            text.requestFocus();
-                        value = String.valueOf("custom");
-                        Log.v("CustomHolder.onCheckedChanged", "putting string" + value);
-                    } else {
-                        if (text.hasFocus())
-                            text.clearFocus();
-                    }
-                });
-            }
-        }
-    }
-}
\ No newline at end of file
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 346a9738b..7d886c623 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -2,6 +2,7 @@ package com.habitrpg.android.habitica.ui.activities;
 
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
@@ -159,6 +160,7 @@ 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.ui.helpers.UiUtils.SnackbarDisplayType;
 import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
 
@@ -376,7 +378,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         if (this.activeFragment != null && fragment.getClass() == this.activeFragment.getClass()) {
             return;
         }
-        if (this.isDestroyed()) {
+        if (SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && this.isDestroyed()) {
             return;
         }
         this.activeFragment = fragment;
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 8957a20e4..6df5bb46b 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
@@ -164,7 +164,7 @@ public class SetupActivity extends BaseActivity implements View.OnClickListener,
         SharedPreferences.Editor editor = sharedPreferences.edit();
         editor.putString("FirstDayOfTheWeek",
                 Integer.toString(Calendar.getInstance().getFirstDayOfWeek()));
-        editor.commit();
+        editor.apply();
         if (v == this.nextButton) {
             if (this.pager.getCurrentItem() == 1) {
                 List<Task> newTasks = this.taskSetupFragment.createSampleTasks();
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 b7bbc29b0..21da38078 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
@@ -170,12 +170,12 @@ public class CustomizationRecyclerViewAdapter extends RecyclerView.Adapter<Recyc
 
 
             DataBindingUtils.loadImage(this.imageView, customization.getImageName(userSize, hairColor));
-            cardView.setCardBackgroundColor(android.R.color.white);
+            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(R.color.brand_500);
+                    cardView.setCardBackgroundColor(context.getResources().getColor(R.color.brand_500));
                 }
             } else {
                 imageView.setAlpha(0.3f);
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 c3252a315..0cb5cdac7 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
@@ -151,7 +151,7 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
 
         Context context;
 
-        public CustomizationViewHolder(View itemView) {
+        CustomizationViewHolder(View itemView) {
             super(itemView);
             ButterKnife.bind(this, itemView);
 
@@ -164,11 +164,11 @@ public class CustomizationSetupAdapter extends RecyclerView.Adapter<RecyclerView
             this.customization = customization;
 
             DataBindingUtils.loadImage(this.imageView, customization.getImageName(userSize, getHairColor()));
-            cardView.setCardBackgroundColor(android.R.color.white);
+            cardView.setCardBackgroundColor(context.getResources().getColor(android.R.color.white));
             imageView.setAlpha(1.0f);
             purchaseOverlay.setAlpha(0.0f);
             if (isCustomizationActive(this.customization)) {
-                cardView.setCardBackgroundColor(R.color.brand_500);
+                cardView.setCardBackgroundColor(context.getResources().getColor(R.color.brand_500));
             }
         }
 
diff --git a/translations/store_strings-tr.xml b/translations/store_strings-tr.xml
index 3e228f554..fcb48f49e 100644
--- a/translations/store_strings-tr.xml
+++ b/translations/store_strings-tr.xml
@@ -3,7 +3,7 @@
   <string name="store_short_description">Hayatını motive ve düzenli kalmak için oyun gibi düzenle!</string>
   <string name="store_description">HabitRPG’den YENİ bir uygulama! Daha iyi bir deneyim ve yeni özellikler için tepeden tırnağa yenilendi. 
 
-Harekete geçmek ve düzenli olmak için hayatını bir oyun olarak gör! Habitica, hedefine ulaşmanı eğlenceli hale getirmeyi kolaylaştırır.
+Harekete geçmek ve düzenli olmak için hayatını bir oyun olarak gör! Habitica, hedefine ulaşmanı eğlenceli hale getirerek kolaylaştırır.
 
 Alışkanlıklarını, Günlük İşlerini, ve Yapılacak İşlerini yaz, ardından avatarını özelleştir. Görevlerini yapıldı olarak işaretleyerek seviye atla ve zırh, hayvan, yetenek, ve görev gibi yeni özellikler aç! Birbirinizi sorumlu tutmak için arkadaşlarınla birlikte canavarlara karşı savaş; ekipman ve özelleştirilmiş ödüller gibi oyun içi ödüller için altınlarını harca. Esnetilebilir, sosyal, ve eğlenceli olan Habitica, harekete geçmen ve zorlukları başarman için mükkemel bir uygulamadır.
 

From 7a81e115244599b9535a387535c16de4ac30aed9 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 1 Feb 2017 17:03:12 +0100
Subject: [PATCH 21/32] fix crash in gem page

---
 Habitica/AndroidManifest.xml                                | 2 +-
 .../android/habitica/ui/activities/GemPurchaseActivity.java | 6 ++++++
 .../android/habitica/ui/fragments/GemsPurchaseFragment.java | 5 +++++
 .../android/habitica/ui/fragments/SubscriptionFragment.java | 5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index c9265498d..ab6844126 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="151"
+    android:versionCode="152"
     android:versionName="0.0.37"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
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 6d03126de..3f9c024ab 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
@@ -131,6 +131,10 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
             public void onReady(@NonNull final BillingRequests billingRequests) {
                 GemPurchaseActivity.this.billingRequests = billingRequests;
 
+                for (CheckoutFragment fragment : fragments) {
+                    fragment.setBillingRequests(billingRequests);
+                }
+
                 checkIfPendingPurchases();
             }
 
@@ -261,6 +265,8 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
 
         void setupCheckout();
         void setListener(GemPurchaseActivity listener);
+
+        void setBillingRequests(BillingRequests billingRequests);
     }
 
     private void checkIfPendingPurchases() {
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 3b1686785..e57b88d8a 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
@@ -95,6 +95,11 @@ public class GemsPurchaseFragment extends BaseFragment implements GemPurchaseAct
         this.listener = listener;
     }
 
+    @Override
+    public void setBillingRequests(BillingRequests billingRequests) {
+        this.billingRequests = billingRequests;
+    }
+
     private void updateButtonLabel(String sku, String price) {
         GemPurchaseOptionsView matchingView;
         if (sku.equals(PurchaseTypes.Purchase4Gems)) {
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 8e7833e7b..47a91ce0a 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
@@ -208,6 +208,11 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
         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>() {

From 1c85fbfa43517edefecbbb14c23adb2711ec4056 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 1 Feb 2017 20:03:36 +0100
Subject: [PATCH 22/32] small design tweaks

---
 Habitica/res/drawable/pill_bg_green.xml                   | 2 +-
 Habitica/res/layout/fragment_subscription.xml             | 7 +++++--
 Habitica/res/values/styles.xml                            | 5 ++++-
 .../android/habitica/callbacks/TaskScoringCallback.java   | 4 +++-
 .../android/habitica/ui/AvatarWithBarsViewModel.java      | 4 +++-
 .../android/habitica/ui/SubscriptionOptionView.java       | 2 +-
 .../habitica/ui/activities/GemPurchaseActivity.java       | 3 +++
 .../adapter/social/PublicGuildsRecyclerViewAdapter.java   | 5 +++--
 .../habitica/ui/fragments/GemsPurchaseFragment.java       | 2 ++
 .../habitica/ui/fragments/tasks/TasksFragment.java        | 6 +++---
 .../android/habitica/ui/menu/MainDrawerBuilder.java       | 8 +++++---
 11 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/Habitica/res/drawable/pill_bg_green.xml b/Habitica/res/drawable/pill_bg_green.xml
index 3c8e06bf7..873c7a182 100644
--- a/Habitica/res/drawable/pill_bg_green.xml
+++ b/Habitica/res/drawable/pill_bg_green.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/good_10"/>
+    <solid android:color="@color/good_50"/>
     <corners android:radius="20dip"/>
     <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
 </shape>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index ccbf310c4..fe3696b6f 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -76,7 +76,8 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/subscribeButton"
                     android:layout_gravity="center"
-                    style="@style/Button.Purple"/>
+                    style="@style/Button.Purple"
+                    android:layout_marginTop="8dp"/>
         </LinearLayout>
 
 
@@ -96,7 +97,9 @@
                 android:textSize="16sp"
                 android:lineSpacingExtra="4dp"
                 android:layout_marginTop="23dp"
-                android:layout_marginBottom="12dp"/>
+                android:layout_marginBottom="12dp"
+                android:layout_marginLeft="26dp"
+                android:layout_marginRight="26dp"/>
 
         <FrameLayout
                 android:layout_width="match_parent"
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index e4a4e62de..9734254c5 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -189,6 +189,7 @@
         <item name="android:textSize">12sp</item>
         <item name="android:drawableLeft">@drawable/ic_check_purple</item>
         <item name="android:layout_gravity">center</item>
+        <item name="android:drawablePadding">4dp</item>
     </style>
 
     <style name="FragmentDialogTitle">
@@ -202,7 +203,9 @@
 
     <style name="GemPurchaseListItemDescription">
         <item name="android:layout_gravity">center_horizontal</item>
-        <item name="android:textSize">12sp</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>
 
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 88a288560..613bf8980 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
@@ -12,6 +12,8 @@ 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;
 
 /**
@@ -57,7 +59,7 @@ public class TaskScoringCallback implements Action1<TaskDirectionData> {
                 String type = taskDirectionData.get_tmp().getDrop().getType();
                 From from = null;
 
-                switch (type.toLowerCase()) {
+                switch (type.toLowerCase(Locale.US)) {
                     case "hatchingpotion":
                         from = new Select().from(HatchingPotion.class);
                         break;
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 16e7327e5..54f440c3b 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
@@ -23,6 +23,8 @@ import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
+import java.util.Locale;
+
 /**
  * Created by Negue on 14.06.2015.
  */
@@ -117,7 +119,7 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
             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() + userClass.substring(1)));
+            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:
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
index cf9d92e47..083c26a1a 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
@@ -85,7 +85,7 @@ public class SubscriptionOptionView extends FrameLayout {
         int verticalPadding = (int) getResources().getDimension(R.dimen.pill_vertical_padding);
         if (purchased) {
             subscriptionSelectedView.setBackgroundResource(R.drawable.subscription_selected);
-            subscriptionSelectedFrameView.setBackgroundResource(R.color.brand_100);
+            subscriptionSelectedFrameView.setBackgroundResource(R.color.brand_300);
             gemCapTextView.setBackgroundResource(R.drawable.pill_bg_green);
             gemCapTextView.setTextColor(getContext().getResources().getColor(R.color.white));
             gemCapTextView.setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
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 3f9c024ab..d1f8e70d2 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
@@ -236,6 +236,9 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
                 }
                 fragment.setListener(GemPurchaseActivity.this);
                 fragment.setupCheckout();
+                if (billingRequests != null) {
+                    fragment.setBillingRequests(billingRequests);
+                }
                 return (Fragment)fragment;
             }
 
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 3fd9a2e9e..9e8764db7 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
@@ -19,6 +19,7 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -104,12 +105,12 @@ public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<Public
         return new Filter() {
             @Override
             protected FilterResults performFiltering(CharSequence constraint) {
-                List<Group> filteredGuilds = null;
+                List<Group> filteredGuilds;
 
                 if(constraint.length() == 0) {
                     filteredGuilds = fullPublicGuildList;
                 } else {
-                    filteredGuilds = getFilteredResults(constraint.toString().toLowerCase());
+                    filteredGuilds = getFilteredResults(constraint.toString().toLowerCase(Locale.US));
                 }
 
                 FilterResults results = new FilterResults();
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 e57b88d8a..3dc6ce4f1 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
@@ -17,6 +17,7 @@ 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;
@@ -125,6 +126,7 @@ public class GemsPurchaseFragment extends BaseFragment implements GemPurchaseAct
                 if (!aBoolean) {
                     // no current product exist
                     final ActivityCheckout checkout = listener.getActivityCheckout();
+                    Log.d("GEM", sku);
                     billingRequests.purchase(ProductTypes.IN_APP, sku, null, checkout.getPurchaseFlow());
                 }
             }
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 1769d9566..a5357eb06 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
@@ -67,6 +67,7 @@ import android.widget.ImageView;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -413,7 +414,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
 
     @Subscribe
     public void onEvent(AddNewTaskCommand event) {
-        openNewTaskActivity(event.ClassType.toLowerCase());
+        openNewTaskActivity(event.ClassType.toLowerCase(Locale.US));
     }
 
     @Subscribe
@@ -661,6 +662,5 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
 
 
 	@Override
-	public String customTitle() {
-        return getString(R.string.sidebar_tasks);	}
+	public String customTitle() { return null; }
 }
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 0eb54676f..3276e9ce1 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
@@ -31,6 +31,8 @@ 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;
 
 public class MainDrawerBuilder {
@@ -80,14 +82,14 @@ public class MainDrawerBuilder {
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_tasks)).withIdentifier(SIDEBAR_TASKS),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_skills)).withIdentifier(SIDEBAR_SKILLS),
 
-                        new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_social).toUpperCase()),
+                        new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_social).toUpperCase(Locale.getDefault())),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_inbox)).withIdentifier(SIDEBAR_INBOX),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_tavern)).withIdentifier(SIDEBAR_TAVERN),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_party)).withIdentifier(SIDEBAR_PARTY),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_guilds)).withIdentifier(SIDEBAR_GUILDS),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_challenges)).withIdentifier(SIDEBAR_CHALLENGES),
 
-                        new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_inventory).toUpperCase()),
+                        new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_section_inventory).toUpperCase(Locale.getDefault())),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_shops)).withIdentifier(SIDEBAR_SHOPS),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_avatar)).withIdentifier(SIDEBAR_AVATAR),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_equipment)).withIdentifier(SIDEBAR_EQUIPMENT),
@@ -95,7 +97,7 @@ public class MainDrawerBuilder {
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_stable)).withIdentifier(SIDEBAR_STABLE),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_purchaseGems)).withIdentifier(SIDEBAR_PURCHASE),
 
-                        new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_about).toUpperCase()),
+                        new SectionIconDrawerItem().withName(activity.getString(R.string.sidebar_about).toUpperCase(Locale.getDefault())),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_news)).withIdentifier(SIDEBAR_NEWS).withSelectable(false),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_settings)).withIdentifier(SIDEBAR_SETTINGS).withSelectable(false),
                         new PrimaryDrawerItem().withName(activity.getString(R.string.sidebar_help)).withIdentifier(SIDEBAR_HELP),

From 27e19eb1e59df5706a3d798375a9f40136a35abe Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 2 Feb 2017 12:26:20 +0100
Subject: [PATCH 23/32] optimize imports and fix code formatting

---
 .../habitrpg/android/habitica/APIHelper.java  |  57 ++----
 .../android/habitica/ContentCache.java        |   2 -
 .../habitica/HabiticaBaseApplication.java     |  65 +++---
 .../habitica/HabiticaPurchaseVerifier.java    |   2 -
 .../habitica/callbacks/SkillCallback.java     |   2 +-
 .../habitica/components/AppComponent.java     |   7 +-
 .../events/commands/JoinChallengeCommand.java |   2 +-
 .../commands/LeaveChallengeCommand.java       |   2 +-
 .../commands/OpenFullProfileCommand.java      |   2 +-
 .../events/commands/SelectMemberCommand.java  |   2 +-
 .../ShowChallengeDetailActivityCommand.java   |   2 +-
 .../ShowChallengeDetailDialogCommand.java     |   2 +-
 .../events/commands/UpdateTagCommand.java     |   2 +-
 .../habitica/helpers/AmplitudeManager.java    |   3 +-
 .../helpers/FirstDayOfTheWeekHelper.java      |   2 +-
 .../habitica/helpers/LanguageHelper.java      |   8 +-
 .../helpers/PopupNotificationsManager.java    |  32 ++-
 .../habitica/helpers/PurchaseTypes.java       |   1 -
 .../habitica/helpers/QrCodeManager.java       |  38 ++--
 .../habitica/helpers/RemindersManager.java    |   6 +-
 .../android/habitica/helpers/SoundFile.java   |  20 +-
 .../habitica/helpers/SoundFileLoader.java     |   8 +-
 .../habitica/helpers/SoundManager.java        |  21 +-
 .../habitica/helpers/TaskAlarmManager.java    | 122 +++++------
 .../GuildInviteLocalNotification.java         |  12 +-
 .../HabiticaFirebaseInstanceIDService.java    |   8 -
 .../HabiticaFirebaseMessagingService.java     |   2 -
 .../HabiticaLocalNotification.java            |   4 +-
 .../HabiticaLocalNotificationFactory.java     |   4 +-
 .../PartyInviteLocalNotification.java         |  15 +-
 .../PushNotificationManager.java              |  53 ++---
 .../QuestBegunLocalNotification.java          |  10 +-
 .../QuestInviteLocalNotification.java         |  11 +-
 .../ReceivedGemsGiftLocalNotification.java    |  12 +-
 ...ceivedPrivateMessageLocalNotification.java |  16 +-
 ...ivedSubscriptionGiftLocalNotification.java |  10 +-
 .../WonChallengeLocalNotification.java        |  10 +-
 .../android/habitica/modules/ApiModule.java   |   2 +-
 .../android/habitica/modules/AppModule.java   |   2 +-
 .../prefs/scanner/IntentIntegrator.java       |   8 +-
 .../LocalNotificationActionReceiver.java      |  40 ++--
 .../receivers/TaskAlarmBootReceiver.java      |   4 -
 .../habitica/receivers/TaskReceiver.java      |   3 +-
 .../android/habitica/ui/AvatarView.java       |   5 +-
 .../habitica/ui/AvatarWithBarsViewModel.java  |   5 +-
 .../habitica/ui/GemPurchaseOptionsView.java   |  28 ++-
 .../habitica/ui/MaxHeightLinearLayout.java    |   8 +-
 .../habitica/ui/SubscriptionDetailsView.java  |   8 +-
 .../habitica/ui/SubscriptionOptionView.java   |  15 +-
 .../ui/activities/AddTaskWidgetActivity.java  |  11 +-
 .../habitica/ui/activities/BaseActivity.java  |   3 +-
 .../activities/ChallengeDetailActivity.java   | 124 ++++++------
 .../ui/activities/ClassSelectionActivity.java |   6 +-
 .../ui/activities/FullProfileActivity.java    | 108 ++++------
 .../ui/activities/GemPurchaseActivity.java    |  28 +--
 .../activities/HabitButtonWidgetActivity.java |  15 +-
 .../habitica/ui/activities/LoginActivity.java | 110 +++++-----
 .../habitica/ui/activities/MainActivity.java  | 168 ++++++++-------
 .../ui/activities/MaintenanceActivity.java    |   2 -
 .../ui/activities/PartyInviteActivity.java    |  18 +-
 .../habitica/ui/activities/PrefsActivity.java |   3 -
 .../habitica/ui/activities/SetupActivity.java |  24 +--
 .../ui/activities/SkillMemberActivity.java    |  22 +-
 .../ui/activities/TaskFormActivity.java       |  92 ++++-----
 .../SkillTasksRecyclerViewAdapter.java        |   1 -
 .../ui/adapter/SkillsRecyclerViewAdapter.java |  10 +-
 .../inventory/ItemRecyclerAdapter.java        |  13 +-
 .../inventory/ShopRecyclerAdapter.java        |   6 +-
 .../ui/adapter/social/AchievementAdapter.java |  36 ++--
 .../social/ChallengesListViewAdapter.java     |  44 ++--
 .../social/ChatRecyclerViewAdapter.java       |  36 ++--
 .../PartyMemberRecyclerViewAdapter.java       |   4 +-
 .../PublicGuildsRecyclerViewAdapter.java      |   8 +-
 .../tasks/BaseTasksRecyclerViewAdapter.java   |  15 +-
 .../SortableTasksRecyclerViewAdapter.java     |  14 +-
 .../habitica/ui/fragments/BaseFragment.java   |  16 +-
 .../ui/fragments/BaseMainFragment.java        |  22 +-
 .../ui/fragments/GemsPurchaseFragment.java    |   2 +-
 .../habitica/ui/fragments/NewsFragment.java   |   7 +-
 .../ui/fragments/SubscriptionFragment.java    |  12 +-
 .../ui/fragments/faq/FAQOverviewFragment.java |   8 +-
 .../customization/AvatarOverviewFragment.java |   6 +-
 .../equipment/EquipmentOverviewFragment.java  |   6 +-
 .../inventory/items/ItemRecyclerFragment.java |   1 -
 .../inventory/items/ItemsFragment.java        |   7 +-
 .../inventory/shops/ShopFragment.java         |   9 +-
 .../inventory/shops/ShopsFragment.java        |   6 +-
 .../stable/MountDetailRecyclerFragment.java   |   6 +-
 .../stable/PetDetailRecyclerFragment.java     |   6 +-
 .../inventory/stable/StableFragment.java      |   6 +-
 .../preferences/AccountDetailsFragment.java   |   5 +-
 .../DayStartPreferenceDialogFragment.java     |   3 +-
 .../preferences/PreferencesFragment.java      |  37 ++--
 .../PushNotificationsPreferencesFragment.java |  13 +-
 .../fragments/setup/AvatarSetupFragment.java  |   6 +-
 .../ui/fragments/skills/SkillsFragment.java   |  13 +-
 .../ui/fragments/social/ChatListFragment.java |   8 +-
 .../social/GroupInformationFragment.java      |   6 +-
 .../ui/fragments/social/GuildFragment.java    |   8 +-
 .../social/GuildsOverviewFragment.java        |   6 +-
 .../ui/fragments/social/InboxFragment.java    |  25 +--
 .../social/InboxMessageListFragment.java      | 191 +++++++++---------
 .../social/PublicGuildsFragment.java          |  10 +-
 .../ui/fragments/social/TavernFragment.java   |   8 +-
 .../ChallegeDetailDialogHolder.java           |  59 +++---
 .../challenges/ChallengeListFragment.java     |  24 ++-
 .../ChallengeTasksRecyclerViewFragment.java   |   2 +-
 .../ChallengesOverviewFragment.java           |  31 ++-
 .../fragments/social/party/PartyFragment.java |  17 +-
 .../social/party/PartyMemberListFragment.java |   2 +-
 .../tasks/TaskRecyclerViewFragment.java       |  34 ++--
 .../ui/fragments/tasks/TasksFragment.java     |  66 +++---
 .../android/habitica/ui/helpers/UiUtils.java  |   4 +-
 .../habitica/ui/menu/EditTagsDrawerItem.java  |   8 +-
 .../ui/menu/EditTagsSectionDrawer.java        |   9 +-
 .../habitica/ui/menu/MainDrawerBuilder.java   |   2 +-
 .../viewHolders/tasks/BaseTaskViewHolder.java |   3 +-
 .../ui/viewHolders/tasks/HabitViewHolder.java |   1 -
 .../widget/AddTaskWidgetProvider.java         |  11 +-
 .../widget/AvatarStatsWidgetProvider.java     |  43 ++--
 .../habitica/widget/BaseWidgetProvider.java   |  14 +-
 .../habitica/widget/DailiesListFactory.java   |   6 +-
 .../widget/DailiesWidgetProvider.java         |   6 +-
 .../widget/HabitButtonWidgetProvider.java     |  26 +--
 .../widget/HabitButtonWidgetService.java      |  64 +++---
 .../habitica/widget/TaskListFactory.java      |  26 +--
 .../widget/TaskListWidgetProvider.java        |  22 +-
 .../habitica/widget/TodoListFactory.java      |   6 +-
 .../widget/TodoListWidgetProvider.java        |   2 +-
 .../habitrpgwrapper/lib/api/ApiService.java   |   5 +-
 .../habitrpgwrapper/lib/models/Challenge.java |  15 +-
 .../lib/models/ContributorInfo.java           |  21 +-
 .../lib/models/HabitRPGUser.java              |  19 +-
 .../habitrpgwrapper/lib/models/Inbox.java     |  36 +---
 .../lib/models/Notification.java              |  28 +--
 .../lib/models/PlayerMinStats.java            |  26 +--
 .../lib/models/Preferences.java               |   4 +-
 .../habitrpgwrapper/lib/models/Purchases.java |   4 +-
 .../habitrpgwrapper/lib/models/ShopItem.java  |  31 +--
 .../lib/models/SubscriptionPlan.java          |   2 +-
 .../models/SubscriptionPlanConsecutive.java   |   2 -
 .../lib/models/inventory/SpecialItem.java     |  12 +-
 .../lib/models/invitations/GuildInvite.java   |  24 +--
 .../lib/models/invitations/Invitations.java   |  19 +-
 .../lib/models/invitations/PartyInvite.java   |  24 +--
 .../lib/models/responses/HabitResponse.java   |  14 +-
 .../lib/models/tasks/ChecklistItem.java       |   4 +-
 .../lib/models/tasks/RemindersItem.java       |   4 +-
 .../lib/models/tasks/Task.java                |  21 +-
 .../lib/utils/ChallengeDeserializer.java      |  13 +-
 .../lib/utils/SkillDeserializer.java          |   3 +-
 .../android/habitica/HabiticaApplication.java |   2 -
 .../android/habitica/api/UserAPITests.java    |   3 -
 .../PopupNotificationsManagerTest.java        |  53 ++---
 .../helpers/RemindersManagerTest.java         |   3 +-
 .../ui/fragments/BaseFragmentTests.java       |   5 -
 .../social/ChatListFragmentTest.java          |   1 -
 .../lib/models/HabitRPGUserTest.java          |   2 +-
 158 files changed, 1326 insertions(+), 1647 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
index 41a9f5cc0..c929a0785 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java
@@ -8,9 +8,8 @@ import com.google.gson.reflect.TypeToken;
 
 import com.amplitude.api.Amplitude;
 import com.habitrpg.android.habitica.database.CheckListItemExcludeStrategy;
-import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
-import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
+import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.magicmicky.habitrpgwrapper.lib.api.ApiService;
 import com.magicmicky.habitrpgwrapper.lib.api.Server;
 import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
@@ -20,11 +19,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.Customization;
 import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle;
 import com.magicmicky.habitrpgwrapper.lib.models.Group;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Notification;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationResult;
-import com.magicmicky.habitrpgwrapper.lib.models.notifications.Reward;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
 import com.magicmicky.habitrpgwrapper.lib.models.Purchases;
 import com.magicmicky.habitrpgwrapper.lib.models.Skill;
 import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep;
@@ -39,6 +33,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.inventory.Mount;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
 import com.magicmicky.habitrpgwrapper.lib.models.responses.FeedResponse;
+import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
@@ -71,22 +66,9 @@ import com.magicmicky.habitrpgwrapper.lib.utils.TaskTagDeserializer;
 import com.magicmicky.habitrpgwrapper.lib.utils.TutorialStepListDeserializer;
 import com.raizlabs.android.dbflow.structure.ModelAdapter;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import android.app.Activity;
 import android.content.Context;
-import android.media.Image;
-import android.os.Build;
 import android.support.v7.app.AlertDialog;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import java.io.IOException;
 import java.lang.annotation.Annotation;
@@ -103,11 +85,8 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.net.ssl.SSLException;
 
-import okhttp3.Interceptor;
-import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Converter;
@@ -124,18 +103,21 @@ import rx.schedulers.Schedulers;
 
 
 public class APIHelper implements Action1<Throwable> {
-    @Inject
-    CrashlyticsProxy crashlyticsProxy;
-
-    @Inject
-    Context context;
-
     // I think we don't need the APIHelper anymore we could just use ApiService
     public final ApiService apiService;
+    private final GsonConverterFactory gsonConverter;
+    private final HostConfig hostConfig;
+    private final Retrofit retrofitAdapter;
+    public String languageCode;
+    @Inject
+    CrashlyticsProxy crashlyticsProxy;
+    @Inject
+    Context context;
     final Observable.Transformer apiCallTransformer =
             observable -> ((Observable) observable)
                     .map(new Func1<HabitResponse, Object>() {
-                        @Override public Object call(HabitResponse habitResponse) {
+                        @Override
+                        public Object call(HabitResponse habitResponse) {
                             if (habitResponse.notifications != null) {
                                 PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(APIHelper.this, context);
                                 popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
@@ -146,13 +128,8 @@ public class APIHelper implements Action1<Throwable> {
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .doOnError(this);
-    private final GsonConverterFactory gsonConverter;
-    private final HostConfig hostConfig;
-    private final Retrofit retrofitAdapter;
     private AlertDialog displayedAlert;
 
-    public String languageCode;
-
     //private OnHabitsAPIResult mResultListener;
     //private HostConfig mConfig;
     public APIHelper(GsonConverterFactory gsonConverter, HostConfig hostConfig) {
@@ -302,7 +279,7 @@ public class APIHelper implements Action1<Throwable> {
     @Override
     public void call(Throwable throwable) {
         final Class<?> throwableClass = throwable.getClass();
-        if (SocketException.class.isAssignableFrom(throwableClass)  ||  SSLException.class.isAssignableFrom(throwableClass)) {
+        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);
@@ -453,11 +430,11 @@ public class APIHelper implements Action1<Throwable> {
         Amplitude.getInstance().setUserId(this.hostConfig.getUser());
     }
 
+    public Observable<HabitResponse<ContentResult>> getContent() {
+        return apiService.getContent(languageCode);
+    }
+
     public static class ErrorResponse {
         public String message;
     }
-
-    public Observable<HabitResponse<ContentResult>>getContent() {
-        return apiService.getContent(languageCode);
-    }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
index a728f0b4d..c485ff090 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java
@@ -12,8 +12,6 @@ import java.util.Collection;
 import java.util.List;
 
 import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 
 public class ContentCache {
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 05588a48b..acceec9cf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
@@ -1,28 +1,9 @@
 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.Build;
-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.helpers.PurchaseTypes;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.activities.IntroActivity;
 import com.habitrpg.android.habitica.ui.activities.LoginActivity;
@@ -34,10 +15,25 @@ 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.Inventory;
-import org.solovyev.android.checkout.ProductTypes;
 import org.solovyev.android.checkout.PurchaseVerifier;
 
+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 java.io.File;
 import java.lang.reflect.Field;
 
@@ -50,16 +46,14 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
 
     public static HabitRPGUser User;
     public static Activity currentActivity = null;
+    private static AppComponent component;
+    public RefWatcher refWatcher;
     @Inject
     Lazy<APIHelper> lazyApiHelper;
     @Inject
     SharedPreferences sharedPrefs;
     @Inject
     CrashlyticsProxy crashlyticsProxy;
-    private static AppComponent component;
-
-    public RefWatcher refWatcher;
-
     /**
      * For better performance billing class should be used as singleton
      */
@@ -124,6 +118,10 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
 
     // region SQLite overrides
 
+    public static AppComponent getComponent() {
+        return component;
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
@@ -209,7 +207,6 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
         }
     }
 
-
     private void registerActivityLifecycleCallbacks() {
         registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
             @Override
@@ -262,6 +259,10 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
         return super.openOrCreateDatabase(getDatabasePath(name).getAbsolutePath(), mode, factory, errorHandler);
     }
 
+    // endregion
+
+    // region IAP - Specific
+
     @Override
     public boolean deleteDatabase(String name) {
         if (!name.endsWith(".db")) {
@@ -288,10 +289,6 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
         return deleted;
     }
 
-    // endregion
-
-    // region IAP - Specific
-
     // 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) {
@@ -350,13 +347,9 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
         return checkout;
     }
 
+    // endregion
+
     public Billing getBilling() {
         return billing;
     }
-
-    // endregion
-
-    public static AppComponent getComponent() {
-        return component;
-    }
 }
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 9a7282eaa..d2ae20875 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica;
 import com.habitrpg.android.habitica.events.UserSubscribedEvent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
 import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationRequest;
-import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationResult;
 import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionValidationRequest;
 import com.magicmicky.habitrpgwrapper.lib.models.Transaction;
 import com.playseeds.android.sdk.Seeds;
@@ -18,7 +17,6 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
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 820975c8b..b81d48f06 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
@@ -2,8 +2,8 @@ package com.habitrpg.android.habitica.callbacks;
 
 import com.habitrpg.android.habitica.events.SkillUsedEvent;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
 import com.magicmicky.habitrpgwrapper.lib.models.Skill;
+import com.magicmicky.habitrpgwrapper.lib.models.Stats;
 import com.magicmicky.habitrpgwrapper.lib.models.responses.SkillResponse;
 
 import org.greenrobot.eventbus.EventBus;
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 c10c95066..0a36d63da 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
@@ -54,9 +54,6 @@ 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.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.ChatListFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GroupInformationFragment;
 import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
@@ -65,6 +62,9 @@ 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;
@@ -224,6 +224,7 @@ public interface AppComponent {
     void inject(TodosRecyclerViewAdapter todosRecyclerViewAdapter);
 
     void inject(SubscriptionFragment subscriptionFragment);
+
     void inject(ChallengeTasksRecyclerViewFragment.ChallengeTasksRecyclerViewAdapter challengeTasksRecyclerViewAdapter);
 
     void inject(ChallengeTasksRecyclerViewFragment challengeTasksRecyclerViewFragment);
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
index 33417ab4f..45e95ac2c 100644
--- 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
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.events.commands;
 public class JoinChallengeCommand {
     public String challengeId;
 
-    public JoinChallengeCommand(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
index f7a5e59c5..0b70cc247 100644
--- 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
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.events.commands;
 public class LeaveChallengeCommand {
     public String challengeId;
 
-    public LeaveChallengeCommand(String challengeId){
+    public LeaveChallengeCommand(String challengeId) {
         this.challengeId = challengeId;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenFullProfileCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenFullProfileCommand.java
index 2b288b741..739179ca1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenFullProfileCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/OpenFullProfileCommand.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.events.commands;
 public class OpenFullProfileCommand {
     public String MemberId;
 
-    public OpenFullProfileCommand(String memberId){
+    public OpenFullProfileCommand(String memberId) {
         MemberId = memberId;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SelectMemberCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SelectMemberCommand.java
index 2d25e8488..bd6602af5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SelectMemberCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SelectMemberCommand.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.events.commands;
 public class SelectMemberCommand {
     public String MemberId;
 
-    public SelectMemberCommand(String memberId){
+    public SelectMemberCommand(String memberId) {
         MemberId = memberId;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java
index d751cd38d..47bd69ef9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailActivityCommand.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.events.commands;
 public class ShowChallengeDetailActivityCommand {
     public String challengeId;
 
-    public ShowChallengeDetailActivityCommand(String challengeId){
+    public ShowChallengeDetailActivityCommand(String challengeId) {
         this.challengeId = challengeId;
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java
index f1ddae5ca..289dc3a8b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/ShowChallengeDetailDialogCommand.java
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.events.commands;
 public class ShowChallengeDetailDialogCommand {
     public String challengeId;
 
-    public ShowChallengeDetailDialogCommand(String challengeId){
+    public ShowChallengeDetailDialogCommand(String challengeId) {
         this.challengeId = challengeId;
     }
 }
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 6d7c5012c..caa9839a4 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
@@ -9,7 +9,7 @@ public class UpdateTagCommand {
     public Tag tag;
     public String uuid;
 
-    public  UpdateTagCommand(Tag tag, 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/AmplitudeManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
index 74a2e09ea..b29959714 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AmplitudeManager.java
@@ -6,7 +6,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.Map;
-import java.util.Objects;
 
 /**
  * Created by viirus on 23-Sep-16.
@@ -18,7 +17,7 @@ public class AmplitudeManager {
     public static String EVENT_CATEGORY_NAVIGATION = "navigation";
 
     public static String EVENT_HITTYPE_EVENT = "event";
-    public static String EVENT_HITTYPE_PAGEVIEW= "pageview";
+    public static String EVENT_HITTYPE_PAGEVIEW = "pageview";
 
     public static void sendEvent(String eventAction, String eventCategory, String hitType) {
         sendEvent(eventAction, eventCategory, hitType, null);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/FirstDayOfTheWeekHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/FirstDayOfTheWeekHelper.java
index d85a4c5a3..80888c923 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/FirstDayOfTheWeekHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/FirstDayOfTheWeekHelper.java
@@ -16,7 +16,7 @@ public class FirstDayOfTheWeekHelper {
     }
 
     public static FirstDayOfTheWeekHelper newInstance(int firstDayOfTheWeekSharedPref) {
-        switch (firstDayOfTheWeekSharedPref){
+        switch (firstDayOfTheWeekSharedPref) {
             case Calendar.SUNDAY:
                 return new FirstDayOfTheWeekHelper(1, Calendar.SUNDAY);
             case Calendar.MONDAY:
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
index b43068061..5a107a65e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/LanguageHelper.java
@@ -10,9 +10,9 @@ public class LanguageHelper {
     private Locale locale = null;
     private String languageCode = null;
 
-    public LanguageHelper (String languageSharedPref) {
+    public LanguageHelper(String languageSharedPref) {
 
-        switch (languageSharedPref){
+        switch (languageSharedPref) {
             case "iw":
                 locale = new Locale("iw");
                 languageCode = "he";
@@ -26,13 +26,13 @@ public class LanguageHelper {
                 languageCode = "id";
                 break;
             case "pt":
-                locale = new Locale("pt","PT");
+                locale = new Locale("pt", "PT");
                 languageCode = "pt";
                 break;
             default:
                 if (languageSharedPref.contains("_")) {
                     String[] languageCodeParts = languageSharedPref.split("_");
-                    locale = new Locale(languageCodeParts[0],languageCodeParts[1]);
+                    locale = new Locale(languageCodeParts[0], languageCodeParts[1]);
                 } else {
                     locale = new Locale(languageSharedPref);
                 }
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 5f3dc0f67..6f026a864 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,14 +1,5 @@
 package com.habitrpg.android.habitica.helpers;
 
-import android.content.Context;
-import android.support.v7.app.AlertDialog;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
@@ -17,6 +8,13 @@ import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
 import com.magicmicky.habitrpgwrapper.lib.models.Notification;
 import com.magicmicky.habitrpgwrapper.lib.models.notifications.Reward;
 
+import android.content.Context;
+import android.support.v7.app.AlertDialog;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,10 +24,10 @@ import java.util.Map;
  */
 
 public class PopupNotificationsManager {
+    private static PopupNotificationsManager instance;
     private Map<String, Boolean> seenNotifications;
     private APIHelper apiHelper;
-    private static PopupNotificationsManager instance;
-	private Context context;
+    private Context context;
 
     // @TODO: A queue for displaying alert dialogues
 
@@ -68,16 +66,16 @@ public class PopupNotificationsManager {
                         earnedString += ", ";
                     }
                 }
-	            youEarnedMessage = context.getString(R.string.checkInRewardEarned,earnedString);
+                youEarnedMessage = context.getString(R.string.checkInRewardEarned, earnedString);
             }
         }
         DataBindingUtils.loadImage(imageView, imageKey);
 
-	    TextView youEarnedTexView = (TextView) view.findViewById(R.id.you_earned_message);
-	    youEarnedTexView.setText(youEarnedMessage);
+        TextView youEarnedTexView = (TextView) view.findViewById(R.id.you_earned_message);
+        youEarnedTexView.setText(youEarnedMessage);
 
-	    String message = context.getString(R.string.nextPrizeUnlocks,notification.data.nextRewardAt);
-	    TextView nextUnlockTextView = (TextView) view.findViewById(R.id.next_unlock_message);
+        String message = context.getString(R.string.nextPrizeUnlocks, notification.data.nextRewardAt);
+        TextView nextUnlockTextView = (TextView) view.findViewById(R.id.next_unlock_message);
         nextUnlockTextView.setText(message);
 
         Button confirmButton = (Button) view.findViewById(R.id.confirm_button);
@@ -122,7 +120,7 @@ public class PopupNotificationsManager {
                 this.seenNotifications = new HashMap<>();
             }
 
-            for (Notification notification: notifications) {
+            for (Notification notification : notifications) {
                 if (this.seenNotifications.get(notification.getId()) != null) {
                     continue;
                 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.java
index 7286f7711..545d24490 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseTypes.java
@@ -1,6 +1,5 @@
 package com.habitrpg.android.habitica.helpers;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
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 a110b1bf6..2845cce64 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
@@ -2,37 +2,31 @@ package com.habitrpg.android.habitica.helpers;
 
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 
-import android.app.Dialog;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.graphics.Bitmap;
-import android.media.Image;
-import android.os.Environment;
-import android.support.v7.preference.PreferenceManager;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.View;
-import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.mikepenz.materialize.color.Material;
 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 net.glxn.qrgen.core.image.ImageType;
 
-import java.io.ByteArrayOutputStream;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.graphics.Bitmap;
+import android.os.Environment;
+import android.support.v7.preference.PreferenceManager;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -112,7 +106,7 @@ public class QrCodeManager {
             return;
         }
 
-        int qrCodeSize = (int)dipToPixels(400.0f);
+        int qrCodeSize = (int) dipToPixels(400.0f);
 
         Bitmap myBitmap = QRCode.from(this.content)
                 .withErrorCorrection(ErrorCorrectionLevel.H)
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 6631c0662..97e4cec40 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
@@ -26,9 +26,9 @@ import javax.inject.Inject;
 
 public class RemindersManager {
 
-    private DateFormat dateFormater;
     @Inject
     CrashlyticsProxy crashlyticsProxy;
+    private DateFormat dateFormater;
 
     public RemindersManager(String taskType) {
         HabiticaBaseApplication.getComponent().inject(this);
@@ -56,7 +56,7 @@ public class RemindersManager {
         }
     }
 
-    public String reminderTimeToString (Date time) {
+    public String reminderTimeToString(Date time) {
         return dateFormater.format(time);
     }
 
@@ -92,7 +92,7 @@ public class RemindersManager {
             dialogConfirmButton.setOnClickListener(view -> {
                 int day = dialogDatePicker.getDayOfMonth();
                 int month = dialogDatePicker.getMonth();
-                int year =  dialogDatePicker.getYear();
+                int year = dialogDatePicker.getYear();
                 int hour1 = dialogTimePicker.getCurrentHour();
                 int minute1 = dialogTimePicker.getCurrentMinute();
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.java
index 77cf810e7..a69dafec9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFile.java
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.helpers;
 
 import android.media.AudioManager;
 import android.media.MediaPlayer;
-import android.util.Log;
 
 import java.io.File;
 
@@ -14,7 +13,7 @@ public class SoundFile implements MediaPlayer.OnCompletionListener {
     private Boolean playerPrepared = false;
     private boolean isPlaying;
 
-    public SoundFile(String theme, String fileName){
+    public SoundFile(String theme, String fileName) {
 
         this.theme = theme;
         this.fileName = fileName;
@@ -30,12 +29,12 @@ public class SoundFile implements MediaPlayer.OnCompletionListener {
         return fileName;
     }
 
-    public String getWebUrl(){
-        return "https://habitica.com/assets/audio/"+getTheme()+"/"+getFileName()+".mp3";
+    public String getWebUrl() {
+        return "https://habitica.com/assets/audio/" + getTheme() + "/" + getFileName() + ".mp3";
     }
 
     public String getFilePath() {
-        return getTheme()+"_"+getFileName()+".mp3";
+        return getTheme() + "_" + getFileName() + ".mp3";
     }
 
     public File getFile() {
@@ -46,8 +45,8 @@ public class SoundFile implements MediaPlayer.OnCompletionListener {
         this.file = file;
     }
 
-    public void prepareMediaPlayer(){
-        if(playerPrepared) {
+    public void prepareMediaPlayer() {
+        if (playerPrepared) {
             return;
         }
 
@@ -61,14 +60,13 @@ public class SoundFile implements MediaPlayer.OnCompletionListener {
             playerPrepared = true;
 
             file = null;
-        }
-        catch(Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    public void play(){
-        if(isPlaying) {
+    public void play() {
+        if (isPlaying) {
             return;
         }
         prepareMediaPlayer();
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.java
index 45355ab4f..deb040899 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundFileLoader.java
@@ -20,7 +20,7 @@ import rx.schedulers.Schedulers;
 public class SoundFileLoader {
     OkHttpClient client;
 
-    public SoundFileLoader(){
+    public SoundFileLoader() {
         client = new OkHttpClient();
     }
 
@@ -41,12 +41,14 @@ public class SoundFileLoader {
                         Response response;
                         try {
                             response = client.newCall(request).execute();
-                            if (!response.isSuccessful()) { throw new IOException(); }
+                            if (!response.isSuccessful()) {
+                                throw new IOException();
+                            }
                         } catch (IOException io) {
                             throw OnErrorThrowable.from(OnErrorThrowable.addValueAsLastCause(io, audioFile));
                         }
 
-                        if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+                        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
                             try {
                                 BufferedSink sink = Okio.buffer(Okio.sink(file));
                                 sink.writeAll(response.body().source());
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.java
index ab8d28569..d375ae2d7 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/SoundManager.java
@@ -1,12 +1,9 @@
 package com.habitrpg.android.habitica.helpers;
 
-import android.media.AudioManager;
-import android.media.MediaPlayer;
-import android.util.Log;
-
 import com.habitrpg.android.habitica.HabiticaApplication;
 
-import java.io.File;
+import android.media.MediaPlayer;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -36,18 +33,18 @@ public class SoundManager {
 
     private HashMap<String, SoundFile> loadedSoundFiles;
 
-    public SoundManager(){
+    public SoundManager() {
         HabiticaApplication.getInstance(HabiticaApplication.currentActivity).getComponent().inject(this);
 
         loadedSoundFiles = new HashMap<>();
     }
 
-    public void setSoundTheme(String soundTheme){
+    public void setSoundTheme(String soundTheme) {
         this.soundTheme = soundTheme;
     }
 
     public Observable<List<SoundFile>> preloadAllFiles() {
-        if(soundTheme.equals("off")) {
+        if (soundTheme.equals("off")) {
             return Observable.empty();
         }
 
@@ -66,16 +63,16 @@ public class SoundManager {
         return soundFileLoader.download(soundFiles);
     }
 
-    public void clearLoadedFiles(){
+    public void clearLoadedFiles() {
         loadedSoundFiles.clear();
     }
 
-    public void loadAndPlayAudio(String type){
-        if(soundTheme.equals("off")) {
+    public void loadAndPlayAudio(String type) {
+        if (soundTheme.equals("off")) {
             return;
         }
 
-        if(loadedSoundFiles.containsKey(type)){
+        if (loadedSoundFiles.containsKey(type)) {
             loadedSoundFiles.get(type).play();
         } else {
             ArrayList<SoundFile> soundFiles = new ArrayList<>();
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 2ea8181eb..c688c5221 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
@@ -41,10 +41,10 @@ public class TaskAlarmManager {
     public static final String TASK_ID_INTENT_KEY = "TASK_ID";
     public static final String TASK_NAME_INTENT_KEY = "TASK_NAME";
     private static TaskAlarmManager instance = null;
-    private Context context;
-    private AlarmManager am;
     @Inject
     CrashlyticsProxy crashlyticsProxy;
+    private Context context;
+    private AlarmManager am;
 
     private TaskAlarmManager(Context context) {
         HabiticaBaseApplication.getComponent().inject(this);
@@ -60,6 +60,63 @@ public class TaskAlarmManager {
         return instance;
     }
 
+    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;
@@ -72,7 +129,6 @@ public class TaskAlarmManager {
         this.removeAlarmsForTask(task);
     }
 
-
     @Subscribe
     public void onEvent(ReminderDeleteEvent event) {
         RemindersItem remindersItem = event.reminder;
@@ -122,7 +178,8 @@ public class TaskAlarmManager {
                 .queryList()))
                 .doOnNext(this::setAlarmsForTask)
                 .subscribeOn(Schedulers.io())
-                .subscribe(task -> {},crashlyticsProxy::logException);
+                .subscribe(task -> {
+                }, crashlyticsProxy::logException);
 
         scheduleDailyReminder(context);
         SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
@@ -180,61 +237,4 @@ public class TaskAlarmManager {
         am.cancel(sender);
 
     }
-
-    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);
-    }
 }
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 a728ac0cd..d7dab613b 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,19 +1,13 @@
 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 android.media.RingtoneManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
-
-import java.util.Map;
 
 /**
  * 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 c9504930a..22624399e 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,15 +1,7 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import android.util.Log;
-
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.FirebaseInstanceIdService;
-import com.habitrpg.android.habitica.APIHelper;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
 
 /**
  * Created by keithholliday on 6/24/16.
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 a4c66251c..cf4b82bdd 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,7 +1,5 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import android.util.Log;
-
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.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 550b5d8d1..5e5b82cd0 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/HabiticaLocalNotificationFactory.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.java
index 3abb8db9d..b82b6bd35 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotificationFactory.java
@@ -6,8 +6,8 @@ package com.habitrpg.android.habitica.helpers.notifications;
 public class HabiticaLocalNotificationFactory {
 
     //use getShape method to get object of type shape
-    public HabiticaLocalNotification build(String notificationType){
-        if(notificationType == null){
+    public HabiticaLocalNotification build(String notificationType) {
+        if (notificationType == null) {
             return null;
         }
 
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 3b1e2d5e3..cb47fcaed 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,22 +1,13 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import android.app.Notification;
+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 android.media.RingtoneManager;
-import android.net.Uri;
-
-import android.support.v4.app.NotificationCompat;
-import android.util.Log;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
-import java.util.Map;
 
 /**
  * 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 7eec7ac62..82bcfaef7 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
@@ -19,19 +19,16 @@ 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 static PushNotificationManager instance = null;
-    private static String DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference";
-
-    static String PARTY_INVITE_PUSH_NOTIFICATION_KEY = "invitedParty";
-    static String RECEIVED_PRIVATE_MESSAGE_PUSH_NOTIFICATION_KEY = "newPM";
-    static String RECEIVED_GEMS_PUSH_NOTIFICATION_KEY = "giftedGems";
-    static String RECEIVED_SUBSCRIPTION_GIFT_PUSH_NOTIFICATION_KEY = "giftedSubscription";
-    static String GUILD_INVITE_PUSH_NOTIFICATION_KEY = "invitedGuild";
-    static String QUEST_INVITE_PUSH_NOTIFICATION_KEY = "questInvitation";
-    static String QUEST_BEGUN_PUSH_NOTIFICATION_KEY = "questStarted";
-    static String WON_CHALLENGE_PUSH_NOTIFICATION_KEY = "wonChallenge";
-
-
     @Inject
     public APIHelper apiHelper;
 
@@ -45,12 +42,8 @@ public class PushNotificationManager {
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
     }
 
-    public void setUser(HabitRPGUser user) {
-        this.user = user;
-    }
-
     public static PushNotificationManager getInstance(Context context) {
-        if(instance == null) {
+        if (instance == null) {
             instance = new PushNotificationManager(context.getApplicationContext());
         }
 
@@ -60,6 +53,10 @@ public class PushNotificationManager {
         return instance;
     }
 
+    public void setUser(HabitRPGUser user) {
+        this.user = user;
+    }
+
     void setRefreshedToken(String refreshedToken) {
         if (this.refreshedToken == null) {
             return;
@@ -72,7 +69,7 @@ public class PushNotificationManager {
     }
 
     //@TODO: Use preferences
-    public void addPushDeviceUsingStoredToken () {
+    public void addPushDeviceUsingStoredToken() {
         if (this.refreshedToken == null || this.refreshedToken.isEmpty()) {
             this.refreshedToken = FirebaseInstanceId.getInstance().getToken();
         }
@@ -81,7 +78,7 @@ public class PushNotificationManager {
             return;
         }
 
-        if (this.user == null ||  this.userHasPushDevice()) {
+        if (this.user == null || this.userHasPushDevice()) {
             return;
         }
 
@@ -93,14 +90,18 @@ public class PushNotificationManager {
         pushDeviceData.put("regId", this.refreshedToken);
         pushDeviceData.put("type", "android");
         apiHelper.apiService.addPushDevice(pushDeviceData)
-            .compose(apiHelper.configureApiCallObserver())
-            .subscribe(aVoid -> {}, throwable -> {});
+                .compose(apiHelper.configureApiCallObserver())
+                .subscribe(aVoid -> {
+                }, throwable -> {
+                });
     }
 
-    public void removePushDeviceUsingStoredToken () {
+    public void removePushDeviceUsingStoredToken() {
         apiHelper.apiService.deletePushDevice(this.refreshedToken)
-            .compose(apiHelper.configureApiCallObserver())
-            .subscribe(aVoid -> {}, throwable -> {});
+                .compose(apiHelper.configureApiCallObserver())
+                .subscribe(aVoid -> {
+                }, throwable -> {
+                });
     }
 
     private Boolean userHasPushDevice() {
@@ -108,8 +109,8 @@ public class PushNotificationManager {
             return true;
         }
 
-        for(PushDevice pushDevice : this.user.getPushDevices()) {
-            if(pushDevice.getRegId().equals(this.refreshedToken)) {
+        for (PushDevice pushDevice : this.user.getPushDevices()) {
+            if (pushDevice.getRegId().equals(this.refreshedToken)) {
                 return 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 f49d32ec5..3f008495c 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,17 +1,11 @@
 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 android.media.RingtoneManager;
-import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
-import java.util.Map;
 
 /**
  * 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 87ddbc61e..5be497247 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,18 +1,13 @@
 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 android.media.RingtoneManager;
-import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
-
-import java.util.Map;
 
 /**
  * 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 7e4d394c4..9a3e2e4b6 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,19 +1,11 @@
 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 android.content.res.Resources;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
-import java.util.Map;
 
 /**
  * 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 b65891b20..61494dd7b 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,23 +1,11 @@
 package com.habitrpg.android.habitica.helpers.notifications;
 
-import android.app.Notification;
+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 android.content.res.Resources;
-import android.media.RingtoneManager;
-import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.RemoteInput;
-import android.util.Log;
-import android.widget.RemoteViews;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.receivers.LocalNotificationActionReceiver;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
-import java.util.Map;
 
 /**
  * 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 e2658ff6f..ada3643a1 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,17 +1,11 @@
 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 android.media.RingtoneManager;
-import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
-import java.util.Map;
 
 /**
  * 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 62e709169..d771614be 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,17 +1,11 @@
 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 android.media.RingtoneManager;
-import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-
-import java.util.Map;
 
 /**
  * Created by keithholliday on 7/2/16.
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 377d38656..b1fd3a8f1 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
@@ -38,7 +38,7 @@ public class ApiModule {
 
     @Provides
     @Singleton
-    public ContentCache providesContentCache(APIHelper helper){
+    public ContentCache providesContentCache(APIHelper helper) {
         return new ContentCache(helper);
     }
 
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 b30ae19bb..6ffa020d8 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
@@ -56,7 +56,7 @@ public class AppModule {
     }
 
     @Provides
-    public SoundFileLoader providesSoundFileLoader(){
+    public SoundFileLoader providesSoundFileLoader() {
         return new SoundFileLoader();
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/scanner/IntentIntegrator.java b/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/scanner/IntentIntegrator.java
index 6c0c37094..8da9eb16d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/scanner/IntentIntegrator.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/prefs/scanner/IntentIntegrator.java
@@ -35,7 +35,8 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * <p>A utility class which helps ease integration with Barcode Scanner via {@link Intent}s. This is
+ * <p>A utility class which helps ease integration with Barcode Scanner via {@link Intent}s. This
+ * is
  * a simple
  * way to invoke barcode scanning and receive the result, without any need to integrate, modify, or
  * learn the
@@ -84,7 +85,8 @@ import java.util.Map;
  * <p/>
  * <p>You can use {@link #setTitle(String)} to customize the title of this download prompt dialog
  * (or, use
- * {@link #setTitleByID(int)} to set the title by string resource ID.) Likewise, the prompt message,
+ * {@link #setTitleByID(int)} to set the title by string resource ID.) Likewise, the prompt
+ * message,
  * and
  * yes/no button labels can be changed.</p>
  * <p/>
@@ -341,7 +343,7 @@ public class IntentIntegrator {
         activity.startActivityForResult(intent, code);
     }
 
-    protected  void startActivityForResult(Fragment fragment, Intent intent, int code) {
+    protected void startActivityForResult(Fragment fragment, Intent intent, int code) {
         fragment.startActivityForResult(intent, code);
     }
 
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 506b41c67..b277ec6d3 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,18 +1,17 @@
 package com.habitrpg.android.habitica.receivers;
 
+import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+
 import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
-import android.util.Log;
-
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
 import javax.inject.Inject;
 
@@ -40,7 +39,8 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver implement
 
         this.apiHelper.apiService.getUser()
                 .compose(this.apiHelper.configureApiCallObserver())
-                .subscribe(new HabitRPGUserCallback(this), throwable -> {});
+                .subscribe(new HabitRPGUserCallback(this), throwable -> {
+                });
     }
 
     @Override
@@ -59,39 +59,51 @@ public class LocalNotificationActionReceiver extends BroadcastReceiver implement
             String partyId = this.user.getInvitations().getParty().getId();
             apiHelper.apiService.joinGroup(partyId)
                     .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(aVoid -> {}, throwable -> {});
+                    .subscribe(aVoid -> {
+                    }, throwable -> {
+                    });
         } else if (action.equals(this.resources.getString(R.string.reject_party_invite))) {
             if (this.user.getInvitations().getParty() == null) return;
             String partyId = this.user.getInvitations().getParty().getId();
             apiHelper.apiService.rejectGroupInvite(partyId)
                     .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(aVoid -> {}, throwable -> {});
+                    .subscribe(aVoid -> {
+                    }, throwable -> {
+                    });
         } else if (action.equals(this.resources.getString(R.string.accept_quest_invite))) {
             if (this.user.getParty() == null) return;
             String partyId = this.user.getParty().getId();
             apiHelper.apiService.acceptQuest(partyId)
                     .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(aVoid -> {}, throwable -> {});
+                    .subscribe(aVoid -> {
+                    }, throwable -> {
+                    });
         } else if (action.equals(this.resources.getString(R.string.reject_quest_invite))) {
             if (this.user.getParty() == null) return;
             String partyId = this.user.getParty().getId();
             apiHelper.apiService.rejectQuest(partyId)
                     .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(aVoid -> {}, throwable -> {});
+                    .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;
             apiHelper.apiService.joinGroup(guildId)
                     .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(aVoid -> {}, throwable -> {});
+                    .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;
             apiHelper.apiService.rejectGroupInvite(guildId)
                     .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(aVoid -> {}, throwable -> {});
+                    .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 39ec50a51..87b4931c8 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
@@ -5,10 +5,6 @@ import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.support.v7.preference.PreferenceManager;
-
-import java.util.Date;
 
 public class TaskAlarmBootReceiver extends BroadcastReceiver {
 
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 4f56f0c1b..c38a0d693 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,8 +1,8 @@
 package com.habitrpg.android.habitica.receivers;
 
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
 
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -13,7 +13,6 @@ import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.NotificationCompat;
-import android.util.Log;
 
 /**
  * Created by keithholliday on 5/29/16.
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 b950b6daf..948a17a85 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
@@ -66,6 +66,7 @@ public class AvatarView extends View {
     private Consumer<Bitmap> avatarImageConsumer;
     private Bitmap avatarBitmap;
     private Canvas avatarCanvas;
+    private Map<LayerType, String> currentLayers;
 
     public AvatarView(Context context) {
         super(context);
@@ -111,8 +112,6 @@ public class AvatarView extends View {
         }
     }
 
-    private Map<LayerType, String> currentLayers;
-
     private void showLayers(@NonNull Map<LayerType, String> layerMap) {
         if (multiDraweeHolder.size() > 0) return;
         int i = 0;
@@ -324,7 +323,7 @@ public class AvatarView extends View {
             Map<LayerType, String> newLayerMap = getLayerMap(user, false);
 
             boolean equals = currentLayers != null && currentLayers.equals(newLayerMap);
-            
+
             if (!equals) {
                 multiDraweeHolder.clear();
                 numberLayersInProcess.set(0);
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 54f440c3b..5bf0d07cf 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
@@ -193,12 +193,11 @@ public class AvatarWithBarsViewModel implements View.OnClickListener {
 
     @Override
     public void onClick(View view) {
-        if(view == gemsText) {
+        if (view == gemsText) {
             // Gems Clicked
 
             EventBus.getDefault().post(new OpenGemPurchaseFragmentCommand());
-        }
-        else {
+        } else {
             // Avatar overview
             OpenMenuItemCommand event = new OpenMenuItemCommand();
             event.identifier = MainDrawerBuilder.SIDEBAR_AVATAR;
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 966b8602f..8f58b4f6c 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,5 +1,7 @@
 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;
@@ -11,27 +13,21 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.habitrpg.android.habitica.R;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 
 public class GemPurchaseOptionsView extends FrameLayout {
 
-    @BindView(R.id.gem_image)
-    ImageView gemImageView;
-
-    @BindView(R.id.gem_amount)
-    TextView gemAmountTextView;
-
-    @BindView(R.id.purchase_button)
-    Button purchaseButton;
-
     @BindView(R.id.seedsImageButton)
     public
     ImageButton seedsImageButton;
-
+    @BindView(R.id.gem_image)
+    ImageView gemImageView;
+    @BindView(R.id.gem_amount)
+    TextView gemAmountTextView;
+    @BindView(R.id.purchase_button)
+    Button purchaseButton;
     private String sku;
 
     public GemPurchaseOptionsView(Context context, AttributeSet attrs) {
@@ -66,11 +62,11 @@ public class GemPurchaseOptionsView extends FrameLayout {
         purchaseButton.setText(price);
     }
 
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
     public String getSku() {
         return sku;
     }
+
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
 }
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 09253c4cc..1b31e4020 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,6 +1,9 @@
 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;
@@ -10,13 +13,10 @@ 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 float maxHeight;
     private final float defaultHeight = 0.9f;
+    private float maxHeight;
 
     public MaxHeightLinearLayout(Context context) {
         super(context);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
index b3a506ec1..3004e5246 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionDetailsView.java
@@ -5,8 +5,6 @@ import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.R;
 import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
 
-import org.w3c.dom.Text;
-
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -101,7 +99,7 @@ public class SubscriptionDetailsView extends LinearLayout {
         } else {
             monthsSubscribedTextView.setText(getResources().getString(R.string.months, plan.consecutive.getCount()));
         }
-        gemCapTextView.setText(String.valueOf(plan.consecutive.getGemCapExtra()+25));
+        gemCapTextView.setText(String.valueOf(plan.consecutive.getGemCapExtra() + 25));
         currentHourglassesTextView.setText(String.valueOf(plan.consecutive.getTrinkets()));
 
         if (plan.paymentMethod.equals("Google")) {
@@ -118,10 +116,10 @@ public class SubscriptionDetailsView extends LinearLayout {
         Intent intent;
         if (plan.paymentMethod.equals("Google")) {
             intent = new Intent("android.intent.action.VIEW");
-            intent.setComponent(new ComponentName("com.android.vending","com.android.vending.MyDownloadsActivity"));
+            intent.setComponent(new ComponentName("com.android.vending", "com.android.vending.MyDownloadsActivity"));
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         } else {
-            intent = new Intent(Intent.ACTION_VIEW, Uri.parse(BuildConfig.BASE_URL+"/"));
+            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/SubscriptionOptionView.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
index 083c26a1a..63ec9d415 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SubscriptionOptionView.java
@@ -1,18 +1,15 @@
 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;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.habitrpg.android.habitica.R;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
@@ -72,14 +69,14 @@ public class SubscriptionOptionView extends FrameLayout {
         this.priceTextView.setText(text);
     }
 
-    public void setSku(String sku) {
-        this.sku = sku;
-    }
-
     public String getSku() {
         return sku;
     }
 
+    public void setSku(String sku) {
+        this.sku = sku;
+    }
+
     public void setIsPurchased(boolean purchased) {
         int horizontalPadding = (int) getResources().getDimension(R.dimen.pill_horizontal_padding);
         int verticalPadding = (int) getResources().getDimension(R.dimen.pill_vertical_padding);
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 1fa439067..f6496e5a7 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,16 +1,15 @@
 package com.habitrpg.android.habitica.ui.activities;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.widget.AddTaskWidgetProvider;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+
 import 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 android.util.Log;
-
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.widget.AddTaskWidgetProvider;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -68,7 +67,7 @@ public class AddTaskWidgetActivity extends AppCompatActivity {
         finish();
 
         Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, this, AddTaskWidgetProvider.class);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {widgetId});
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{widgetId});
         sendBroadcast(intent);
     }
 
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 e1c570582..6d8ab42e0 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
@@ -3,7 +3,6 @@ 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 com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
 
 import android.content.Intent;
 import android.os.Build;
@@ -78,7 +77,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
     }
 
-    void showDeveloperOptionsScreen(){
+    void showDeveloperOptionsScreen() {
         Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS);
         intent.setFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
         startActivity(intent);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
index 73731ad6b..f57ac30cb 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,20 +1,5 @@
 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.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.LinearLayout;
-import android.widget.TextView;
-
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
@@ -30,6 +15,21 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 import net.pherth.android.emoji_library.EmojiParser;
 import net.pherth.android.emoji_library.EmojiTextView;
 
+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.LinearLayout;
+import android.widget.TextView;
+
 import java.util.ArrayList;
 import java.util.Map;
 
@@ -42,16 +42,12 @@ import butterknife.OnClick;
 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 APIHelper apiHelper;
-
+    @BindView(R.id.detail_tabs)
+    TabLayout detail_tabs;
+    @BindView(R.id.toolbar)
+    Toolbar toolbar;
     private ChallengeViewHolder challengeViewHolder;
 
     private Challenge challenge;
@@ -184,6 +180,47 @@ public class ChallengeDetailActivity extends BaseActivity {
         component.inject(this);
     }
 
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_leave:
+                new AlertDialog.Builder(this)
+                        .setTitle(this.getString(R.string.challenge_leave_title))
+                        .setMessage(String.format(this.getString(R.string.challenge_leave_text), challenge.name))
+                        .setPositiveButton(this.getString(R.string.yes), (dialog, which) -> {
+                            this.apiHelper.apiService.leaveChallenge(challenge.id)
+                                    .compose(apiHelper.configureApiCallObserver())
+                                    .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();
+                return true;
+
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public boolean onSupportNavigateUp() {
+        finish();
+        return true;
+    }
+
+    @Override
+    public void onBackPressed() {
+        finish();
+    }
+
     public class ChallengeViewHolder extends RecyclerView.ViewHolder {
         @BindView(R.id.challenge_name)
         EmojiTextView challengeName;
@@ -235,45 +272,4 @@ public class ChallengeDetailActivity extends BaseActivity {
                     challenge1 -> ChallengeDetailActivity.this.onBackPressed());
         }
     }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_leave:
-                new AlertDialog.Builder(this)
-                        .setTitle(this.getString(R.string.challenge_leave_title))
-                        .setMessage(String.format(this.getString(R.string.challenge_leave_text), challenge.name))
-                        .setPositiveButton(this.getString(R.string.yes), (dialog, which) -> {
-                            this.apiHelper.apiService.leaveChallenge(challenge.id)
-                                    .compose(apiHelper.configureApiCallObserver())
-                                    .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();
-                return true;
-
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public boolean onSupportNavigateUp() {
-        finish();
-        return true;
-    }
-
-    @Override
-    public void onBackPressed() {
-        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 4d7796de7..88b67cd32 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
@@ -10,7 +10,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.Hair;
 import com.magicmicky.habitrpgwrapper.lib.models.Items;
 import com.magicmicky.habitrpgwrapper.lib.models.Outfit;
 import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
 
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -25,7 +24,7 @@ import rx.functions.Action1;
 
 public class ClassSelectionActivity extends BaseActivity implements Action1<HabitRPGUser> {
 
-    String  currentClass;
+    String currentClass;
     Boolean isInitialSelection;
     Boolean classWasUnset = false;
     Boolean shouldFinish = false;
@@ -177,8 +176,7 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
                     });
             AlertDialog alert = builder.create();
             alert.show();
-        }
-        else {
+        } else {
             AlertDialog.Builder builder = new AlertDialog.Builder(this)
                     .setTitle(getString(R.string.class_confirmation, className))
                     .setNegativeButton(getString(R.string.dialog_go_back), (dialog, which) -> {
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 dc40eeb85..4e4caa1de 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,24 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-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 com.facebook.drawee.backends.pipeline.Fresco;
 import com.facebook.drawee.controller.BaseControllerListener;
 import com.facebook.drawee.view.SimpleDraweeView;
@@ -45,6 +26,25 @@ import com.magicmicky.habitrpgwrapper.lib.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;
@@ -55,78 +55,63 @@ import javax.inject.Inject;
 import butterknife.BindView;
 
 public class FullProfileActivity extends BaseActivity {
-    private String userId;
-    private String userName;
-
     @Inject
     ContentCache contentCache;
-
     @Inject
     APIHelper apiHelper;
-
     @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;
-    private AvatarWithBarsViewModel avatarWithBars;
-
     @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) {
@@ -243,12 +228,12 @@ public class FullProfileActivity extends BaseActivity {
         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);
+                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);
             }
         });
 
@@ -269,6 +254,10 @@ public class FullProfileActivity extends BaseActivity {
                         });
     }
 
+    // endregion
+
+    // region Attributes
+
     private void fillAchievements(AchievementResult achievements) {
         List<Object> items = new ArrayList<>();
 
@@ -296,7 +285,7 @@ public class FullProfileActivity extends BaseActivity {
         stopAndHideProgress(achievementProgress);
     }
 
-    private void fillAchievements(AchievementGroup achievementGroup, List<Object> targetList){
+    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));
@@ -305,8 +294,6 @@ public class FullProfileActivity extends BaseActivity {
         targetList.addAll(achievementList);
     }
 
-    // region Utils
-
     private void stopAndHideProgress(ProgressBar bar) {
         bar.setIndeterminate(false);
         bar.setVisibility(View.GONE);
@@ -355,15 +342,6 @@ public class FullProfileActivity extends BaseActivity {
         return gearRow;
     }
 
-    // endregion
-
-    // region Attributes
-
-    private float attributeStrSum = 0;
-    private float attributeIntSum = 0;
-    private float attributeConSum = 0;
-    private float attributePerSum = 0;
-
     private void addLevelAttributes(Stats stats, HabitRPGUser user) {
         float byLevelStat = Math.min(stats.getLvl() / 2.0f, 50f);
 
@@ -531,10 +509,6 @@ public class FullProfileActivity extends BaseActivity {
         return tableRow;
     }
 
-    private boolean attributeDetailsHidden = true;
-
-    private ArrayList<TableRow> attributeRows = new ArrayList<>();
-
     private void toggleAttributeDetails() {
         attributeDetailsHidden = !attributeDetailsHidden;
 
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 d1f8e70d2..ec0881d71 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
@@ -4,16 +4,13 @@ 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.BoughtGemsEvent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
 import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment;
 import com.habitrpg.android.habitica.ui.fragments.SubscriptionFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.party.PartyInviteFragment;
 import com.playseeds.android.sdk.Seeds;
 import com.playseeds.android.sdk.inappmessaging.InAppMessageListener;
 
-import org.greenrobot.eventbus.EventBus;
 import org.solovyev.android.checkout.ActivityCheckout;
 import org.solovyev.android.checkout.BillingRequests;
 import org.solovyev.android.checkout.Checkout;
@@ -43,16 +40,12 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
 
     @Inject
     CrashlyticsProxy crashlyticsProxy;
-
-    private ActivityCheckout checkout;
-
     @BindView(R.id.tab_layout)
     TabLayout tabLayout;
-
     @BindView(R.id.view_pager)
     ViewPager viewPager;
-
     List<CheckoutFragment> fragments = new ArrayList<>();
+    private ActivityCheckout checkout;
     private BillingRequests billingRequests;
 
     @Override
@@ -239,7 +232,7 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
                 if (billingRequests != null) {
                     fragment.setBillingRequests(billingRequests);
                 }
-                return (Fragment)fragment;
+                return (Fragment) fragment;
             }
 
             @Override
@@ -264,14 +257,6 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
         }
     }
 
-    public interface CheckoutFragment {
-
-        void setupCheckout();
-        void setListener(GemPurchaseActivity listener);
-
-        void setBillingRequests(BillingRequests billingRequests);
-    }
-
     private void checkIfPendingPurchases() {
         billingRequests.getAllPurchases(ProductTypes.IN_APP, new RequestListener<Purchases>() {
             @Override
@@ -300,4 +285,13 @@ public class GemPurchaseActivity extends BaseActivity implements InAppMessageLis
         });
     }
 
+    public interface CheckoutFragment {
+
+        void setupCheckout();
+
+        void setListener(GemPurchaseActivity listener);
+
+        void setBillingRequests(BillingRequests billingRequests);
+    }
+
 }
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 bfc3b86d1..f46a22c2f 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,5 +1,11 @@
 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.widget.HabitButtonWidgetProvider;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+
 import android.appwidget.AppWidgetManager;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -8,14 +14,7 @@ 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.ui.adapter.SkillTasksRecyclerViewAdapter;
-import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class HabitButtonWidgetActivity extends BaseActivity implements TaskClickActivity {
 
@@ -74,7 +73,7 @@ public class HabitButtonWidgetActivity extends BaseActivity implements TaskClick
         finish();
 
         Intent intent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, this, HabitButtonWidgetProvider.class);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] {widgetId});
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{widgetId});
         sendBroadcast(intent);
     }
 
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 493b852ea..4beb1a453 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
@@ -16,6 +16,7 @@ import com.facebook.login.LoginResult;
 import com.facebook.login.widget.LoginButton;
 import com.habitrpg.android.habitica.APIHelper;
 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;
@@ -69,10 +70,10 @@ import rx.functions.Action1;
  */
 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";
-    static final int REQUEST_CODE_PICK_ACCOUNT = 1000;
     private static final int REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR = 1001;
 
 
@@ -80,6 +81,8 @@ public class LoginActivity extends BaseActivity
     public APIHelper apiHelper;
     @Inject
     public SharedPreferences sharedPrefs;
+    @Inject
+    private HostConfig hostConfig;
     public String mTmpUserToken;
     public String mTmpApiToken;
     public Boolean isRegistering;
@@ -102,6 +105,55 @@ public class LoginActivity extends BaseActivity
     private Menu menu;
     private CallbackManager callbackManager;
     private String googleEmail;
+    private View.OnClickListener mLoginNormalClick = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            mProgressBar.setVisibility(View.VISIBLE);
+            if (isRegistering) {
+                String username, email, password, cpassword;
+                username = String.valueOf(mUsernameET.getText()).trim();
+                email = String.valueOf(mEmail.getText()).trim();
+                password = String.valueOf(mPasswordET.getText());
+                cpassword = String.valueOf(mConfirmPassword.getText());
+                if (username.length() == 0 || password.length() == 0 || email.length() == 0 || cpassword.length() == 0) {
+                    showValidationError(R.string.login_validation_error_fieldsmissing);
+                    return;
+                }
+                apiHelper.registerUser(username, email, password, cpassword)
+                        .compose(apiHelper.configureApiCallObserver())
+                        .subscribe(LoginActivity.this, throwable -> {
+                            hideProgress();
+                        });
+            } else {
+                String username, password;
+                username = String.valueOf(mUsernameET.getText()).trim();
+                password = String.valueOf(mPasswordET.getText());
+                if (username.length() == 0 || password.length() == 0) {
+                    showValidationError(R.string.login_validation_error_fieldsmissing);
+                    return;
+                }
+                apiHelper.connectUser(username, password)
+                        .compose(apiHelper.configureApiCallObserver())
+                        .subscribe(LoginActivity.this, throwable -> {
+                            hideProgress();
+                        });
+            }
+        }
+    };
+    private View.OnClickListener mForgotPWClick = v -> {
+        String url = hostConfig.getAddress();
+        Intent i = new Intent(Intent.ACTION_VIEW);
+        i.setData(Uri.parse(url));
+        startActivity(i);
+    };
+
+    public static void show(final View v) {
+        v.setVisibility(View.VISIBLE);
+    }
+
+    public static void hide(final View v) {
+        v.setVisibility(View.GONE);
+    }
 
     @Override
     protected int getLayoutResId() {
@@ -177,54 +229,6 @@ public class LoginActivity extends BaseActivity
                 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;
-				}
-                apiHelper.registerUser(username,email,password, cpassword)
-                        .compose(apiHelper.configureApiCallObserver())
-                        .subscribe(LoginActivity.this, throwable -> {hideProgress();});
-            } else {
-                String username,password;
-                username = String.valueOf(mUsernameET.getText()).trim();
-                password = String.valueOf(mPasswordET.getText());
-				if (username.length() == 0 || password.length() == 0) {
-					showValidationError(R.string.login_validation_error_fieldsmissing);
-					return;
-				}
-                apiHelper.connectUser(username,password)
-                        .compose(apiHelper.configureApiCallObserver())
-                        .subscribe(LoginActivity.this, throwable -> {hideProgress();});
-            }
-		}
-	};
-
-	private View.OnClickListener mForgotPWClick = v -> {
-        String url = 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() {
@@ -385,7 +389,7 @@ public class LoginActivity extends BaseActivity
         } catch (Exception e) {
             e.printStackTrace();
         }
-        
+
         if (userAuthResponse.getNewUser()) {
             this.startSetupActivity();
         } else {
@@ -426,7 +430,7 @@ public class LoginActivity extends BaseActivity
                 .subscribe(LoginActivity.this, throwable -> {
                     hideProgress();
                     if (throwable.getCause() != null && GoogleAuthException.class.isAssignableFrom(throwable.getCause().getClass())) {
-                        handleGoogleAuthException((GoogleAuthException)throwable.getCause());
+                        handleGoogleAuthException((GoogleAuthException) throwable.getCause());
                     }
                 });
     }
@@ -436,7 +440,7 @@ public class LoginActivity extends BaseActivity
             // 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)
+            int statusCode = ((GooglePlayServicesAvailabilityException) e)
                     .getConnectionStatusCode();
             Dialog dialog = GooglePlayServicesUtil.getErrorDialog(statusCode,
                     LoginActivity.this,
@@ -446,7 +450,7 @@ public class LoginActivity extends BaseActivity
             // 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();
+            Intent intent = ((UserRecoverableAuthException) e).getIntent();
             startActivityForResult(intent,
                     REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR);
         }
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 7d886c623..40fbc3d78 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.activities;
 
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
@@ -178,16 +177,15 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     @Inject
     public MaintenanceApiService maintenanceService;
     public HabitRPGUser user;
+    @BindView(R.id.floating_menu_wrapper)
+    public
+    FrameLayout floatingMenuWrapper;
     @Inject
     protected HostConfig hostConfig;
     @Inject
     protected SharedPreferences sharedPreferences;
     @Inject
     CrashlyticsProxy crashlyticsProxy;
-
-    @BindView(R.id.floating_menu_wrapper)
-    public
-    FrameLayout floatingMenuWrapper;
     @BindView(R.id.toolbar)
     Toolbar toolbar;
     @BindView(R.id.detail_tabs)
@@ -196,18 +194,16 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     View avatar_with_bars;
     @BindView(R.id.overlayFrameLayout)
     FrameLayout overlayFrameLayout;
+    PushNotificationManager pushNotificationManager;
     private Drawer drawer;
     private Drawer filterDrawer;
     private AccountHeader accountHeader;
     private BaseMainFragment activeFragment;
     private AvatarWithBarsViewModel avatarInHeader;
     private AlertDialog faintDialog;
-
     private AvatarView sideAvatarView;
     private AvatarView dialogAvatarView;
-
     private Date lastSync;
-
     private TutorialView activeTutorialView;
     private boolean isloadingContent;
     private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
@@ -232,8 +228,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n));
     }
 
-    PushNotificationManager pushNotificationManager;
-
     @Override
     protected int getLayoutResId() {
         return R.layout.activity_main;
@@ -244,10 +238,10 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         super.onCreate(savedInstanceState);
 
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString("language","en"));
+        LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString("language", "en"));
         Locale.setDefault(languageHelper.getLocale());
         Configuration configuration = new Configuration();
-        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN){
+        if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
             configuration.locale = languageHelper.getLocale();
         } else {
             configuration.setLocale(languageHelper.getLocale());
@@ -256,7 +250,6 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                 getResources().getDisplayMetrics());
 
 
-
         if (!HabiticaApplication.checkUserAuthentication(this, hostConfig)) {
             return;
         }
@@ -352,10 +345,10 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
     }
 
     private void updateWidget(Class widgetClass) {
-        Intent intent = new Intent(this,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);
+        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids);
         sendBroadcast(intent);
     }
 
@@ -403,7 +396,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
             Preferences preferences = user.getPreferences();
 
-            if(preferences!= null) {
+            if (preferences != null) {
                 apiHelper.languageCode = preferences.getLanguage();
             }
 
@@ -843,8 +836,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
         IDrawerItem item = drawer.getDrawerItem(MainDrawerBuilder.SIDEBAR_SKILLS);
         if (((user.getPreferences() != null && user.getPreferences().getDisableClasses())
-                || (user.getFlags() != null && !user.getFlags().getClassSelected())) &&
-                !hasSpecialItems) {
+                || (user.getFlags() != null && !user.getFlags().getClassSelected()))
+                && !hasSpecialItems) {
             if (item != null) {
                 drawer.removeItem(MainDrawerBuilder.SIDEBAR_SKILLS);
             }
@@ -883,16 +876,15 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         this.drawer.setSelectionAtPosition(this.activeFragment.fragmentSidebarPosition, false);
     }
 
-    private void setTranslatedFragmentTitle(BaseMainFragment fragment){
+    private void setTranslatedFragmentTitle(BaseMainFragment fragment) {
         if (getSupportActionBar() == null) {
             return;
         }
-	    if(fragment!= null && fragment.isAdded() && fragment.customTitle() != null){
-		    getSupportActionBar().setTitle(fragment.customTitle());
-	    }
-	    else if(user != null && user.getProfile() != null){
-		    getSupportActionBar().setTitle(user.getProfile().getName());
-	    }
+        if (fragment != null && fragment.isAdded() && fragment.customTitle() != null) {
+            getSupportActionBar().setTitle(fragment.customTitle());
+        } else if (user != null && user.getProfile() != null) {
+            getSupportActionBar().setTitle(user.getProfile().getName());
+        }
     }
 
     public void onBackPressed() {
@@ -992,20 +984,23 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                     .compose(apiHelper.configureApiCallObserver())
                     .doOnNext(aVoid -> showSnackbar(this, floatingMenuWrapper, getString(R.string.successful_purchase, event.item.text), SnackbarDisplayType.NORMAL))
                     .subscribe(buyResponse -> {
-                        apiHelper.retrieveUser(false)
-                                .compose(apiHelper.configureApiCallObserver())
-                                .subscribe(new HabitRPGUserCallback(user1 -> {
-                                    UpdateGoldGemsPurchasedevent event1 = new UpdateGoldGemsPurchasedevent();
-                                    event1.numberLeft = user1.getPurchased().getPlan().numberOfGemsLeft();
-                                    EventBus.getDefault().post(event1);
-                                    MainActivity.this.onUserReceived(user1);
-                                }), throwable -> {});
-                    }, throwable -> {
-                        HttpException error = (HttpException) throwable;
-                        if (error.code() == 401 && event.item.getCurrency().equals("gems")) {
-                            openGemPurchaseFragment(null);
-                        }
-                    });
+                                apiHelper.retrieveUser(false)
+                                        .compose(apiHelper.configureApiCallObserver())
+                                        .subscribe(new HabitRPGUserCallback(user1 -> {
+                                                    UpdateGoldGemsPurchasedevent event1 = new UpdateGoldGemsPurchasedevent();
+                                                    event1.numberLeft = user1.getPurchased().getPlan().numberOfGemsLeft();
+                                                    EventBus.getDefault().post(event1);
+                                                    MainActivity.this.onUserReceived(user1);
+                                                }), throwable -> {
+                                                }
+                                        );
+                            }, throwable -> {
+                                HttpException error = (HttpException) throwable;
+                                if (error.code() == 401 && event.item.getCurrency().equals("gems")) {
+                                    openGemPurchaseFragment(null);
+                                }
+                            }
+                    );
         } else {
             openGemPurchaseFragment(null);
         }
@@ -1034,45 +1029,46 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             apiHelper.apiService.buyItem(event.Reward.getId())
                     .compose(apiHelper.configureApiCallObserver())
                     .subscribe(buyResponse -> {
-                        String snackbarMessage = getString(R.string.successful_purchase, event.Reward.getText());
+                                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);
+                                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 -> {
                             }
-                            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 {
             soundManager.loadAndPlayAudio(SoundManager.SoundReward);
             // user created Rewards
@@ -1096,8 +1092,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         apiHelper.apiService.deleteTask(cmd.TaskIdToDelete).compose(apiHelper.configureApiCallObserver())
                 .subscribe(aVoid -> {
                     EventBus.getDefault().post(new TaskRemovedEvent(cmd.TaskIdToDelete));
-                }, throwable -> {
-                });
+                }, throwable -> {});
     }
 
     @Subscribe
@@ -1111,7 +1106,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                                 openedEvent.mysteryItem = mysteryItem;
                                 EventBus.getDefault().post(openedEvent);
                                 MainActivity.this.onUserReceived(user1);
-                            }), throwable -> {});
+                            }), throwable -> {
+                            });
                 }, throwable -> {});
     }
 
@@ -1514,13 +1510,15 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                     EventBus.getDefault().post(new TaskUpdatedEvent(event.Task));
                 });
 
-        switch(event.Task.type){
+        switch (event.Task.type) {
             case Task.TYPE_DAILY: {
                 soundManager.loadAndPlayAudio(SoundManager.SoundDaily);
-            } break;
+            }
+            break;
             case Task.TYPE_TODO: {
                 soundManager.loadAndPlayAudio(SoundManager.SoundTodo);
-            } break;
+            }
+            break;
         }
     }
 
@@ -1652,7 +1650,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Subscribe
     public void onEvent(OpenFullProfileCommand cmd) {
-        if(cmd.MemberId.equals("system"))
+        if (cmd.MemberId.equals("system"))
             return;
 
         Bundle bundle = new Bundle();
@@ -1668,8 +1666,8 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         this.filterDrawer.removeItemByPosition(position);
     }
 
-    public void updateFilterDrawerItem (IDrawerItem item, int position) {
+    public void updateFilterDrawerItem(IDrawerItem item, int position) {
         this.filterDrawer.removeItemByPosition(position);
-        this.filterDrawer.addItemAtPosition(item,position);
+        this.filterDrawer.addItemAtPosition(item, position);
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java
index cadb997e3..9d17e2651 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
@@ -21,8 +21,6 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 public class MaintenanceActivity extends BaseActivity {
 
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 937b4bc95..3d94e5c1c 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
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.ui.activities;
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
 import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
@@ -22,13 +21,11 @@ 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.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,24 +40,17 @@ public class PartyInviteActivity extends BaseActivity {
     public static final String USER_IDS_KEY = "userIDs";
     public static final String IS_EMAIL_KEY = "isEmail";
     public static final String EMAILS_KEY = "emails";
-
-    private HabitRPGUser user;
-    private String userIdToInvite;
-
-    @Inject
-    APIHelper apiHelper;
-
     @Inject
     protected HostConfig hostConfig;
-
+    @Inject
+    APIHelper apiHelper;
     @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 habitRPGUser) {
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 454bf3be4..37e2f01d2 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
@@ -15,9 +15,6 @@ import android.preference.PreferenceManager;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import android.support.v7.preference.PreferenceScreen;
 import android.support.v7.widget.Toolbar;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 
 import butterknife.BindView;
 
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 6df5bb46b..41b21154e 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,16 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.preference.PreferenceManager;
-import android.view.View;
-import android.widget.Button;
-
-import com.amplitude.api.Amplitude;
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
@@ -28,15 +17,22 @@ import com.raizlabs.android.dbflow.sql.language.Select;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
-import org.json.JSONException;
-import org.json.JSONObject;
+
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.preference.PreferenceManager;
+import android.view.View;
+import android.widget.Button;
 
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Objects;
 
 import javax.inject.Inject;
 
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 8c37b3d59..7a3f6699f 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,11 +1,5 @@
 package com.habitrpg.android.habitica.ui.activities;
 
-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.APIHelper;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
@@ -15,19 +9,23 @@ import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAd
 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 javax.inject.Inject;
 
 import butterknife.BindView;
 
 public class SkillMemberActivity extends BaseActivity {
 
-    private PartyMemberRecyclerViewAdapter viewAdapter;
-
-    @BindView(R.id.recyclerView)
-    RecyclerView recyclerView;
-
     @Inject
     public APIHelper apiHelper;
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+    private PartyMemberRecyclerViewAdapter viewAdapter;
 
     @Override
     protected int getLayoutResId() {
@@ -74,7 +72,7 @@ public class SkillMemberActivity extends BaseActivity {
     }
 
     @Subscribe
-    public void onEvent(SelectMemberCommand evt){
+    public void onEvent(SelectMemberCommand evt) {
         Intent resultIntent = new Intent();
         resultIntent.putExtra("member_id", evt.MemberId);
         setResult(Activity.RESULT_OK, resultIntent);
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 fa7bd2987..620ae71f1 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,5 +1,33 @@
 package com.habitrpg.android.habitica.ui.activities;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.events.TaskSaveEvent;
+import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
+import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
+import com.habitrpg.android.habitica.helpers.RemindersManager;
+import com.habitrpg.android.habitica.helpers.TagsHelper;
+import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
+import com.habitrpg.android.habitica.ui.WrapContentRecyclerViewLayoutManager;
+import com.habitrpg.android.habitica.ui.adapter.tasks.CheckListAdapter;
+import com.habitrpg.android.habitica.ui.adapter.tasks.RemindersAdapter;
+import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
+import com.habitrpg.android.habitica.ui.helpers.SimpleItemTouchHelperCallback;
+import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
+import com.magicmicky.habitrpgwrapper.lib.models.Tag;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.Days;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
+import net.pherth.android.emoji_library.EmojiEditText;
+import net.pherth.android.emoji_library.EmojiPopup;
+
+import org.greenrobot.eventbus.EventBus;
+
 import android.app.DatePickerDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -35,34 +63,6 @@ import android.widget.Spinner;
 import android.widget.TableRow;
 import android.widget.TextView;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.TaskSaveEvent;
-import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
-import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper;
-import com.habitrpg.android.habitica.helpers.RemindersManager;
-import com.habitrpg.android.habitica.helpers.TagsHelper;
-import com.habitrpg.android.habitica.helpers.TaskAlarmManager;
-import com.habitrpg.android.habitica.ui.WrapContentRecyclerViewLayoutManager;
-import com.habitrpg.android.habitica.ui.adapter.tasks.CheckListAdapter;
-import com.habitrpg.android.habitica.ui.adapter.tasks.RemindersAdapter;
-import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
-import com.habitrpg.android.habitica.ui.helpers.SimpleItemTouchHelperCallback;
-import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
-import com.magicmicky.habitrpgwrapper.lib.models.Tag;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Days;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import net.pherth.android.emoji_library.EmojiEditText;
-import net.pherth.android.emoji_library.EmojiPopup;
-
-import org.greenrobot.eventbus.EventBus;
-
 import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
@@ -601,12 +601,12 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             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());
+                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());
             }
@@ -695,12 +695,12 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
                 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());
+                    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);
@@ -798,12 +798,12 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
 
                     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());
+                    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());
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 3ad69abf5..fede5c856 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
@@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.adapter;
 
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding;
-import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
 import com.habitrpg.android.habitica.ui.activities.TaskClickActivity;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
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 f8c9f4042..61cc403aa 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,13 +90,13 @@ public class SkillsRecyclerViewAdapter extends RecyclerView.Adapter<SkillsRecycl
             skillNameTextView.setText(skill.text);
             skillNotesTextView.setText(skill.notes);
 
-            if(skill.isSpecialItem){
+            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);
+                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);
 
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 d140f8da8..aef2973db 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.java
@@ -11,7 +11,6 @@ import com.habitrpg.android.habitica.events.commands.SellItemCommand;
 import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemRecyclerFragment;
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenu;
 import com.habitrpg.android.habitica.ui.menu.BottomSheetMenuItem;
-import com.magicmicky.habitrpgwrapper.lib.models.ShopItem;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food;
 import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion;
@@ -75,10 +74,10 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
         for (Object obj : itemList) {
             if (obj.getClass().equals(SpecialItem.class)) {
                 SpecialItem item = (SpecialItem) obj;
-                    if (item.isMysteryItem) {
-                        item.setOwned(numberLeft);
-                        break;
-                    }
+                if (item.isMysteryItem) {
+                    item.setOwned(numberLeft);
+                    break;
+                }
             }
             itemPos++;
         }
@@ -147,7 +146,7 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
         public void onClick(View v) {
             if (!isHatching && !isFeeding) {
                 BottomSheetMenu menu = new BottomSheetMenu(context);
-                if (!(item instanceof QuestContent) && !(item instanceof  SpecialItem)) {
+                if (!(item instanceof QuestContent) && !(item instanceof SpecialItem)) {
                     menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.sell, item.getValue()), true));
                 }
                 if (item instanceof Egg) {
@@ -157,7 +156,7 @@ public class ItemRecyclerAdapter extends RecyclerView.Adapter<ItemRecyclerAdapte
                 } else if (item instanceof QuestContent) {
                     menu.addMenuItem(new BottomSheetMenuItem(resources.getString(R.string.invite_party)));
                 } else if (item instanceof SpecialItem) {
-                    SpecialItem specialItem = (SpecialItem)item;
+                    SpecialItem specialItem = (SpecialItem) item;
                     if (specialItem.isMysteryItem && specialItem.getOwned() > 0) {
                         menu.addMenuItem(new BottomSheetMenuItem(context.getString(R.string.open)));
                     }
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 a74819f87..e96b7e884 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
@@ -76,7 +76,7 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         Object obj = this.items.get(position);
         if (obj.getClass().equals(Shop.class)) {
             ShopHeaderViewHolder viewHolder = (ShopHeaderViewHolder) holder;
-            Shop shop = (Shop)obj;
+            Shop shop = (Shop) obj;
             DataBindingUtils.loadImage(viewHolder.imageView, shop.imageName);
             viewHolder.descriptionView.setText(Html.fromHtml(shop.getNotes()));
         } else if (obj.getClass().equals(ShopCategory.class)) {
@@ -131,7 +131,7 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         @BindView(R.id.unlockView)
         TextView unlockView;
         @BindView(R.id.limitedCountText)
-                TextView limitedCountText;
+        TextView limitedCountText;
 
         String shopIdentifier;
         ShopItem item;
@@ -249,6 +249,6 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             ButterKnife.bind(this, itemView);
             descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
         }
-        
+
     }
 }
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 1c76aa01f..ce4a31414 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,17 +1,5 @@
 package com.habitrpg.android.habitica.ui.adapter.social;
 
-import android.content.res.Resources;
-import android.graphics.drawable.Animatable;
-import android.support.v7.app.AlertDialog;
-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.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;
@@ -23,6 +11,16 @@ import com.habitrpg.android.habitica.ui.activities.MainActivity;
 import com.habitrpg.android.habitica.ui.viewHolders.SectionViewHolder;
 import com.magicmicky.habitrpgwrapper.lib.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;
@@ -107,9 +105,9 @@ public class AchievementAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         }
 
         public void bind(Achievement item) {
-            String iconUrl = AvatarView.IMAGE_URI_ROOT  + (!item.earned ? "achievement-unearned" : item.icon ) + "2x.png";
+            String iconUrl = AvatarView.IMAGE_URI_ROOT + (!item.earned ? "achievement-unearned" : item.icon) + "2x.png";
 
-              draweeView.setController(Fresco.newDraweeControllerBuilder()
+            draweeView.setController(Fresco.newDraweeControllerBuilder()
                     .setUri(iconUrl)
                     .setControllerListener(new BaseControllerListener<ImageInfo>() {
                         @Override
@@ -119,13 +117,12 @@ public class AchievementAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
                     .build());
 
 
-
             this.achievement = item;
             titleView.setText(item.title);
 
-            if(item.optionalCount == null) {
+            if (item.optionalCount == null) {
                 countText.setVisibility(View.GONE);
-            } else{
+            } else {
                 countText.setVisibility(View.VISIBLE);
                 countText.setText(item.optionalCount.toString());
             }
@@ -137,7 +134,7 @@ public class AchievementAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
 
             View customView = LayoutInflater.from(itemView.getContext())
                     .inflate(R.layout.dialog_achievement_details, null);
-            ImageView achievementImage = (ImageView)customView.findViewById(R.id.achievement_image);
+            ImageView achievementImage = (ImageView) customView.findViewById(R.id.achievement_image);
             achievementImage.setImageDrawable(draweeView.getDrawable());
 
             TextView titleView = (TextView) customView.findViewById(R.id.achievement_title);
@@ -148,7 +145,8 @@ public class AchievementAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
             textView.setText(achievement.text);
 
             b.setView(customView);
-            b.setPositiveButton(R.string.profile_achievement_ok, (dialogInterface, i) -> {});
+            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 7f98d841d..7f6e0056f 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,15 +1,5 @@
 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.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailActivityCommand;
 import com.habitrpg.android.habitica.events.commands.ShowChallengeDetailDialogCommand;
@@ -20,6 +10,16 @@ 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;
 
@@ -135,6 +135,18 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
             }
         }
 
+        public static String getLabelByTypeAndCount(Context context, String type, int count) {
+            if (type == Challenge.TASK_ORDER_DAILYS) {
+                return context.getString(count == 1 ? R.string.daily : R.string.dailies);
+            } else if (type == Challenge.TASK_ORDER_HABITS) {
+                return context.getString(count == 1 ? R.string.habit : R.string.habits);
+            } else if (type == Challenge.TASK_ORDER_REWARDS) {
+                return context.getString(count == 1 ? R.string.reward : R.string.rewards);
+            } else {
+                return context.getString(count == 1 ? R.string.todo : R.string.todos);
+            }
+        }
+
         public void bind(Challenge challenge) {
             this.challenge = challenge;
 
@@ -160,18 +172,6 @@ public class ChallengesListViewAdapter extends RecyclerView.Adapter<ChallengesLi
             gemPrizeTextView.setText(String.valueOf(challenge.prize));
         }
 
-        public static String getLabelByTypeAndCount(Context context, String type, int count) {
-            if (type == Challenge.TASK_ORDER_DAILYS) {
-                return context.getString(count == 1 ? R.string.daily : R.string.dailies);
-            } else if (type == Challenge.TASK_ORDER_HABITS) {
-                return context.getString(count == 1 ? R.string.habit : R.string.habits);
-            } else if (type == Challenge.TASK_ORDER_REWARDS) {
-                return context.getString(count == 1 ? R.string.reward : R.string.rewards);
-            } else {
-                return context.getString(count == 1 ? R.string.todo : R.string.todos);
-            }
-        }
-
         @Override
         public void onClick(View view) {
             if (challenge != null) {
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 f1b5e9a5e..bbf70b5ca 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
@@ -55,7 +55,7 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
 
     private List<ChatMessage> messages;
     private HabitRPGUser user;
-	private String uuid;
+    private String uuid;
     private String groupId;
     private boolean isTavern;
     private boolean isInboxChat = false;
@@ -64,8 +64,8 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
 
     public ChatRecyclerViewAdapter(List<ChatMessage> messages, HabitRPGUser user, String groupId, boolean isTavern) {
         this.messages = messages;
-	    this.user = user;
-	    if(user!=null) this.uuid = user.getId();
+        this.user = user;
+        if (user != null) this.uuid = user.getId();
         this.groupId = groupId;
         this.isTavern = isTavern;
     }
@@ -359,14 +359,12 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
 
                     ChatMessage chatMsg = currentMsg;
 
-                    if (!chatMsg.uuid.equals(uuid) )
-						{
+                    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);
-						}
+                    }
+                    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);
 
@@ -443,15 +441,15 @@ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter<ChatRecyclerVi
         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();
+                    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: {
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 8cc243779..1570624de 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
@@ -9,6 +9,8 @@ import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
 import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
+import org.greenrobot.eventbus.EventBus;
+
 import android.content.Context;
 import android.content.res.Resources;
 import android.databinding.DataBindingUtil;
@@ -19,8 +21,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.util.List;
 
 import butterknife.BindView;
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 9e8764db7..d4b96f266 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
@@ -24,7 +24,7 @@ import java.util.Locale;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<PublicGuildsRecyclerViewAdapter.GuildViewHolder> implements Filterable{
+public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<PublicGuildsRecyclerViewAdapter.GuildViewHolder> implements Filterable {
 
     public APIHelper apiHelper;
     private List<Group> publicGuildList;
@@ -107,7 +107,7 @@ public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<Public
             protected FilterResults performFiltering(CharSequence constraint) {
                 List<Group> filteredGuilds;
 
-                if(constraint.length() == 0) {
+                if (constraint.length() == 0) {
                     filteredGuilds = fullPublicGuildList;
                 } else {
                     filteredGuilds = getFilteredResults(constraint.toString().toLowerCase(Locale.US));
@@ -129,8 +129,8 @@ public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<Public
     protected List<Group> getFilteredResults(String query) {
         List<Group> filteredGuilds = new ArrayList<>();
 
-        for(Group guild : fullPublicGuildList) {
-            if(guild.name.toLowerCase().contains(query)) {
+        for (Group guild : fullPublicGuildList) {
+            if (guild.name.toLowerCase().contains(query)) {
                 filteredGuilds.add(guild);
             }
         }
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 4d9bea2f2..1139fdfc9 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
@@ -29,15 +29,14 @@ 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;
-
-    private final String userID;
-    int layoutResource;
-    public String taskType;
-    Context context;
     protected List<Task> content;
     protected List<Task> filteredContent;
+    int layoutResource;
+    Context context;
     private TagsHelper tagsHelper;
 
     public BaseTasksRecyclerViewAdapter(String taskType, TagsHelper tagsHelper, int layoutResource,
@@ -50,10 +49,10 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
         this.filteredContent = new ArrayList<>();
         injectThis(HabiticaBaseApplication.getComponent());
 
-        if(loadFromDatabase()) {
+        if (loadFromDatabase()) {
             this.loadContent(true);
         }
-        
+
         this.layoutResource = layoutResource;
     }
 
@@ -154,7 +153,7 @@ public abstract class BaseTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder
         filter();
     }
 
-    public boolean loadFromDatabase(){
+    public boolean loadFromDatabase() {
         return true;
     }
 
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 03b541180..6e7a2fbe6 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,13 +1,13 @@
 package com.habitrpg.android.habitica.ui.adapter.tasks;
 
-import android.content.Context;
-
 import com.habitrpg.android.habitica.helpers.TagsHelper;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter;
 import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperDropCallback;
 import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 
+import android.content.Context;
+
 import java.util.Collections;
 
 /**
@@ -16,10 +16,6 @@ import java.util.Collections;
 public abstract class SortableTasksRecyclerViewAdapter<VH extends BaseTaskViewHolder>
         extends BaseTasksRecyclerViewAdapter<VH> implements ItemTouchHelperAdapter, ItemTouchHelperDropCallback {
 
-    public interface SortTasksCallback {
-        void onMove(Task task, int from, int to);
-    }
-
     private SortTasksCallback sortCallback;
 
     public SortableTasksRecyclerViewAdapter(String taskType, TagsHelper tagsHelper, int layoutResource,
@@ -41,8 +37,12 @@ public abstract class SortableTasksRecyclerViewAdapter<VH extends BaseTaskViewHo
 
     @Override
     public void onDrop(int from, int to) {
-        if (this.sortCallback != null && from != 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/fragments/BaseFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
index 88874880e..1026f4449 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,13 +1,5 @@
 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.components.AppComponent;
 import com.habitrpg.android.habitica.events.DisplayTutorialEvent;
@@ -23,6 +15,14 @@ import com.squareup.leakcanary.RefWatcher;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.EventBusException;
 
+import android.os.Bundle;
+import android.support.annotation.CallSuper;
+import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
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 92ad89d40..becff3b16 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,12 @@
 package com.habitrpg.android.habitica.ui.fragments;
 
+import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.helpers.SoundManager;
+import com.habitrpg.android.habitica.ui.activities.MainActivity;
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
@@ -8,28 +15,19 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.helpers.SoundManager;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
 import javax.inject.Inject;
 
 public abstract class BaseMainFragment extends BaseFragment {
 
     @Inject
     public APIHelper apiHelper;
-
-    @Inject
-    protected SoundManager soundManager;
-
     public MainActivity activity;
     public TabLayout tabLayout;
     public FrameLayout floatingMenuWrapper;
     public boolean usesTabLayout;
     public int fragmentSidebarPosition;
+    @Inject
+    protected SoundManager soundManager;
     protected HabitRPGUser user;
 
     public void setUser(HabitRPGUser user) {
@@ -110,7 +108,7 @@ public abstract class BaseMainFragment extends BaseFragment {
         super.onSaveInstanceState(outState);
     }
 
-    public String customTitle(){
+    public String customTitle() {
         return null;
     }
 }
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 3dc6ce4f1..f88f09816 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
@@ -66,7 +66,7 @@ public class GemsPurchaseFragment extends BaseFragment implements GemPurchaseAct
         gems42View.setOnPurchaseClickListener(v -> purchaseGems(PurchaseTypes.Purchase42Gems));
         gems84View.setOnPurchaseClickListener(v -> purchaseGems(PurchaseTypes.Purchase84Gems));
 
-        gems84View.seedsImageButton.setOnClickListener(v -> ((GemPurchaseActivity)this.getActivity()).showSeedsPromo(getString(R.string.seeds_interstitial_gems), "store"));
+        gems84View.seedsImageButton.setOnClickListener(v -> ((GemPurchaseActivity) this.getActivity()).showSeedsPromo(getString(R.string.seeds_interstitial_gems), "store"));
     }
 
     @Override
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 5c5633433..b9b633037 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
@@ -39,7 +39,8 @@ public class NewsFragment extends BaseMainFragment {
     }
 
 
-
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_news);	}
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_news);
+    }
 }
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 47a91ce0a..c556e80da 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
@@ -3,7 +3,6 @@ package com.habitrpg.android.habitica.ui.fragments;
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
-import com.habitrpg.android.habitica.events.BoughtGemsEvent;
 import com.habitrpg.android.habitica.events.UserSubscribedEvent;
 import com.habitrpg.android.habitica.helpers.PurchaseTypes;
 import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
@@ -13,22 +12,17 @@ import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
 
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.solovyev.android.checkout.ActivityCheckout;
 import org.solovyev.android.checkout.BillingRequests;
-import org.solovyev.android.checkout.Checkout;
 import org.solovyev.android.checkout.Inventory;
 import org.solovyev.android.checkout.ProductTypes;
-import org.solovyev.android.checkout.Purchase;
-import org.solovyev.android.checkout.Purchases;
 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;
@@ -36,7 +30,6 @@ import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import java.util.Date;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -100,13 +93,14 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
 
     @Override
     public void onDestroyView() {
-         super.onDestroyView();
+        super.onDestroyView();
     }
 
     @Subscribe
     public void fetchUser(@Nullable UserSubscribedEvent event) {
         apiHelper.apiService.getUser().compose(apiHelper.configureApiCallObserver())
-                .subscribe(this::setUser, throwable -> {});
+                .subscribe(this::setUser, throwable -> {
+                });
     }
 
     @Override
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 d113336dc..2c4a466f9 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
@@ -59,8 +59,8 @@ public class FAQOverviewFragment extends BaseMainFragment {
         adapter.setArticles(articles);
     }
 
-	@Override
-	public String customTitle() {
-		return getString(R.string.FAQ);
-	}
+    @Override
+    public String customTitle() {
+        return getString(R.string.FAQ);
+    }
 }
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 96d12848f..609961e8e 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
@@ -154,6 +154,8 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
     }
 
 
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_avatar);	}
+    @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/EquipmentOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
index 873fa1360..f43cf9aff 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
@@ -166,7 +166,9 @@ public class EquipmentOverviewFragment extends BaseMainFragment implements Trans
         return true;
     }
 
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_equipment);	}
+    @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 ef64c32d5..766ed3a93 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
@@ -4,7 +4,6 @@ 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.UpdateGoldGemsPurchasedevent;
 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;
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 1885a4d66..37112e833 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
@@ -6,7 +6,6 @@ import com.habitrpg.android.habitica.events.commands.HatchingCommand;
 import com.habitrpg.android.habitica.events.commands.InvitePartyToQuestCommand;
 import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
-import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment;
 import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder;
 
 import org.greenrobot.eventbus.EventBus;
@@ -144,6 +143,8 @@ public class ItemsFragment extends BaseMainFragment {
     }
 
 
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_items);	}
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_items);
+    }
 }
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 ba70b37a9..2b7fb61df 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
@@ -37,17 +37,13 @@ public class ShopFragment extends BaseFragment {
     public RecyclerViewEmptySupport recyclerView;
     @BindView(R.id.empty_view)
     public TextView emptyView;
-
-    private View view;
     public ShopRecyclerAdapter adapter;
-
     public String shopIdentifier;
     public HabitRPGUser user;
-
     public Shop shop;
-
     @Inject
     APIHelper apiHelper;
+    private View view;
 
     @Nullable
     @Override
@@ -126,7 +122,8 @@ public class ShopFragment extends BaseFragment {
                 .subscribe(shop -> {
                     this.shop = shop;
                     this.adapter.setShop(shop);
-                }, throwable -> {});
+                }, throwable -> {
+                });
     }
 
     @Override
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 09f5340ec..ab1e0f370 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
@@ -98,7 +98,9 @@ public class ShopsFragment extends BaseMainFragment {
     }
 
 
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_shops);	}
+    @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 8f53aa5bc..4c63cdf6f 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
@@ -107,6 +107,8 @@ public class MountDetailRecyclerFragment extends BaseMainFragment {
 
     }
 
-	@Override
-	public String customTitle() {	return getString(R.string.mounts);	}
+    @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 1e6113960..f2c8dbcc0 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
@@ -131,6 +131,8 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
         adapter.setOwnedMountsMapping(user.getItems().getMounts());
     }
 
-	@Override
-	public String customTitle() {	return getString(R.string.pets);	}
+    @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 f8bb47065..28af11859 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
@@ -86,6 +86,8 @@ public class StableFragment extends BaseMainFragment {
     }
 
 
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_stable);	}
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_stable);
+    }
 }
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 6c209e912..edb244024 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
@@ -28,7 +28,7 @@ import java.util.Map;
 public class AccountDetailsFragment extends BasePreferencesFragment {
 
     private QrCodeManager qrCodeManager;
-
+    private HabitRPGUser user;
     private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
         @Override
         public void onResultReceived(HabitRPGUser habitRPGUser) {
@@ -45,7 +45,6 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
             return true;
         }
     };
-    private HabitRPGUser user;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -102,7 +101,7 @@ public class AccountDetailsFragment extends BasePreferencesFragment {
     private void showSubscriptionStatusDialog() {
         SubscriptionDetailsView view = new SubscriptionDetailsView(getContext());
         view.setPlan(user.getPurchased().getPlan());
-        final AlertDialog dialog =  new AlertDialog.Builder(getContext())
+        final AlertDialog dialog = new AlertDialog.Builder(getContext())
                 .setView(view)
                 .setTitle(R.string.subscription_status)
                 .setPositiveButton(R.string.close, (dialogInterface, i) -> {
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 29ef4725e..64aa94695 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
@@ -17,7 +17,6 @@ import android.widget.TimePicker;
 import java.text.DateFormat;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.Locale;
 
 public class DayStartPreferenceDialogFragment extends PreferenceDialogFragmentCompat {
     public static final String TAG = TimePreferenceDialogFragment.class.getSimpleName();
@@ -66,7 +65,7 @@ public class DayStartPreferenceDialogFragment extends PreferenceDialogFragmentCo
     private void updateDescriptionText(int hour) {
         Calendar date = new GregorianCalendar();
         if (date.get(Calendar.HOUR) < hour) {
-            date.set(Calendar.DAY_OF_MONTH, date.get(Calendar.DAY_OF_MONTH)+1);
+            date.set(Calendar.DAY_OF_MONTH, date.get(Calendar.DAY_OF_MONTH) + 1);
         }
         date.set(Calendar.HOUR_OF_DAY, hour);
         date.set(Calendar.MINUTE, 0);
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 53d212e2d..a5995c6bb 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,15 +1,5 @@
 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.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
@@ -31,6 +21,16 @@ 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;
+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 java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -44,12 +44,12 @@ public class PreferencesFragment extends BasePreferencesFragment implements
     public APIHelper apiHelper;
     @Inject
     public SoundManager soundManager;
+    public MainActivity activity;
     private Context context;
     private TimePreference timePreference;
     private PreferenceScreen pushNotificationsPreference;
     private Preference classSelectionPreference;
     private HabitRPGUser user;
-    public MainActivity activity;
     private PushNotificationManager pushNotificationManager;
 
     private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
@@ -157,7 +157,6 @@ public class PreferencesFragment extends BasePreferencesFragment implements
     }
 
 
-
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         if (key.equals("use_reminder")) {
@@ -187,13 +186,15 @@ public class PreferencesFragment extends BasePreferencesFragment implements
             updateObject.put("dayStart", hour);
             apiHelper.apiService.changeCustomDayStart(updateObject)
                     .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(user -> {}, throwable -> {});
+                    .subscribe(user -> {
+                    }, throwable -> {
+                    });
         } else if (key.equals("language")) {
-            LanguageHelper languageHelper = new LanguageHelper(sharedPreferences.getString(key,"en"));
+            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){
+            if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
                 configuration.locale = languageHelper.getLocale();
             } else {
                 configuration.setLocale(languageHelper.getLocale());
@@ -217,7 +218,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
                     }, throwable -> {
                     });
 
-            if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1){
+            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);
@@ -226,7 +227,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
                 this.startActivity(intent);
                 getActivity().finishAffinity();
             }
-	        EventBus.getDefault().post(new RefreshUserCommand());
+            EventBus.getDefault().post(new RefreshUserCommand());
 
         } else if (key.equals("audioTheme")) {
             String newAudioTheme = sharedPreferences.getString(key, "off");
@@ -287,7 +288,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
         }
         if (user != null && user.getPreferences() != null) {
             TimePreference cdsTimePreference = (TimePreference) findPreference("cds_time");
-            cdsTimePreference.setText(user.getPreferences().getDayStart()+":00");
+            cdsTimePreference.setText(user.getPreferences().getDayStart() + ":00");
         }
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.java
index 92f1074e0..cfa839c31 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PushNotificationsPreferencesFragment.java
@@ -1,23 +1,12 @@
 package com.habitrpg.android.habitica.ui.fragments.preferences;
 
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.v7.preference.Preference;
-import android.widget.Toast;
-
-import com.habitrpg.android.habitica.R;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
 
 /**
  * Created by keithholliday on 6/27/16.
  */
 public class PushNotificationsPreferencesFragment extends BasePreferencesFragment implements
-        SharedPreferences.OnSharedPreferenceChangeListener  {
+        SharedPreferences.OnSharedPreferenceChangeListener {
 
     @Override
     protected void setupPreferences() {
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 2b4ae10ac..7559b41a4 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
@@ -40,10 +40,9 @@ public class AvatarSetupFragment extends BaseFragment {
     AvatarView avatarView;
     CustomizationSetupAdapter adapter;
     GridLayoutManager layoutManager;
-    private HabitRPGUser user;
-
     @Inject
     APIHelper apiHelper;
+    private HabitRPGUser user;
 
     @Nullable
     @Override
@@ -111,7 +110,8 @@ public class AvatarSetupFragment extends BaseFragment {
             this.apiHelper.getContent().compose(this.apiHelper.configureApiCallObserver())
                     .subscribe(contentResult -> {
                         this.loadCustomizations();
-                    }, throwable -> {});
+                    }, throwable -> {
+                    });
         }
         this.adapter.setCustomizationList(customizations);
     }
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 7197202fd..5855d8366 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
@@ -49,6 +49,10 @@ public class SkillsFragment extends BaseMainFragment {
     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) {
@@ -231,12 +235,9 @@ public class SkillsFragment extends BaseMainFragment {
         }
     }
 
-    static public Double round(Double value, int n) {
-        return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n));
+    @Override
+    public String customTitle() {
+        return getString(R.string.sidebar_skills);
     }
 
-
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_skills);	}
-
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
index 4c2513804..6f624cae6 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
@@ -37,7 +37,6 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Toast;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -165,10 +164,9 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
     }
 
     @Subscribe
-    public void onEvent(CopyChatMessageCommand cmd)
-    {
-        ClipboardManager clipMan = (ClipboardManager)getActivity().getSystemService(Context.CLIPBOARD_SERVICE);
-        ClipData chatMessage = ClipData.newPlainText("Chat Message",cmd.chatMessage.text);
+    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);
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 854fa3b07..8ce3ea3ee 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
@@ -322,7 +322,8 @@ public class GroupInformationFragment extends BaseFragment {
                 .subscribe(group -> {
                     setGroup(group);
                     viewBinding.setInvitation(null);
-                }, throwable -> {});
+                }, throwable -> {
+                });
     }
 
     @OnClick(R.id.btnPartyInviteReject)
@@ -331,6 +332,7 @@ public class GroupInformationFragment extends BaseFragment {
                 .compose(apiHelper.configureApiCallObserver())
                 .subscribe(aVoid -> {
                     viewBinding.setInvitation(null);
-                }, throwable -> {});
+                }, 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 0ef23b929..e0998703c 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
@@ -253,8 +253,8 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
         this.activity.supportInvalidateOptionsMenu();
     }
 
-	@Override
-	public String customTitle() {
-		return getString(R.string.guild);
-	}
+    @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 78b422f70..25aea7430 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
@@ -114,6 +114,8 @@ public class GuildsOverviewFragment extends BaseMainFragment implements View.OnC
     }
 
 
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_guilds);	}
+    @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 8a5dd87e9..bce66c1bf 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
@@ -7,19 +7,13 @@ 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.ui.helpers.ViewHelper;
 import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
-import org.w3c.dom.Text;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
@@ -60,7 +54,9 @@ public class InboxFragment extends BaseMainFragment
 
         this.apiHelper.apiService.markPrivateMessagesRead()
                 .compose(apiHelper.configureApiCallObserver())
-                .subscribe(aVoid -> {}, throwable -> {});
+                .subscribe(aVoid -> {
+                }, throwable -> {
+                });
 
         View v = inflater.inflate(R.layout.fragment_inbox, container, false);
         unbinder = ButterKnife.bind(this, v);
@@ -94,14 +90,14 @@ public class InboxFragment extends BaseMainFragment
     }
 
     private void openNewMessageDialog() {
-        this.chooseRecipientDialogView = this.activity.getLayoutInflater().inflate(R.layout.dialog_choose_message_recipient,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);
+                    EditText uuidEditText = (EditText) chooseRecipientDialogView.findViewById(R.id.uuidEditText);
                     openInboxMessages(uuidEditText.getText().toString(), "");
                 })
                 .setNeutralButton(getString(R.string.action_cancel), (dialog, which) -> {
@@ -127,7 +123,8 @@ public class InboxFragment extends BaseMainFragment
         swipeRefreshLayout.setRefreshing(true);
         this.apiHelper.retrieveUser(true)
                 .compose(apiHelper.configureApiCallObserver())
-                .subscribe(new HabitRPGUserCallback(this), throwable -> {});
+                .subscribe(new HabitRPGUserCallback(this), throwable -> {
+                });
     }
 
     public void setInboxMessages() {
@@ -206,8 +203,8 @@ public class InboxFragment extends BaseMainFragment
         }
     }
 
-	@Override
-	public String customTitle() {
-		return getString(R.string.sidebar_inbox);
-	}
+    @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 08ea3be97..2bd1498bf 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,13 +1,5 @@
 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.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
@@ -21,11 +13,17 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
 import org.greenrobot.eventbus.Subscribe;
 
-import java.sql.Date;
+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.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -36,104 +34,105 @@ import butterknife.ButterKnife;
  * Created by keithholliday on 6/20/16.
  */
 public class InboxMessageListFragment extends BaseMainFragment
-            implements SwipeRefreshLayout.OnRefreshListener, HabitRPGUserCallback.OnUserReceived {
+        implements SwipeRefreshLayout.OnRefreshListener, HabitRPGUserCallback.OnUserReceived {
 
-        @BindView(R.id.inbox_refresh_layout)
-        SwipeRefreshLayout swipeRefreshLayout;
+    @BindView(R.id.inbox_refresh_layout)
+    SwipeRefreshLayout swipeRefreshLayout;
 
-        @BindView(R.id.chat_list)
-        RecyclerView chatRecyclerView;
+    @BindView(R.id.chat_list)
+    RecyclerView chatRecyclerView;
 
-        List<ChatMessage> messages;
-        ChatRecyclerViewAdapter chatAdapter;
-        String chatRoomUser;
-        String replyToUserUUID;
+    List<ChatMessage> messages;
+    ChatRecyclerViewAdapter chatAdapter;
+    String chatRoomUser;
+    String replyToUserUUID;
 
-        public InboxMessageListFragment() {
-            messages = new ArrayList<ChatMessage>();
+    public InboxMessageListFragment() {
+        messages = new ArrayList<ChatMessage>();
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+
+        View view = inflater.inflate(R.layout.fragment_inbox_message_list, 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, false);
+        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.apiHelper.retrieveUser(true)
+                .compose(apiHelper.configureApiCallObserver())
+                .subscribe(new HabitRPGUserCallback(this), 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);
         }
 
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                                 Bundle savedInstanceState) {
-            super.onCreateView(inflater, container, savedInstanceState);
+        Collections.sort(this.messages,
+                (message1, message2) -> message2.timestamp.compareTo(message1.timestamp));
 
-            View view = inflater.inflate(R.layout.fragment_inbox_message_list, 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, false);
-            chatAdapter.setToInboxChat(this.replyToUserUUID);
-            chatAdapter.setSendingUser(this.user);
-            chatRecyclerView.setAdapter(chatAdapter);
-
-            return view;
+        if (this.chatAdapter != null) {
+            chatAdapter.setToInboxChat(replyToUserUUID);
+            this.chatAdapter.setMessages(this.messages);
         }
+    }
 
-        @Override
-        public void injectFragment(AppComponent component) {
-            component.inject(this);
-        }
+    @Override
+    public void onUserReceived(HabitRPGUser user) {
+        this.user = user;
+        this.setMessages(user.getInbox().getMessages(), this.chatRoomUser, this.replyToUserUUID);
+        swipeRefreshLayout.setRefreshing(false);
+    }
 
-        private void refreshUserInbox () {
-            this.swipeRefreshLayout.setRefreshing(true);
-            this.apiHelper.retrieveUser(true)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(new HabitRPGUserCallback(this), throwable -> {});
-        }
+    @Subscribe
+    public void onEvent(SendNewInboxMessageCommand cmd) {
+        HashMap<String, String> messageObject = new HashMap<>();
+        messageObject.put("message", cmd.Message);
+        messageObject.put("toUserId", cmd.UserToSendTo);
 
-        @Override
-        public void onRefresh() {
-            this.refreshUserInbox();
-        }
+        apiHelper.apiService.postPrivateMessage(messageObject)
+                .compose(apiHelper.configureApiCallObserver())
+                .subscribe(postChatMessageResult -> {
+                    this.refreshUserInbox();
+                }, throwable -> {
+                });
 
-        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) {
-            HashMap<String, String> messageObject = new HashMap<>();
-            messageObject.put("message", cmd.Message);
-            messageObject.put("toUserId", cmd.UserToSendTo);
-
-            apiHelper.apiService.postPrivateMessage(messageObject)
-                    .compose(apiHelper.configureApiCallObserver())
-                    .subscribe(postChatMessageResult -> {
-                        this.refreshUserInbox();
-                    }, throwable -> {
-                    });
-
-            UiUtils.dismissKeyboard(HabiticaApplication.currentActivity);
-        }
+        UiUtils.dismissKeyboard(HabiticaApplication.currentActivity);
+    }
 
 
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java
index 4ee2b32e6..f83623777 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
@@ -89,9 +89,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();
+        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(this.activity, R.color.white));
         guildSearchView.setQueryHint(getString(R.string.guild_search_hint));
         guildSearchView.setOnQueryTextListener(this);
 
@@ -110,6 +110,8 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
         return true;
     }
 
-	@Override
-	public String customTitle() {	return getString(R.string.public_guilds);	}
+    @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 ed90857d4..e201f32ce 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
@@ -14,8 +14,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import java.util.Locale;
-
 import javax.inject.Inject;
 
 public class TavernFragment extends BaseMainFragment {
@@ -134,6 +132,8 @@ public class TavernFragment extends BaseMainFragment {
         }
     }
 
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_tavern);	}
+    @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/ChallegeDetailDialogHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java
index 3e7428adf..ab4f5ce33 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java
@@ -1,16 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.social.challenges;
 
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
@@ -18,7 +7,6 @@ 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.ui.helpers.ViewHelper;
 import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
@@ -28,6 +16,16 @@ import net.pherth.android.emoji_library.EmojiTextView;
 
 import org.greenrobot.eventbus.EventBus;
 
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
 import java.util.ArrayList;
 import java.util.Map;
 
@@ -82,6 +80,18 @@ public class ChallegeDetailDialogHolder {
         ButterKnife.bind(this, view);
     }
 
+    public static void showDialog(Activity activity, APIHelper apiHelper, HabitRPGUser user, Challenge challenge,
+                                  Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
+        View dialogLayout = activity.getLayoutInflater().inflate(R.layout.dialog_challenge_detail, null);
+
+        ChallegeDetailDialogHolder challegeDetailDialogHolder = new ChallegeDetailDialogHolder(dialogLayout, activity);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+                .setView(dialogLayout);
+
+        challegeDetailDialogHolder.bind(builder.show(), apiHelper, user, challenge, challengeJoinedAction, challengeLeftAction);
+    }
+
     public void bind(AlertDialog dialog, APIHelper apiHelper, HabitRPGUser user, Challenge challenge,
                      Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
         this.dialog = dialog;
@@ -195,13 +205,13 @@ public class ChallegeDetailDialogHolder {
             TextView title = (TextView) entry.findViewById(R.id.daily_title);
             title.setText(EmojiParser.parseEmojis(task.text));
 
-            if(task.checklist != null && !task.checklist.isEmpty()){
+            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(task.checklist.size()+"");
+                TextView checkListAllTextView = (TextView) entry.findViewById(R.id.checkListAllTextView);
+                checkListAllTextView.setText(task.checklist.size() + "");
             }
 
             tasks_layout.addView(entry);
@@ -228,13 +238,13 @@ public class ChallegeDetailDialogHolder {
 
             tasks_layout.addView(entry);
 
-            if(task.checklist != null && !task.checklist.isEmpty()){
+            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(task.checklist.size()+"");
+                TextView checkListAllTextView = (TextView) entry.findViewById(R.id.checkListAllTextView);
+                checkListAllTextView.setText(task.checklist.size() + "");
             }
         }
 
@@ -328,17 +338,4 @@ public class ChallegeDetailDialogHolder {
             dialog.dismiss();
         }).show();
     }
-
-
-    public static void showDialog(Activity activity, APIHelper apiHelper, HabitRPGUser user, Challenge challenge,
-                                  Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
-        View dialogLayout = activity.getLayoutInflater().inflate(R.layout.dialog_challenge_detail, null);
-
-        ChallegeDetailDialogHolder challegeDetailDialogHolder = new ChallegeDetailDialogHolder(dialogLayout, activity);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
-                .setView(dialogLayout);
-
-        challegeDetailDialogHolder.bind(builder.show(), apiHelper, user, challenge, challengeJoinedAction, challengeLeftAction);
-    }
 }
\ No newline at end of file
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 17b716fc4..833dbf281 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,14 +1,5 @@
 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 com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter;
@@ -18,6 +9,15 @@ import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 import com.raizlabs.android.dbflow.sql.language.Where;
 
+import android.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 java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -184,6 +184,8 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
         challengeAdapter.replaceChallenge(challenge);
     }
 
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_challenges);	}
+    @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 036f128b4..eccb79d65 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
@@ -217,7 +217,7 @@ public class ChallengeTasksRecyclerViewFragment extends BaseFragment {
         public DividerViewHolder(View itemView) {
             super(itemView, false);
 
-            divider_name = (TextView)itemView.findViewById(R.id.divider_name);
+            divider_name = (TextView) itemView.findViewById(R.id.divider_name);
 
             context = itemView.getContext();
         }
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 bd33e9440..305cd604f 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,14 +1,5 @@
 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.HabiticaApplication;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
@@ -22,21 +13,30 @@ 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.Stack;
 
-import rx.Observable;
-import rx.subjects.AsyncSubject;
 import rx.subjects.PublishSubject;
 
 public class ChallengesOverviewFragment extends BaseMainFragment {
 
     public ViewPager viewPager;
     public FragmentStatePagerAdapter statePagerAdapter;
+    int currentPage;
     private Stack<Integer> pageHistory;
     private boolean saveToHistory;
-    int currentPage;
     private PublishSubject<ArrayList<Challenge>> getUserChallengesObservable;
+    private ChallengeListFragment userChallengesFragment;
+    private ChallengeListFragment availableChallengesFragment;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -70,7 +70,7 @@ public class ChallengesOverviewFragment extends BaseMainFragment {
         return v;
     }
 
-    private void subscribeGetChallenges(){
+    private void subscribeGetChallenges() {
         this.apiHelper.apiService.getUserChallenges()
                 .compose(apiHelper.configureApiCallObserver())
                 .subscribe(challenges -> {
@@ -85,9 +85,6 @@ public class ChallengesOverviewFragment extends BaseMainFragment {
         component.inject(this);
     }
 
-    private ChallengeListFragment userChallengesFragment;
-    private ChallengeListFragment availableChallengesFragment;
-
     public void setViewPagerAdapter() {
         android.support.v4.app.FragmentManager fragmentManager = getChildFragmentManager();
 
@@ -153,7 +150,7 @@ public class ChallengesOverviewFragment extends BaseMainFragment {
     public void onEvent(ShowChallengeDetailDialogCommand cmd) {
         Challenge challenge = new Select().from(Challenge.class).where(Condition.column("id").is(cmd.challengeId)).querySingle();
 
-        ChallegeDetailDialogHolder.showDialog(HabiticaApplication.currentActivity, apiHelper, user, challenge, challenge1 ->  {
+        ChallegeDetailDialogHolder.showDialog(HabiticaApplication.currentActivity, apiHelper, user, challenge, challenge1 -> {
             // challenge joined
             userChallengesFragment.addItem(challenge1);
             availableChallengesFragment.updateItem(challenge1);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
index eff786fc7..600c4bdf5 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,8 +3,6 @@ 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.events.commands.OpenFullProfileCommand;
-import com.habitrpg.android.habitica.ui.activities.FullProfileActivity;
 import com.habitrpg.android.habitica.ui.activities.GroupFormActivity;
 import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
@@ -19,7 +17,6 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -27,8 +24,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import org.greenrobot.eventbus.Subscribe;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -41,14 +36,12 @@ import javax.inject.Inject;
 public class PartyFragment extends BaseMainFragment {
 
     public ViewPager viewPager;
+    @Inject
+    ContentCache contentCache;
     private Group group;
-
     private PartyMemberListFragment partyMemberListFragment;
     private GroupInformationFragment groupInformationFragment;
     private ChatListFragment chatListFragment;
-
-    @Inject
-    ContentCache contentCache;
     private FragmentPagerAdapter viewPagerAdapter;
 
     @Override
@@ -358,7 +351,9 @@ public class PartyFragment extends BaseMainFragment {
     }
 
 
-	@Override
-	public String customTitle() {	return getString(R.string.sidebar_party);	}
+    @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/PartyMemberListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java
index 63a973b41..e03321fb4 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
@@ -67,7 +67,7 @@ public class PartyMemberListFragment extends BaseFragment {
 
     public void setMemberList(List<HabitRPGUser> members) {
         this.members = members;
-        viewAdapter.setMemberList(members,  false);
+        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 a42ac1a98..a2fb279f2 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,15 +1,5 @@
 package com.habitrpg.android.habitica.ui.fragments.tasks;
 
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.components.AppComponent;
@@ -29,13 +19,22 @@ 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.menu.DividerItemDecoration;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
+import android.graphics.Color;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
 import javax.inject.Inject;
 import javax.inject.Named;
 
@@ -105,7 +104,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
         }
     }
 
-    private void allowReordering(){
+    private void allowReordering() {
         ItemTouchHelper itemTouchHelper = new ItemTouchHelper(mItemTouchCallback);
         itemTouchHelper.attachToRecyclerView(recyclerView);
     }
@@ -118,19 +117,20 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
             @Override
             public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
                 super.onSelectedChanged(viewHolder, actionState);
-                if (viewHolder != null){
+                if (viewHolder != null) {
                     viewHolder.itemView.setBackgroundColor(Color.LTGRAY);
                 }
             }
 
             public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
                 if (mFromPosition == null) mFromPosition = viewHolder.getAdapterPosition();
-                ((ItemTouchHelperAdapter)recyclerAdapter).onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition());
+                ((ItemTouchHelperAdapter) recyclerAdapter).onItemMove(viewHolder.getAdapterPosition(), target.getAdapterPosition());
                 return true;
             }
 
             @Override
-            public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {}
+            public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+            }
 
             //defines the enabled move directions in each state (idle, swiping, dragging).
             @Override
@@ -144,8 +144,8 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
                 super.clearView(recyclerView, viewHolder);
 
                 viewHolder.itemView.setBackgroundColor(Color.WHITE);
-                if (mFromPosition != null){
-                    ((ItemTouchHelperDropCallback)recyclerAdapter).onDrop(mFromPosition, viewHolder.getAdapterPosition());
+                if (mFromPosition != null) {
+                    ((ItemTouchHelperDropCallback) recyclerAdapter).onDrop(mFromPosition, viewHolder.getAdapterPosition());
                 }
             }
         };
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 a5357eb06..2032d667b 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
@@ -219,10 +219,12 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
                 TaskRecyclerViewFragment fragment;
                 SortableTasksRecyclerViewAdapter.SortTasksCallback sortCallback =
                         (task, from, to) -> {
-                            if (apiHelper != null){
+                            if (apiHelper != null) {
                                 apiHelper.apiService.postTaskNewPosition(task.getId(), String.valueOf(to))
                                         .compose(apiHelper.configureApiCallObserver())
-                                        .subscribe(aVoid -> {}, e -> {});
+                                        .subscribe(aVoid -> {
+                                        }, e -> {
+                                        });
                             }
                         };
 
@@ -363,7 +365,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
         final Tag t = event.tag;
         final String uuid = event.uuid;
         if (apiHelper != null) {
-            apiHelper.apiService.updateTag(uuid,t)
+            apiHelper.apiService.updateTag(uuid, t)
                     .compose(apiHelper.configureApiCallObserver())
                     .subscribe(tag -> {
                         UiUtils.dismissKeyboard(this.activity);
@@ -424,8 +426,8 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
 
     @Subscribe
     public void onEvent(ToggledEditTagsEvent event) {
-        if(user != null) {
-            if(this.editingTags == event.editing) {
+        if (user != null) {
+            if (this.editingTags == event.editing) {
                 return;
             }
             this.editingTags = event.editing;
@@ -439,7 +441,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
         if (this.tagsHelper != null) {
             List<IDrawerItem> items = new ArrayList<>();
 
-            if(this.editingTags) {
+            if (this.editingTags) {
                 items.add(new EditTagsSectionDrawer().withEditing(this.editingTags).withName(getString(R.string.filter_drawer_edit_tags)));
                 items.add(new EditTextDrawer());
                 if (tagList != null) {
@@ -453,7 +455,7 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
                 if (isAdded()) {
                     this.activity.fillFilterDrawer(items);
                 }
-            }else {
+            } else {
                 items.add(new EditTagsSectionDrawer().withEditing(this.editingTags).withName(getString(R.string.filter_drawer_filter_tags)));
                 items.add(new EditTextDrawer());
                 if (tagList != null) {
@@ -475,12 +477,12 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
 
     public void addTagFilterDrawerItem(Tag tag) {
         if (this.tagsHelper != null) {
-            if(this.editingTags) {
+            if (this.editingTags) {
                 IDrawerItem item = new EditTagsDrawerItem()
                         .withName(tag.getName())
                         .withTag(tag);
                 this.activity.addFilterDrawerItem(item);
-            }else {
+            } else {
                 IDrawerItem item = new SwitchDrawerItem()
                         .withName(tag.getName())
                         .withTag(tag)
@@ -507,18 +509,18 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
             int pos = tags.indexOf(t) + 2;
             IDrawerItem item;
 
-            if(this.editingTags) {
+            if (this.editingTags) {
                 item = new EditTagsDrawerItem()
                         .withName(t.getName())
                         .withTag(t);
-            }else {
+            } else {
                 item = new SwitchDrawerItem()
                         .withName(t.getName())
                         .withTag(t)
                         .withChecked(this.tagsHelper.isTagChecked(t.getId()))
                         .withOnCheckedChangeListener(this);
             }
-            this.activity.updateFilterDrawerItem(item,pos);
+            this.activity.updateFilterDrawerItem(item, pos);
         }
     }
 
@@ -587,13 +589,13 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
 
         Button btnDelete = null;
 
-        final View editTagDialogView = this.activity.getLayoutInflater().inflate(R.layout.dialog_edit_tag,null);
+        final View editTagDialogView = this.activity.getLayoutInflater().inflate(R.layout.dialog_edit_tag, null);
 
-        if(editTagDialogView != null) {
-            EditText tagEditText = (EditText)editTagDialogView.findViewById(R.id.tagEditText);
+        if (editTagDialogView != null) {
+            EditText tagEditText = (EditText) editTagDialogView.findViewById(R.id.tagEditText);
             tagEditText.setText(tag.getName());
 
-            btnDelete = (Button)editTagDialogView.findViewById(R.id.btnDelete);
+            btnDelete = (Button) editTagDialogView.findViewById(R.id.btnDelete);
             ViewHelper.SetBackgroundTint(btnDelete, ContextCompat.getColor(this.activity, R.color.worse_10));
         }
 
@@ -601,21 +603,23 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
                 .setTitle(getString(R.string.edit_tag_title))
                 .setPositiveButton(getString(R.string.save_changes), null)
                 .setNeutralButton(getString(R.string.dialog_go_back), (dialog, which) -> {
-                    EditText tagEditText = (EditText)editTagDialogView.findViewById(R.id.tagEditText);
-                    UiUtils.dismissKeyboard(this.activity,tagEditText);
+                    EditText tagEditText = (EditText) editTagDialogView.findViewById(R.id.tagEditText);
+                    UiUtils.dismissKeyboard(this.activity, tagEditText);
                     dialog.cancel();
                 })
                 .create();
-        btnDelete.setOnClickListener((View v) -> {showDeleteTagDialog(alert,tag);});
+        btnDelete.setOnClickListener((View v) -> {
+            showDeleteTagDialog(alert, tag);
+        });
         alert.setView(editTagDialogView);
         alert.show();
 
-        alert.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener(){
+        alert.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View view) {
-                EditText tagEditText = (EditText)editTagDialogView.findViewById(R.id.tagEditText);
-                if(attemptUpdateTag(tagEditText,tag)) {
+                EditText tagEditText = (EditText) editTagDialogView.findViewById(R.id.tagEditText);
+                if (attemptUpdateTag(tagEditText, tag)) {
                     alert.dismiss();
                 }
             }
@@ -626,14 +630,14 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
         String newTagName = tagEditText.getText().toString();
         boolean dismiss = true;
 
-        if(newTagName.equals("")) {
+        if (newTagName.equals("")) {
             dismiss = false;
             return dismiss;
         }
 
-        UiUtils.dismissKeyboard(activity,tagEditText);
+        UiUtils.dismissKeyboard(activity, tagEditText);
 
-        if(newTagName.equals(tag.getName())) {
+        if (newTagName.equals(tag.getName())) {
             return dismiss;
         }
 
@@ -646,14 +650,14 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
     public void showDeleteTagDialog(AlertDialog d, Tag tag) {
         AlertDialog confirmDeleteAlert = new AlertDialog.Builder(this.activity)
                 .setTitle(getString(R.string.confirm_delete_tag_title)).setMessage(getString(R.string.confirm_delete_tag_message))
-                .setPositiveButton(getString(R.string.yes),(dialog,which) -> {
+                .setPositiveButton(getString(R.string.yes), (dialog, which) -> {
                     EventBus.getDefault().post(new DeleteTagCommand(tag));
-                    UiUtils.dismissKeyboard(this.activity,d.getCurrentFocus());
+                    UiUtils.dismissKeyboard(this.activity, d.getCurrentFocus());
                     //dismiss both dialogs
                     dialog.dismiss();
                     d.dismiss();
                 })
-                .setNegativeButton(getString(R.string.no),(dialog, which) -> {
+                .setNegativeButton(getString(R.string.no), (dialog, which) -> {
                     dialog.dismiss();
                 })
                 .create();
@@ -661,6 +665,8 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
     }
 
 
-	@Override
-	public String customTitle() { return null; }
+    @Override
+    public String customTitle() {
+        return null;
+    }
 }
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 5bce5b38c..91f96e5f4 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
@@ -32,12 +32,12 @@ public class UiUtils {
      * 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 view     View that currently has focus
      * @param activity - Current activity
      */
     public static void dismissKeyboard(Activity activity, View view) {
         InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        if(view != null) {
+        if (view != null) {
             imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsDrawerItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsDrawerItem.java
index e24c50168..30a1d09b1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsDrawerItem.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsDrawerItem.java
@@ -70,7 +70,7 @@ public class EditTagsDrawerItem extends BasePrimaryDrawerItem<EditTagsDrawerItem
         ViewHelper.SetBackgroundTint(viewHolder.btnEdit, ContextCompat.getColor(ctx, R.color.brand));
         viewHolder.btnEdit.setEnabled(true);
 
-        viewHolder.tag = (Tag)this.getTag();
+        viewHolder.tag = (Tag) this.getTag();
 
         //call the onPostBindView method to trigger post bind view actions (like the listener to modify the item if required)
         onPostBindView(this, viewHolder.itemView);
@@ -94,15 +94,15 @@ public class EditTagsDrawerItem extends BasePrimaryDrawerItem<EditTagsDrawerItem
 
         private ViewHolder(View view) {
             super(view);
-            tagTextView = (TextView)view.findViewById(R.id.tagTextView);
+            tagTextView = (TextView) view.findViewById(R.id.tagTextView);
 
-            btnEdit = (Button)view.findViewById(R.id.btnEdit);
+            btnEdit = (Button) view.findViewById(R.id.btnEdit);
             btnEdit.setOnClickListener(this);
         }
 
         @Override
         public void onClick(View view) {
-            if(this.tag != null) {
+            if (this.tag != null) {
                 EventBus.getDefault().post(new EditTagCommand(this.tag));
                 //EventBus.getDefault().post(new DeleteTagCommand(this.tag));
             }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsSectionDrawer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsSectionDrawer.java
index 2f0151e52..086ad693c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsSectionDrawer.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTagsSectionDrawer.java
@@ -1,5 +1,7 @@
 package com.habitrpg.android.habitica.ui.menu;
 
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.events.ToggledEditTagsEvent;
 import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
 import com.mikepenz.fastadapter.utils.ViewHolderFactory;
 import com.mikepenz.materialdrawer.holder.ColorHolder;
@@ -9,9 +11,6 @@ import com.mikepenz.materialdrawer.model.interfaces.Nameable;
 import com.mikepenz.materialdrawer.model.interfaces.Typefaceable;
 import com.mikepenz.materialize.util.UIUtils;
 
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.events.ToggledEditTagsEvent;
-
 import org.greenrobot.eventbus.EventBus;
 
 import android.content.Context;
@@ -131,9 +130,9 @@ public class EditTagsSectionDrawer extends AbstractDrawerItem<EditTagsSectionDra
 
         viewHolder.editing = this.editing;
 
-        if(this.editing) {
+        if (this.editing) {
             viewHolder.btnEdit.setText(ctx.getString(R.string.edit_tag_btn_done));
-        }else {
+        } else {
             viewHolder.btnEdit.setText(ctx.getString(R.string.edit_tag_btn_edit));
         }
 
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 3276e9ce1..0fd7ded68 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
@@ -14,10 +14,10 @@ import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemsFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.shops.ShopsFragment;
 import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragment;
 import com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment;
-import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengesOverviewFragment;
 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.TavernFragment;
+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.tasks.TasksFragment;
 import com.mikepenz.materialdrawer.AccountHeader;
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 421c92bef..f5980cc17 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
@@ -72,8 +72,7 @@ public abstract class BaseTaskViewHolder extends RecyclerView.ViewHolder impleme
         itemView.setOnClickListener(this);
         itemView.setClickable(true);
 
-        if(useButterKnife)
-        {
+        if (useButterKnife) {
             ButterKnife.bind(this, itemView);
         }
 
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 4e8041435..86c3116b6 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
@@ -6,7 +6,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 
 import org.greenrobot.eventbus.EventBus;
 
-import android.graphics.Color;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
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 3dc6f4524..451d90fac 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,20 +1,17 @@
 package com.habitrpg.android.habitica.widget;
 
+import com.habitrpg.android.habitica.R;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.widget.RemoteViews;
 
-import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-
 public class AddTaskWidgetProvider extends BaseWidgetProvider {
 
     @Override
@@ -69,6 +66,6 @@ public class AddTaskWidgetProvider extends BaseWidgetProvider {
 
     private String getSelectedTaskType(int widgetId) {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this.context);
-        return preferences.getString("add_task_widget_"+widgetId, Task.TYPE_HABIT);
+        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 130b14c18..0b000cf0e 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
@@ -28,18 +28,33 @@ import javax.inject.Inject;
 
 public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
     private static final String LOG = AvatarStatsWidgetProvider.class.getName();
+    @Inject
+    APIHelper apiHelper;
+    @Inject
+    HostConfig hostConfig;
     private AppWidgetManager appWidgetManager;
+    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
+        @Override
+        public void onResultReceived(HabitRPGUser habitRPGUser) {
+            updateData(habitRPGUser);
+        }
+
+        @Override
+        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
+            return true;
+        }
+
+        @Override
+        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
+            return true;
+        }
+    };
 
     @Override
     public int layoutResourceId() {
         return R.layout.widget_avatar_stats;
     }
 
-    @Inject
-    APIHelper apiHelper;
-    @Inject
-    HostConfig hostConfig;
-
     private void setUp(Context context) {
         if (apiHelper == null) {
             HabiticaBaseApplication application = HabiticaApplication.getInstance(context);
@@ -59,7 +74,6 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
         new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).async().querySingle(userTransactionListener);
     }
 
-
     @Override
     public RemoteViews configureRemoteViews(RemoteViews remoteViews, int widgetId, int columns, int rows) {
         if (columns > 3) {
@@ -79,23 +93,6 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
         return remoteViews;
     }
 
-    private TransactionListener<HabitRPGUser> userTransactionListener = new TransactionListener<HabitRPGUser>() {
-        @Override
-        public void onResultReceived(HabitRPGUser habitRPGUser) {
-            updateData(habitRPGUser);
-        }
-
-        @Override
-        public boolean onReady(BaseTransaction<HabitRPGUser> baseTransaction) {
-            return true;
-        }
-
-        @Override
-        public boolean hasResult(BaseTransaction<HabitRPGUser> baseTransaction, HabitRPGUser habitRPGUser) {
-            return true;
-        }
-    };
-
     private void updateData(HabitRPGUser user) {
         if (user == null || user.getStats() == null) {
             return;
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 d0997eca8..2b6825f2f 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,22 +1,20 @@
 package com.habitrpg.android.habitica.widget;
 
+import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
+import com.magicmicky.habitrpgwrapper.lib.models.Stats;
+import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
+import com.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;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.View;
 import android.widget.RemoteViews;
 import android.widget.Toast;
 
-import com.habitrpg.android.habitica.R;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
-
 import static com.habitrpg.android.habitica.ui.activities.MainActivity.MIN_LEVEL_FOR_SKILLS;
 import static com.habitrpg.android.habitica.ui.activities.MainActivity.round;
 
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 b586ab23a..3b5ed8dfb 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,11 +1,11 @@
 package com.habitrpg.android.habitica.widget;
 
-import android.content.Context;
-import android.content.Intent;
-
 import com.habitrpg.android.habitica.R;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 
+import android.content.Context;
+import android.content.Intent;
+
 
 public class DailiesListFactory extends TaskListFactory {
     public DailiesListFactory(Context context, Intent intent) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java
index a97f2a3cf..f794285ab 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,16 +1,16 @@
 package com.habitrpg.android.habitica.widget;
 
-import android.content.Context;
-
 import com.habitrpg.android.habitica.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
 
+import android.content.Context;
+
 import javax.inject.Inject;
 
-public class DailiesWidgetProvider extends TaskListWidgetProvider{
+public class DailiesWidgetProvider extends TaskListWidgetProvider {
 
     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";
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 30f745b2f..3f6f66140 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,5 +1,14 @@
 package com.habitrpg.android.habitica.widget;
 
+import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HabiticaBaseApplication;
+import com.habitrpg.android.habitica.HostConfig;
+import com.habitrpg.android.habitica.R;
+import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
+import com.raizlabs.android.dbflow.sql.builder.Condition;
+import com.raizlabs.android.dbflow.sql.language.Select;
+
 import android.appwidget.AppWidgetManager;
 import android.content.ComponentName;
 import android.content.Context;
@@ -7,26 +16,9 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.widget.RemoteViews;
-import android.widget.Toast;
-
-import com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.HabiticaBaseApplication;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.R;
-import com.habitrpg.android.habitica.ui.helpers.UiUtils;
-import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
-import com.magicmicky.habitrpgwrapper.lib.models.Stats;
-import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
-import com.raizlabs.android.dbflow.sql.builder.Condition;
-import com.raizlabs.android.dbflow.sql.language.Select;
 
 import javax.inject.Inject;
 
-import static com.habitrpg.android.habitica.ui.activities.MainActivity.MIN_LEVEL_FOR_SKILLS;
-import static com.habitrpg.android.habitica.ui.activities.MainActivity.round;
-
 public class HabitButtonWidgetProvider extends BaseWidgetProvider {
 
     public static final String HABIT_ACTION = "com.habitrpg.android.habitica.HABIT_ACTION";
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 a5411ee79..bea5e5e68 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,18 +1,5 @@
 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.net.Uri;
-import android.os.IBinder;
-import android.view.View;
-import android.widget.RemoteViews;
-
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HostConfig;
 import com.habitrpg.android.habitica.R;
@@ -23,6 +10,18 @@ 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;
+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.view.View;
+import android.widget.RemoteViews;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -41,6 +40,22 @@ public class HabitButtonWidgetService extends Service {
 
     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) {
@@ -60,23 +75,6 @@ public class HabitButtonWidgetService extends Service {
         return START_STICKY;
     }
 
-    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;
-        }
-    };
-
     private void updateData(Task task) {
         RemoteViews remoteViews = new RemoteViews(this.getPackageName(), R.layout.widget_habit_button);
         if (task != null) {
@@ -96,7 +94,7 @@ public class HabitButtonWidgetService extends Service {
             } else {
                 remoteViews.setViewVisibility(R.id.btnMinusWrapper, View.VISIBLE);
                 remoteViews.setInt(R.id.btnMinus, "setBackgroundColor", resources.getColor(task.getMediumTaskColor()));
-                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, getPendingIntent(task.getId(), TaskDirection.down.toString() , taskMapping.get(task.getId())));
+                remoteViews.setOnClickPendingIntent(R.id.btnMinusWrapper, getPendingIntent(task.getId(), TaskDirection.down.toString(), taskMapping.get(task.getId())));
             }
             appWidgetManager.updateAppWidget(taskMapping.get(task.getId()), remoteViews);
         }
@@ -118,7 +116,7 @@ public class HabitButtonWidgetService extends Service {
     }
 
     private String getTaskId(int widgetId) {
-        return sharedPreferences.getString("habit_button_widget_"+widgetId, "");
+        return sharedPreferences.getString("habit_button_widget_" + widgetId, "");
     }
 
     private PendingIntent getPendingIntent(String taskId, String direction, int widgetId) {
@@ -127,7 +125,7 @@ public class HabitButtonWidgetService extends Service {
         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,
+        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 957b40d3a..1ef5b7106 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,13 +1,5 @@
 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.ui.helpers.MarkdownParser;
@@ -19,6 +11,14 @@ 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;
+import android.text.SpannableStringBuilder;
+import android.text.style.DynamicDrawableSpan;
+import android.widget.RemoteViews;
+import android.widget.RemoteViewsService;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,6 +31,9 @@ import rx.schedulers.Schedulers;
 
 public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsFactory {
     private final int widgetId;
+    @Inject
+    @Named("UserID")
+    public String userID;
     private Integer customDayStart;
     private int listItemResId;
     private int listItemTextResId;
@@ -39,10 +42,6 @@ public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsF
     private Context context = null;
     private boolean reloadData;
 
-    @Inject
-    @Named("UserID")
-    public String userID;
-
     public TaskListFactory(Context context, Intent intent, String taskType, int listItemResId, int listItemTextResId) {
         this.context = context;
         this.widgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, 0);
@@ -60,7 +59,8 @@ public abstract class TaskListFactory implements RemoteViewsService.RemoteViewsF
                     .subscribe(habitRPGUser -> {
                         customDayStart = habitRPGUser.getPreferences().getDayStart();
                         this.loadData();
-                    }, throwable -> {});
+                    }, throwable -> {
+                    });
         } else {
             this.loadData();
         }
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 1a2b77177..8ce0bd9f6 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,15 +1,5 @@
 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.APIHelper;
 import com.habitrpg.android.habitica.HabiticaApplication;
 import com.habitrpg.android.habitica.HabiticaBaseApplication;
@@ -21,6 +11,16 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
 
+import android.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;
 
 public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
@@ -40,7 +40,9 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
     }
 
     protected abstract Class getServiceClass();
+
     protected abstract Class getProviderClass();
+
     protected abstract int getTitleResId();
 
 
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 d0744d757..5ba153e73 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,11 +1,11 @@
 package com.habitrpg.android.habitica.widget;
 
-import android.content.Context;
-import android.content.Intent;
-
 import com.habitrpg.android.habitica.R;
 import com.magicmicky.habitrpgwrapper.lib.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);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListWidgetProvider.java
index 4511cd8cd..aafd4e9e6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListWidgetProvider.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListWidgetProvider.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.widget;
 
 import com.habitrpg.android.habitica.R;
 
-public class TodoListWidgetProvider extends TaskListWidgetProvider{
+public class TodoListWidgetProvider extends TaskListWidgetProvider {
 
     @Override
     protected Class getServiceClass() {
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
index c12ffde1c..bd094ab4b 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
@@ -1,11 +1,9 @@
 package com.magicmicky.habitrpgwrapper.lib.api;
 
 import com.magicmicky.habitrpgwrapper.lib.models.AchievementResult;
-import android.databinding.ObservableList;
-
+import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
 import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
 import com.magicmicky.habitrpgwrapper.lib.models.ContentResult;
-import com.magicmicky.habitrpgwrapper.lib.models.Gear;
 import com.magicmicky.habitrpgwrapper.lib.models.Group;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.Items;
@@ -29,7 +27,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.responses.UnlockResponse;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
-import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Challenge.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Challenge.java
index 4e833e3b8..433c23f3a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Challenge.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Challenge.java
@@ -1,7 +1,6 @@
 package com.magicmicky.habitrpgwrapper.lib.models;
 
 import com.habitrpg.android.habitica.HabitDatabase;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.NotNull;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
@@ -72,26 +71,22 @@ public class Challenge extends BaseModel {
 
     public HabitRPGUser leader;
 
-    public HashMap<String, String[]> getTasksOrder(){
+    public HashMap<String, String[]> getTasksOrder() {
         HashMap<String, String[]> map = new HashMap();
 
-        if(!dailyList.isEmpty())
-        {
+        if (!dailyList.isEmpty()) {
             map.put(TASK_ORDER_DAILYS, dailyList.split(","));
         }
 
-        if(!habitList.isEmpty())
-        {
+        if (!habitList.isEmpty()) {
             map.put(TASK_ORDER_HABITS, habitList.split(","));
         }
 
-        if(!rewardList.isEmpty())
-        {
+        if (!rewardList.isEmpty()) {
             map.put(TASK_ORDER_REWARDS, rewardList.split(","));
         }
 
-        if(!todoList.isEmpty())
-        {
+        if (!todoList.isEmpty()) {
             map.put(TASK_ORDER_TODOS, todoList.split(","));
         }
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContributorInfo.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContributorInfo.java
index 27c5a4c01..04d38aa76 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContributorInfo.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ContributorInfo.java
@@ -2,6 +2,7 @@ package com.magicmicky.habitrpgwrapper.lib.models;
 
 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;
@@ -55,38 +56,38 @@ public class ContributorInfo extends BaseModel {
     @Expose
     private String text;
 
-    public void setAdmin(Boolean admin) {
-        this.admin = admin;
-    }
-
     public Boolean getAdmin() {
         return this.admin;
     }
 
-    public void setContributions(String contributions) {
-        this.contributions = contributions;
+    public void setAdmin(Boolean admin) {
+        this.admin = admin;
     }
 
     public String getContributions() {
         return this.contributions;
     }
 
-    public void setLevel(int level) {
-        this.level = level;
+    public void setContributions(String contributions) {
+        this.contributions = contributions;
     }
 
     public int getLevel() {
         return this.level;
     }
 
-    public void setText(String text) {
-        this.text = text;
+    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;
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
index d5c12f4c3..6e2325681 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java
@@ -135,7 +135,7 @@ public class HabitRPGUser extends BaseModel {
         this.challengeList = challenges;
     }
 
-    public void resetChallengeList(){
+    public void resetChallengeList() {
         challengeList = null;
     }
 
@@ -159,19 +159,18 @@ public class HabitRPGUser extends BaseModel {
         return stats;
     }
 
-    public void setInbox(Inbox inbox) {
-        this.inbox = inbox;
+    public void setStats(Stats stats) {
+        this.stats = stats;
     }
 
     public Inbox getInbox() {
         return inbox;
     }
 
-    public void setStats(Stats stats) {
-        this.stats = stats;
+    public void setInbox(Inbox inbox) {
+        this.inbox = inbox;
     }
 
-
     public Profile getProfile() {
         return profile;
     }
@@ -361,8 +360,12 @@ public class HabitRPGUser extends BaseModel {
         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 (purchased != null) {
+            purchased.user_id = id;
+        }
+        if (contributor != null) {
+            contributor.user_id = id;
+        }
         if (invitations != null) {
             invitations.user_id = id;
         }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Inbox.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Inbox.java
index 59064507f..83cfbec65 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Inbox.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Inbox.java
@@ -2,9 +2,9 @@ package com.magicmicky.habitrpgwrapper.lib.models;
 
 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;
@@ -22,7 +22,7 @@ public class Inbox extends BaseModel {
     @Column
     @PrimaryKey
 //    @NotNull
-    String user_Id;
+            String user_Id;
 
     @SerializedName("optOut")
     @Expose
@@ -41,72 +41,56 @@ public class Inbox extends BaseModel {
     private Integer newMessages;
 
     /**
-     *
-     * @return
-     * The optOut
+     * @return The optOut
      */
     public Boolean getOptOut() {
         return optOut;
     }
 
     /**
-     *
-     * @param optOut
-     * The optOut
+     * @param optOut The optOut
      */
     public void setOptOut(Boolean optOut) {
         this.optOut = optOut;
     }
 
     /**
-     *
-     * @return
-     * The messages
+     * @return The messages
      */
     public Map<String, ChatMessage> getMessages() {
         return messages;
     }
 
     /**
-     *
-     * @param messages
-     * The messages
+     * @param messages The messages
      */
     public void setMessages(Map<String, ChatMessage> messages) {
         this.messages = messages;
     }
 
     /**
-     *
-     * @return
-     * The blocks
+     * @return The blocks
      */
     public List<Object> getBlocks() {
         return blocks;
     }
 
     /**
-     *
-     * @param blocks
-     * The blocks
+     * @param blocks The blocks
      */
     public void setBlocks(List<Object> blocks) {
         this.blocks = blocks;
     }
 
     /**
-     *
-     * @return
-     * The newMessages
+     * @return The newMessages
      */
     public Integer getNewMessages() {
         return newMessages;
     }
 
     /**
-     *
-     * @param newMessages
-     * The newMessages
+     * @param newMessages The newMessages
      */
     public void setNewMessages(Integer newMessages) {
         this.newMessages = newMessages;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Notification.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Notification.java
index 014392430..3b95cfee5 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Notification.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Notification.java
@@ -6,50 +6,40 @@ package com.magicmicky.habitrpgwrapper.lib.models;
 
 import com.magicmicky.habitrpgwrapper.lib.models.notifications.NotificationData;
 
-import org.json.JSONObject;
-
 import java.util.HashMap;
 import java.util.Map;
 
 public class Notification {
 
+    public NotificationData data;
     private String type;
     private String createdAt;
-    public NotificationData data;
     private String id;
     private Map<String, Object> additionalProperties = new HashMap<String, Object>();
 
     /**
-     *
-     * @return
-     * The type
+     * @return The type
      */
     public String getType() {
         return type;
     }
 
     /**
-     *
-     * @param type
-     * The type
+     * @param type The type
      */
     public void setType(String type) {
         this.type = type;
     }
 
     /**
-     *
-     * @return
-     * The createdAt
+     * @return The createdAt
      */
     public String getCreatedAt() {
         return createdAt;
     }
 
     /**
-     *
-     * @param createdAt
-     * The createdAt
+     * @param createdAt The createdAt
      */
     public void setCreatedAt(String createdAt) {
         this.createdAt = createdAt;
@@ -74,18 +64,14 @@ public class Notification {
 //    }
 
     /**
-     *
-     * @return
-     * The id
+     * @return The id
      */
     public String getId() {
         return id;
     }
 
     /**
-     *
-     * @param id
-     * The id
+     * @param id The id
      */
     public void setId(String id) {
         this.id = id;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
index 3fcb1cc26..d2d5f73c7 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java
@@ -1,7 +1,5 @@
 package com.magicmicky.habitrpgwrapper.lib.models;
 
-import android.content.Context;
-
 import com.google.gson.annotations.SerializedName;
 
 import com.habitrpg.android.habitica.R;
@@ -9,6 +7,8 @@ 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.
  */
@@ -79,17 +79,17 @@ public abstract class PlayerMinStats extends BasicStats {
     }
 
     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);
+        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);
         }
     }
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java
index b5fe26233..f4ae4e11a 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Preferences.java
@@ -211,11 +211,11 @@ public class Preferences extends BaseModel {
         this.disableClasses = disableClasses;
     }
 
-    public String getLanguage(){
+    public String getLanguage() {
         return language;
     }
 
-    public void setLanguage(String language){
+    public void setLanguage(String language) {
         this.language = language;
     }
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
index 6a0bea830..9b1070f71 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Purchases.java
@@ -18,13 +18,11 @@ import java.util.List;
 public class Purchases extends BaseModel {
 
 
+    public List<Customization> customizations;
     @Column
     @PrimaryKey
     @NotNull
     String user_id;
-
-    public List<Customization> customizations;
-
     @Column
     @ForeignKey(references = {@ForeignKeyReference(columnName = "plan_user_id",
             columnType = String.class,
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java
index 584460d5f..5c819da1e 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java
@@ -12,7 +12,8 @@ public class ShopItem {
     public String key;
     public String text;
     public String notes;
-    @SerializedName("class") public String imageName;
+    @SerializedName("class")
+    public String imageName;
     public Integer value;
     public Boolean locked;
     public String currency;
@@ -21,6 +22,18 @@ public class ShopItem {
     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;
     }
@@ -49,7 +62,7 @@ public class ShopItem {
         if (imageName != null) {
             return imageName;
         } else {
-            return "shop_"+key;
+            return "shop_" + key;
         }
     }
 
@@ -120,21 +133,9 @@ public class ShopItem {
         if (getCurrency().equals("gold")) {
             return getValue() <= user.getStats().getGp();
         } else if (getCurrency().equals("gems")) {
-            return getValue() <= (user.getBalance()*4);
+            return getValue() <= (user.getBalance() * 4);
         } else {
             return false;
         }
     }
-
-    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;
-    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
index 7f3f30e47..879ae27ba 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlan.java
@@ -67,7 +67,7 @@ public class SubscriptionPlan extends BaseModel {
         if (customerId == null) {
             return 0;
         }
-        return 25+consecutive.getGemCapExtra()-gemsBought;
+        return 25 + consecutive.getGemCapExtra() - gemsBought;
     }
 
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
index b571c50ff..6e2f4e1c6 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SubscriptionPlanConsecutive.java
@@ -6,8 +6,6 @@ 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;
-
 @Table(databaseName = HabitDatabase.NAME)
 public class SubscriptionPlanConsecutive extends BaseModel {
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java
index f642b1ae1..26c3f05bb 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/SpecialItem.java
@@ -12,19 +12,19 @@ public class SpecialItem extends Item {
 
     public boolean isMysteryItem;
 
-    @Override
-    public String getType() {
-        return "special";
-    }
-
     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.key = "inventory_present_" + month;
         item.isMysteryItem = true;
         return item;
     }
+
+    @Override
+    public String getType() {
+        return "special";
+    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/GuildInvite.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/GuildInvite.java
index e3d1a7291..a070c5ffe 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/GuildInvite.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/GuildInvite.java
@@ -21,54 +21,42 @@ public class GuildInvite {
     private String id;
 
     /**
-     *
-     * @return
-     * The inviter
+     * @return The inviter
      */
     public String getInviter() {
         return inviter;
     }
 
     /**
-     *
-     * @param inviter
-     * The inviter
+     * @param inviter The inviter
      */
     public void setInviter(String inviter) {
         this.inviter = inviter;
     }
 
     /**
-     *
-     * @return
-     * The name
+     * @return The name
      */
     public String getName() {
         return name;
     }
 
     /**
-     *
-     * @param name
-     * The name
+     * @param name The name
      */
     public void setName(String name) {
         this.name = name;
     }
 
     /**
-     *
-     * @return
-     * The id
+     * @return The id
      */
     public String getId() {
         return id;
     }
 
     /**
-     *
-     * @param id
-     * The id
+     * @param id The id
      */
     public void setId(String id) {
         this.id = id;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/Invitations.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/Invitations.java
index d09fda0e8..b37765fa8 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/Invitations.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/Invitations.java
@@ -2,8 +2,8 @@ package com.magicmicky.habitrpgwrapper.lib.models.invitations;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+
 import com.habitrpg.android.habitica.HabitDatabase;
-import com.magicmicky.habitrpgwrapper.lib.models.invitations.PartyInvite;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.NotNull;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
@@ -12,7 +12,6 @@ import com.raizlabs.android.dbflow.structure.BaseModel;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by keithholliday on 7/2/16.
@@ -34,36 +33,28 @@ public class Invitations extends BaseModel {
     private List<GuildInvite> guilds = new ArrayList<GuildInvite>();
 
     /**
-     *
-     * @return
-     * The party invite
+     * @return The party invite
      */
     public PartyInvite getParty() {
         return party;
     }
 
     /**
-     *
-     * @param party
-     * The party
+     * @param party The party
      */
     public void setParty(PartyInvite party) {
         this.party = party;
     }
 
     /**
-     *
-     * @return
-     * The guilds invite
+     * @return The guilds invite
      */
     public List<GuildInvite> getGuilds() {
         return guilds;
     }
 
     /**
-     *
-     * @param guilds
-     * The guilds
+     * @param guilds The guilds
      */
     public void setGuilds(List<GuildInvite> guilds) {
         this.guilds = guilds;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/PartyInvite.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/PartyInvite.java
index 05bb1e08c..7f0e85e07 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/PartyInvite.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/invitations/PartyInvite.java
@@ -18,54 +18,42 @@ public class PartyInvite {
     private String inviter;
 
     /**
-     *
-     * @return
-     * The id
+     * @return The id
      */
     public String getId() {
         return id;
     }
 
     /**
-     *
-     * @param id
-     * The id
+     * @param id The id
      */
     public void setId(String id) {
         this.id = id;
     }
 
     /**
-     *
-     * @return
-     * The name
+     * @return The name
      */
     public String getName() {
         return name;
     }
 
     /**
-     *
-     * @param name
-     * The name
+     * @param name The name
      */
     public void setName(String name) {
         this.name = name;
     }
 
     /**
-     *
-     * @return
-     * The inviter
+     * @return The inviter
      */
     public String getInviter() {
         return inviter;
     }
 
     /**
-     *
-     * @param inviter
-     * The inviter
+     * @param inviter The inviter
      */
     public void setInviter(String inviter) {
         this.inviter = inviter;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/HabitResponse.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/HabitResponse.java
index 9c484be60..933abf3ba 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/HabitResponse.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/HabitResponse.java
@@ -10,32 +10,26 @@ import java.util.List;
 
 public class HabitResponse<T> {
 
-    private Boolean success;
     public T data;
     public List<Notification> notifications;
+    private Boolean success;
 
     /**
-     *
-     * @return
-     * The success
+     * @return The success
      */
     public Boolean getSuccess() {
         return success;
     }
 
     /**
-     *
-     * @param success
-     * The success
+     * @param success The success
      */
     public void setSuccess(Boolean success) {
         this.success = success;
     }
 
     /**
-     *
-     * @return
-     * The data
+     * @return The data
      */
     public T getData() {
         return data;
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ChecklistItem.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ChecklistItem.java
index ee638d592..4c44a1c3f 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ChecklistItem.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/ChecklistItem.java
@@ -48,8 +48,8 @@ public class ChecklistItem extends BaseModel {
         this.setCompleted(completed);
     }
 
-    public ChecklistItem(String s) {
-        this(null, s);
+    public ChecklistItem(String text) {
+        this(null, text);
     }
 
     public ChecklistItem(ChecklistItem item) {
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/RemindersItem.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/RemindersItem.java
index b08c54876..c05a37292 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/RemindersItem.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/RemindersItem.java
@@ -3,7 +3,6 @@ package com.magicmicky.habitrpgwrapper.lib.models.tasks;
 import com.habitrpg.android.habitica.HabitDatabase;
 import com.habitrpg.android.habitica.database.ExcludeCheckListItem;
 import com.habitrpg.android.habitica.events.ReminderDeleteEvent;
-import com.habitrpg.android.habitica.events.TaskSaveEvent;
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
@@ -82,8 +81,7 @@ public class RemindersItem extends BaseModel {
             //This will get all the task info
             Task taskModel = task.toModel();
 
-            if (taskModel.getId() == null)
-            {
+            if (taskModel.getId() == null) {
                 return taskModel;
             }
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
index 20eb86329..e9a953c28 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java
@@ -1,8 +1,5 @@
 package com.magicmicky.habitrpgwrapper.lib.models.tasks;
 
-import android.support.annotation.Nullable;
-import android.util.Log;
-
 import com.google.gson.annotations.SerializedName;
 
 import com.habitrpg.android.habitica.HabitDatabase;
@@ -22,6 +19,8 @@ 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;
@@ -158,6 +157,13 @@ public class Task extends BaseModel {
         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
      *
@@ -167,13 +173,6 @@ public class Task extends BaseModel {
         this.setValue(Double.valueOf(value));
     }
 
-    /**
-     * @param value the value to set
-     */
-    public void setValue(Double value) {
-        this.value = value;
-    }
-
     /**
      * Returns a string of the type of the Task
      *
@@ -604,7 +603,7 @@ public class Task extends BaseModel {
         Calendar newTime = new GregorianCalendar();
         newTime.setTime(oldTime);
 
-        if (this.getFrequency().equals(FREQUENCY_DAILY) ) {
+        if (this.getFrequency().equals(FREQUENCY_DAILY)) {
             Calendar startDate = new GregorianCalendar();
             startDate.setTime(this.getStartDate());
 
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChallengeDeserializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChallengeDeserializer.java
index cd6ca0c34..f79c8b296 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChallengeDeserializer.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/ChallengeDeserializer.java
@@ -1,19 +1,16 @@
 package com.magicmicky.habitrpgwrapper.lib.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.magicmicky.habitrpgwrapper.lib.models.Challenge;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
 
-import java.util.HashMap;
+import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
+
+import android.text.TextUtils;
 
 import java.lang.reflect.Type;
-import java.util.StringJoiner;
 
 public class ChallengeDeserializer implements JsonDeserializer<Challenge> {
     @Override
@@ -64,7 +61,7 @@ public class ChallengeDeserializer implements JsonDeserializer<Challenge> {
 
         JsonElement tasksOrderElement = jsonObject.get("tasksOrder");
 
-        if(tasksOrderElement != null && !tasksOrderElement.isJsonNull()){
+        if (tasksOrderElement != null && !tasksOrderElement.isJsonNull()) {
             JsonObject tasksOrderObj = tasksOrderElement.getAsJsonObject();
 
             challenge.todoList = getTaskArrayAsString(context, tasksOrderObj, Challenge.TASK_ORDER_TODOS);
@@ -76,7 +73,7 @@ public class ChallengeDeserializer implements JsonDeserializer<Challenge> {
         return challenge;
     }
 
-    private String getTaskArrayAsString(JsonDeserializationContext context, JsonObject tasksOrderObj, String taskType){
+    private String getTaskArrayAsString(JsonDeserializationContext context, JsonObject tasksOrderObj, String taskType) {
 
         if (tasksOrderObj.has(taskType)) {
             JsonElement jsonElement = tasksOrderObj.get(taskType);
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
index a8c571949..88fd78c02 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
@@ -42,8 +42,7 @@ public class SkillDeserializer
 
                 JsonElement lvlElement = skillObject.get("lvl");
 
-                if(lvlElement != null)
-                {
+                if (lvlElement != null) {
                     skill.lvl = lvlElement.getAsInt();
                 }
 
diff --git a/Habitica/src/release/java/com/habitrpg/android/habitica/HabiticaApplication.java b/Habitica/src/release/java/com/habitrpg/android/habitica/HabiticaApplication.java
index 0d9f5117a..77bc47386 100644
--- a/Habitica/src/release/java/com/habitrpg/android/habitica/HabiticaApplication.java
+++ b/Habitica/src/release/java/com/habitrpg/android/habitica/HabiticaApplication.java
@@ -4,8 +4,6 @@ import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.components.DaggerAppComponent;
 import com.habitrpg.android.habitica.modules.AppModule;
 
-import android.content.Context;
-
 public class HabiticaApplication extends HabiticaBaseApplication {
     @Override
     protected AppComponent initDagger() {
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 31b71b76a..5036d11f9 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
@@ -5,9 +5,6 @@ import com.habitrpg.android.habitica.BuildConfig;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
 import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
-
-import junit.framework.Assert;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
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 bf76856be..e471383a0 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,48 +1,33 @@
 package com.habitrpg.android.habitica.helpers;
 
+import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.BuildConfig;
+import com.habitrpg.android.habitica.HabiticaApplication;
+import com.habitrpg.android.habitica.HostConfig;
+import com.magicmicky.habitrpgwrapper.lib.models.Notification;
+import com.magicmicky.habitrpgwrapper.lib.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 com.habitrpg.android.habitica.APIHelper;
-import com.habitrpg.android.habitica.BuildConfig;
-import com.habitrpg.android.habitica.HabiticaApplication;
-import com.habitrpg.android.habitica.HostConfig;
-import com.habitrpg.android.habitica.ui.activities.AboutActivity;
-import com.habitrpg.android.habitica.ui.activities.BaseActivity;
-import com.habitrpg.android.habitica.ui.activities.IntroActivity;
-import com.habitrpg.android.habitica.ui.activities.MainActivity;
-import com.magicmicky.habitrpgwrapper.lib.models.Notification;
-import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
-import com.magicmicky.habitrpgwrapper.lib.models.notifications.NotificationData;
-import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowAlertDialog;
-
-import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 
-import retrofit2.converter.gson.GsonConverterFactory;
-import rx.observers.TestSubscriber;
-
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 /**
  * Created by krh12 on 12/9/2016.
@@ -57,9 +42,11 @@ public class PopupNotificationsManagerTest {
 
     public String username;
     public final String password = "password";
+    private Context context;
 
     @Before
     public void setUp() {
+        context = ShadowApplication.getInstance().getApplicationContext();
         hostConfig = new HostConfig(BuildConfig.BASE_URL,
                 BuildConfig.PORT,
                 "",
@@ -71,7 +58,7 @@ public class PopupNotificationsManagerTest {
     @Test
     public void itDoesNothingWhenNotificationsListIsEmpty() {
         List<Notification> notifications = new ArrayList<>();
-        PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(apiHelper);
+        PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(apiHelper, context);
         popupNotificationsManager.showNotificationDialog(notifications);
 
         AlertDialog alert =
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/RemindersManagerTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/RemindersManagerTest.java
index bd79ef4e0..ef0d2a2f1 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/RemindersManagerTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/helpers/RemindersManagerTest.java
@@ -1,9 +1,8 @@
 package com.habitrpg.android.habitica.helpers;
 
-import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem;
+import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import org.junit.Test;
 
 /**
  * Created by keithholliday on 7/16/16.
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/BaseFragmentTests.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/BaseFragmentTests.java
index 8c2c0885b..8532e3f5d 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/BaseFragmentTests.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/BaseFragmentTests.java
@@ -5,7 +5,6 @@ import com.habitrpg.android.habitica.BuildConfig;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.ui.activities.MainActivity;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,12 +18,8 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
 import android.widget.LinearLayout;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
 
 @Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.LOLLIPOP)
 @RunWith(RobolectricTestRunner.class)
diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragmentTest.java
index ee3e67999..d29770ceb 100644
--- a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragmentTest.java
+++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragmentTest.java
@@ -1,7 +1,6 @@
 package com.habitrpg.android.habitica.ui.fragments.social;
 
 import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests;
-import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment;
 
 public class ChatListFragmentTest extends BaseFragmentTests<ChatListFragment> {
 
diff --git a/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUserTest.java b/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUserTest.java
index 3467206ce..3ca02b5fc 100644
--- a/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUserTest.java
+++ b/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUserTest.java
@@ -10,7 +10,7 @@ import org.robolectric.annotation.Config;
 
 import java.util.HashMap;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 @Config(constants = BuildConfig.class)
 @RunWith(RobolectricTestRunner.class)

From d167743a89532c8d4515f1a93c41fde5474a61f0 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 2 Feb 2017 12:55:04 +0100
Subject: [PATCH 24/32] bump version number

---
 Habitica/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index ab6844126..b216f7ea9 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="152"
+    android:versionCode="153"
     android:versionName="0.0.37"
     android:screenOrientation="portrait"
     android:installLocation="auto" >

From 402dbd5ba7952b755e1393d34135d9d333eb3dc0 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 2 Feb 2017 13:21:57 +0100
Subject: [PATCH 25/32] change travis config

---
 .travis.yml                                   | 19 ++++++++++++++-----
 .../habitica/ui/activities/LoginActivity.java |  3 +--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0fab055ef..06d7c1d42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: android
 jdk: oraclejdk8
+sudo: required
 addons:
   apt:
     sources:
@@ -7,6 +8,7 @@ addons:
     packages:
       - g++-4.8
 before_install:
+  - $CXX --version
   - export JAVA7_HOME=/usr/lib/jvm/java-7-oracle
   - export JAVA8_HOME=/usr/lib/jvm/java-8-oracle
   - nvm install 6.9.3
@@ -48,9 +50,16 @@ android:
     - 'android-sdk-preview-license-52d11cd2'
     - 'android-sdk-license-.+'
     - 'google-gdk-license-.+'
+before_script:
+  - cp habitica.properties.travis habitica.properties
+  - cp habitica.resources.example habitica.resources
+  - cp Habitica/google-services.json.example Habitica/google-services.json
 script:
-    - cp habitica.properties.travis habitica.properties
-    - cp habitica.resources.example habitica.resources
-    - cp Habitica/google-services.json.example Habitica/google-services.json
-    - ./gradlew assembleDebug -PdisablePreDex
-    - ./gradlew testDebugUnitTest -PdisablePreDex --stacktrace --info
+  - ./gradlew $TEST
+env:
+  global:
+    - CXX=g++-4.8
+    - DISABLE_REQUEST_LOGGING=true
+  matrix:
+    - TEST="assembleDebug -PdisablePreDex"
+    - TEST="testDebugUnitTest -PdisablePreDex --stacktrace --info"
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 4beb1a453..f10c2b088 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
@@ -15,7 +15,6 @@ import com.facebook.FacebookException;
 import com.facebook.login.LoginResult;
 import com.facebook.login.widget.LoginButton;
 import com.habitrpg.android.habitica.APIHelper;
-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;
@@ -82,7 +81,7 @@ public class LoginActivity extends BaseActivity
     @Inject
     public SharedPreferences sharedPrefs;
     @Inject
-    private HostConfig hostConfig;
+    public HostConfig hostConfig;
     public String mTmpUserToken;
     public String mTmpApiToken;
     public Boolean isRegistering;

From bcc0396dfba1c12edecc631e9febdef771dc88c3 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 2 Feb 2017 13:33:27 +0100
Subject: [PATCH 26/32] =?UTF-8?q?don=E2=80=99t=20run=20server=20for=20ever?=
 =?UTF-8?q?y=20build=20matrix=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 06d7c1d42..50bee60c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,18 +11,18 @@ before_install:
   - $CXX --version
   - export JAVA7_HOME=/usr/lib/jvm/java-7-oracle
   - export JAVA8_HOME=/usr/lib/jvm/java-8-oracle
-  - nvm install 6.9.3
-  - nvm use 6.9.3
-  - npm i -g npm@4
-  - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
-  - echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list
-  - sudo apt-get update
-  - sudo apt-get install mongodb-org-server
-  - git clone https://github.com/HabitRPG/habitrpg.git ../habitrpg
-  - until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 2; done
-  - cd ../habitrpg && cp config.json.example config.json && npm install
-  - npm start &
-  - until nc -z localhost 3000; do echo Waiting for Habitica Server; sleep 2; done
+  - if [ $REQUIRES_SERVER ]; then nvm install 6.9.3; fi
+  - if [ $REQUIRES_SERVER ]; then nvm use 6.9.3; fi
+  - if [ $REQUIRES_SERVER ]; then npm i -g npm@4; fi
+  - if [ $REQUIRES_SERVER ]; then sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10; fi
+  - if [ $REQUIRES_SERVER ]; then echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list; fi
+  - if [ $REQUIRES_SERVER ]; then sudo apt-get update; fi
+  - if [ $REQUIRES_SERVER ]; then sudo apt-get install mongodb-org-server; fi
+  - if [ $REQUIRES_SERVER ]; then git clone https://github.com/HabitRPG/habitrpg.git ../habitrpg; fi
+  - if [ $REQUIRES_SERVER ]; then until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 2; done; fi
+  - if [ $REQUIRES_SERVER ]; then cd ../habitrpg && cp config.json.example config.json && npm install; fi
+  - if [ $REQUIRES_SERVER ]; then npm start &; fi
+  - if [ $REQUIRES_SERVER ]; then until nc -z localhost 3000; do echo Waiting for Habitica Server; sleep 2; done; fi
   - cd -
 android:
   components:
@@ -62,4 +62,4 @@ env:
     - DISABLE_REQUEST_LOGGING=true
   matrix:
     - TEST="assembleDebug -PdisablePreDex"
-    - TEST="testDebugUnitTest -PdisablePreDex --stacktrace --info"
+    - TEST="testDebugUnitTest -PdisablePreDex --stacktrace --info" REQUIRES_SERVER=true

From b859bd9e8bc6abad4633f118f4f9378c7f9c1589 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 2 Feb 2017 14:32:05 +0100
Subject: [PATCH 27/32] fix tests

---
 Habitica/AndroidManifest.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index b216f7ea9..a7964dff7 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -75,7 +75,9 @@
         </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"

From 2a6b24ba28bd1c456900d2ad3cc2916436423df8 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 2 Feb 2017 14:44:10 +0100
Subject: [PATCH 28/32] fix travis syntax

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 50bee60c0..34eed7b9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ before_install:
   - if [ $REQUIRES_SERVER ]; then git clone https://github.com/HabitRPG/habitrpg.git ../habitrpg; fi
   - if [ $REQUIRES_SERVER ]; then until nc -z localhost 27017; do echo Waiting for MongoDB; sleep 2; done; fi
   - if [ $REQUIRES_SERVER ]; then cd ../habitrpg && cp config.json.example config.json && npm install; fi
-  - if [ $REQUIRES_SERVER ]; then npm start &; fi
+  - if [ $REQUIRES_SERVER ]; then npm start; fi &
   - if [ $REQUIRES_SERVER ]; then until nc -z localhost 3000; do echo Waiting for Habitica Server; sleep 2; done; fi
   - cd -
 android:

From 36d2eaafac04021354c4956ed221b87d033cf5e3 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 2 Feb 2017 14:53:21 +0100
Subject: [PATCH 29/32] fix travis build leaving directory

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 34eed7b9e..d35090c90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_install:
   - if [ $REQUIRES_SERVER ]; then cd ../habitrpg && cp config.json.example config.json && npm install; fi
   - if [ $REQUIRES_SERVER ]; then npm start; fi &
   - if [ $REQUIRES_SERVER ]; then until nc -z localhost 3000; do echo Waiting for Habitica Server; sleep 2; done; fi
-  - cd -
+  - if [ $REQUIRES_SERVER ]; cd -; fi
 android:
   components:
     # Uncomment the lines below if you want to

From ce897ea916e17e9d2e958b394f3dca6edab260e8 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 2 Feb 2017 15:19:21 +0100
Subject: [PATCH 30/32] fix bash syntax

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d35090c90..f8dcfb42e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ before_install:
   - if [ $REQUIRES_SERVER ]; then cd ../habitrpg && cp config.json.example config.json && npm install; fi
   - if [ $REQUIRES_SERVER ]; then npm start; fi &
   - if [ $REQUIRES_SERVER ]; then until nc -z localhost 3000; do echo Waiting for Habitica Server; sleep 2; done; fi
-  - if [ $REQUIRES_SERVER ]; cd -; fi
+  - if [ $REQUIRES_SERVER ]; then cd -; fi
 android:
   components:
     # Uncomment the lines below if you want to

From 27f3e5645b2aeee9534018a938e753444f2a8814 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Fri, 3 Feb 2017 13:21:42 +0100
Subject: [PATCH 31/32] subscription layout changes

---
 Habitica/AndroidManifest.xml                  |   2 +-
 Habitica/build.gradle                         |   1 +
 .../ic_keyboard_arrow_down_black_24dp.xml     |   2 +-
 .../ic_keyboard_arrow_up_black_24dp.xml       |   4 +
 Habitica/res/layout/challenge_item.xml        |   2 +-
 Habitica/res/layout/fragment_subscription.xml | 247 +++++++++++-------
 Habitica/res/values/colors.xml                |   2 +-
 Habitica/res/values/strings.xml               |  10 +-
 Habitica/res/values/styles.xml                |  25 +-
 .../ui/fragments/SubscriptionFragment.java    |  52 ++++
 10 files changed, 235 insertions(+), 112 deletions(-)
 create mode 100644 Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index a7964dff7..a676ada8f 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="153"
+    android:versionCode="155"
     android:versionName="0.0.37"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 29e3ab6e5..1e24d535e 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -150,6 +150,7 @@ android {
 
     defaultConfig {
         applicationId "com.habitrpg.android.habitica"
+        vectorDrawables.useSupportLibrary = true
     }
 
     lintOptions {
diff --git a/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
index b904f8cf3..91fb946f2 100644
--- a/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
+++ b/Habitica/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
-    <path android:fillColor="#000000" android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
+    <path android:fillColor="#7e000000" android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z"/>
 </vector>
diff --git a/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml b/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
new file mode 100644
index 000000000..0f8503e44
--- /dev/null
+++ b/Habitica/res/drawable/ic_keyboard_arrow_up_black_24dp.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
+    <path android:fillColor="#7e000000" android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+</vector>
diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml
index dc9819fc3..2efee0584 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -174,6 +174,6 @@
         <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_keyboard_arrow_right_gray_24dp"/>
+                app:srcCompat="@drawable/ic_keyboard_arrow_right_gray_24dp"/>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index fe3696b6f..e013c328b 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.NestedScrollView
         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"
@@ -14,18 +15,134 @@
                   android:layout_height="wrap_content"
                   android:padding="20dp">
 
-        <TextView android:layout_height="wrap_content"
-                  android:layout_width="wrap_content"
-                  android:paddingLeft="16dp"
-                  android:paddingRight="16dp"
-                  android:paddingBottom="20dp"
-                  android:text="@string/subscribe.title"
-                  android:layout_gravity="center_horizontal"
-                  android:gravity="center"
-                  android:textColor="@color/best_10"
-                  android:drawableTop="@drawable/ic_heart_large"
-                  android:textSize="14sp"
-                  android:lineSpacingExtra="4dp" />
+        <TextView
+                android:id="@+id/subscribeBenefitsTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/subscribe_prompt"
+                android:gravity="center"
+                android:textStyle="normal|bold"
+                android:textColor="@color/brand_100"
+                android:textSize="16sp"
+                android:lineSpacingExtra="4dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="16dp"
+                android:layout_marginLeft="26dp"
+                android:layout_marginRight="26dp"/>
+
+        <FrameLayout
+                android:id="@+id/subscribe.listitem1.box"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/subscriptionBox">
+
+            <TextView
+                    android:text="@string/subscribe.listitem1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/SubscriptionListTitle"
+                    />
+
+            <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:srcCompat="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    android:id="@+id/subscribe.listitem1.expand"
+                    android:layout_gravity="right"/>
+
+        </FrameLayout>
+
+        <TextView
+                android:id="@+id/subscribe.listitem1.description"
+                android:text="@string/subscribe.listitem1.description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/SubscriptionListDescription"
+                android:visibility="gone"/>
+
+        <FrameLayout
+                android:id="@+id/subscribe.listitem2.box"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/subscriptionBox">
+            <TextView
+                    android:text="@string/subscribe.listitem2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/SubscriptionListTitle"
+                    />
+
+            <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:srcCompat="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    android:id="@+id/subscribe.listitem2.expand"
+                    android:layout_gravity="right"/>
+        </FrameLayout>
+
+        <TextView
+                android:id="@+id/subscribe.listitem2.description"
+                android:text="@string/subscribe.listitem2.description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/SubscriptionListDescription"
+                android:visibility="gone" />
+
+        <FrameLayout
+                android:id="@+id/subscribe.listitem3.box"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/subscriptionBox">
+            <TextView
+                    android:text="@string/subscribe.listitem3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/SubscriptionListTitle"
+                    />
+
+            <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:srcCompat="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    android:id="@+id/subscribe.listitem3.expand"
+                    android:layout_gravity="right"/>
+        </FrameLayout>
+
+        <TextView
+                android:id="@+id/subscribe.listitem3.description"
+                android:text="@string/subscribe.listitem3.description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/SubscriptionListDescription"
+                android:visibility="gone" />
+
+        <FrameLayout
+                android:id="@+id/subscribe.listitem4.box"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/subscriptionBox"
+                android:layout_marginBottom="8dp">
+            <TextView
+                    android:text="@string/subscribe.listitem4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    style="@style/SubscriptionListTitle"
+                    />
+            <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:srcCompat="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    android:id="@+id/subscribe.listitem4.expand"
+                    android:layout_gravity="right"/>
+        </FrameLayout>
+
+        <TextView
+                android:id="@+id/subscribe.listitem4.description"
+                android:text="@string/subscribe.listitem4.description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                style="@style/SubscriptionListDescription"
+                android:visibility="gone" />
 
         <ProgressBar
                 style="?android:attr/progressBarStyle"
@@ -38,6 +155,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
+                android:layout_marginTop="24dp"
                 >
 
             <com.habitrpg.android.habitica.ui.SubscriptionOptionView
@@ -46,6 +164,7 @@
                     android:layout_height="wrap_content"
                     app:recurringText="@string/month"
                     app:gemCapText="@string/subscribe1month.gemcap"/>
+
             <com.habitrpg.android.habitica.ui.SubscriptionOptionView
                     android:id="@+id/subscription3month"
                     android:layout_width="match_parent"
@@ -84,96 +203,22 @@
         <com.habitrpg.android.habitica.ui.SubscriptionDetailsView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/subscriptionDetails"/>
+                android:id="@+id/subscriptionDetails"
+                android:layout_marginTop="24dp"/>
 
-        <TextView
-                android:id="@+id/subscribeBenefitsTitle"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/subscribe_prompt"
-                android:gravity="center"
-                android:textStyle="normal|bold"
-                android:textColor="@color/brand_100"
-                android:textSize="16sp"
-                android:lineSpacingExtra="4dp"
-                android:layout_marginTop="23dp"
-                android:layout_marginBottom="12dp"
-                android:layout_marginLeft="26dp"
-                android:layout_marginRight="26dp"/>
+        <TextView android:layout_height="wrap_content"
+                  android:layout_width="wrap_content"
+                  android:paddingLeft="16dp"
+                  android:paddingRight="16dp"
+                  android:paddingBottom="20dp"
+                  android:text="@string/subscribe.title"
+                  android:layout_gravity="center_horizontal"
+                  android:gravity="center"
+                  android:textColor="@color/best_10"
+                  android:drawableTop="@drawable/ic_heart_large"
+                  android:textSize="14sp"
+                  android:lineSpacingExtra="4dp"
+                android:layout_marginTop="16dp"/>
 
-        <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/subscriptionBox"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="8dp">
-            <TextView
-                    android:text="@string/subscribe.listitem1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/GemPurchaseListItem"
-                    />
-        </FrameLayout>
-        <TextView
-                android:text="@string/subscribe.listitem1.description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/GemPurchaseListItemDescription" />
-
-        <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/subscriptionBox"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="8dp">
-            <TextView
-                    android:text="@string/subscribe.listitem2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/GemPurchaseListItem"
-                    />
-        </FrameLayout>
-        <TextView
-                android:text="@string/subscribe.listitem2.description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/GemPurchaseListItemDescription" />
-
-        <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/subscriptionBox"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="8dp">
-            <TextView
-                    android:text="@string/subscribe.listitem3"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/GemPurchaseListItem"
-                    />
-        </FrameLayout>
-        <TextView
-                android:text="@string/subscribe.listitem3.description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/GemPurchaseListItemDescription" />
-
-        <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/subscriptionBox"
-                android:layout_marginBottom="8dp">
-            <TextView
-                    android:text="@string/subscribe.listitem4"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="@style/GemPurchaseListItem"
-                    />
-        </FrameLayout>
-        <TextView
-                android:text="@string/subscribe.listitem4.description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/GemPurchaseListItemDescription" />
     </LinearLayout>
 </android.support.v4.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index d19d041a4..de5379624 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -110,5 +110,5 @@
     <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">#deddde</color>
+    <color name="pill_gray">#efefef</color>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index b5f980bf9..9d88520f7 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -457,10 +457,10 @@ To start, which parts of your life do you want to improve?</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 sell you Gems at a cost of 20 gold per gem. His monthly shipments are initially capped at 25 Gems per month, but this 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">Makes completed To-Dos and task history available for longer.</string>
-    <string name="subscribe.listitem3.description">Complete your stable faster!</string>
-    <string name="subscribe.listitem4.description">Each month you will receive a unique cosmetic item for your avatar! Plus, 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.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>
@@ -470,7 +470,7 @@ To start, which parts of your life do you want to improve?</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_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>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 9734254c5..02f1a82c8 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -192,6 +192,12 @@
         <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>
@@ -233,8 +239,11 @@
 
     <style name="subscriptionBox">
         <item name="android:background">@color/habit_inactive_gray</item>
-        <item name="android:padding">12dp</item>
-        <item name="android:layout_marginTop">16dp</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">
@@ -253,6 +262,18 @@
         <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>
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 c556e80da..db7c06e25 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
@@ -27,6 +27,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -45,6 +47,33 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
     @Inject
     APIHelper apiHelper;
 
+    @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;
 
@@ -114,6 +143,29 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
         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

From 7e9c70fae8f9003ab355be751a2b9abfbf454ba4 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Mon, 6 Feb 2017 15:53:10 +0100
Subject: [PATCH 32/32] fix potential crashes

---
 Habitica/AndroidManifest.xml                      |   4 ++--
 .../res/drawable-hdpi/ic_check_purple_24dp.png    | Bin 0 -> 252 bytes
 .../res/drawable-mdpi/ic_check_purple_24dp.png    | Bin 0 -> 180 bytes
 .../res/drawable-xhdpi/ic_check_purple_24dp.png   | Bin 0 -> 301 bytes
 .../res/drawable-xxhdpi/ic_check_purple_24dp.png  | Bin 0 -> 428 bytes
 .../res/drawable-xxxhdpi/ic_check_purple_24dp.png | Bin 0 -> 521 bytes
 Habitica/res/layout/activity_full_profile.xml     |  10 +++++-----
 Habitica/res/values-v21/styles.xml                |  13 +++++++++++++
 Habitica/res/values/styles.xml                    |   2 +-
 .../helpers/PopupNotificationsManager.java        |   6 +++++-
 .../ui/fragments/social/GuildFragment.java        |   2 +-
 11 files changed, 27 insertions(+), 10 deletions(-)
 create mode 100644 Habitica/res/drawable-hdpi/ic_check_purple_24dp.png
 create mode 100644 Habitica/res/drawable-mdpi/ic_check_purple_24dp.png
 create mode 100644 Habitica/res/drawable-xhdpi/ic_check_purple_24dp.png
 create mode 100644 Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.png
 create mode 100644 Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.png
 create mode 100644 Habitica/res/values-v21/styles.xml

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index a676ada8f..7e415a6bb 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="155"
-    android:versionName="0.0.37"
+    android:versionCode="156"
+    android:versionName="0.0.37.1"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
 
diff --git a/Habitica/res/drawable-hdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-hdpi/ic_check_purple_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac436a012b0987d56ed55ff519621601e55f293e
GIT binary patch
literal 252
zcmV<Y00aMtP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0002PNkl<Zc-rmP
zF%E+u6vlBjyY(6#gQRPF1CQa@ffIGB?X5aH=`(4Q=7k{O`+(sM{}q1`c|>#RN7GV9
zK?+ikg7BTFp%u`Ec~cAJYJ>hUzicg#4^!<8MPo{Uk}zmcG6o6C!k|Fe7zF4LW)F0w
z9#mHf69V0+`Mc;d0wsb8f$nVa5K0WQw`Gn!Wb&XyF)<%?2qlh*J!KsAqRt3R%CYCD
z4+4`qhd4?clQS3{5|cZr9SU>g>ahCPp&$h*NT?OquFvf1h5E+;0000<MNUMnLSTYs
Cz+{&I

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-mdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-mdpi/ic_check_purple_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0548bcbe8d3393363c33ee746d04e1c7f710dc3
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj)t)YnAr-fh3$AG-E>KOA*qU%7
za)Gxu_oBuh`~v0|4l&Jm_&+m|(eLoeM8>$onp+zdJe(5YFy-M5odm{5OC4nVcn@!k
z6yUnbVWiL$bhwZ;ka?2o#3>Se`g{{~JC&{%I8E%y;f!n(p4^o%Z9=NW#*<qbV-CB&
eZWc^pWUx$7UiV?bDMg?&7(8A5T-G@yGywn)Ye3`x

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xhdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-xhdpi/ic_check_purple_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2d27754e2761101ec60061fd4995746a5231288
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUtFP<)rAr-gY-q_81$Uvkuv3$y!
zgKRd|VT%^-&fe&FtkJ+>gX)AJizEHn^3hgDSAMQ{IudrKwA|SCynq7(BMX?QDBrmI
zJ6FNS{M{%0s+i9_UT*5b|M4!vqQ}upDo3|7Su8)co#8~6JM*T;6B(vfh&brVF&2DW
z99EOtP*tOmko|qb?d@XnOa&hge@{H`;<E9F>47w{|F^Y;0!{3mhzp!Q>@2wa(#M7W
z8&!`m%F2Hh>v9a~?yv3DQ|w#uV@mM@`9)PVuN<E__jLT2Gx<jQ3c2~!Qw2))9E<gs
u@G)w-rQ^};dv2_P=kpgs94pXpkNsn7UsCZd^HiY!89ZJ6T-G@yGywpmXnZ#S

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-xxhdpi/ic_check_purple_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..26bee6d377301cf759da2e6c26b3055f3e93d082
GIT binary patch
literal 428
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2U@Z1@aSW-r_4d~7+`|Sutq*-B
zaL!ud(5+NmvZRcm@0#N*?f{kSEk+NPGd1aUPjP)#Z}I*M`wcPvEtU3lc^-BO3@ic;
z42&Q`uz`VzLjg#f$lb>9^z)QYbCnpL7S<i-aHyP<wB&@vZXQ3uON$@bm`srJb5RJL
zli|R8&Qn-jXac97h=TDP4u@qH_Zq)lvzXU7>p=x;R@-C26`FnK3mBi@5jrk>LCYep
zA?)x+hAmotycfJrUH`!lc3Ae>u}H2jvpyN~RTw$FVoK+{5Pj<H{ROu??mn2pBpdv0
zX5)D;kJyJ(m}-4^;<`;9#8e%M{M6Mc7&P6&+x}AV1U|unth&!p9<h(F$cbc6oL7DP
zqJ^iwVyuw|^SQ0%GHXK@i=5=`d!}b5ep0mW+a@b^Aa&HtzV!*$@m238Xjn|Eo#1j{
zqu!Y#)_&b?fi{n~tcp3R?RVNQ%I47)y|+iD`OM!kLV^SsE*#KcVm%|@E@$uhb(`Zn
QU@S0ry85}Sb4q9e09J9R?f?J)

literal 0
HcmV?d00001

diff --git a/Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.png b/Habitica/res/drawable-xxxhdpi/ic_check_purple_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..60b00801664b5dfc9d17c24d64fdaf82b86fb675
GIT binary patch
literal 521
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V7%bz;uunK>+S8+zRr$3ZVyEc
zEM~qYa<DH<qmk*3DC>te?M!;bsuLzSOgLGQ(_brA&uBS+kxIE*`|a1inLkSlGB7kS
zGB7YRFaXWuVPKG8U@!pNasVo!a7FL-JBAP4|F3P^%E?go(VUlMQQuK{H-$G9e-v3B
zy*gqq*?6GpBV&ZF9mBbgj0JuC2hPVv9AiIV3F9{u|9Qpm?xQwyOGmt@g3q5WhJ}y9
znK{Jw3pt$l5z27r*m{Ny$Lo8g?5!Ps{Fuo&tz*7u!ptAH7|e6|bJLG(XTR}yfBn7{
z?&>X1A7wMv^zXM+)RBy5ez5(=HICEA<XL}c?-M<A>7zTty1tJ8TbFxsoIWmJ%kFW!
z`?{NlVEkj_1I&s2|0gN#yS9BnTubqz*Z=u8ICzN1|DOKAr)A2=bQ|tjjT6lNt!Xc`
z<v9OeVM(9;=gbvsPQQL^mUr)0n9`A7C|AJcH1kIoyU|{b)JM_tI=(7Q>CCTH(LD0q
zURdnWZ~0T)AOGgNa(w)|eyPXTAA;{#J)iyv)JyZc`eS0=G0&qvF0NDa+WJHAeVf<P
oAAkHM7~EJ;0vILai{3LIIc{ORYfI%)U=%ZWy85}Sb4q9e0EKJTegFUf

literal 0
HcmV?d00001

diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index 5846402b9..6e398d916 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -293,11 +293,11 @@
                                 android:textStyle="bold" />
 
                             <com.facebook.drawee.view.SimpleDraweeView
-                                android:id="@+id/attributes_collapse_icon"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:src="@drawable/ic_keyboard_arrow_right_black_24dp"
-                                android:layout_gravity="bottom" />
+                                    android:id="@+id/attributes_collapse_icon"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    app:srcCompat="@drawable/ic_keyboard_arrow_right_black_24dp"
+                                    android:layout_gravity="bottom" />
 
                         </LinearLayout>
 
diff --git a/Habitica/res/values-v21/styles.xml b/Habitica/res/values-v21/styles.xml
new file mode 100644
index 000000000..36b71cf42
--- /dev/null
+++ b/Habitica/res/values-v21/styles.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <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</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:drawablePadding">4dp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 02f1a82c8..4e344dc98 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -187,7 +187,7 @@
         <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</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>
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 6f026a864..7ea30aba2 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
@@ -108,7 +108,11 @@ public class PopupNotificationsManager {
     }
 
     public Boolean showNotificationDialog(final List<Notification> notifications) {
-        if (notifications.size() == 0) {
+        if (notifications == null || notifications.size() == 0) {
+            return false;
+        }
+
+        if (HabiticaApplication.currentActivity == null || HabiticaApplication.currentActivity.isFinishing()) {
             return false;
         }
 
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 e0998703c..0c3f714c2 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
@@ -169,7 +169,7 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
 
             @Override
             public void onPageSelected(int position) {
-                if (position == 1 && GuildFragment.this.guild != null) {
+                if (position == 1 && GuildFragment.this.guild != null && chatListFragment != null) {
                     chatListFragment.setNavigatedToFragment(GuildFragment.this.guild.id);
                 }
             }