diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 43a3efd55..5aeda4e9a 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="119"
+    android:versionCode="120"
     android:versionName="0.0.34"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index ab3589289..2490495bc 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -12,10 +12,14 @@
   <string name="SP_userID_summary">Вашият потребителски идентификатор</string>
   <string name="SP_APIToken_title">Жетон за ППИ</string>
   <string name="SP_APIToken_summary">Вашият жетон за ППИ</string>
+  <string name="Language_title">Език</string>
+  <string name="Language_summary">Промяна на езика на Хабитика</string>
   <string name="SP_user_qr_code">Вашият QR-код</string>
   <string name="PS_contact_title">Свържете се с мен</string>
   <string name="unknown_error">Възникна грешка…</string>
   <string name="pref_account_header">Профил</string>
+  <string name="pref_first_day_of_the_week_title">Начален ден на седмицата</string>
+  <string name="pref_first_day_of_the_week_summary">Първият ден от седмицата във всички календари</string>
   <string name="pref_reminder_header">Ежедневно напомняне</string>
   <string name="pref_reminder_checkbox">Включване на напомнянето</string>
   <string name="pref_reminder_picker">Задаване на времето за напомняне</string>
@@ -373,4 +377,13 @@
   <string name="scan_qr_code">Сканиране на QR-код</string>
   <string name="enter_recipient_uuid">Въведете потр. ид. на получателя</string>
   <string name="invited_to_party">Получихте покана да се присъедините към група!</string>
+  <string name="stats_widget_label">Статистика на Хабитика</string>
+  <string name="add_task">Добавяне на задача</string>
+  <string name="add_habit">Добавяне на навик</string>
+  <string name="add_daily">Добавяне на ежедневна</string>
+  <string name="add_todo">Добавяне на задача</string>
+  <string name="add_reward">Добавяне на награда</string>
+  <string name="all_dailies_completed">Изпълнихте всичките си ежедневни задачи. Добра работа!</string>
+  <string name="widget_dailies">Ежедневни задачи в Хабитика</string>
+  <string name="widget_add_task">Добавяне на задача в Хабитика</string>
 </resources>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 85b994681..ee2f77ec0 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -371,6 +371,5 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</string>
   <string name="choose_recipient_title">Nachrichtenempfänger auswählen</string>
   <string name="action_continue">Weiter</string>
   <string name="scan_qr_code">QR Code scannen</string>
-  <string name="enter_recipient_uuid">Benutzer ID des Empfängers eingeben</string>
   <string name="invited_to_party">Du wurdest in eine Gruppe eingeladen!</string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index 5d56552dd..147668a88 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -26,7 +26,6 @@
   <string name="preference_push_gifted_gems">Gifted Gems</string>
   <string name="preference_push_gifted_subscription">Gifted Subscription</string>
   <string name="preference_push_invited_to_party">Invited to Party</string>
-  <string name="preference_push_invited_to_guild">Invited to Guild</string>
   <string name="preference_push_your_quest_has_begun">Your Quest has Begun</string>
   <string name="preference_push_invited_to_quest">Invited to Quest</string>
   <!--Adding tasks-->
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index cb9780f91..8b55d0dea 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -26,7 +26,6 @@
   <string name="preference_push_gifted_gems">Gemas regaladas</string>
   <string name="preference_push_gifted_subscription">Suscripción regalada</string>
   <string name="preference_push_invited_to_party">Invitado a un grupo</string>
-  <string name="preference_push_invited_to_guild">Invitado a un gremio</string>
   <string name="preference_push_your_quest_has_begun">La misión ha comenzado</string>
   <string name="preference_push_invited_to_quest">Invitado a una misión</string>
   <!--Adding tasks-->
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index 0d7ba4512..3a1cdec88 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -12,10 +12,14 @@
   <string name="SP_userID_summary">Votre ID d\'utilisateur</string>
   <string name="SP_APIToken_title">Jeton d\'API</string>
   <string name="SP_APIToken_summary">Votre Jeton d\'API</string>
