diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 8ae079e08..832b03c34 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="106"
+    android:versionCode="108"
     android:versionName="0.0.33"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/res/layout/row_shopitem.xml b/Habitica/res/layout/row_shopitem.xml
index 2310d9358..a23a3f264 100644
--- a/Habitica/res/layout/row_shopitem.xml
+++ b/Habitica/res/layout/row_shopitem.xml
@@ -48,4 +48,15 @@
             android:background="@drawable/rounded_purple_square"
             android:paddingLeft="6dp"
             android:paddingStart="6dp" />
+    <TextView
+            android:id="@+id/unlockView"
+            android:layout_marginLeft="8dp"
+            android:layout_marginStart="8dp"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            tools:text="Description"
+            android:visibility="gone"
+            android:maxLines="5"
+            style="@style/RowText"
+            android:layout_gravity="center_vertical"/>
 </LinearLayout>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 24bbdefbf..650bc23d3 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -325,4 +325,9 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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="leaderMessage" formatted="false">Nachricht von %1$s</string>
+  <string name="confirm">Bestätigen</string>
+  <string name="market">Marktplatz</string>
+  <string name="timeTravelers">Mysteriöse Zeitreisende</string>
+  <string name="seasonalShop">Jahreszeitenmarkt</string>
+  <string name="empty_inbox">Du hast keine Nachrichten in Deinem Posteingang. Du kannst einem anderen Benutzer eine neue Nachricht von deren öffentlichen Chatnachrichten aus senden!</string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.sidebar.xml b/Habitica/res/values-en-rGB/strings.sidebar.xml
index b40bf8c3d..4a18afa1b 100644
--- a/Habitica/res/values-en-rGB/strings.sidebar.xml
+++ b/Habitica/res/values-en-rGB/strings.sidebar.xml
@@ -3,6 +3,7 @@
   <string name="sidebar.tasks">Tasks</string>
   <string name="sidebar.skills">Skills</string>
   <string name="sidebar.section.social">Social</string>
+  <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>
diff --git a/Habitica/res/values-fr/strings.sidebar.xml b/Habitica/res/values-fr/strings.sidebar.xml
index 0dd523ae8..7c5098877 100644
--- a/Habitica/res/values-fr/strings.sidebar.xml
+++ b/Habitica/res/values-fr/strings.sidebar.xml
@@ -16,4 +16,5 @@
   <string name="sidebar.news">Nouveautés</string>
   <string name="sidebar.settings">Paramètres</string>
   <string name="sidebar.about">À propos</string>
+  <string name="sidebar_shops">Magasins</string>
 </resources>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index f69b243b3..d955cc841 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -325,4 +325,9 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</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="leaderMessage" formatted="false">Message de %1$s</string>
+  <string name="confirm">Confirmer</string>
+  <string name="market">Marché</string>
+  <string name="timeTravelers">Voyageurs temporels</string>
+  <string name="seasonalShop">Boutique saisonnière</string>
+  <string name="empty_inbox">Vous n\'avez pas de message dans la boite de réception. Vous pouvez envoyer un nouveau message à partir des discussions publiques de chaque personne.</string>
 </resources>
diff --git a/Habitica/res/values-it/strings.sidebar.xml b/Habitica/res/values-it/strings.sidebar.xml
index 5c4261bbc..b24ce555c 100644
--- a/Habitica/res/values-it/strings.sidebar.xml
+++ b/Habitica/res/values-it/strings.sidebar.xml
@@ -16,4 +16,5 @@
   <string name="sidebar.news">Novità</string>
   <string name="sidebar.settings">Impostazioni</string>
   <string name="sidebar.about">Su Habitica</string>
+  <string name="sidebar_shops">Negozi</string>
 </resources>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 8f0330ed5..cfa6056a1 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -321,7 +321,14 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <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="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="leaderMessage" formatted="false">Messaggio da %1$s</string>
+  <string name="confirm">Conferma</string>
+  <string name="market">Mercato</string>
+  <string name="timeTravelers">Viaggiatori del Tempo</string>
+  <string name="seasonalShop">Negozio Stagionale</string>
+  <string name="empty_inbox">Non hai nessun messaggio. Puoi inviare un messaggio privato ad un utente dai loro messaggi nelle chat pubbliche!</string>
 </resources>
diff --git a/Habitica/res/values-ja/strings.sidebar.xml b/Habitica/res/values-ja/strings.sidebar.xml
index b77cc926c..e48775131 100644
--- a/Habitica/res/values-ja/strings.sidebar.xml
+++ b/Habitica/res/values-ja/strings.sidebar.xml
@@ -3,6 +3,7 @@
   <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>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 0f1eae211..93a890f10 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -34,7 +34,7 @@
   <string name="email_username">メールアドレスまたはユーザー名</string>
   <string name="password">パスワード</string>
   <string name="emailAddress">メールアドレス</string>
-  <string name="confirmpassword">パスワード (確認)</string>
+  <string name="confirmpassword">パスワード ( 確認 )</string>
   <string name="logout">ログアウト</string>
   <string name="logout_description">ログアウトする</string>
   <string name="account_details">アカウントの詳細</string>
diff --git a/Habitica/res/values-nl/strings.sidebar.xml b/Habitica/res/values-nl/strings.sidebar.xml
index 26de2163d..4a88293d6 100644
--- a/Habitica/res/values-nl/strings.sidebar.xml
+++ b/Habitica/res/values-nl/strings.sidebar.xml
@@ -16,4 +16,5 @@
   <string name="sidebar.news">Nieuws</string>
   <string name="sidebar.settings">Instellingen</string>
   <string name="sidebar.about">Over</string>
+  <string name="sidebar_shops">Winkels</string>
 </resources>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index 8590a97cb..9aad792c3 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -56,7 +56,7 @@
   <string name="authentication_error_title">Authenticatiefout</string>
   <string name="authentication_error_body">Je Gebruikersnaam en/of Wachtwoord is onjuist.</string>
   <string name="login_validation_error_title">Validatiefout</string>
-  <string name="login_validation_error_fieldsmissing">Je moet alle vlakken invullen.</string>
+  <string name="login_validation_error_fieldsmissing">Je moet alle velden invullen.</string>
   <string name="save_changes">Opslaan</string>
   <string name="notes">Aantekeningen</string>
   <string name="text">Tekst</string>
@@ -92,7 +92,7 @@
   <string name="levelup_health">Je bent volledig genezen!</string>
   <string name="levelup_button">Hoera!</string>
   <string name="faint_subtitle">Wanhoop niet!</string>
-  <string name="faint_penalty_body">Je verliest een niveau, je goud, en een stuk uitrusting, maar je kunt ze allemaal terugkrijgen door hard te werken! Succes--je zult het geweldig doen.</string>
+  <string name="faint_penalty_body">Je verliest een niveau, je goud en een stuk uitrusting, maar je kunt ze allemaal terug krijgen door hard te werken! Succes--je zult het geweldig doen.</string>
   <string name="faint_header">Je hebt geen Gezondheid meer!</string>
   <string name="faint_button">Herstel Gezondheid &amp; probeer opnieuw</string>
   <string name="filter">Filter</string>
@@ -104,13 +104,13 @@
   <string name="reminder_title">Vergeet niet om je Dagelijkse taken af te vinken!</string>
   <string name="skill_progress_title">Gebruik vaardigheid</string>
   <string name="coming_soon">Binnenkort beschikbaar</string>
-  <string name="chat_flag_confirmation">Weet je zeker dat je dit bericht wil melden wegens overtreding?</string>
+  <string name="chat_flag_confirmation">Weet je zeker dat je dit bericht wilt melden wegens overtreding?</string>
   <string name="flag_confirm">Markeer bericht</string>
   <string name="unlock_lvl_11">Beschikbaar vanaf niveau 11</string>
   <string name="no_party_message">Je zit niet in een groep. Bezoek de website als je je bij een groep wilt aansluiten.</string>
   <string name="forgot_pw_btn">Wachtwoord vergeten</string>
   <string name="forgot_pw_tv">Wachtwoord vergeten? Gebruik dan de mobiele website.</string>