+  <string name="Language_title">Langage</string>
+  <string name="Language_summary">Changer le langage d\'Habitica</string>
   <string name="SP_user_qr_code">Votre QR code</string>
   <string name="PS_contact_title">Contactez-moi</string>
   <string name="unknown_error">Une erreur est survenue...</string>
   <string name="pref_account_header">Compte</string>
+  <string name="pref_first_day_of_the_week_title">Premier jour de la semaine</string>
+  <string name="pref_first_day_of_the_week_summary">Premier jour de la semaine dans tous les calendriers</string>
   <string name="pref_reminder_header">Rappel Quotidien</string>
   <string name="pref_reminder_checkbox">Activer le rappel</string>
   <string name="pref_reminder_picker">Changer l\'heure du rappel</string>
@@ -371,6 +375,5 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</string>
   <string name="choose_recipient_title">Choisissez un destinataire</string>
   <string name="action_continue">Continuer</string>
   <string name="scan_qr_code">Scanner le QR code</string>
-  <string name="enter_recipient_uuid">Entrez l\'ID d\'utilisateur du destinataire</string>
   <string name="invited_to_party">Vous avez été invité·e à rejoindre une équipe !</string>
 </resources>
diff --git a/Habitica/res/values-he/strings.xml b/Habitica/res/values-he/strings.xml
index fbd02c5eb..8ee9cc769 100644
--- a/Habitica/res/values-he/strings.xml
+++ b/Habitica/res/values-he/strings.xml
@@ -26,7 +26,6 @@
   <string name="preference_push_gifted_gems">אבני חן ניתנו במתנה</string>
   <string name="preference_push_gifted_subscription">מנוי ניתן במתנה</string>
   <string name="preference_push_invited_to_party">הוזמנו לחבורה</string>
-  <string name="preference_push_invited_to_guild">הוזמנו לגילדה</string>
   <string name="preference_push_your_quest_has_begun">ההרפתקה שלכם החלה</string>
   <string name="preference_push_invited_to_quest">הוזמנו להרפתקה</string>
   <!--Adding tasks-->
diff --git a/Habitica/res/values-id/strings.xml b/Habitica/res/values-id/strings.xml
index afef99269..edec5e583 100644
--- a/Habitica/res/values-id/strings.xml
+++ b/Habitica/res/values-id/strings.xml
@@ -26,7 +26,6 @@
   <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">Terundang ke Perserikatan</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-->
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 6fcf051a3..8d842b2b3 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -12,10 +12,14 @@
   <string name="SP_userID_summary">Il tuo ID utente</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">Il tuo API Token</string>
+  <string name="Language_title">Lingua</string>
+  <string name="Language_summary">Cambia la lingua di Habitica</string>
   <string name="SP_user_qr_code">Il tuo codice QR</string>
   <string name="PS_contact_title">Contattami</string>
   <string name="unknown_error">Si è verificato un errore...</string>
   <string name="pref_account_header">Account</string>
+  <string name="pref_first_day_of_the_week_title">Primo giorno della settimana</string>
+  <string name="pref_first_day_of_the_week_summary">Primo giorno della settimana in tutti i calendari</string>
   <string name="pref_reminder_header">Notifica giornaliera</string>
   <string name="pref_reminder_checkbox">Attiva notifica</string>
   <string name="pref_reminder_picker">Imposta ora notifica</string>
@@ -26,7 +30,7 @@
   <string name="preference_push_gifted_gems">Gemme regalate</string>
   <string name="preference_push_gifted_subscription">Abbonamento regalato</string>
   <string name="preference_push_invited_to_party">Invito in una squadra</string>
-  <string name="preference_push_invited_to_guild">Invito in una Gilda</string>
+  <string name="preference_push_invited_to_guild">Invito Gilda</string>
   <string name="preference_push_your_quest_has_begun">La tua Missione è cominciata</string>
   <string name="preference_push_invited_to_quest">Invito ad una Missione</string>
   <!--Adding tasks-->