-  <string name="tavern.inn.checkOut">Heractiveer je daagelijkse taken</string>
+  <string name="tavern.inn.checkOut">Heractiveer je Dagelijkse taken</string>
   <string name="tavern.inn.rest">Pauzeer je Dagelijkse Taken</string>
   <string name="reward.dialog.buy">Kopen</string>
   <string name="reward.dialog.dismiss">Verwijderen</string>
@@ -165,13 +165,13 @@
   <string name="intro_1_description">Sluit je aan bij meer dan 1.100.000 anderen 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 mogelijkheden 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">Doe sociaal en bevecht de monsters</string>
+  <string name="intro_3_title">Wees sociaal en vecht tegen monsters</string>
   <string name="intro_3_description">Houd je doelen op het goede spoor met hulp van je vrienden. Ondersteun elkaar in het leven en vecht samen terwijl je steeds beter wordt.</string>
-  <string name="intro_finish_button">Begin</string>
+  <string name="intro_finish_button">Ga van start</string>
   <string name="previous_button">Vorige</string>
   <string name="next_button">Volgende</string>
   <string name="skip_button">Sla over</string>
-  <string name="setup_welcome_description">Welkom in Habitica, waar vooruitgang in het spel je leven kan verbeteren! Terwijl je echte doelen bereikt, verdien je uitrusting, huisdieren, quests en meer.</string>
+  <string name="setup_welcome_description">Welkom in Habitica, waar vooruitgang in het spel je leven zal verbeteren! Terwijl je echte doelen bereikt, verdien je uitrusting, huisdieren, queestes en meer.</string>
   <string name="setup_welcome_title">Welkom</string>
   <string name="avatar_setup_description">Als eerste heb je een avatar nodig die jou vertegenwoordigt in het spel! De dingen die je in het echte leven doet zullen een effect hebben op de gezondheid, het level en het goud van je avatar.</string>
   <string name="task_setup_description">Geweldig! Laten we nu wat taken klaar zetten zodat je kan beginnen met het verdienen van ervaringspunten en goud.
@@ -325,4 +325,9 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
   <string name="open_in_store">Open in de play store</string>
   <string name="change_class_confirmation">Weet je zeker dat je van klasse wil veranderen? Dit kost 3 edelstenen.</string>
   <string name="leaderMessage" formatted="false">Bericht van %1$s</string>
+  <string name="confirm">Bevestig</string>
+  <string name="market">Markt</string>
+  <string name="timeTravelers">Tijd Reizigers</string>
+  <string name="seasonalShop">Seizoenswinkel</string>
+  <string name="empty_inbox">Je hebt geen Inbox berichten. Je kan een gebruiker een nieuw bericht sturen vanuit hun publieke chat berichten.</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.sidebar.xml b/Habitica/res/values-pl/strings.sidebar.xml
index 7a11a7929..b4bfbcdd5 100644
--- a/Habitica/res/values-pl/strings.sidebar.xml
+++ b/Habitica/res/values-pl/strings.sidebar.xml
@@ -3,6 +3,7 @@
   <string name="sidebar.tasks">Zadania</string>
   <string name="sidebar.skills">Umiejętności</string>
   <string name="sidebar.section.social">Społeczność</string>
+  <string name="sidebar.inbox">Skrzyna pocztowa</string>
   <string name="sidebar.tavern">Karczma</string>
   <string name="sidebar.party">Drużyna</string>
   <string name="sidebar.purchaseGems">Kup Klejnoty</string>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 501bbd710..cceabb3e3 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -94,6 +94,7 @@
   <string name="faint_subtitle">Nie rozpaczaj!</string>
   <string name="faint_penalty_body">Straciłeś Poziom, Złoto i jedną część Wyposażenia, ale możesz je odzyskać dzięki ciężkiej pracy! Powodzenia - dasz radę.</string>
   <string name="faint_header">Możesz stracić całe Zdrowie!</string>
+  <string name="faint_button">Uzupełnij Zdrowie &amp; Spróbuj jeszcze raz</string>
   <string name="filter">Filtr</string>
   <string name="profile_image">Obrazek profilowy</string>
   <string name="mana_price_button" formatted="false">%d PM</string>