@@ -373,4 +377,14 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <string name="action_continue">Continua</string>
   <string name="scan_qr_code">Rileva codice QR</string>
   <string name="invited_to_party">Hai ricevuto un invito per unirti a una squadra!</string>
+  <string name="stats_widget_label">Statistiche Habitica</string>
+  <string name="add_task">Aggiungi Attività</string>
+  <string name="add_habit">Aggiungi Abitudine</string>
+  <string name="add_daily">Aggiungi Daily</string>
+  <string name="add_todo">Aggiungi To-Do</string>
+  <string name="add_reward">Aggiungi Ricompensa</string>
+  <string name="all_dailies_completed">Hai completato tutte le tue Daily. Ottimo lavoro!</string>
+  <string name="widget_habit_button">Habitica esegui abitudine</string>
+  <string name="widget_dailies">Habitica Daily</string>
+  <string name="widget_add_task">Habitica aggiungi attività</string>
 </resources>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 371067060..1f22ad121 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -12,10 +12,14 @@
   <string name="SP_userID_summary">あなたのユーザーID</string>
   <string name="SP_APIToken_title">API トークン</string>
   <string name="SP_APIToken_summary">あなたの API トークン</string>
+  <string name="Language_title">言語</string>
+  <string name="Language_summary">Habitica の言語を変更する</string>
   <string name="SP_user_qr_code">QR コード</string>
   <string name="PS_contact_title">開発者に連絡する</string>
   <string name="unknown_error">エラーが発生しました…</string>
   <string name="pref_account_header">アカウント</string>
+  <string name="pref_first_day_of_the_week_title">週の最初の曜日</string>
+  <string name="pref_first_day_of_the_week_summary">すべてのカレンダーでの週の最初の曜日</string>
   <string name="pref_reminder_header">毎日の通知</string>
   <string name="pref_reminder_checkbox">通知を有効にする</string>
   <string name="pref_reminder_picker">通知時間を設定</string>
@@ -374,4 +378,14 @@
   <string name="scan_qr_code">QR コードを読み取る</string>
   <string name="enter_recipient_uuid">送信先の ユーザー ID を入力</string>
   <string name="invited_to_party">パーティーに招待されました!</string>
+  <string name="stats_widget_label">Habitica での統計</string>
+  <string name="add_task">タスクを追加</string>
+  <string name="add_habit">習慣を追加</string>
+  <string name="add_daily">日課を追加</string>
+  <string name="add_todo">To-Do を追加</string>
+  <string name="add_reward">ごほうびを追加</string>
+  <string name="all_dailies_completed">日課をすべて完了した。お見事!</string>
+  <string name="widget_habit_button">Habitica の習慣</string>
+  <string name="widget_dailies">Habitica の日課</string>
+  <string name="widget_add_task">Habitica のタスク追加</string>
 </resources>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index b32335549..edf216640 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -26,7 +26,6 @@
   <string name="preference_push_gifted_gems">Padovanoti Brangakmeniai</string>
   <string name="preference_push_gifted_subscription">Padovanota Prenumerata</string>
   <string name="preference_push_invited_to_party">Pakvietimas į Grupę</string>
-  <string name="preference_push_invited_to_guild">Pakvietimas į Gildiją</string>
   <string name="preference_push_your_quest_has_begun">Tavo Misija Prasidėjo</string>
   <string name="preference_push_invited_to_quest">Pakvietimas į Misiją</string>
   <!--Adding tasks-->
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index 78452b38e..c00481219 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -12,10 +12,14 @@
   <string name="SP_userID_summary">Jouw gebruikers-ID</string>
   <string name="SP_APIToken_title">API-token</string>
   <string name="SP_APIToken_summary">Jouw API-token</string>