diff --git a/Habitica/res/values-pt-rPT/strings.sidebar.xml b/Habitica/res/values-pt-rPT/strings.sidebar.xml
index 6a6691b03..7df89c5de 100644
--- a/Habitica/res/values-pt-rPT/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rPT/strings.sidebar.xml
@@ -3,6 +3,7 @@
   <string name="sidebar.tasks">Tarefas</string>
   <string name="sidebar.skills">Habilidades</string>
   <string name="sidebar.section.social">Social</string>
+  <string name="sidebar.inbox">Caixa de Entrada</string>
   <string name="sidebar.tavern">Taberna</string>
   <string name="sidebar.party">Equipa</string>
   <string name="sidebar.purchaseGems">Comprar Gemas</string>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index 995b38d14..6394c92ab 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -36,6 +36,7 @@
   <string name="emailAddress">Endereço de email</string>
   <string name="confirmpassword">Confirmar password</string>
   <string name="logout">Sair</string>
+  <string name="logout_description">Termine a sessão da sua conta</string>
   <string name="account_details">Detalhes da conta</string>
   <string name="LoginActivityName">Bem-vindo</string>
   <string name="string_revive">Reanimar</string>
@@ -69,6 +70,7 @@
   <string name="positive_habit_form">Positivo ( + )</string>
   <string name="negative_habit_form">Negativo ( - )</string>
   <string name="checklist">Lista de verificações</string>
+  <string name="reminders">Lembretes</string>
   <string name="actions">Ações</string>
   <string name="attributes">Atributos</string>
   <string name="physical">Físico</string>
@@ -286,4 +288,27 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="empty_items" formatted="false">Você não tem quaisquer %s</string>
   <string name="user_level" formatted="false">Nível %s</string>
   <string name="user_level_with_class" formatted="false">Nível %1$s - %2$s</string>
+  <string name="warrior">Guerreiro</string>
+  <string name="rogue">Bandido</string>
+  <string name="mage">Mago</string>
+  <string name="healer">Curandeiro</string>
+  <string name="select_class">Selecionar Classe</string>
+  <string name="class_confirmation" formatted="false">Tem a certeza de que deseja ser um %s?</string>
+  <string name="choose_class">Escolher Classe</string>
+  <string name="dialog_go_back">Anterior</string>
+  <string name="change_class">Altere a sua classe</string>
+  <string name="enable_class">Ativar Sistema de Classe</string>
+  <string name="changing_class_progress">Alteração de Classe</string>
+  <string name="by_email">Por E-mail</string>
+  <string name="invite_existing_users">Convidar Utilziadores Existentes</string>
+  <string name="send">Enviar</string>
+  <string name="invite">Convidar Amigos</string>
+  <string name="add_invites">Adicionar Convites</string>
+  <string name="user_id">Id. do Utilizador</string>
+  <string name="email">E-mail</string>
+  <string name="invite_users">Convidar para a Festa</string>
+  <string name="share_using">Partilhe, utilizando</string>
+  <string name="open_in_store">Abrir na Play Store</string>
+  <string name="change_class_confirmation">Tem a certeza de que pretende alterar a sua classe? Isto irá custar 3 gemas.</string>
+  <string name="leaderMessage" formatted="false">Mensagem de %1$s</string>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 8777d9893..390d4b3b9 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -352,4 +352,15 @@ To start, which parts of your life do you want to improve?</string>
     <string name="timeTravelers">Time Travelers</string>
     <string name="seasonalShop">Seasonal Shop</string>
     <string name="empty_inbox">You don\'t have any Inbox messages. You can send a user a new message from their public chat messages!</string>
+    <string name="party_invite">Unlock by inviting friends</string>
+    <string name="no_gold">Not enough Gold</string>
+    <string name="no_potion">You don\'t need to buy an health potion</string>
+    <string name="successful_purchase" formatted="false">%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="gem">gem</string>
+    <string name="hourglass">hourglass</string>
+    <string name="hourglasses">hourglasses</string>
+    <string name="gold_singular">gold</string>
+    <string name="gems_plural">gold</string>
 </resources>
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 0db3124d5..19c709f1e 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
@@ -25,7 +25,15 @@ import java.util.UUID;
  */
 public class RemindersManager {
 
-    DateFormat dateFormater = new SimpleDateFormat("dd MMMM yyyy HH:mm:ss");
+    DateFormat dateFormater;
+
+    public RemindersManager(String taskType) {
+        if (taskType.equals("todo")) {
+            dateFormater = DateFormat.getDateTimeInstance();
+        } else {
+            dateFormater = DateFormat.getTimeInstance();
+        }
+    }
 
     public RemindersItem createReminderFromDateString(String dateString) {
         try {
@@ -61,25 +69,22 @@ public class RemindersManager {
             TimePicker dialogTimePicker = (TimePicker) dialog.findViewById(R.id.timePicker);
             DatePicker dialogDatePicker = (DatePicker) dialog.findViewById(R.id.datePicker);
 
-            dialogConfirmButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    int day = dialogDatePicker.getDayOfMonth();
-                    int month = dialogDatePicker.getMonth();
-                    int year =  dialogDatePicker.getYear();
-                    int hour = dialogTimePicker.getCurrentHour();
-                    int minute = dialogTimePicker.getCurrentMinute();
+            dialogConfirmButton.setOnClickListener(view -> {
+                int day = dialogDatePicker.getDayOfMonth();
+                int month = dialogDatePicker.getMonth();
+                int year =  dialogDatePicker.getYear();
+                int hour1 = dialogTimePicker.getCurrentHour();
+                int minute1 = dialogTimePicker.getCurrentMinute();
 
-                    Calendar calendar = Calendar.getInstance();
-                    calendar.set(year, month, day, hour, minute, 0);
+                Calendar calendar = Calendar.getInstance();
+                calendar.set(year, month, day, hour1, minute1, 0);
 
-                    if (reminder != null) {
-                        reminder.setTime(calendar.getTime());
-                    }
-
-                    editText.setText(dateFormater.format(calendar.getTime()));
-                    dialog.hide();
+                if (reminder != null) {
+                    reminder.setTime(calendar.getTime());
                 }
+
+                editText.setText(dateFormater.format(calendar.getTime()));
+                dialog.hide();
             });
             dialog.show();
         } else {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java
index 265ebc3cc..2c1deed1c 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.java
@@ -8,6 +8,8 @@ import android.content.DialogInterface;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
+import android.text.Spannable;
+import android.text.Spanned;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.ImageView;
@@ -84,7 +86,7 @@ public class ItemDetailDialog extends AlertDialog {
         });
     }
 
-    public void setDescription(String description) {
+    public void setDescription(CharSequence description) {
         contentTextView.setText(description);
         contentTextView.setVisibility(View.VISIBLE);
     }
@@ -97,6 +99,9 @@ public class ItemDetailDialog extends AlertDialog {
             case "gems":
                 currencyImageView.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_header_gem));
                 break;
+            default:
+                currencyImageView.setImageDrawable(null);
+                break;
         }
     }
 