+  <string name="Language_title">Taal</string>
+  <string name="Language_summary">Verander Habitica\'s taal</string>
   <string name="SP_user_qr_code">Je QR code</string>
   <string name="PS_contact_title">Contact</string>
   <string name="unknown_error">Er ging iets mis...</string>
   <string name="pref_account_header">Account</string>
+  <string name="pref_first_day_of_the_week_title">Eerste dag van de week</string>
+  <string name="pref_first_day_of_the_week_summary">Eerste dag van de week op alle kalenders</string>
   <string name="pref_reminder_header">Dagelijkse herinnering</string>
   <string name="pref_reminder_checkbox">Activeer herinnering</string>
   <string name="pref_reminder_picker">Stel tijd van herinnering In</string>
@@ -26,7 +30,6 @@
   <string name="preference_push_gifted_gems">Edelstenen geschonken</string>
   <string name="preference_push_gifted_subscription">Abonnement geschonken</string>
   <string name="preference_push_invited_to_party">Uitgenodigd voor groep</string>
-  <string name="preference_push_invited_to_guild">Uitgenodigd voor gilde</string>
   <string name="preference_push_your_quest_has_begun">Je queeste is begonnen</string>
   <string name="preference_push_invited_to_quest">Uitgenodigd voor queeste</string>
   <!--Adding tasks-->
@@ -371,6 +374,10 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
   <string name="choose_recipient_title">Kies een ontvanger voor het bericht</string>
   <string name="action_continue">Ga verder</string>
   <string name="scan_qr_code">Scan QR code</string>
-  <string name="enter_recipient_uuid">Voer Gebruikers ID van ontvanger in</string>
   <string name="invited_to_party">Je bent uitgenodigd voor een groep!</string>
+  <string name="add_task">Voeg taak toe</string>
+  <string name="add_habit">Voeg Gewoonte toe</string>
+  <string name="add_daily">Voeg Dagelijkse taak toe</string>
+  <string name="add_reward">Voeg Beloning toe</string>
+  <string name="all_dailies_completed">Je hebt al je Dagelijkse taken voltooid. Goed gedaan!</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 2a9f0a1aa..531989ca3 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -354,6 +354,14 @@ Od czego chcesz zacząć poprawiać swoje życie?</string>
   <string name="gold_plural">złoto</string>
   <string name="chat_message_copied">Wiadomość skopiowana do schowka</string>
   <string name="copy_chat_message">Kopiuj do schowka</string>
+  <string name="edit_tag_title">Edytuj tag</string>
+  <string name="edit_tag_btn_edit">Edytuj</string>
+  <string name="edit_tag_btn_done">Zrobione</string>
+  <string name="edit_tag_btn_delete">Usuń</string>
+  <string name="confirm_delete_tag_title">Jesteś pewien?</string>
+  <string name="confirm_delete_tag_message">Czy na pewno chcesz usunąć?</string>
+  <string name="filter_drawer_edit_tags">Edytuj tagi</string>
+  <string name="filter_drawer_filter_tags">Filtruj po tagach</string>
   <!--QR Strings-->
   <string name="qr_section_title">Czy ktoś zaprosił Cię przy pomocy tego kodu QR?</string>
   <string name="qr_save_message">Kod QR zapisany w</string>
@@ -363,4 +371,5 @@ Od czego chcesz zacząć poprawiać swoje życie?</string>
   <string name="choose_recipient_title">Wybierz odbiorcę wiadomości</string>
   <string name="action_continue">Kontynuuj</string>
   <string name="scan_qr_code">Przeskanuj kod QR</string>
+  <string name="invited_to_party">Zostałeś zaproszony do drużyny!</string>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 15a99d0aa..630214d19 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -12,10 +12,14 @@
   <string name="SP_userID_summary">Seu ID de usuário</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">Seu API Token</string>
+  <string name="Language_title">Idioma</string>
+  <string name="Language_summary">Mudar idioma do Habitica</string>
   <string name="SP_user_qr_code">Seu código QR</string>
   <string name="PS_contact_title">Contate-me</string>
   <string name="unknown_error">Um erro aconteceu...</string>
   <string name="pref_account_header">Conta</string>