@@ -117,5 +122,4 @@ public class ItemDetailDialog extends AlertDialog {
     public void setBuyListener(OnClickListener listener) {
         this.setButton(BUTTON_POSITIVE, getContext().getText(R.string.reward_dialog_buy), listener);
     }
-
 }
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 9e7c0736a..7c685e246 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
@@ -880,6 +880,9 @@ 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);
+                })
                 .subscribe(buyResponse -> {
                     apiHelper.retrieveUser(false)
                             .compose(apiHelper.configureApiCallObserver())
@@ -892,7 +895,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         final String rewardKey = event.Reward.getId();
 
         if (user.getStats().getGp() < event.Reward.getValue()) {
-            showSnackbar(this, floatingMenuWrapper, "Not enough Gold", SnackbarDisplayType.FAILURE);
+            showSnackbar(this, floatingMenuWrapper, getString(R.string.no_gold), SnackbarDisplayType.FAILURE);
             return;
         }
 
@@ -901,7 +904,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             int maxHp = user.getStats().getMaxHealth();
 
             if (currentHp == maxHp) {
-                UiUtils.showSnackbar(this, floatingMenuWrapper, "You don't need to buy an health potion", SnackbarDisplayType.FAILURE_BLUE);
+                UiUtils.showSnackbar(this, floatingMenuWrapper, getString(R.string.no_potion), SnackbarDisplayType.FAILURE_BLUE);
                 return;
             }
         }
@@ -910,7 +913,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
             apiHelper.apiService.buyItem(event.Reward.getId())
                     .compose(apiHelper.configureApiCallObserver())
                     .subscribe(buyResponse -> {
-                        String snackbarMessage = event.Reward.getText() + " successfully purchased!";
+                        String snackbarMessage = getString(R.string.successful_purchase, event.Reward.getText());
 
                         if (event.Reward.getId().equals("armoire")) {
                             if (buyResponse.armoire.get("type").equals("gear")) {
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 d993387f9..bc85040d1 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
@@ -230,7 +230,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             return;
         }
 
-        remindersManager = new RemindersManager();
+        remindersManager = new RemindersManager(taskType);
         taskAlarmManager = TaskAlarmManager.getInstance(this);
 
         dueDateListener = new DateEditTextListener(dueDatePickerText);
@@ -472,7 +472,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             reminders = task.getReminders();
         }
 
-        remindersAdapter = new RemindersAdapter(reminders);
+        remindersAdapter = new RemindersAdapter(reminders, taskType);
 
         LinearLayoutManager llm = new LinearLayoutManager(this);
         llm.setOrientation(LinearLayoutManager.VERTICAL);
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 445d690fd..559a5e7be 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
@@ -12,6 +12,8 @@ import com.magicmicky.habitrpgwrapper.lib.models.ShopItem;
 import org.greenrobot.eventbus.EventBus;
 
 import android.content.Context;
+import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
@@ -112,6 +114,8 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         TextView descriptionView;
         @BindView(R.id.buyButton)
         Button buyButton;
+        @BindView(R.id.unlockView)
+        TextView unlockView;
 
         String shopIdentifier;
         ShopItem item;
@@ -128,7 +132,34 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             itemView.setOnClickListener(this);
             itemView.setClickable(true);
 
-            buyButton.setOnClickListener(view -> this.buyItem());
+            buyButton.setOnClickListener(view -> {
+                String currencyString = "";
+                if (item.getCurrency().equals("gems")) {
+                    if (item.getValue() == 1) {
+                        currencyString = context.getString(R.string.gem);
+                    } else {
+                        currencyString = context.getString(R.string.gems);
+                    }
+                } else if (item.getCurrency().equals("gold")) {
+                    if (item.getValue() == 1) {
+                        currencyString = context.getString(R.string.gold_singular);
+                    } else {
+                        currencyString = context.getString(R.string.gems_plural);
+                    }
+                } else if (item.getCurrency().equals("hourglasses")) {
+                    if (item.getValue() == 1) {
+                        currencyString = context.getString(R.string.hourglass);
+                    } else {
+                        currencyString = context.getString(R.string.hourglasses);
+                    }
+                }
+                new AlertDialog.Builder(context)
+                        .setTitle(R.string.purchase_confirmation_title)
+                        .setMessage(context.getString(R.string.confirm_purchase_text, item.getText(), item.getValue().toString(), currencyString))
+                        .setPositiveButton(android.R.string.yes, (dialog, which) -> this.buyItem())
+                        .setNegativeButton(android.R.string.no, (dialog, which) -> dialog.dismiss())
+                        .show();
+            });
         }
 
         private void buyItem() {
@@ -141,20 +172,27 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         public void bind(ShopItem item) {
             this.item = item;
             titleView.setText(item.getText());
-            descriptionView.setText(item.getNotes());
+            descriptionView.setText(Html.fromHtml(item.getNotes()));
 
             DataBindingUtils.loadImage(this.imageView, item.getImageName());
 
-            buyButton.setText(item.getValue().toString());
-            switch (item.getCurrency()) {
-                case "gold":
-                    buyButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_gold, 0, 0, 0);
-                    break;
-                case "gems":
-                    buyButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_gem, 0, 0, 0);
-                    break;
-                default:
-                    buyButton.setVisibility(View.GONE);
+            if (item.getUnlockCondition() == null) {
+                buyButton.setText(item.getValue().toString());
+                switch (item.getCurrency()) {
+                    case "gold":
+                        buyButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_gold, 0, 0, 0);
+                        break;
+                    case "gems":
+                        buyButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_gem, 0, 0, 0);
+                        break;
+                    default:
+                        buyButton.setVisibility(View.GONE);
+                }
+                unlockView.setVisibility(View.GONE);
+            } else {
+                buyButton.setVisibility(View.GONE);
+                unlockView.setVisibility(View.VISIBLE);
+                unlockView.setText(item.unlockCondition.readableUnlockConditionId());
             }
         }
 