+  <string name="pref_first_day_of_the_week_title">Primeiro dia da semana</string>
+  <string name="pref_first_day_of_the_week_summary">Primeiro dia da semana em todos os calendários</string>
   <string name="pref_reminder_header">Lembrete Diário</string>
   <string name="pref_reminder_checkbox">Ativar Lembrete</string>
   <string name="pref_reminder_picker">Definir Tempo do Lembrete</string>
@@ -372,6 +376,16 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="choose_recipient_title">Escolha o destinatário da mensagem</string>
   <string name="action_continue">Continuar</string>
   <string name="scan_qr_code">Escanear QR Code</string>
-  <string name="enter_recipient_uuid">Entre com o ID de usuário do destinatário</string>
+  <string name="enter_recipient_uuid">Insira o ID de Usuário do convidado</string>
   <string name="invited_to_party">Você foi convidado para um grupo!</string>
+  <string name="stats_widget_label">Estatísticas Habitica</string>
+  <string name="add_task">Adicionar Tarefa</string>
+  <string name="add_habit">Adicionar Hábito</string>
+  <string name="add_daily">Adicionar Ação Diária</string>
+  <string name="add_todo">Adicionar Tarefa</string>
+  <string name="add_reward">Adicionar recompensa</string>
+  <string name="all_dailies_completed">Você completou todas as suas ações diárias. Parabéns!</string>
+  <string name="widget_habit_button">Habitica Fazer Hábito</string>
+  <string name="widget_dailies">Habitica Diárias</string>
+  <string name="widget_add_task">Habitica Adicionar Afazer</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index a8da06847..7f017729b 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -26,7 +26,7 @@
   <string name="preference_push_gifted_gems">Gemas Oferecidas</string>
   <string name="preference_push_gifted_subscription">Subscriação Oferecida</string>
   <string name="preference_push_invited_to_party">Convidado para a Equipa</string>
-  <string name="preference_push_invited_to_guild">Convidado para o Grêmio</string>
+  <string name="preference_push_invited_to_guild">Convidado para uma Guilda</string>
   <string name="preference_push_your_quest_has_begun">A Sua Missão Começou</string>
   <string name="preference_push_invited_to_quest">Convidado para a Missão</string>
   <!--Adding tasks-->
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 60f1197e7..63b4e3b17 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -12,10 +12,14 @@
   <string name="SP_userID_summary">Ваш ID</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">Ваш API Token</string>
+  <string name="Language_title">Язык</string>
+  <string name="Language_summary">Изменить язык Habitica</string>
   <string name="SP_user_qr_code">Ваш QR код</string>
   <string name="PS_contact_title">Свяжитесь со мной</string>
   <string name="unknown_error">Произошла ошибка...</string>
   <string name="pref_account_header">Аккаунт</string>
+  <string name="pref_first_day_of_the_week_title">Первый день недели</string>
+  <string name="pref_first_day_of_the_week_summary">Первый день недели во всех календарях</string>
   <string name="pref_reminder_header">Ежедневное напоминание</string>
   <string name="pref_reminder_checkbox">Активируйте напоминание</string>
   <string name="pref_reminder_picker">Установите время напоминания</string>
@@ -26,7 +30,7 @@
   <string name="preference_push_gifted_gems">Подаренные самоцветы</string>
   <string name="preference_push_gifted_subscription">Подаренная подписка</string>
   <string name="preference_push_invited_to_party">Приглашены в команду</string>
-  <string name="preference_push_invited_to_guild">Приглашены в Гильдию</string>
+  <string name="preference_push_invited_to_guild">Приглашены в гильдию</string>
   <string name="preference_push_your_quest_has_begun">Ваш Квест начался</string>
   <string name="preference_push_invited_to_quest">Приглашены в Квест</string>
   <!--Adding tasks-->
@@ -371,6 +375,16 @@
   <string name="choose_recipient_title">Выберите получателя</string>
   <string name="action_continue">Продолжить</string>
   <string name="scan_qr_code">Сканировать QR код</string>
-  <string name="enter_recipient_uuid">Ввести пользовательский ID получателей</string>
+  <string name="enter_recipient_uuid">Ввести пользовательский ID участника</string>
   <string name="invited_to_party">Вас пригласили в команду!</string>
+  <string name="stats_widget_label">Характеристики Habitica</string>
+  <string name="add_task">Добавить задачу</string>
+  <string name="add_habit">Добавить привычку</string>
+  <string name="add_daily">Добавить ежедневное задание</string>
+  <string name="add_todo">Добавить задачу</string>
+  <string name="add_reward">Добавить награду</string>
+  <string name="all_dailies_completed">Вы справились со всеми ежедневными заданиями. Так держать!</string>
+  <string name="widget_habit_button">Привычки Habitica</string>
+  <string name="widget_dailies">Ежедневные задания Habitica</string>
+  <string name="widget_add_task">Добавить задачу Habitica</string>
 </resources>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index 0b21001fb..2737a555f 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -24,7 +24,6 @@
   <string name="preference_push_you_won_challenge">你贏得了一個挑戰！</string>
   <string name="preference_push_received_a_private_message">你收到一則私人訊息</string>
   <string name="preference_push_invited_to_party">你受邀加入隊伍</string>
-  <string name="preference_push_invited_to_guild">你受邀加入公會</string>
   <string name="preference_push_your_quest_has_begun">你的任務開始了</string>
   <string name="preference_push_invited_to_quest">你受邀參加任務</string>
   <!--Adding tasks-->
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 013e24565..2f42e4189 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -26,7 +26,6 @@
   <string name="preference_push_gifted_gems">赠送的钻石</string>
   <string name="preference_push_gifted_subscription">赠送的订阅</string>
   <string name="preference_push_invited_to_party">被邀请加入队伍</string>
-  <string name="preference_push_invited_to_guild">被邀请加入公会</string>
   <string name="preference_push_your_quest_has_begun">你的冒险开始了</string>
   <string name="preference_push_invited_to_quest">被邀请加入冒险</string>
   <!--Adding tasks-->
diff --git a/Habitica/res/values/strings.constants.xml b/Habitica/res/values/strings.constants.xml
index f5ce56263..8396b200a 100644
--- a/Habitica/res/values/strings.constants.xml
+++ b/Habitica/res/values/strings.constants.xml
@@ -6,7 +6,7 @@
     <string name="SP_APIToken" translatable="false">APIToken</string>
     <string name="SP_username" translatable="false">Username</string>
     <string name="SP_email" translatable="false">E-mail</string>
-    <string name="base_url" translatable="false">https://habitrpg-beta.herokuapp.com</string>
+    <string name="base_url" translatable="false">https://habitica.com</string>
 
     <!-- Local notification actions -->
     <string name="accept_party_invite" translatable="false">ACCEPT_PARTY_INVITE</string>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index d708094e3..4a66ad065 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -22,8 +22,8 @@
     <string name="pref_account_header">Account</string>
     <string name="pref_first_day_of_the_week_title">First Day of the Week</string>
     <string name="pref_first_day_of_the_week_summary">First day of the week in all calendars</string>
-    <string name="pref_first_day_of_the_week_default_value">1</string>
-    <string name="pref_first_day_of_the_week_key">FirstDayOfTheWeek</string>
+    <string name="pref_first_day_of_the_week_default_value" translatable="false">1</string>
+    <string name="pref_first_day_of_the_week_key" translatable="false">FirstDayOfTheWeek</string>
     <string name="pref_reminder_header">Daily Reminder</string>
     <string name="pref_reminder_checkbox">Activate Reminder</string>
     <string name="pref_reminder_picker">Set Reminder Time</string>