@@ -162,11 +200,13 @@ public class ShopRecyclerAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         public void onClick(View view) {
             ItemDetailDialog dialog = new ItemDetailDialog(context);
             dialog.setTitle(item.getText());
-            dialog.setDescription(item.getNotes());
+            dialog.setDescription(Html.fromHtml(item.getNotes()));
             dialog.setImage(item.getImageName());
-            dialog.setCurrency(item.getCurrency());
-            dialog.setValue(item.getValue());
-            dialog.setBuyListener((clickedDialog, which) -> this.buyItem());
+            if (item.getUnlockCondition() == null) {
+                dialog.setCurrency(item.getCurrency());
+                dialog.setValue(item.getValue());
+                dialog.setBuyListener((clickedDialog, which) -> this.buyItem());
+            }
             dialog.show();
         }
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
index e21665243..55f844a6b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RemindersAdapter.java
@@ -39,9 +39,9 @@ public class RemindersAdapter extends RecyclerView.Adapter<RemindersAdapter.Item
     private final List<RemindersItem> reminders = new ArrayList<>();
     private RemindersManager remindersManager;
 
-    public RemindersAdapter(List<RemindersItem> remindersInc) {
+    public RemindersAdapter(List<RemindersItem> remindersInc, String taskType) {
         reminders.addAll(remindersInc);
-        remindersManager = new RemindersManager();
+        remindersManager = new RemindersManager(taskType);
     }
 
     @Override
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 cccff4c5a..211d0ee4a 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
@@ -312,8 +312,10 @@ public class HabitRPGUser extends BaseModel {
             t.user_id = id;
         }
 
-        for (Tag t : tags) {
-            t.user_id = id;
+        if (tags != null) {
+            for (Tag t : tags) {
+                t.user_id = id;
+            }
         }
 
         super.save();
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 3dbbb01cb..b7c1b47f1 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
@@ -13,6 +13,7 @@ public class ShopItem {
     public String currency;
     public String purchaseType;
     public String categoryIdentifier;
+    public ShopItemUnlockCondition unlockCondition;
 
     public String getKey() {
         return key;
@@ -81,4 +82,12 @@ public class ShopItem {
     public void setPurchaseType(String purchaseType) {
         this.purchaseType = purchaseType;
     }
+
+    public ShopItemUnlockCondition getUnlockCondition() {
+        return unlockCondition;
+    }
+
+    public void setUnlockCondition(ShopItemUnlockCondition unlockCondition) {
+        this.unlockCondition = unlockCondition;
+    }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItemUnlockCondition.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItemUnlockCondition.java
new file mode 100644
index 000000000..30aa83662
--- /dev/null
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItemUnlockCondition.java
@@ -0,0 +1,18 @@
+package com.magicmicky.habitrpgwrapper.lib.models;
+
+import com.habitrpg.android.habitica.R;
+
+public class ShopItemUnlockCondition {
+
+    String condition;
+
+    public int readableUnlockConditionId() {
+        switch (this.condition) {
+
+            case "party invite":
+                return R.string.party_invite;
+            default:
+                return 0;
+        }
+    }
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java
index 042d8db1e..7618d4fba 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java
@@ -19,7 +19,9 @@ public class RemindersItemSerializer
     public JsonElement serialize(RemindersItem src, Type typeOfSrc, JsonSerializationContext context) {
         JsonObject object = new JsonObject();
         object.addProperty("id", src.getId());
-        object.addProperty("startDate", src.getStartDate().getTime());
+        if (src.getStartDate() != null) {
+            object.addProperty("startDate", src.getStartDate().getTime());
+        }
         object.addProperty("time", src.getTime().getTime());
         return object;
     }